Changeset 8285

Timestamp:

Apr 21, 2011, 7:43:10 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 8098 - 8277 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• CMakeLists.txt (modified) (2 diffs)
• bin/client1.bat.in (modified) (1 diff)
• bin/client2.bat.in (modified) (1 diff)
• bin/dedicated.bat.in (modified) (1 diff)
• bin/dedicatedClient.bat.in (modified) (1 diff)
• bin/masterserver.bat.in (modified) (1 diff)
• bin/run.bat.in (modified) (1 diff)
• bin/server.bat.in (modified) (1 diff)
• bin/standalone.bat.in (modified) (1 diff)
• cmake/BundleConfig.cmake (copied) (copied from code/branches/kicklib/cmake/BundleConfig.cmake)
• cmake/CompilerConfigMSVC.cmake (modified) (1 diff)
• cmake/LibraryConfig.cmake (modified) (5 diffs)
• cmake/PackageConfig.cmake (modified) (2 diffs)
• cmake/PackageConfigMSVC.cmake (modified) (1 diff)
• cmake/PackageConfigOSX.cmake (modified) (2 diffs)
• cmake/PrepareDevBundle.cmake (copied) (copied from code/branches/kicklib/cmake/PrepareDevBundle.cmake)
• cmake/tools/FindALUT.cmake (modified) (1 diff)
• cmake/tools/FindCEGUI.cmake (modified) (5 diffs)
• cmake/tools/FindLua5.1.cmake (modified) (1 diff)
• cmake/tools/FindOGRE.cmake (modified) (2 diffs)
• cmake/tools/FindOgg.cmake (modified) (1 diff)
• cmake/tools/FindVorbis.cmake (modified) (1 diff)
• cmake/tools/TargetUtilities.cmake (modified) (3 diffs)
• contrib/CMakeLists.txt (copied) (copied from code/branches/kicklib/contrib/CMakeLists.txt)
• contrib/orxonox.desktop (modified) (1 diff)
• contrib/orxonox.png (copied) (copied from code/branches/kicklib/contrib/orxonox.png)
• contrib/orxonox_old.svg (copied) (copied from code/branches/kicklib/contrib/orxonox_old.svg)
• data/CMakeLists.txt (modified) (1 diff)
• data/DataInstallScript.cmake (deleted)
• data/levels/planets.oxw (copied) (copied from code/branches/kicklib/data/levels/planets.oxw)
• data/mac (copied) (copied from code/branches/kicklib/data/mac)
• data/mac/English.lproj (copied) (copied from code/branches/kicklib/data/mac/English.lproj)
• data/mac/English.lproj/InfoPlist.strings (copied) (copied from code/branches/kicklib/data/mac/English.lproj/InfoPlist.strings)
• data/mac/English.lproj/MainMenu.nib (copied) (copied from code/branches/kicklib/data/mac/English.lproj/MainMenu.nib)
• data/mac/English.lproj/MainMenu.nib/designable.nib (copied) (copied from code/branches/kicklib/data/mac/English.lproj/MainMenu.nib/designable.nib)
• data/mac/English.lproj/MainMenu.nib/keyedobjects.nib (copied) (copied from code/branches/kicklib/data/mac/English.lproj/MainMenu.nib/keyedobjects.nib)
• data/mac/English.lproj/MainMenu.xib (copied) (copied from code/branches/kicklib/data/mac/English.lproj/MainMenu.xib)
• data/mac/Icon.icns (copied) (copied from code/branches/kicklib/data/mac/Icon.icns)
• data/mac/Orxonox-Info.plist (copied) (copied from code/branches/kicklib/data/mac/Orxonox-Info.plist)
• src/CMakeLists.txt (modified) (4 diffs)
• src/Orxonox.cc (modified) (2 diffs)
• src/OrxonoxConfig.cmake (modified) (1 diff)
• src/OrxonoxConfig.h.in (modified) (1 diff)
• src/OrxonoxMac.h (copied) (copied from code/branches/kicklib/src/OrxonoxMac.h)
• src/OrxonoxMac.mm (copied) (copied from code/branches/kicklib/src/OrxonoxMac.mm)
• src/SpecialConfig.h.in (modified) (1 diff)
• src/external/ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• src/external/ois/CMakeLists.txt (modified) (1 diff)
• src/external/tinyxml/CMakeLists.txt (modified) (1 diff)
• src/external/tinyxml/VERSION (modified) (1 diff)
• src/external/tinyxml/changes_orxonox.diff (modified) (1 diff)
• src/external/tinyxml/ticpp.cpp (modified) (4 diffs)
• src/external/tinyxml/ticpp.h (modified) (14 diffs)
• src/libraries/core/CorePrereqs.h (modified) (3 diffs)
• src/libraries/core/GraphicsManager.cc (modified) (6 diffs)
• src/libraries/core/GraphicsManager.h (modified) (1 diff)
• src/libraries/core/Identifier.h (modified) (1 diff)
• src/libraries/core/PathConfig.cc (modified) (7 diffs)
• src/libraries/core/PathConfig.h (modified) (1 diff)
• src/libraries/core/Resource.cc (modified) (2 diffs)
• src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) (4 diffs)
• src/orxonox/sound/SoundManager.cc (modified) (1 diff)

code/branches/kicklib2/CMakeLists.txt

@@ -57 +57 @@
 SET(DEFAULT_CONFIG_PATH  config)
 SET(DEFAULT_LOG_PATH     log)
+SET(DEFAULT_BUNDLE_PATH  bundle)
 
 # Set output directories
@@ -138 +139 @@
 ADD_SUBDIRECTORY(bin)
 
+# System specific files (mostly for installation)
+ADD_SUBDIRECTORY(contrib)
+
 # 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/kicklib2/bin/client1.bat.in

@@ -1 +1 @@
 title @PROJECT_NAME@
 path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
-@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --client --writingPathSuffix client1
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --client --writingPathSuffix client1
 pause

code/branches/kicklib2/bin/client2.bat.in

@@ -1 +1 @@
 title @PROJECT_NAME@
 path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
-@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --client --writingPathSuffix client2
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --client --writingPathSuffix client2
 pause

code/branches/kicklib2/bin/dedicated.bat.in

@@ -1 +1 @@
 title @PROJECT_NAME@
 path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
-@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --dedicated --writingPathSuffix dedicated
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --dedicated --writingPathSuffix dedicated
 pause

code/branches/kicklib2/bin/dedicatedClient.bat.in

@@ -1 +1 @@
 title @PROJECT_NAME@
 path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
-@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --dedicatedClient --writingPathSuffix dedicatedClient
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --dedicatedClient --writingPathSuffix dedicatedClient
 pause

code/branches/kicklib2/bin/masterserver.bat.in

@@ -1 +1 @@
 title @PROJECT_NAME@
 path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
-@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --masterserver --writingPathSuffix masterserver
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --masterserver --writingPathSuffix masterserver
 pause

code/branches/kicklib2/bin/run.bat.in

@@ -1 +1 @@
 title @PROJECT_NAME@
 path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
-@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@"
 pause

code/branches/kicklib2/bin/server.bat.in

@@ -1 +1 @@
 title @PROJECT_NAME@
 path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
