X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=8208d60b2f2968e1b8cf958d0b298acdbeca934b;hb=83dd4aeb0f3deef28f2bbda315a6fb7add8c79e9;hp=2334e460b4c00a04094890b64b2193108da8ad0f;hpb=fe831b45a76f058d17bfef8b5f45d7e563d97089;p=lugaru.git

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 2334e46..8208d60 100644
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -276,6 +276,7 @@ static int _argc = 0;
 static char **_argv = NULL;
 #endif
 
+#ifdef _WIN32
 bool cmdline(const char *cmd)
 {
     for (int i = 1; i < _argc; i++)
@@ -289,6 +290,21 @@ bool cmdline(const char *cmd)
 
     return false;
 }
+#else
+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;
+}
+#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)
@@ -1742,6 +1760,7 @@ int main(int argc, char **argv)
 
 
 #if !USE_DEVIL
+#ifdef _WIN32
 static bool load_image(const char *file_name, TGAImageRec &tex)
 {
     char *ptr = strrchr((char *)file_name, '.');
@@ -1756,6 +1775,22 @@ static bool load_image(const char *file_name, TGAImageRec &tex)
     STUBBED("Unsupported image type");
     return false;
 }
+#else
+static bool load_image(const char *file_name, TGAImageRec &tex)
+{
+    char *ptr = strrchr((char *)file_name, '.');
+    if (ptr)
+    {
+        if (strcasecmp(ptr+1, "png") == 0)
+            return load_png(file_name, tex);
+        else if (strcasecmp(ptr+1, "jpg") == 0)
+            return load_jpg(file_name, tex);
+    }
+
+    STUBBED("Unsupported image type");
+    return false;
+}
+#endif
 
 
 struct my_error_mgr {
@@ -1906,6 +1941,7 @@ png_done:
 }
 
 
+#ifdef _WIN32
 static bool save_image(const char *file_name)
 {
     char *ptr = strrchr((char *)file_name, '.');
@@ -1918,6 +1954,20 @@ static bool save_image(const char *file_name)
     STUBBED("Unsupported image type");
     return false;
 }
+#else
+static bool save_image(const char *file_name)
+{
+    char *ptr = strrchr((char *)file_name, '.');
+    if (ptr)
+    {
+        if (strcasecmp(ptr+1, "png") == 0)
+            return save_png(file_name);
+    }
+
+    STUBBED("Unsupported image type");
+    return false;
+}
+#endif
 
 
 static bool save_png(const char *file_name)