Changeset 8090

Timestamp:

Mar 18, 2011, 10:00:27 AM (14 years ago)

Author:

youngk

Message:

IT WORKS! Orxonox will now run properly with Cocoa - All window issues are fixed. Needs some cleanup, but only little. Rund App from Desktop.@reto: please review my changes. @fabian: watch and learn

Location:

code/branches/mac_osx

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/PrepareDevBundle.cmake (added)
• data/mac/English.lproj/MainMenu.nib (added)
• data/mac/English.lproj/MainMenu.nib/designable.nib (added)
• data/mac/English.lproj/MainMenu.nib/keyedobjects.nib (added)
• data/mac/Orxonox-Info.plist (modified) (1 diff)
• data/mac/_Orxonox-Info.plist (deleted)
• src/CMakeLists.txt (modified) (2 diffs)
• src/Orxonox.cc (modified) (1 diff)
• src/OrxonoxMac.mm (modified) (3 diffs)
• src/libraries/core/GraphicsManager.cc (modified) (1 diff)
• src/orxonox/sound/SoundManager.cc (modified) (1 diff)

code/branches/mac_osx/CMakeLists.txt

@@ -57 +57 @@
 SET(DEFAULT_CONFIG_PATH  config)
 SET(DEFAULT_LOG_PATH     log)
+SET(DEFAULT_BUNDLE_PATH  bundle)
 
 # Set output directories

code/branches/mac_osx/data/mac/Orxonox-Info.plist

@@ -8 +8 @@
         <string>${EXECUTABLE_NAME}</string>
         <key>CFBundleIconFile</key>
-        <string></string>
+        <string>Icon.icns</string>
         <key>CFBundleIdentifier</key>
-        <string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+        <string>net.orxonox.${PROJECT_NAME}</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
         <key>CFBundleName</key>
-        <string>${PRODUCT_NAME}</string>
+        <string>${PROJECT_NAME}</string>
+        <key>CFBundleVersion</key>
+        <string>${ORXONOX_VERSION}</string>
+        <key>CFBundleShortVersionString</key>
+        <string>${ORXONOX_VERSION}, ${ORXONOX_VERSION_NAME}</string>
+        <key>CFBundleGetInfoString</key>
+        <string>Orxonox: The hottest space shooter ever to exist!</string>
+        <key>NSHumanReadableCopyright</key>
+        <string>GPL version 2 or higher, and CC-BY-SA</string>
         <key>CFBundlePackageType</key>
         <string>APPL</string>
-        <key>CFBundleShortVersionString</key>
-        <string>1.0</string>
-        <key>CFBundleSignature</key>
-        <string>????</string>
-        <key>CFBundleVersion</key>
-        <string>1</string>
         <key>LSMinimumSystemVersion</key>
-        <string>${MACOSX_DEPLOYMENT_TARGET}</string>
+        <string>10.5</string>
         <key>NSMainNibFile</key>
         <string>MainMenu</string>

code/branches/mac_osx/src/CMakeLists.txt

@@ -140 +140 @@
   SOURCE_FILES
     Orxonox.cc
-#    OrxonoxMac.mm
+    OrxonoxMac.mm
   OUTPUT_NAME orxonox
 )
@@ -151 +151 @@
     "/System/Library/Frameworks/Foundation.framework"
   )