-@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --server --writingPathSuffix server
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --server --writingPathSuffix server
 pause

code/branches/kicklib2/bin/standalone.bat.in

@@ -1 +1 @@
 title @PROJECT_NAME@
 path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
-@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --standalone --writingPathSuffix standalone
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --standalone --writingPathSuffix standalone
 pause

code/branches/kicklib2/cmake/CompilerConfigMSVC.cmake

@@ -68 +68 @@
 # Note: It hasn't been checked yet whether we have code that might break
 #ADD_COMPILER_FLAGS("-fp:fast" CACHE)
-
-# No iterator checking for release builds (MSVC 8 dosn't understand this though)
-ADD_COMPILER_FLAGS("-D_SECURE_SCL=0" ReleaseAll CACHE)
 
 # Newer MSVC versions come with std::shared_ptr which conflicts with

code/branches/kicklib2/cmake/LibraryConfig.cmake

@@ -58 +58 @@
   ELSEIF(MSVC90)
     SET(_compiler_prefix msvc9)
-  ELSEIF(MSVC100)
+  ELSEIF(MSVC10)
     SET(_compiler_prefix msvc10)
   ENDIF()
@@ -98 +98 @@
 # Performs the search and sets the variables    #
 
-FIND_PACKAGE(OGRE     1.6    REQUIRED)
-#FIND_PACKAGE(ENet     1.1    REQUIRED)
+#FIND_PACKAGE(ENet     1.2    REQUIRED)
+FIND_PACKAGE(CEGUI    0.6    REQUIRED)
 FIND_PACKAGE(Lua5.1          REQUIRED)
 FIND_PACKAGE(Ogg             REQUIRED)
@@ -105 +105 @@
 FIND_PACKAGE(ALUT            REQUIRED)
 FIND_PACKAGE(ZLIB            REQUIRED)
-IF(POCO_REQUIRED)
-  FIND_PACKAGE(POCO          REQUIRED)
-  # Always link against POCO too because of threading
-  SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${POCO_LIBRARY})
-ENDIF()
+
 IF(WIN32)
   FIND_PACKAGE(DbgHelp)
@@ -115 +111 @@
 ENDIF()
 
-##### CEGUI #####
-# We make use of the CEGUI script module called CEGUILua.
-# However there is a small issue with that: Both CEGUILua and Orxonox use
-# Lua library functions on the same objects. And it turns out that in this case
-# the linked library must be EXACTLY the same.
-# Since Lua v5.1 has been out for a long while, this does not seem to be a
-# problem anymore, at least as long as Lua 5.2 is not released.
-FIND_PACKAGE(CEGUI 0.6 REQUIRED)
 
 ##### OpenAL #####
@@ -147 +135 @@
 ##### Boost #####
 # Expand the next statement if newer boost versions are released
-SET(Boost_ADDITIONAL_VERSIONS 1.37 1.37.0 1.38 1.38.0 1.39 1.39.0 1.40 1.40.0
-                              1.41 1.41.0 1.42 1.42.0 1.43 1.43.0 1.44 1.44.0
-                              1.45 1.45.0 1.46 1.46.0 1.46.1)
-IF( NOT TARDIS )
-  FIND_PACKAGE(Boost 1.35 REQUIRED thread filesystem system date_time)
+SET(Boost_ADDITIONAL_VERSIONS 1.40 1.40.0 1.41 1.41.0 1.42 1.42.0 1.43 1.43.0
+                              1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1)
+IF(NOT TARDIS)
+  FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
 ENDIF()
 # No auto linking, so this option is useless anyway
 MARK_AS_ADVANCED(Boost_LIB_DIAGNOSTIC_DEFINITIONS)
-# Complain about incompatibilities
-IF(GCC_VERSION)
-  COMPARE_VERSION_STRINGS("${GCC_VERSION}" "4.4.0" _compare_result)
-  IF(NOT _compare_result LESS 0)
-    IF(${Boost_VERSION} LESS 103700)
-      MESSAGE(STATUS "Warning: Boost versions earlier than 1.37 may not compile with GCC 4.4 or later!")
-    ENDIF()
-  ENDIF()
+
+##### OGRE #####
+FIND_PACKAGE(OGRE 1.6 REQUIRED)
+# For Ogre >= 1.7, we might need a threading library
+# Variables are either defined by dependency package config or by FindOGRE
+IF(OGRE_NEEDS_POCO)
+  FIND_PACKAGE(POCO REQUIRED)
+  # Always link against POCO too because of threading
+  SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${POCO_LIBRARY})
+ELSEIF(OGRE_NEEDS_BOOST)
+  # Always link against boost too because of threading
+  SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${Boost_THREAD_LIBRARY})
 ENDIF()
 

code/branches/kicklib2/cmake/PackageConfig.cmake

@@ -33 +33 @@
 COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} 5 _result TRUE)
 IF(NOT _result EQUAL -1 AND NOT APPLE)
-  SET(POCO_REQUIRED TRUE)
+  SET(OGRE_NEEDS_POCO TRUE)
 ENDIF()
 
@@ -75 +75 @@
 
   ## RELEASE
-  # Try to filter out all the debug libraries. If the regex doesn't do the
-  # job anymore, simply adjust it.
-  INSTALL(
-    DIRECTORY ${DEP_BINARY_DIR}/
-    DESTINATION bin
-    CONFIGURATIONS Release RelWithDebInfo MinSizeRel
-    REGEX "_[Dd]\\.[a-zA-Z0-9+-]+$|-mt-gd-|^.*\\.pdb$" EXCLUDE
-  )
+  IF(EXISTS ${DEP_BINARY_DIR}/install_manifest.txt)
+    FILE(STRINGS ${DEP_BINARY_DIR}/install_manifest.txt _files)
+    FOREACH(_file ${_files})
+      INSTALL(
+        FILES ${DEP_BINARY_DIR}/${_file}
+        DESTINATION bin
+        CONFIGURATIONS Release RelWithDebInfo MinSizeRel
+      )
+    ENDFOREACH(_file)
+  ELSE()
+    # Try to filter out all the debug libraries. If the regex doesn't do the
+    # job anymore, simply adjust it.
+    INSTALL(
+      DIRECTORY ${DEP_BINARY_DIR}/
+      DESTINATION bin
+      CONFIGURATIONS Release RelWithDebInfo MinSizeRel
+      REGEX "_[Dd]\\.[a-zA-Z0-9+-]+$|-mt-gd-|^.*\\.pdb$" EXCLUDE
+    )
+  ENDIF()
 ENDIF()

code/branches/kicklib2/cmake/PackageConfigMSVC.cmake

@@ -57 +57 @@
   # Certain find scripts don't behave as ecpected to we have
   # to specify the libraries ourselves.
