Changeset 8083 for code/branches

Timestamp:

Mar 17, 2011, 12:12:17 PM (14 years ago)

Author:

youngk

Message:

Cocoa Integration of Orxonox and CPack testing. @Reto: Do NOT merge with kicklib, please.

Location:

code/branches/mac_osx

Files:

• CMakeLists.txt (modified) (1 diff)
• bin/mac (added)
• bin/mac/OrxonoxMac (added)
• cmake/BundleConfig.cmake (added)
• cmake/tools/TargetUtilities.cmake (modified) (1 diff)
• data/levels/test_swallow.oxw (modified) (2 diffs)
• data/mac (added)
• data/mac/English.lproj (added)
• data/mac/English.lproj/InfoPlist.strings (added)
• data/mac/English.lproj/MainMenu.xib (added)
• data/mac/Icon.icns (added)
• data/mac/Orxonox-Info.plist (added)
• data/mac/_Orxonox-Info.plist (added)
• src/CMakeLists.txt (modified) (1 diff)
• src/Orxonox.cc (modified) (1 diff)
• src/OrxonoxMac.h (added)
• src/OrxonoxMac.mm (added)

code/branches/mac_osx/CMakeLists.txt

@@ -140 +140 @@
 # Last but not least: Try to make a doc target with Doxygen
 ADD_SUBDIRECTORY(doc)
+
+########### CPack Packaging ###########
+
+# Currently only testing on Apple
+#IF(APPLE)
+#  INCLUDE(BundleConfig)
+#ENDIF(APPLE)

code/branches/mac_osx/cmake/tools/TargetUtilities.cmake

@@ -176 +176 @@
     ADD_COMPILER_FLAGS("-w")
   ENDIF()
-
+  
   # Don't compile header files
   FOREACH(_file ${_${_target_name}_files})
-    IF(NOT _file MATCHES "\\.(c|cc|cpp)")
+    IF(NOT _file MATCHES "\\.(c|cc|cpp|cxx|mm)$")
       SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES HEADER_FILE_ONLY TRUE)
     ENDIF()
   ENDFOREACH(_file)
-
-
 
   # Add the library/executable

code/branches/mac_osx/data/levels/test_swallow.oxw

@@ -2 +2 @@
   include("hudtemplates3.oxo")
   include("stats.oxo")
+  include("templates/lodinformation.oxt")
   include("templates/spaceship_swallow.oxt")
   include("templates/spaceship_pirate.oxt")
 ?>
+
+
 
 <Level
@@ -11 +14 @@
 
 >
+  <templates>
+   <Template link=lodtemplate_default />
+  </templates>
+
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

code/branches/mac_osx/src/CMakeLists.txt

@@ -140 +140 @@
   SOURCE_FILES
     Orxonox.cc
+    OrxonoxMac.mm
   OUTPUT_NAME orxonox
 )
+
+# Apple Mac OS X specific build settings
+IF(APPLE)
+  # On Apple we need to link to AppKit and Foundation frameworks
+  TARGET_LINK_LIBRARIES(orxonox-main 
+    "/System/Library/Frameworks/AppKit.framework"
+    "/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"
+  )
+ENDIF(APPLE)
+
 # Main executable should depend on all modules
 ADD_DEPENDENCIES(orxonox-main ${ORXONOX_MODULES})

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)
 #else
 int main(int argc, char** argv)
 #endif
 {
+    COUT(0) << "main mac" << std::endl;
     try
     {