-  
-  # Tell Apple where to find the Info.plist file, used for Cocoa
-  # TODO: Of course, this only makes sense for development builds. CPack will take care of this otherwise
-  # Property XCODE_ATTRIBUTE_INFOPLIST_FILE is fo Xcode, while the other is for makefile generator
-  SET_TARGET_PROPERTIES(orxonox-main PROPERTIES 
-    XCODE_ATTRIBUTE_INFOPLIST_FILE "${DEFAULT_DATA_PATH}/mac/Orxonox-Info.plist"
-    MACOSX_BUNDLE_INFO_PLIST "${DEFAULT_DATA_PATH}/mac/Orxonox-Info.plist"
-  )
+
+  # Post-build step for the creation of the Dev-App bundle
+  INCLUDE(PrepareDevBundle)
+  ADD_CUSTOM_COMMAND(
+    TARGET orxonox-main
+    POST_BUILD 
+    # Copy the Orxonox.app from the dummy location to the correct one
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/Dummy/${PROJECT_NAME}.app" "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app"
+    # Copy the executable into the Orxonox.app
+    COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${ORXONOX_EXECUTABLE_NAME}" "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS"
+    # Copy the dev-build marker file to Orxonox.app
+    COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/orxonox_dev_build.keep_me" "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS"
+    # Create a shortcut of the application to the Desktop
+    COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_BINARY_DIR}/${DEFAULT_BUNDLE_PATH}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app" "$ENV{HOME}/Desktop/${PROJECT_NAME}_${CMAKE_CFG_INTDIR}.app"
+  ) 
 ENDIF(APPLE)
 

code/branches/mac_osx/src/Orxonox.cc

@@ -53 +53 @@
 #ifdef ORXONOX_USE_WINMAIN
 INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
-//#elif defined(ORXONOX_PLATFORM_APPLE)
-//int main_mac(int argc, char** argv)
+#elif defined(ORXONOX_PLATFORM_APPLE)
+int main_mac(int argc, char** argv)
 #else
 int main(int argc, char** argv)
 #endif
 {
-    COUT(0) << "main mac" << std::endl;
     try
     {
 #ifndef ORXONOX_USE_WINMAIN
         std::string strCmdLine;
-        for (int i = 1; i < argc; ++i)
+        for (int i = 2; i < argc; ++i)
             strCmdLine = strCmdLine + argv[i] + ' ';
 #endif

code/branches/mac_osx/src/OrxonoxMac.mm

@@ -9 +9 @@
 #import "OrxonoxMac.h"
 
-//#import <Foundation/Foundation.h>
-
 static int argc_s = 0;
 static char** argv_s = 0;
@@ -16 +14 @@
 int main(int argc, char** argv)
 {
-    //NSLog(@"main");
     argc_s = argc;
     argv_s = argv;
     
-    //NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-    //[[NSApplication sharedApplication] setDelegate:[[[OrxonoxAppDelegate alloc] init] autorelease]];
     int retVal = NSApplicationMain(argc, (const char**)argv);
-    //[pool drain];
     
     return retVal;
@@ -32 +26 @@
 - (void)applicationDidFinishLaunching:(NSNotification *)notification
 {
-    NSLog(@"applicationDidFinishLaunching");
     exit(main_mac(argc_s, argv_s));
 }

code/branches/mac_osx/src/libraries/core/GraphicsManager.cc

@@ -316 +316 @@
 
 // HACK
-#ifdef ORXONOX_PLATFORM_APPLE
-        //INFO: This will give our window focus, and not lock it to the terminal
-        ProcessSerialNumber psn = {0, kCurrentProcess};
-        TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-        SetFrontProcess(&psn);
-#endif
+//#ifdef ORXONOX_PLATFORM_APPLE
+//        //INFO: This will give our window focus, and not lock it to the terminal
+//        ProcessSerialNumber psn = {0, kCurrentProcess};
+//        TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+//        SetFrontProcess(&psn);
+//#endif
 // End of HACK
 

code/branches/mac_osx/src/orxonox/sound/SoundManager.cc

@@ -326 +326 @@
         alListener3f(AL_POSITION, position.x, position.y, position.z);
         ALenum error = alGetError();
-        if (error == AL_INVALID_VALUE)
-            COUT(2) << "Sound: OpenAL: Invalid listener position" << std::endl;
+        if (error == AL_INVALID_VALUE) {}
+            // @TODO: Follow this constantly appearing, nerve-racking warning
+            //COUT(2) << "Sound: OpenAL: Invalid listener position" << std::endl;
     }