-  SET(TCL_LIBRARY  ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "")
-  SET(ZLIB_LIBRARY ${DEP_LIBRARY_DIR}/zdll.lib  CACHE FILEPATH "")
+  IF(MSVC10)
+    SET(TCL_LIBRARY
+      optimized ${DEP_LIBRARY_DIR}/tcl85t.lib
+      debug     ${DEP_LIBRARY_DIR}/tcl85tg.lib
+      CACHE FILEPATH ""
+    )
+    SET(ZLIB_LIBRARY
+      optimized ${DEP_LIBRARY_DIR}/zlib-vc100.lib
+      debug     ${DEP_LIBRARY_DIR}/zlib-vc100_d.lib
+      CACHE FILEPATH ""
+    )
+  ELSE()
+    SET(TCL_LIBRARY  ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "")
+    SET(ZLIB_LIBRARY ${DEP_LIBRARY_DIR}/zdll.lib  CACHE FILEPATH "")
+  ENDIF()
   # Part of Platform SDK and usually gets linked automatically
   SET(WMI_LIBRARY  wbemuuid.lib)

code/branches/kicklib2/cmake/PackageConfigOSX.cmake

@@ -30 +30 @@
 IF(NOT _INTERNAL_PACKAGE_MESSAGE)
   MESSAGE(STATUS "Using library package for the dependencies.")
+  
+  # The following shell script sets the appropriate install_names for our libraries
+  # and therefore it must be run before anything else is set, dep-package-wise.
+  EXECUTE_PROCESS(
+    COMMAND ${DEPENDENCY_PACKAGE_DIR}/install_dependencies.sh
+    WORKING_DIRECTORY ${DEPENDENCY_PACKAGE_DIR}
+    OUTPUT_FILE ${CMAKE_BINARY_DIR}/dep_pack_install_log.keep_me 
+  )
   SET(_INTERNAL_PACKAGE_MESSAGE 1 CACHE INTERNAL "Do not edit!" FORCE)
 ENDIF()
 
-SET(DEP_INCLUDE_DIR ${DEPENDENCY_PACKAGE_DIR}/include)
-SET(DEP_LIBRARY_DIR ${DEPENDENCY_PACKAGE_DIR}/lib)
-SET(DEP_BINARY_DIR  ${DEPENDENCY_PACKAGE_DIR}/bin)
+SET(DEP_INCLUDE_DIR   ${DEPENDENCY_PACKAGE_DIR}/include)
+SET(DEP_LIBRARY_DIR   ${DEPENDENCY_PACKAGE_DIR}/lib)
+SET(DEP_BINARY_DIR    ${DEPENDENCY_PACKAGE_DIR}/bin)
 SET(DEP_FRAMEWORK_DIR ${DEPENDENCY_PACKAGE_DIR}/Library/Frameworks)
 
-# Sets the library path for the FIND_LIBRARY
-SET(CMAKE_LIBRARY_PATH ${DEP_LIBRARY_DIR})
+# Sets the library and framwork paths for the FIND_LIBRARY commands
+SET(CMAKE_LIBRARY_PATH   ${DEP_LIBRARY_DIR})
+SET(CMAKE_FRAMEWORK_PATH ${DEP_FRAMEWORK_DIR})
 
 # Include paths and other special treatments
-SET(ENV{ALUTDIR}               ${DEP_FRAMEWORK_DIR})
-SET(ENV{BOOST_ROOT}            ${DEPENDENCY_PACKAGE_DIR})
-SET(ENV{CEGUIDIR}              ${DEP_FRAMEWORK_DIR})
-SET(ENV{LUA_DIR}               ${DEP_INCLUDE_DIR}/lua)
-SET(ENV{LUA5.1_DIR}            ${DEP_INCLUDE_DIR}/lua)
-SET(ENV{OGGDIR}                ${DEP_INCLUDE_DIR})
-SET(ENV{VORBISDIR}             ${DEP_INCLUDE_DIR})
-SET(ENV{OGRE_HOME}             ${DEP_FRAMEWORK_DIR})
-SET(ENV{OGRE_PLUGIN_DIR}       ${DEP_BINARY_DIR})
+SET(ENV{BOOST_ROOT}      ${DEPENDENCY_PACKAGE_DIR})
+SET(ENV{OGGDIR}          ${DEP_INCLUDE_DIR})
+SET(ENV{VORBISDIR}       ${DEP_INCLUDE_DIR})
+SET(ENV{OGRE_PLUGIN_DIR} ${DEP_BINARY_DIR})
+
+# Linking to OGRE requires linking to the boost threading library
+SET(OGRE_NEEDS_BOOST TRUE)
 
 # For OS X 10.5 we have to ship modified headers to make it compile
@@ -59 +66 @@
 ENDIF()
 
-# Xcode won't be able to run the toluabind code generation if we're using the dependency package
-#IF(DEPENDENCY_PACKAGE_ENABLE)
-#  IF(${CMAKE_GENERATOR} STREQUAL "Xcode")
-#    SET(ENV{DYLD_LIBRARY_PATH}               ${DEPENDENCY_PACKAGE_DIR}/lib)
-#    SET(ENV{DYLD_FRAMEWORK_PATH}             ${DEPENDENCY_PACKAGE_DIR}/Library/Frameworks)
-#  ENDIF(${CMAKE_GENERATOR} STREQUAL "Xcode")
-#ENDIF(DEPENDENCY_PACKAGE_ENABLE)
-
 ### INSTALL ###
 
 # Tcl script library
 # TODO: How does this work on OS X?
+# Concerning all OS X install procedures: use CPACK
 #INSTALL(
 #  DIRECTORY ${DEP_LIBRARY_DIR}/tcl/

code/branches/kicklib2/cmake/tools/FindALUT.cmake

@@ -32 +32 @@
 FIND_PATH(ALUT_INCLUDE_DIR alut.h
   PATHS $ENV{ALUTDIR}
-  PATH_SUFFIXES include include/AL Headers Headers/AL
+  PATH_SUFFIXES include include/AL
 )
 FIND_LIBRARY(ALUT_LIBRARY_OPTIMIZED

code/branches/kicklib2/cmake/tools/FindCEGUI.cmake

@@ -34 +34 @@
 FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
   PATHS $ENV{CEGUIDIR}
-  PATH_SUFFIXES include include/CEGUI CEGUI.framework/Headers
+  PATH_SUFFIXES include include/CEGUI
 )
 
@@ -44 +44 @@
   NAMES CEGUIBase CEGUI
   PATHS $ENV{CEGUIDIR}
