--- gigedit/trunk/src/gigedit/main.cpp	2007/06/10 10:56:11	1225
+++ gigedit/trunk/src/gigedit/main.cpp	2013/09/15 13:31:04	2470
@@ -19,8 +19,31 @@
 
 #include "gigedit.h"
 
+#if defined(WIN32)
+#include <windows.h>
+
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
+    LPSTR lpCmdLine, int nCmdShow)
+{
+    GigEdit app;
+    return app.run(__argc, __argv);
+}
+
+#else
+
 int main(int argc, char* argv[])
 {
-    return (argc >= 2) ? GigEdit::run(argv[1])
-                       : GigEdit::run();
+#ifdef __APPLE__
+    // remove the argument added by the OS
+    if (argc > 1 && strncmp(argv[1], "-psn", 4) == 0) {
+        argc--;
+        for (int i = 1 ; i < argc ; i++) {
+            argv[i] = argv[i + 1];
+        }
+    }
+#endif
+    GigEdit app;
+    return app.run(argc, argv);
 }
+
+#endif