Fixed 'OpenGL_Windows.cpp' to work on Linux and Windows; Fixed 'Sources/CMakeLists...

[lugaru.git] / Source / OpenGL_Windows.cpp

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 2334e460b4c00a04094890b64b2193108da8ad0f..ddf9408a26c370822a0dc4c005c21812275de534 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -276,6 +276,21 @@ static int _argc = 0;
 static char **_argv = NULL;
 #endif
 
+#ifdef _WIN32
+bool cmdline(const char *cmd)
+{
+    for (int i = 1; i < _argc; i++)
+    {
+        char *arg = _argv[i];
+        while (*arg == '-')
+            arg++;
+        if (strcasecmp(arg, cmd) == 0)
+            return true;
+    }
+
+    return false;
+}
+#else
 bool cmdline(const char *cmd)
 {
     for (int i = 1; i < _argc; i++)
@@ -289,6 +304,7 @@ bool cmdline(const char *cmd)
 
     return false;
 }
+#endif
 
 
 // --------------------------------------------------------------------------
@@ -559,6 +575,8 @@ static void sdlEventProc(const SDL_Event &e, Game &game)
                 ClearKey(MAC_CONTROL_KEY);
             if ((mod & KMOD_ALT) == 0)
                 ClearKey(MAC_OPTION_KEY);
+            if ((mod & KMOD_META) == 0)
+                ClearKey(MAC_COMMAND_KEY);
             if ((mod & KMOD_SHIFT) == 0)
                 ClearKey(MAC_SHIFT_KEY);
             if ((mod & KMOD_CAPS) == 0)