-  PATH_SUFFIXES lib bin CEGUIBase.framework CEGUI.framework
+  PATH_SUFFIXES lib bin
 )
 FIND_LIBRARY(CEGUI_LIBRARY_DEBUG
@@ -56 +56 @@
 # Find CEGUILua headers
 FIND_PATH(CEGUILUA_INCLUDE_DIR CEGUILua.h
-  PATHS $ENV{CEGUIDIR} ${CEGUI_INCLUDE_DIR}/ScriptingModules/LuaScriptModule
-  PATH_SUFFIXES include include/CEGUI CEGUILuaScriptModule.framework/Headers
+  PATHS
+    $ENV{CEGUIDIR}
+    $ENV{CEGUILUADIR}
+    ${CEGUI_INCLUDE_DIR}/ScriptingModules/LuaScriptModule
+  PATH_SUFFIXES include include/CEGUI
 )
 # Find CEGUILua libraries
 FIND_LIBRARY(CEGUILUA_LIBRARY_OPTIMIZED
   NAMES CEGUILua CEGUILuaScriptModule
-  PATHS $ENV{CEGUIDIR}
-  PATH_SUFFIXES lib bin CEGUILuaScriptModule.framework
+  PATHS $ENV{CEGUIDIR} $ENV{CEGUILUADIR}
+  PATH_SUFFIXES lib bin
 )
 FIND_LIBRARY(CEGUILUA_LIBRARY_DEBUG
   NAMES CEGUILuad CEGUILua_d CEGUILuaScriptModuled CEGUILuaScriptModule_d
-  PATHS $ENV{CEGUIDIR}
+  PATHS $ENV{CEGUIDIR} $ENV{CEGUILUADIR}
   PATH_SUFFIXES lib bin
 )
@@ -79 +82 @@
     # For newer CEGUI versions >= 0.7
     ${CEGUILUA_INCLUDE_DIR}/support/tolua++
-    # For Apples
-    $ENV{CEGUIDIR}
-  PATH_SUFFIXES ceguitolua++.framework/Headers
-  NO_DEFAULT_PATH # MUST be in CEGUILUA_INCLUDE_DIR somewhere
+    # For Mac OS X, tolua++ is a separate framework in the dependency package
+    ${DEP_FRAMEWORK_DIR}
+  NO_DEFAULT_PATH # Don't attempt to find tolua++ installed on the system
 )
 # Find CEGUI Tolua++ libraries
 FIND_LIBRARY(CEGUI_TOLUA_LIBRARY_OPTIMIZED
   NAMES CEGUItoluapp tolua++ ceguitolua++
-  PATHS $ENV{CEGUIDIR}
-  PATH_SUFFIXES lib bin ceguitolua++.framework
+  PATHS $ENV{CEGUIDIR} ${CEGUITOLUADIR}
+  PATH_SUFFIXES lib bin
 )
 FIND_LIBRARY(CEGUI_TOLUA_LIBRARY_DEBUG
   NAMES CEGUItoluappd CEGUItoluapp_d tolua++d tolua++_d
-  PATHS $ENV{CEGUIDIR}
+  PATHS $ENV{CEGUIDIR} ${CEGUITOLUADIR}
   PATH_SUFFIXES lib bin
 )
@@ -101 +103 @@
   # Find CEGUI OGRE Renderer headers
   FIND_PATH(CEGUI_OGRE_RENDERER_INCLUDE_DIR CEGUIOgreRenderer.h
-    PATHS $ENV{CEGUIDIR} ${CEGUI_INCLUDE_DIR}/RendererModules/Ogre
-    PATH_SUFFIXES include include/CEGUI CEGUI.framework/Headers
+    PATHS
+      $ENV{CEGUIDIR}
+      $ENV{CEGUIOGRERENDERERDIR}
+      ${CEGUI_INCLUDE_DIR}/RendererModules/Ogre
+    PATH_SUFFIXES include include/CEGUI
   )
   # Find CEGUI OGRE Renderer libraries
   FIND_LIBRARY(CEGUI_OGRE_RENDERER_LIBRARY_OPTIMIZED
     NAMES CEGUIOgreRenderer
-    PATHS $ENV{CEGUIDIR}
+    PATHS $ENV{CEGUIDIR} $ENV{CEGUIOGRERENDERERDIR}
     PATH_SUFFIXES lib bin
   )
   FIND_LIBRARY(CEGUI_OGRE_RENDERER_LIBRARY_DEBUG
     NAMES CEGUIOgreRendererd CEGUIOgreRenderer_d
-    PATHS $ENV{CEGUIDIR}
+    PATHS $ENV{CEGUIDIR} $ENV{CEGUIOGRERENDERERDIR}
     PATH_SUFFIXES lib bin
   )

code/branches/kicklib2/cmake/tools/FindLua5.1.cmake

@@ -56 +56 @@
 # Find include path
 FIND_PATH(LUA5.1_INCLUDE_DIR lua.h
-  PATHS $ENV{LUA5.1_DIR}
+  PATHS $ENV{LUA5.1_DIR} $ENV{LUA_DIR}
   PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
 )

code/branches/kicklib2/cmake/tools/FindOGRE.cmake

@@ -23 +23 @@
 FIND_PATH(OGRE_INCLUDE_DIR Ogre.h
   PATHS $ENV{OGRE_HOME}
-  PATH_SUFFIXES include include/OGRE Ogre.framework/Headers
+  PATH_SUFFIXES include include/OGRE
 )
 FIND_LIBRARY(OGRE_LIBRARY_OPTIMIZED
@@ -33 +33 @@
   NAMES OgreMaind OgreMain_d OgreMainD OgreMain_D Ogred Ogre_d OgreD Ogre_d
   PATHS $ENV{OGRE_HOME}
-  PATH_SUFFIXES lib bin/Debug bin/debug Debug debug Versions/A
+  PATH_SUFFIXES lib bin/Debug bin/debug Debug debug
 )
 

code/branches/kicklib2/cmake/tools/FindOgg.cmake

