diff --git a/.gitmodules b/.gitmodules index 77d1b7e..e74ee9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "LogVisor"] path = LogVisor url = https://github.com/AxioDL/LogVisor.git +[submodule "glslang"] + path = glslang + url = https://github.com/AxioDL/glslang.git diff --git a/glslang b/glslang new file mode 160000 index 0000000..e23c984 --- /dev/null +++ b/glslang @@ -0,0 +1 @@ +Subproject commit e23c9849c2c7b0b918b4871685bab65dd3457d74 diff --git a/lib/mac/ApplicationCocoa.mm b/lib/mac/ApplicationCocoa.mm index 9dd4342..f369c96 100644 --- a/lib/mac/ApplicationCocoa.mm +++ b/lib/mac/ApplicationCocoa.mm @@ -75,10 +75,10 @@ public: keyEquivalent:@"f"]; [fsItem setKeyEquivalentModifierMask:NSCommandKeyMask]; [appMenu addItem:[NSMenuItem separatorItem]]; - NSMenuItem* quit_item = [appMenu addItemWithTitle:[NSString stringWithFormat:@"Quit %s", m_friendlyName.c_str()] - action:@selector(quitApp:) - keyEquivalent:@"q"]; - [quit_item setKeyEquivalentModifierMask:NSCommandKeyMask]; + NSMenuItem* quitItem = [appMenu addItemWithTitle:[NSString stringWithFormat:@"Quit %s", m_friendlyName.c_str()] + action:@selector(quitApp:) + keyEquivalent:@"q"]; + [quitItem setKeyEquivalentModifierMask:NSCommandKeyMask]; [[rootMenu addItemWithTitle:[NSString stringWithUTF8String:m_friendlyName.c_str()] action:nil keyEquivalent:@""] setSubmenu:appMenu]; [[NSApplication sharedApplication] setMainMenu:rootMenu];