Mac OS X|Fixed: Deployment and app shutdown

skyjake · Mar 11, 2012 · 8b21b8f · 8b21b8f
1 parent 6a45da4
commit 8b21b8f
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 1 deletion.
diff --git a/doomsday/engine/engine.pro b/doomsday/engine/engine.pro
@@ -667,7 +667,11 @@ macx {
     }
     fixInstallName("libdeng2.2.dylib")
 
-    doPostLink("macdeployqt Doomsday.app")
+    # Clean up previous deployment.
+    doPostLink("rm -rf Doomsday.app/Contents/PlugIns/")
+    doPostLink("rm -f Doomsday.app/Contents/Resources/qt.conf")
+
+    doPostLink("macdeployqt Doomsday.app -no-plugins")
 }
 
 # Installation ---------------------------------------------------------------

diff --git a/doomsday/engine/portable/include/dd_pinit.h b/doomsday/engine/portable/include/dd_pinit.h
@@ -33,6 +33,10 @@
 #include "dd_api.h"
 #include <de/c_wrapper.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Maximum allowed number of plugins.
 #define MAX_PLUGS   32
 
@@ -47,4 +51,8 @@ void DD_InitCommandLine(const char* cmdLine);
 extern game_import_t gi;
 extern game_export_t gx;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LIBDENG_PORTABLE_INIT_H */
diff --git a/doomsday/engine/portable/include/library.h b/doomsday/engine/portable/include/library.h
@@ -35,6 +35,10 @@
 #ifndef LIBDENG_SYSTEM_UTILS_DYNAMIC_LIBRARY_H
 #define LIBDENG_SYSTEM_UTILS_DYNAMIC_LIBRARY_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct library_s; // The library instance (opaque).
 typedef struct library_s Library;
 
@@ -89,4 +93,8 @@ void* Library_Symbol(Library* lib, const char* symbolName);
  */
 const char* Library_LastError(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LIBDENG_SYSTEM_UTILS_DYNAMIC_LIBRARY_H */
diff --git a/doomsday/engine/portable/src/dd_input.c b/doomsday/engine/portable/src/dd_input.c
@@ -1026,6 +1026,10 @@ static void postEvents(timespan_t ticLength)
     }
 #endif
 
+#ifdef UNIX
+    SDL_PumpEvents();
+#endif
+
     if(ArgExists("-noinput")) return;
 
     DD_ReadKeyboard();

diff --git a/doomsday/engine/unix/include/dd_uinit.h b/doomsday/engine/unix/include/dd_uinit.h
@@ -32,6 +32,10 @@
 #include "dd_pinit.h"
 #include "library.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
     Library* hInstPlug[MAX_PLUGS];
     GETGAMEAPI GetGameAPI;
@@ -49,4 +53,8 @@ extern application_t app;
 
 void DD_Shutdown(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LIBDENG_UINIT_H */