@@ -22 +22 @@
 )
 FIND_LIBRARY(OGG_LIBRARY_OPTIMIZED
-  NAMES ogg ogg-0
+  NAMES ogg ogg-0 libogg
   PATHS $ENV{OGGDIR}
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(OGG_LIBRARY_DEBUG
-  NAMES oggd ogg_d oggD ogg_D
+  NAMES oggd ogg_d oggD ogg_D libogg_d
   PATHS $ENV{OGGDIR}
   PATH_SUFFIXES lib

code/branches/kicklib2/cmake/tools/FindVorbis.cmake

@@ -22 +22 @@
 )
 FIND_LIBRARY(VORBIS_LIBRARY_OPTIMIZED
-  NAMES vorbis vorbis-0
+  NAMES vorbis vorbis-0 libvorbis
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(VORBIS_LIBRARY_DEBUG
-  NAMES vorbisd vorbis_d vorbisD vorbis_D
+  NAMES vorbisd vorbis_d vorbisD vorbis_D libvorbis_d
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(VORBISFILE_LIBRARY_OPTIMIZED
-  NAMES vorbisfile vorbisfile-3
+  NAMES vorbisfile vorbisfile-3 libvorbisfile
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(VORBISFILE_LIBRARY_DEBUG
-  NAMES vorbisfiled vorbisfile_d vorbisfileD vorbisfile_D
+  NAMES vorbisfiled vorbisfile_d vorbisfileD vorbisfile_D libvorbisfile_d
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib

code/branches/kicklib2/cmake/tools/TargetUtilities.cmake

@@ -53 +53 @@
  #    This function also installs the target!
  #  Prerequisistes:
- #    ORXONOX_DEFAULT_LINK, ORXONOX_CONFIG_FILES, ORXONOX_CONFIG_FILES_GENERATED
+ #    ORXONOX_DEFAULT_LINK
  #  Parameters:
  #    _target_name, ARGN for the macro arguments
@@ -206 +206 @@
         SOURCE_GROUP("Config" FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_arg_PCH_FILE})
       ENDIF()
-      # Also include all config files
-      LIST(APPEND _${_target_name}_files ${ORXONOX_CONFIG_FILES} ${ORXONOX_CONFIG_FILES_GENERATED})
-      # Add unprocessed config files to the 'Config' section
-      SOURCE_GROUP("Config" FILES ${ORXONOX_CONFIG_FILES})
-      # Add generated config files to the 'Generated' section
-      SOURCE_GROUP("Generated" FILES ${ORXONOX_CONFIG_FILES_GENERATED})
     ENDIF()
   ENDIF()
@@ -291 +285 @@
   IF(_arg_LINK_LIBRARIES)
     TARGET_LINK_LIBRARIES(${_target_name} ${_arg_LINK_LIBRARIES})
+  ENDIF()
+
+  # RPATH settings for the installation
+  IF(UNIX)
+    SET(_rpath ${LIBRARY_INSTALL_DIRECTORY})
+    IF(_arg_MODULE)
+      LIST(APPEND _rpath ${MODULE_INSTALL_DIRECTORY})
+    ENDIF()
+    SET_TARGET_PROPERTIES(${_target_name} PROPERTIES INSTALL_RPATH "${_rpath}")
   ENDIF()
 

code/branches/kicklib2/contrib/orxonox.desktop

@@ -2 +2 @@
 Name=Orxonox
 Comment=A spacecraft shooter
-Exec=orxonox
+Exec=/usr/games/orxonox
 Icon=/usr/share/pixmaps/orxonox.png
 Type=Application

code/branches/kicklib2/data/CMakeLists.txt

@@ -59 +59 @@
   DIRECTORY ${EXTERNAL_DATA_DIRECTORY}/
   DESTINATION ${DATA_INSTALL_DIRECTORY}
-  REGEX "\\.svn$|_svn$|resources\\.oxr|AUTHORS|LICENSE" EXCLUDE
+  REGEX "\\.svn$|_svn$|AUTHORS|LICENSE" EXCLUDE
 )
-# Configure the install scripts (variables not available during installation)
-CONFIGURE_FILE(DataInstallScript.cmake ${CMAKE_CURRENT_BINARY_DIR}/DataInstallScript.cmake @ONLY)
-# Join both resources.oxr files
-INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/DataInstallScript.cmake)

code/branches/kicklib2/src/CMakeLists.txt

@@ -41 +41 @@
 #ADD_COMPILER_FLAGS("-DENET_DLL"           WIN32 LINK_ENET_DYNAMIC)
 ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL"   WIN32 LINK_LUA5.1_DYNAMIC)
-ADD_COMPILER_FLAGS("-DZLIB_DLL"           WIN32 LINK_ZLIB_DYNAMIC)
 # If no defines are specified, these libs get linked dynamically
 ADD_COMPILER_FLAGS("-DCEGUI_STATIC -DTOLUA_STATIC" WIN32 NOT LINK_CEGUI_DYNAMIC)
@@ -139 +138 @@
 ENDIF()
 
+SET(ORXONOX_MAIN_FILES Orxonox.cc)
+
+# Add special source file for OS X
+IF(APPLE)
+  LIST(APPEND ORXONOX_MAIN_FILES OrxonoxMac.mm)
+ENDIF()
+
 ORXONOX_ADD_EXECUTABLE(orxonox-main
   # When defined as WIN32 this removes the console window on Windows
@@ -145 +151 @@
     orxonox
   SOURCE_FILES
-    Orxonox.cc
+    ${ORXONOX_MAIN_FILES}
   OUTPUT_NAME orxonox
 )
@@ -179 +185 @@
 ENDIF(MSVC)
 
+# 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 
+    "-framework AppKit"
+    "-framework Foundation"
+  )
+
+  # Post-build step for the creation of the Dev-App bundle
+  INCLUDE(PrepareDevBundle)
+  ADD_CUSTOM_COMMAND(
+    TARGET orxonox-main
+    POST_BUILD 
+    # Copy the executable into the Orxonox.app
+    COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${ORXONOX_EXECUTABLE_NAME}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${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_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app/Contents/MacOS"
+    # Create a shortcut of the application to the root of the build tree
+    COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${PROJECT_NAME}.app" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app" 
+  ) 
+ENDIF(APPLE)
+
 #################### Doxygen ####################
 

code/branches/kicklib2/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)
@@ -60 +62 @@
     {
 #ifndef ORXONOX_USE_WINMAIN
+
+#ifdef ORXONOX_PLATFORM_APPLE
+        // On Apples, the kernel supplies a second argument, which we have to circumvent
+        const int firstArgument = 2;
+#else
+        // 0 is the execution path
+        const int firstArgument = 1;
+#endif
+    
         std::string strCmdLine;
-        for (int i = 1; i < argc; ++i)
+        for (int i = firstArgument; i < argc; ++i)
             strCmdLine = strCmdLine + argv[i] + ' ';
 #endif

code/branches/kicklib2/src/OrxonoxConfig.cmake

@@ -111 +111 @@
   ${CMAKE_CURRENT_BINARY_DIR}/SpecialConfig.h
 )
+
+# Make special target including the configured header files for Visual Studio
+IF(MSVC)
+  ADD_CUSTOM_TARGET(config
+    SOURCES
+      ${ORXONOX_CONFIG_FILES}
+      ${ORXONOX_CONFIG_FILES_GENERATED}
+  )
+ENDIF()

code/branches/kicklib2/src/OrxonoxConfig.h.in

@@ -228 +228 @@
 }
 
+// Define Boost Filesystem version
+#include <boost/version.hpp>
+#ifndef BOOST_FILESYSTEM_VERSION
+#  if (BOOST_VERSION < 104600)
+#    define BOOST_FILESYSTEM_VERSION 2
+#  else
+#    define BOOST_FILESYSTEM_VERSION 3
+#  endif
+#endif
+
 #endif /* _OrxonoxConfig_H__ */

code/branches/kicklib2/src/SpecialConfig.h.in

@@ -92 +92 @@
 
     // OGRE PLUGINS
-    // Apple has trouble finding OGRE plugins because of its install-name convention
-    // Adopting the executable_path structure for later use in app bundles
 #ifdef NDEBUG
     const char ogrePlugins[] = "@OGRE_PLUGINS_RELEASE@";
-#  ifdef DEPENDENCY_PACKAGE_ENABLE
-#    ifdef ORXONOX_PLATFORM_APPLE
-       const char ogrePluginsDirectory[] = "@executable_path/../Plugins";
-#    else
-       const char ogrePluginsDirectory[] = ".";
-#    endif
-#  else
     const char ogrePluginsDirectory[] = "@OGRE_PLUGINS_FOLDER_RELEASE@";
-#  endif
 #else
     const char ogrePlugins[] = "@OGRE_PLUGINS_DEBUG@";
-#  ifdef DEPENDENCY_PACKAGE_ENABLE
-#    ifdef ORXONOX_PLATFORM_APPLE
-       const char ogrePluginsDirectory[] = "@OGRE_PLUGINS_FOLDER_DEBUG@";
-#    else
-       const char ogrePluginsDirectory[] = ".";
-#    endif
-#  else
     const char ogrePluginsDirectory[] = "@OGRE_PLUGINS_FOLDER_DEBUG@";
-#  endif
 #endif
 } }

code/branches/kicklib2/src/external/ogreceguirenderer/CMakeLists.txt

@@ -35 +35 @@
     "OGRE_GUIRENDERER_EXPORTS"
   LINK_LIBRARIES
-    ${Boost_SYSTEM_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_DATE_TIME_LIBRARY}
     ${OGRE_LIBRARY}
     ${CEGUI_LIBRARY}

code/branches/kicklib2/src/external/ois/CMakeLists.txt

@@ -54 +54 @@
 
 # Some unexplained hackery for Visual Studio 2005
-ADD_COMPILER_FLAGS("-D_WIN32_DCOM" MSVC8)
+ADD_COMPILER_FLAGS("-D_WIN32_DCOM" MSVC80)
 
 # MinGW doesn't come with some required Windows headers

code/branches/kicklib2/src/external/tinyxml/CMakeLists.txt

@@ -36 +36 @@
   ORXONOX_EXTERNAL
   NO_DLL_INTERFACE
-  VERSION
-    2.5.3
   SOURCE_FILES
     ${TINYXML_FILES}

code/branches/kicklib2/src/external/tinyxml/VERSION

@@ -1 @@
-TinyXML++ trunk checkout revision 106. Built on top of TinyXML 2.5.3
+TinyXML++ trunk checkout revision 122 (version 0.04a).
+Built with TinyXML 2.5.3.

code/branches/kicklib2/src/external/tinyxml/changes_orxonox.diff

@@ -1 @@
---- ticpp.h     Tue Nov  4 21:55:49 2008
-+++ ticpp.h     Sat Jan 10 14:48:41 2009
-@@ -1229,6 +1229,7 @@
+--- ticpp.h
++++ ticpp.h
+@@ -38,9 +38,7 @@
+ @todo add TYPECOUNT support. See ticpp::NodeFactory.
+ @todo Add a quick reference
+ */
+-#ifndef TIXML_USE_TICPP
+-       #define TIXML_USE_TICPP
+-#endif
++#ifdef TIXML_USE_TICPP
+ 
+ #ifndef TICPP_INCLUDED
+ #define TICPP_INCLUDED
+@@ -1231,6 +1229,7 @@
  
                 T* m_tiXmlPointer;              /**< Internal pointer to the TiXml Class which is being wrapped */
  
-+    public:
++       public:
                 /**
                 @internal
                 Gets the internal TinyXML pointer.
-@@ -1240,6 +1241,7 @@
+@@ -1242,6 +1241,7 @@
                         ValidatePointer();
                         return m_tiXmlPointer;
                 }
-+    protected:
++       protected:
  
                 /**
                 @internal
+@@ -1903,3 +1903,5 @@
+ }
+ 
+ #endif // TICPP_INCLUDED
++
++#endif // TIXML_USE_TICPP

code/branches/kicklib2/src/external/tinyxml/ticpp.cpp

@@ -370 +370 @@
 }
 
-Node* Node::InsertEndChild( Node& addThis )
+Node* Node::InsertEndChild( const Node& addThis )
 {
         if ( addThis.Type() == TiXmlNode::DOCUMENT )
@@ -404 +404 @@
 }
 
-Node* Node::InsertBeforeChild( Node* beforeThis, Node& addThis )
+Node* Node::InsertBeforeChild( Node* beforeThis, const Node& addThis )
 {
         if ( addThis.Type() == TiXmlNode::DOCUMENT )
@@ -423 +423 @@
 }
 
-Node* Node::InsertAfterChild( Node* afterThis, Node& addThis )
+Node* Node::InsertAfterChild( Node* afterThis, const Node& addThis )
 {
         if ( addThis.Type() == TiXmlNode::DOCUMENT )
@@ -442 +442 @@
 }
 
-Node* Node::ReplaceChild( Node* replaceThis, Node& withThis )
+Node* Node::ReplaceChild( Node* replaceThis, const Node& withThis )
 {
         if ( withThis.Type() == TiXmlNode::DOCUMENT )

code/branches/kicklib2/src/external/tinyxml/ticpp.h

@@ -225 +225 @@
                         return ( GetBasePointer() == rhs.GetBasePointer() );
                 }
-                
+
                 /**
                 Compare internal TiXml pointers to determine is both are wrappers around the same node
@@ -233 +233 @@
                         return ( GetBasePointer() != rhs.GetBasePointer() );
                 }
-                
+
                 /**
                 Builds detailed error string using TiXmlDocument::Error() and others
@@ -250 +250 @@
                                         {
                                                 full_message    << "\nDescription: " << doc->ErrorDesc()
-                                                                                << "\nFile: " << (strlen( doc->Value() ) > 0 ? doc->Value() : "<unnamed-file>") 
-                                                                                << "\nLine: " << doc->ErrorRow() 
+                                                                                << "\nFile: " << (strlen( doc->Value() ) > 0 ? doc->Value() : "<unnamed-file>")
+                                                                                << "\nLine: " << doc->ErrorRow()
                                                                                 << "\nColumn: " << doc->ErrorCol();
                                         }
@@ -287 +287 @@
                                 TICPPTHROW( "Internal TiXml Pointer is NULL" );
                         }
-                }               
+                }
 
                 /**
@@ -617 +617 @@
                 @see TiXmlNode::InsertEndChild
                 */
-                Node* InsertEndChild( Node& addThis );
+                Node* InsertEndChild( const Node& addThis );
 
                 /**
@@ -642 +642 @@
                 @see TiXmlNode::InsertBeforeChild
                 */
-                Node* InsertBeforeChild( Node* beforeThis, Node& addThis );
+                Node* InsertBeforeChild( Node* beforeThis, const Node& addThis );
 
                 /**
@@ -655 +655 @@
                 @see TiXmlNode::InsertAfterChild
                 */
-                Node* InsertAfterChild( Node* afterThis, Node& addThis );
+                Node* InsertAfterChild( Node* afterThis, const Node& addThis );
 
                 /**
@@ -667 +667 @@
                 @see TiXmlNode::ReplaceChild
                 */
-                Node* ReplaceChild( Node* replaceThis, Node& withThis );
+                Node* ReplaceChild( Node* replaceThis, const Node& withThis );
 
                 /**
@@ -1163 +1163 @@
                 /** Sets internal pointer to the Previous Sibling, or Iterator::END, if there are no prior siblings */
                 Iterator operator--(int)
-                {                       
+                {
                         Iterator tmp(*this);
                         --(*this);
@@ -1230 +1230 @@
                 T* m_tiXmlPointer;              /**< Internal pointer to the TiXml Class which is being wrapped */
 
-    public:
+        public:
                 /**
                 @internal
@@ -1242 +1242 @@
                         return m_tiXmlPointer;
                 }
-    protected:
+        protected:
 
                 /**
@@ -1400 +1400 @@
 
                 /**
-                Constructor.
-                Create a document with a name. The name of the document is also the filename of the xml.
-
-                @param documentName Name to set in the Document.
-                */
+                 * Constructor.
+                 * Create a document with a name. The name of the document is also the filename of the xml.
+                 * @param documentName Name to set in the Document.
+                 * @note LoadFile() needs to be called to actually load the data from the file specified by documentName
+                 *               SaveFile() needs to be called to save data to file specified by documentName.
+                 */
                 Document( const std::string& documentName );
 
@@ -1749 +1750 @@
                                 if ( throwIfNotFound )
                                 {
-                                        TICPPTHROW( "Attribute does not exist" );
+                                        const std::string error( std::string( "Attribute '" ) + name + std::string( "' does not exist" ) );
+                                        TICPPTHROW( error );
                                 }
                         }
@@ -1781 +1783 @@
                                 if ( throwIfNotFound )
                                 {
-                                        TICPPTHROW( "Attribute does not exist" );
+                                        const std::string error( std::string( "Attribute '" ) + name + std::string( "' does not exist" ) );
+                                        TICPPTHROW( error );
                                 }
                                 else

code/branches/kicklib2/src/libraries/core/CorePrereqs.h

@@ -262 +262 @@
 namespace boost
 {
-#if BOOST_VERSION < 104400
+#if (BOOST_VERSION < 104400)
+
     namespace filesystem
     {
@@ -269 +270 @@
         typedef basic_path<std::string, path_traits> path;
     }
-#elif BOOST_VERSION < 104600
+
+#elif (BOOST_VERSION < 104800)
+
+# if BOOST_FILESYSTEM_VERSION == 2
     namespace filesystem2
     {
@@ -282 +286 @@
         using filesystem2::path;
     }
+# elif BOOST_FILESYSTEM_VERSION == 3
+    namespace filesystem3
+    {
+        class path;
+    }
+    namespace filesystem
+    {
+        using filesystem3::path;
+    }
+# endif
+
 #else
-    namespace filesystem3
+
+    // TODO: Check this once boost 1.48 is released
+    namespace filesystem
     {
         class path;
     }
-    namespace filesystem
-    {
-        using filesystem3::path;
-    }
+
 #endif
+
     class thread;
     class mutex;

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

@@ -30 +30 @@
 #include "GraphicsManager.h"
 
+#include <cstdlib>
 #include <fstream>
 #include <sstream>
@@ -120 +121 @@
         // Only for development runs
         if (PathConfig::isDevelopmentRun())
-        {
             Ogre::ResourceGroupManager::getSingleton().addResourceLocation(PathConfig::getExternalDataPathString(), "FileSystem");
-            extResources_.reset(new XMLFile("resources.oxr"));
-            extResources_->setLuaSupport(false);
-            Loader::open(extResources_.get());
-        }
+
+        extResources_.reset(new XMLFile("resources.oxr"));
+        extResources_->setLuaSupport(false);
+        Loader::open(extResources_.get());
 
         if (bLoadRenderer)
@@ -150 +150 @@
         // Undeclare the resources
         Loader::unload(resources_.get());
-        if (PathConfig::isDevelopmentRun())
-            Loader::unload(extResources_.get());
+        Loader::unload(extResources_.get());
     }
 
@@ -158 +157 @@
         SetConfigValue(ogreConfigFile_,  "ogre.cfg")
             .description("Location of the Ogre config file");
-        SetConfigValue(ogrePluginsDirectory_, specialConfig::ogrePluginsDirectory)
-            .description("Folder where the Ogre plugins are located.");
         SetConfigValue(ogrePlugins_, specialConfig::ogrePlugins)
             .description("Comma separated list of all plugins to load.");
@@ -251 +248 @@
     void GraphicsManager::loadOgrePlugins()
     {
-        // just to make sure the next statement doesn't segfault
-        if (ogrePluginsDirectory_.empty())
-            ogrePluginsDirectory_ = '.';
-
-        boost::filesystem::path folder(ogrePluginsDirectory_);
+        // Plugin path can have many different locations...
+        std::string pluginPath = specialConfig::ogrePluginsDirectory;
+#ifdef DEPENDENCY_PACKAGE_ENABLE
+        if (!PathConfig::isDevelopmentRun())
+        {
+#  if defined(ORXONOX_PLATFORM_WINDOWS)
+            pluginPath = PathConfig::getExecutablePathString();
+#  elif defined(ORXONOX_PLATFORM_APPLE)
+            // TODO: Where are the plugins being installed to?
+            pluginPath = PathConfig::getExecutablePathString();
+#  endif
+        }
+#endif
+
+#ifdef ORXONOX_PLATFORM_WINDOWS
+        // Add OGRE plugin path to the environment. That way one plugin could
+        // also depend on another without problems on Windows
+        const char* currentPATH = getenv("PATH");
+        std::string newPATH = pluginPath;
+        if (currentPATH != NULL)
+            newPATH = std::string(currentPATH) + ';' + newPATH;
+        putenv(const_cast<char*>(("PATH=" + newPATH).c_str()));
+#endif
+
         // Do some SubString magic to get the comma separated list of plugins
         SubString plugins(ogrePlugins_, ",", " ", false, '\\', false, '"', false, '{', '}', false, '\0');
-        // Use backslash paths on Windows! file_string() already does that though.
         for (unsigned int i = 0; i < plugins.size(); ++i)
-#if BOOST_FILESYSTEM_VERSION < 3
-            ogreRoot_->loadPlugin((folder / plugins[i]).file_string());
-#else
-            ogreRoot_->loadPlugin((folder / plugins[i]).string());
-#endif
+            ogreRoot_->loadPlugin(pluginPath + '/' + plugins[i]);
     }
 
@@ -290 +301 @@
 
         Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, ogreWindowEventListener_.get());
-
-// 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
-// End of HACK
 
         // create a full screen default viewport

code/branches/kicklib2/src/libraries/core/GraphicsManager.h

@@ -128 +128 @@
         // config values
         std::string         ogreConfigFile_;           //!< ogre config filename
-        std::string         ogrePluginsDirectory_;     //!< Directory where the Ogre plugins are located
         std::string         ogrePlugins_;              //!< Comma separated list of all plugins to load
         std::string         ogreLogFile_;              //!< log filename for Ogre log messages

code/branches/kicklib2/src/libraries/core/Identifier.h

@@ -395 +395 @@
     {
         // Get the name of the class
-        const std::string& name = typeid(T).name();
+        std::string name = typeid(T).name();
 
         // create a new identifier anyway. Will be deleted in Identifier::getIdentifier if not used.

code/branches/kicklib2/src/libraries/core/PathConfig.cc

@@ -33 +33 @@
 #include <cstdio>
 #include <vector>
-#include <boost/version.hpp>
 #include <boost/filesystem.hpp>
 
@@ -56 +55 @@
 #include "CommandLineParser.h"
 
-// Boost 1.36 has some issues with deprecated functions that have been omitted
-#if (BOOST_VERSION == 103600)
-#  define BOOST_LEAF_FUNCTION filename
-#elif (BOOST_FILESYSTEM_VERSION < 3)
-#  define BOOST_LEAF_FUNCTION leaf
+// Differentiate Boost Filesystem v2 and v3
+#if (BOOST_FILESYSTEM_VERSION < 3)
+#  define BF_LEAF leaf
+#  define BF_GENERIC_STRING string
+#  define BF_NATIVE_STRING file_string
 #else
-#  define BOOST_LEAF_FUNCTION path().filename().string
+#  define BF_LEAF path().filename().string
+#  define BF_GENERIC_STRING generic_string
+#  define BF_NATIVE_STRING string
 #endif
 
@@ -242 +243 @@
             {
                 ThrowException(General, std::string("The ") + it->second + " directory has been preoccupied by a file! \
-                                         Please remove " + it->first.string());
+                                         Please remove " + it->first.BF_GENERIC_STRING());
             }
             if (bf::create_directories(it->first)) // function may not return true at all (bug?)
@@ -259 +260 @@
         size_t moduleextensionlength = moduleextension.size();
 
+#ifdef ORXONOX_PLATFORM_WINDOWS
         // Add that path to the PATH variable in case a module depends on another one
-        std::string pathVariable(getenv("PATH"));
-        putenv(const_cast<char*>(("PATH=" + pathVariable + ';' + modulePath_.string()).c_str()));
+        const char* currentPATH = getenv("PATH");
+        std::string newPATH = modulePath_.BF_NATIVE_STRING();
+        if (currentPATH != NULL)
+            newPATH = std::string(currentPATH) + ';' + newPATH;
+        putenv(const_cast<char*>(("PATH=" + newPATH).c_str()));
+#endif
 
         // Make sure the path exists, otherwise don't load modules
@@ -273 +279 @@
         while (file != end)
         {
-            std::string filename = file->BOOST_LEAF_FUNCTION();
+            std::string filename = file->BF_LEAF();
 
             // Check if the file ends with the extension in question
@@ -282 +288 @@
                     // We've found a helper file
                     const std::string& library = filename.substr(0, filename.size() - moduleextensionlength);
-#if BOOST_FILESYSTEM_VERSION < 3
-                    modulePaths.push_back((modulePath_ / library).file_string());
-#else
-                    modulePaths.push_back((modulePath_ / library).string());
-#endif
+                    modulePaths.push_back(getModulePathString() + library);
                 }
             }
@@ -297 +299 @@
     /*static*/ std::string PathConfig::getRootPathString()
     {
-        return getInstance().rootPath_.string() + '/';
+        return getInstance().rootPath_.BF_GENERIC_STRING() + '/';
     }
 
     /*static*/ std::string PathConfig::getExecutablePathString()
     {
-        return getInstance().executablePath_.string() + '/';
+        return getInstance().executablePath_.BF_GENERIC_STRING() + '/';
     }
 
     /*static*/ std::string PathConfig::getDataPathString()
     {
-        return getInstance().dataPath_.string() + '/';
+        return getInstance().dataPath_.BF_GENERIC_STRING() + '/';
     }
 
     /*static*/ std::string PathConfig::getExternalDataPathString()
     {
-        return getInstance().externalDataPath_.string() + '/';
+        return getInstance().externalDataPath_.BF_GENERIC_STRING() + '/';
     }
 
     /*static*/ std::string PathConfig::getConfigPathString()
     {
-        return getInstance().configPath_.string() + '/';
+        return getInstance().configPath_.BF_GENERIC_STRING() + '/';
     }
 
     /*static*/ std::string PathConfig::getLogPathString()
     {
-        return getInstance().logPath_.string() + '/';
+        return getInstance().logPath_.BF_GENERIC_STRING() + '/';
     }
 
     /*static*/ std::string PathConfig::getModulePathString()
     {
-        return getInstance().modulePath_.string() + '/';
+        return getInstance().modulePath_.BF_GENERIC_STRING() + '/';
     }
 }

code/branches/kicklib2/src/libraries/core/PathConfig.h

@@ -113 +113 @@
             static std::string getModulePathString();
 
-            //! Return trrue for runs in the build directory (not installed)
+            //! Return true for runs in the build directory (not installed)
             static bool isDevelopmentRun() { return getInstance().bDevRun_; }
 

code/branches/kicklib2/src/libraries/core/Resource.cc

@@ -33 +33 @@
 #include <OgreFileSystem.h>
 #include <OgreResourceGroupManager.h>
+
+// Differentiate Boost Filesystem v2 and v3
+#if (BOOST_FILESYSTEM_VERSION < 3)
+#  define BF_GENERIC_STRING string
+#else
+#  define BF_GENERIC_STRING generic_string
+#endif
 
 namespace orxonox
@@ -98 +105 @@
                     boost::filesystem::path base(it->archive->getName());
                     base /= it->filename;
-                    ptr->fileSystemPath = base.string();
+                    ptr->fileSystemPath = base.BF_GENERIC_STRING();
                 }
                 return ptr;

code/branches/kicklib2/src/libraries/core/command/ArgumentCompletionFunctions.cc

@@ -35 +35 @@
 
 #include <map>
-#include <boost/version.hpp>
 #include <boost/filesystem.hpp>
 
@@ -47 +46 @@
 #include "TclThreadManager.h"
 
-// Boost 1.36 has some issues with deprecated functions that have been omitted
-#if (BOOST_VERSION == 103600)
-#  define BOOST_LEAF_FUNCTION filename
-#  define BOOST_DICTIONARY_ENTRY_NAME string
-#elif (BOOST_FILESYSTEM_VERSION < 3)
-#  define BOOST_LEAF_FUNCTION leaf
-#  define BOOST_DICTIONARY_ENTRY_NAME string
+// Differentiate Boost Filesystem v2 and v3
+#if (BOOST_FILESYSTEM_VERSION < 3)
+#  define BF_LEAF leaf
+#  define BF_GENERIC_STRING string
+#  define BF_DICTIONARY_ENTRY_NAME string
 #else
-#  define BOOST_LEAF_FUNCTION path().filename().string
-#  define BOOST_DICTIONARY_ENTRY_NAME path().string
+#  define BF_LEAF path().filename().string
+#  define BF_GENERIC_STRING generic_string
+#  define BF_DICTIONARY_ENTRY_NAME path().string
 #endif
 
@@ -250 +248 @@
                 else
                 {
-                    const std::string& dir = startdirectory.string();
+                    const std::string& dir = startdirectory.BF_GENERIC_STRING();
                     if (dir.size() > 0 && dir[dir.size() - 1] == ':')
                         startdirectory = dir + '/';
@@ -262 +260 @@
                 {
                     if (boost::filesystem::is_directory(*file))
-                        dirlist.push_back(ArgumentCompletionListElement(file->BOOST_DICTIONARY_ENTRY_NAME() + '/', getLowercase(file->BOOST_DICTIONARY_ENTRY_NAME()) + '/', file->BOOST_LEAF_FUNCTION() + '/'));
+                        dirlist.push_back(ArgumentCompletionListElement(file->BF_DICTIONARY_ENTRY_NAME() + '/', getLowercase(file->BF_DICTIONARY_ENTRY_NAME()) + '/', file->BF_LEAF() + '/'));
                     else
-                        filelist.push_back(ArgumentCompletionListElement(file->BOOST_DICTIONARY_ENTRY_NAME(), getLowercase(file->BOOST_DICTIONARY_ENTRY_NAME()), file->BOOST_LEAF_FUNCTION()));
+                        filelist.push_back(ArgumentCompletionListElement(file->BF_DICTIONARY_ENTRY_NAME(), getLowercase(file->BF_DICTIONARY_ENTRY_NAME()), file->BF_LEAF()));
                     ++file;
                 }

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

@@ -330 +330 @@
         ALenum error = alGetError();
         if (error == AL_INVALID_VALUE)
+            // @TODO: Follow this constantly appearing, nerve-racking warning
             COUT(2) << "Sound: OpenAL: Invalid listener position" << std::endl;
     }