[Orxonox-commit 3600] r8285 - in code/branches/kicklib2: . bin cmake cmake/tools contrib data data/levels data/mac data/mac/English.lproj data/mac/English.lproj/MainMenu.nib src src/external/ogreceguirenderer src/external/ois src/external/tinyxml src/libraries/core src/libraries/core/command src/orxonox/sound
rgrieder at orxonox.net
rgrieder at orxonox.net
Thu Apr 21 19:43:11 CEST 2011
Author: rgrieder
Date: 2011-04-21 19:43:10 +0200 (Thu, 21 Apr 2011)
New Revision: 8285
Added:
code/branches/kicklib2/cmake/BundleConfig.cmake
code/branches/kicklib2/cmake/PrepareDevBundle.cmake
code/branches/kicklib2/contrib/CMakeLists.txt
code/branches/kicklib2/contrib/orxonox.png
code/branches/kicklib2/contrib/orxonox_old.svg
code/branches/kicklib2/data/levels/planets.oxw
code/branches/kicklib2/data/mac/
code/branches/kicklib2/data/mac/English.lproj/
code/branches/kicklib2/data/mac/English.lproj/InfoPlist.strings
code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/
code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/designable.nib
code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/keyedobjects.nib
code/branches/kicklib2/data/mac/English.lproj/MainMenu.xib
code/branches/kicklib2/data/mac/Icon.icns
code/branches/kicklib2/data/mac/Orxonox-Info.plist
code/branches/kicklib2/src/OrxonoxMac.h
code/branches/kicklib2/src/OrxonoxMac.mm
Removed:
code/branches/kicklib2/contrib/orxonox.png
code/branches/kicklib2/data/DataInstallScript.cmake
code/branches/kicklib2/data/levels/planets.oxw
code/branches/kicklib2/data/mac/English.lproj/
code/branches/kicklib2/data/mac/English.lproj/InfoPlist.strings
code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/
code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/designable.nib
code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/keyedobjects.nib
code/branches/kicklib2/data/mac/English.lproj/MainMenu.xib
code/branches/kicklib2/data/mac/Icon.icns
code/branches/kicklib2/data/mac/Orxonox-Info.plist
Modified:
code/branches/kicklib2/
code/branches/kicklib2/CMakeLists.txt
code/branches/kicklib2/bin/client1.bat.in
code/branches/kicklib2/bin/client2.bat.in
code/branches/kicklib2/bin/dedicated.bat.in
code/branches/kicklib2/bin/dedicatedClient.bat.in
code/branches/kicklib2/bin/masterserver.bat.in
code/branches/kicklib2/bin/run.bat.in
code/branches/kicklib2/bin/server.bat.in
code/branches/kicklib2/bin/standalone.bat.in
code/branches/kicklib2/cmake/CompilerConfigMSVC.cmake
code/branches/kicklib2/cmake/LibraryConfig.cmake
code/branches/kicklib2/cmake/PackageConfig.cmake
code/branches/kicklib2/cmake/PackageConfigMSVC.cmake
code/branches/kicklib2/cmake/PackageConfigOSX.cmake
code/branches/kicklib2/cmake/tools/FindALUT.cmake
code/branches/kicklib2/cmake/tools/FindCEGUI.cmake
code/branches/kicklib2/cmake/tools/FindLua5.1.cmake
code/branches/kicklib2/cmake/tools/FindOGRE.cmake
code/branches/kicklib2/cmake/tools/FindOgg.cmake
code/branches/kicklib2/cmake/tools/FindVorbis.cmake
code/branches/kicklib2/cmake/tools/TargetUtilities.cmake
code/branches/kicklib2/contrib/orxonox.desktop
code/branches/kicklib2/data/CMakeLists.txt
code/branches/kicklib2/src/CMakeLists.txt
code/branches/kicklib2/src/Orxonox.cc
code/branches/kicklib2/src/OrxonoxConfig.cmake
code/branches/kicklib2/src/OrxonoxConfig.h.in
code/branches/kicklib2/src/SpecialConfig.h.in
code/branches/kicklib2/src/external/ogreceguirenderer/CMakeLists.txt
code/branches/kicklib2/src/external/ois/CMakeLists.txt
code/branches/kicklib2/src/external/tinyxml/CMakeLists.txt
code/branches/kicklib2/src/external/tinyxml/VERSION
code/branches/kicklib2/src/external/tinyxml/changes_orxonox.diff
code/branches/kicklib2/src/external/tinyxml/ticpp.cpp
code/branches/kicklib2/src/external/tinyxml/ticpp.h
code/branches/kicklib2/src/libraries/core/CorePrereqs.h
code/branches/kicklib2/src/libraries/core/GraphicsManager.cc
code/branches/kicklib2/src/libraries/core/GraphicsManager.h
code/branches/kicklib2/src/libraries/core/Identifier.h
code/branches/kicklib2/src/libraries/core/PathConfig.cc
code/branches/kicklib2/src/libraries/core/PathConfig.h
code/branches/kicklib2/src/libraries/core/Resource.cc
code/branches/kicklib2/src/libraries/core/command/ArgumentCompletionFunctions.cc
code/branches/kicklib2/src/orxonox/sound/SoundManager.cc
Log:
Merged revisions 8098 - 8277 from kicklib to kicklib2.
Property changes on: code/branches/kicklib2
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/ai:6592-7033
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dynamicmatch:6584-7030
/code/branches/fps:6591-7072
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hudelements:6584-6941
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/ipv6:7293-7458
/code/branches/kicklib:7940-8096
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8072
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/miniprojects:2754-2824
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network64:2210-2355
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/overlay:2117-2385
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup2:5942-6405
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/png2:7262-7263
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation3:6913-7162
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound3:5941-6102
/code/branches/steering:5949-6091
/code/branches/tetris:8100-8107
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051
/code/branches/weaponsystem:2742-2890
+ /code/branches/ai:6592-7033
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dynamicmatch:6584-7030
/code/branches/fps:6591-7072
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hudelements:6584-6941
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/ipv6:7293-7458
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/miniprojects:2754-2824
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network64:2210-2355
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/overlay:2117-2385
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup2:5942-6405
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/png2:7262-7263
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation3:6913-7162
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound3:5941-6102
/code/branches/steering:5949-6091
/code/branches/tetris:8100-8107
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051
/code/branches/weaponsystem:2742-2890
Modified: code/branches/kicklib2/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/CMakeLists.txt 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/CMakeLists.txt 2011-04-21 17:43:10 UTC (rev 8285)
@@ -56,6 +56,7 @@
SET(DEFAULT_DATA_PATH data)
SET(DEFAULT_CONFIG_PATH config)
SET(DEFAULT_LOG_PATH log)
+SET(DEFAULT_BUNDLE_PATH bundle)
# Set output directories
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${DEFAULT_RUNTIME_PATH})
@@ -137,5 +138,15 @@
# Configure the binary output directory. Do this after src!
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)
Modified: code/branches/kicklib2/bin/client1.bat.in
===================================================================
--- code/branches/kicklib2/bin/client1.bat.in 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/bin/client1.bat.in 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,4 +1,4 @@
title @PROJECT_NAME@
path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
- at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --client --writingPathSuffix client1
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --client --writingPathSuffix client1
pause
Modified: code/branches/kicklib2/bin/client2.bat.in
===================================================================
--- code/branches/kicklib2/bin/client2.bat.in 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/bin/client2.bat.in 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,4 +1,4 @@
title @PROJECT_NAME@
path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
- at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --client --writingPathSuffix client2
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --client --writingPathSuffix client2
pause
Modified: code/branches/kicklib2/bin/dedicated.bat.in
===================================================================
--- code/branches/kicklib2/bin/dedicated.bat.in 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/bin/dedicated.bat.in 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,4 +1,4 @@
title @PROJECT_NAME@
path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
- at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --dedicated --writingPathSuffix dedicated
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --dedicated --writingPathSuffix dedicated
pause
Modified: code/branches/kicklib2/bin/dedicatedClient.bat.in
===================================================================
--- code/branches/kicklib2/bin/dedicatedClient.bat.in 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/bin/dedicatedClient.bat.in 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,4 +1,4 @@
title @PROJECT_NAME@
path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
- at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --dedicatedClient --writingPathSuffix dedicatedClient
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --dedicatedClient --writingPathSuffix dedicatedClient
pause
Modified: code/branches/kicklib2/bin/masterserver.bat.in
===================================================================
--- code/branches/kicklib2/bin/masterserver.bat.in 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/bin/masterserver.bat.in 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,4 +1,4 @@
title @PROJECT_NAME@
path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
- at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --masterserver --writingPathSuffix masterserver
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --masterserver --writingPathSuffix masterserver
pause
Modified: code/branches/kicklib2/bin/run.bat.in
===================================================================
--- code/branches/kicklib2/bin/run.bat.in 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/bin/run.bat.in 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,4 +1,4 @@
title @PROJECT_NAME@
path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
- at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@"
pause
Modified: code/branches/kicklib2/bin/server.bat.in
===================================================================
--- code/branches/kicklib2/bin/server.bat.in 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/bin/server.bat.in 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,4 +1,4 @@
title @PROJECT_NAME@
path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
- at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --server --writingPathSuffix server
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --server --writingPathSuffix server
pause
Modified: code/branches/kicklib2/bin/standalone.bat.in
===================================================================
--- code/branches/kicklib2/bin/standalone.bat.in 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/bin/standalone.bat.in 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,4 +1,4 @@
title @PROJECT_NAME@
path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
- at CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@ --standalone --writingPathSuffix standalone
+"@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@" --standalone --writingPathSuffix standalone
pause
Copied: code/branches/kicklib2/cmake/BundleConfig.cmake (from rev 8277, code/branches/kicklib/cmake/BundleConfig.cmake)
===================================================================
--- code/branches/kicklib2/cmake/BundleConfig.cmake (rev 0)
+++ code/branches/kicklib2/cmake/BundleConfig.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -0,0 +1,65 @@
+#
+# ORXONOX - the hottest 3D action shooter ever to exist
+# > www.orxonox.net <
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+#
+# Author:
+# Kevin Young
+# Description:
+# Sets all necessary variables for CPack package generation
+#
+
+# Common properties across all generators
+
+#SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY FALSE)
+SET(CPACK_INSTALL_CMAKE_PROJECTS ${CMAKE_BINARY_DIR};${PROJECT_NAME};ALL;/)
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}")
+SET(CPACK_PACKAGE_EXECUTABLES ${ORXONOX_EXECUTABLE_NAME};${PROJECT_NAME})
+SET(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME} ${ORXONOX_VERSION_NAME}")
+SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${PROJECT_NAME} ${ORXONOX_VERSION}")
+# Defaults to PROJECT_NAME anyway
+#SET(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
+SET(CPACK_PACKAGE_VENDOR "www.orxonox.net")
+SET(CPACK_PACKAGE_VERSION_MAJOR ${ORXONOX_VERSION_MAJOR})
+SET(CPACK_PACKAGE_VERSION_MINOR ${ORXONOX_VERSION_MINOR})
+SET(CPACK_PACKAGE_VERSION_PATCH ${ORXONOX_VERSION_PATCH})
+#SET(CPACK_PROJECT_CONFIG_FILE ${CMAKE_BINARY_DIR}/CPackOptions.cmake)
+SET(CPACK_SOURCE_GENERATOR TGZ;ZIP)
+# Unsure what pattern to set here
+#SET(CPACK_SOURCE_IGNORE_FILES /CVS/;/\\.svn/;\\.swp$;\\.#;/#;.*~;cscope.*)
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${ORXONOX_VERSION}")
+#SET(CPACK_SOURCE_STRIP_FILES FALSE)
+# Defaults to CMAKE_SYSTEM_NAME anyway
+#SET(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}")
+
+# Advanced settings
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENCE")
+
+# Apple specific settings
+IF(APPLE)
+ SET(CPACK_GENERATOR "Bundle")
+
+ SET(CPACK_BUNDLE_NAME "${CPACK_PACKAGE_FILE_NAME}")
+ SET(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/Icon.icns")
+ SET(CPACK_BUNDLE_PLIST "${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/Orxonox-Info.plist")
+ SET(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_SOURCE_DIR}/${DEFAULT_RUNTIME_PATH}/mac/OrxonoxMac")
+ENDIF(APPLE)
+
+# Fire up CPack
+INCLUDE(CPack)
Modified: code/branches/kicklib2/cmake/CompilerConfigMSVC.cmake
===================================================================
--- code/branches/kicklib2/cmake/CompilerConfigMSVC.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/cmake/CompilerConfigMSVC.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -68,9 +68,6 @@
# 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
# boost::shared_ptr in cpptcl. And since we don't yet use the new C++ standard
# anyway, disable it completely.
Modified: code/branches/kicklib2/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/kicklib2/cmake/LibraryConfig.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/cmake/LibraryConfig.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -57,7 +57,7 @@
SET(_compiler_prefix msvc8)
ELSEIF(MSVC90)
SET(_compiler_prefix msvc9)
- ELSEIF(MSVC100)
+ ELSEIF(MSVC10)
SET(_compiler_prefix msvc10)
ENDIF()
FIND_PATH(DEPENDENCY_PACKAGE_DIR
@@ -97,31 +97,19 @@
############### Library finding #################
# 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)
FIND_PACKAGE(Vorbis REQUIRED)
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)
FIND_PACKAGE(DirectX REQUIRED)
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 #####
FIND_PACKAGE(OpenAL REQUIRED)
@@ -146,22 +134,25 @@
##### 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()
Modified: code/branches/kicklib2/cmake/PackageConfig.cmake
===================================================================
--- code/branches/kicklib2/cmake/PackageConfig.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/cmake/PackageConfig.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -32,7 +32,7 @@
# Ogre versions >= 1.7 require the POCO library on Windows with MSVC for threading
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()
# Include paths and other special treatments
@@ -74,12 +74,23 @@
)
## 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()
Modified: code/branches/kicklib2/cmake/PackageConfigMSVC.cmake
===================================================================
--- code/branches/kicklib2/cmake/PackageConfigMSVC.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/cmake/PackageConfigMSVC.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -56,8 +56,21 @@
# 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)
Modified: code/branches/kicklib2/cmake/PackageConfigOSX.cmake
===================================================================
--- code/branches/kicklib2/cmake/PackageConfigOSX.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/cmake/PackageConfigOSX.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -29,28 +29,35 @@
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
# on gcc >= 4.2 (binaries stay the same)
# Sets the library path for the FIND_LIBRARY
@@ -58,18 +65,11 @@
SET(ENV{OPENALDIR} ${DEP_INCLUDE_DIR}/openal)
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/
# DESTINATION lib/tcl
Copied: code/branches/kicklib2/cmake/PrepareDevBundle.cmake (from rev 8277, code/branches/kicklib/cmake/PrepareDevBundle.cmake)
===================================================================
--- code/branches/kicklib2/cmake/PrepareDevBundle.cmake (rev 0)
+++ code/branches/kicklib2/cmake/PrepareDevBundle.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -0,0 +1,59 @@
+ #
+ # ORXONOX - the hottest 3D action shooter ever to exist
+ # > www.orxonox.net <
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+ # of the License, or (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along
+ # with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ #
+ # Author:
+ # Kevin Young
+ # Description:
+ # Creates the file structure for the development application bundle
+ #
+
+IF(NOT CMAKE_CONFIGURATION_TYPES)
+ SET(_subdirs .)
+ SET(_default_subdir .)
+ELSE()
+ SET(_subdirs ${CMAKE_CONFIGURATION_TYPES})
+ SET(_default_subdir) # No default subdir
+ENDIF()
+
+FOREACH(_subdir ${_subdirs})
+ GET_FILENAME_COMPONENT(CURRENT_RUNTIME_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_subdir} ABSOLUTE)
+
+ # Convenience variables
+ # Note that this is just an empty bundle! The executable itself will
+ # be added at build time
+ SET(DEVBUNDLE_CURRENT_DIR "${CURRENT_RUNTIME_DIR}/${PROJECT_NAME}.app/Contents")
+ SET(DEVBUNDLE_CURRENT_BIN "${DEVBUNDLE_CURRENT_DIR}/MacOS")
+ SET(DEVBUNDLE_CURRENT_RESOURCES "${DEVBUNDLE_CURRENT_DIR}/Resources")
+ SET(DEVBUNDLE_DEFAULT_LANGFILE "English.lproj")
+ SET(DEVBUNDLE_NIB_FILE "MainMenu.nib")
+
+ # Create bundle folder structure
+ FILE(MAKE_DIRECTORY "${DEVBUNDLE_CURRENT_DIR}")
+ FILE(MAKE_DIRECTORY "${DEVBUNDLE_CURRENT_BIN}")
+ FILE(MAKE_DIRECTORY "${DEVBUNDLE_CURRENT_RESOURCES}")
+ FILE(MAKE_DIRECTORY "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}")
+
+ # Populate with Info.plist, NIB-file and the Icon.icns
+ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/Orxonox-Info.plist" "${DEVBUNDLE_CURRENT_DIR}/Info.plist")
+ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/Icon.icns" "${DEVBUNDLE_CURRENT_RESOURCES}/Icon.icns" COPYONLY)
+ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/designable.nib" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/designable.nib" COPYONLY)
+ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/keyedobjects.nib" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/${DEVBUNDLE_NIB_FILE}/keyedobjects.nib" COPYONLY)
+ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/${DEFAULT_DATA_PATH}/mac/${DEVBUNDLE_DEFAULT_LANGFILE}/InfoPlist.strings" "${DEVBUNDLE_CURRENT_RESOURCES}/${DEVBUNDLE_DEFAULT_LANGFILE}/InfoPlist.strings")
+
+ENDFOREACH(_subdir)
Modified: code/branches/kicklib2/cmake/tools/FindALUT.cmake
===================================================================
--- code/branches/kicklib2/cmake/tools/FindALUT.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/cmake/tools/FindALUT.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -31,7 +31,7 @@
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
NAMES alut ALUT
Modified: code/branches/kicklib2/cmake/tools/FindCEGUI.cmake
===================================================================
--- code/branches/kicklib2/cmake/tools/FindCEGUI.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/cmake/tools/FindCEGUI.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -33,7 +33,7 @@
# Find CEGUI headers
FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
PATHS $ENV{CEGUIDIR}
- PATH_SUFFIXES include include/CEGUI CEGUI.framework/Headers
+ PATH_SUFFIXES include include/CEGUI
)
# Inspect CEGUIVersion.h for the version number
@@ -43,7 +43,7 @@
FIND_LIBRARY(CEGUI_LIBRARY_OPTIMIZED
NAMES CEGUIBase CEGUI
PATHS $ENV{CEGUIDIR}
- PATH_SUFFIXES lib bin CEGUIBase.framework CEGUI.framework
+ PATH_SUFFIXES lib bin
)
FIND_LIBRARY(CEGUI_LIBRARY_DEBUG
NAMES
@@ -55,18 +55,21 @@
# 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
)
@@ -78,20 +81,19 @@
${CEGUILUA_INCLUDE_DIR}
# 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
)
@@ -100,18 +102,21 @@
IF(_version_compare GREATER -1)
# 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
)
SET(CEGUI_OGRE_RENDERER_REQUIRED_VARIABLES
Modified: code/branches/kicklib2/cmake/tools/FindLua5.1.cmake
===================================================================
--- code/branches/kicklib2/cmake/tools/FindLua5.1.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/cmake/tools/FindLua5.1.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -55,7 +55,7 @@
# 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
)
Modified: code/branches/kicklib2/cmake/tools/FindOGRE.cmake
===================================================================
--- code/branches/kicklib2/cmake/tools/FindOGRE.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/cmake/tools/FindOGRE.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -22,7 +22,7 @@
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
NAMES OgreMain Ogre
@@ -32,7 +32,7 @@
FIND_LIBRARY(OGRE_LIBRARY_DEBUG
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
)
# Inspect OgrePrerquisites.h for the version number
Modified: code/branches/kicklib2/cmake/tools/FindOgg.cmake
===================================================================
--- code/branches/kicklib2/cmake/tools/FindOgg.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/cmake/tools/FindOgg.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -21,12 +21,12 @@
PATH_SUFFIXES include
)
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
)
Modified: code/branches/kicklib2/cmake/tools/FindVorbis.cmake
===================================================================
--- code/branches/kicklib2/cmake/tools/FindVorbis.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/cmake/tools/FindVorbis.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -21,22 +21,22 @@
PATH_SUFFIXES include
)
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
)
Modified: code/branches/kicklib2/cmake/tools/TargetUtilities.cmake
===================================================================
--- code/branches/kicklib2/cmake/tools/TargetUtilities.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/cmake/tools/TargetUtilities.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -52,7 +52,7 @@
# Note:
# 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
#
@@ -205,12 +205,6 @@
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_arg_PCH_FILE})
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()
@@ -292,6 +286,15 @@
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()
+
# DEFINE_SYMBOL
IF(_arg_DEFINE_SYMBOL)
SET_TARGET_PROPERTIES(${_target_name} PROPERTIES DEFINE_SYMBOL ${_arg_DEFINE_SYMBOL})
Copied: code/branches/kicklib2/contrib/CMakeLists.txt (from rev 8277, code/branches/kicklib/contrib/CMakeLists.txt)
===================================================================
--- code/branches/kicklib2/contrib/CMakeLists.txt (rev 0)
+++ code/branches/kicklib2/contrib/CMakeLists.txt 2011-04-21 17:43:10 UTC (rev 8285)
@@ -0,0 +1,30 @@
+ #
+ # ORXONOX - the hottest 3D action shooter ever to exist
+ # > www.orxonox.net <
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+ # of the License, or (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along
+ # with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ #
+ # Author:
+ # Reto Grieder
+ # Description:
+ # Installs system specific files
+ #
+
+IF(UNIX AND NOT APPLE)
+ INSTALL(FILES orxonox.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+ #INSTALL(FILES orxonox.manpage.xml DESTINATION /usr/man)
+ INSTALL(FILES orxonox.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
+ENDIF()
Modified: code/branches/kicklib2/contrib/orxonox.desktop
===================================================================
--- code/branches/kicklib2/contrib/orxonox.desktop 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/contrib/orxonox.desktop 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Orxonox
Comment=A spacecraft shooter
-Exec=orxonox
+Exec=/usr/games/orxonox
Icon=/usr/share/pixmaps/orxonox.png
Type=Application
Categories=Game;ActionGame;
Deleted: code/branches/kicklib2/contrib/orxonox.png
===================================================================
(Binary files differ)
Copied: code/branches/kicklib2/contrib/orxonox.png (from rev 8271, code/branches/kicklib/contrib/orxonox.png)
===================================================================
(Binary files differ)
Copied: code/branches/kicklib2/contrib/orxonox_old.svg (from rev 8277, code/branches/kicklib/contrib/orxonox_old.svg)
===================================================================
--- code/branches/kicklib2/contrib/orxonox_old.svg (rev 0)
+++ code/branches/kicklib2/contrib/orxonox_old.svg 2011-04-21 17:43:10 UTC (rev 8285)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.0"
+ width="512"
+ height="512"
+ id="svg2470">
+ <defs
+ id="defs2473" />
+ <g
+ transform="matrix(1.1599689,0,0,1.1599689,-61.312471,31.367136)"
+ id="g2926">
+ <path
+ d="m 273.28125,-3.125 c -0.33753,0 -0.65944,0.08735 -0.90625,0.25 -5.92032,7.076685 -7.84063,17.421024 -12.65625,24.90625 C 253.18934,15.254565 248.02475,7.185974 241.375,0.625 236.24444,0.487636 237.24295,7.769684 236,11.09375 c -1.40718,5.637813 -1.54432,13.090512 -3.71875,17.75 -8.1499,-4.590776 -14.00418,-13.119802 -22.65625,-16.65625 -5.54138,0.49717 -2.26469,8.117402 -2.75,11.625 0.41171,5.885154 1.1234,11.752708 1.21875,17.65625 -9.50055,-2.306123 -17.81793,-8.969835 -27.4375,-10.65625 -3.0683,3.596395 1.24993,8.896672 1.6875,13.09375 1.55845,5.265262 3.58081,10.764988 4.53125,15.90625 -9.11905,0.01479 -18.15995,-4.436704 -27.25,-3.34375 -4.30764,3.112184 1.42027,8.14505 2.78125,11.34375 2.73464,4.97687 6.87252,10.35987 8.40625,15.25 -8.53732,2.40472 -17.83424,0.0399 -26.3125,2.34375 -4.10152,3.72395 2.46967,8.12489 4.59375,10.8125 3.93039,4.27106 9.2141,8.7766 12,13.28125 -8.53218,3.6784 -18.53609,4.45017 -26.5625,9.0625 -2.42321,4.35828 4.70455,6.09961 7.25,8.125 4.54859,1.64473 9.10784,6.62509 14.09375,5.46875 8.13723,-6.11487 16.83861,-12.32293 23.15625,-20.34375 1.00807,-4.69869 -5.24641,-7.46118 -7.3125,-11.0625 -3.66639,-2.9888 -3.46849,-4.56704 1.46875,-4.03125 5.78421,-1.06632 12.57867,0.2104 17.71875,-2.75 0.55821,-5.59782 -4.82637,-10.12365 -7.03125,-15 -1.60907,-2.75911 -5.59927,-7.49445 0.3125,-5.4375 6.54924,0.33788 13.62847,4.26334 20,2 -0.0463,-7.6094 -4.34262,-15.3235 -5.46875,-22.21875 7.15363,1.852187 13.62354,7.6005 21.125,7.46875 3.74883,-2.879531 0.94331,-8.917904 1.25,-12.9375 0.22935,-2.626039 -1.92354,-9.40513 0.0312,-9.5625 6.2856,3.664902 11.23114,10.11029 18.03125,12.5625 4.58537,-1.52821 3.05426,-8.404676 4.5625,-12.125 1.14998,-2.101484 0.31871,-10.345824 2.78125,-9 4.92337,4.70408 8.30534,11.451021 14.3125,14.96875 5.20466,-2.13308 5.66461,-9.220405 8.375,-13.53125 1.15641,-1.528772 2.49879,-8.326772 3.96875,-4.125 3.5119,6.843474 5.79708,14.413287 11.1875,20.15625 4.86052,-6.260249 9.20592,-13.13261 14.59375,-18.84375 2.0846,7.256092 1.73134,15.440104 4.84375,22.28125 3.71306,1.852801 6.89994,-3.785302 10.09375,-5.21875 2.85776,-1.935856 6.57948,-5.653071 9.25,-6.3125 0.74248,7.049444 -1.49508,14.673134 0.96875,21.4375 4.97094,1.63046 9.95865,-3.049665 14.59375,-4.375 2.06444,-0.257305 8.81732,-5.477872 6.875,-0.84375 -1.129,6.58358 -6.01032,13.0311 -4.71875,19.78125 3.10906,3.48067 8.59157,-0.39671 12.53125,-0.1875 3.13681,0.19129 13.05964,-4.50259 9.09375,0.875 -2.92401,5.77285 -7.54509,10.95675 -8.9375,17.34375 2.62412,3.90386 8.77423,1.98887 12.84375,3.21875 2.23111,1.00437 10.53001,-0.7558 8.9375,1.71875 -3.12096,4.0206 -7.83072,7.17714 -9.875,12.0625 5.9344,7.73633 14.64175,13.5482 22,19.90625 2.7109,2.82784 6.84075,3.85912 10,1.1875 5.20461,-3.25861 11.59896,-5.90672 15.125,-11.0625 -0.50167,-4.58807 -7.50322,-3.80105 -10.78125,-5.71875 -4.91178,-1.7421 -12.28829,-2.78454 -15.75,-5.46875 5.3611,-7.20545 13.81313,-12.44008 18.03125,-20.5 -0.0544,-5.63131 -8.06821,-3.59256 -11.5625,-4.0625 -5.50764,-0.26559 -11.93251,-0.17594 -16.78125,-1.53125 3.98173,-8.18256 9.92897,-15.7419 13.75,-24.15625 -1.22332,-5.067064 -8.08293,-1.666959 -11.4375,-1.625 -5.93821,0.79112 -12.659,3.0636 -18.1875,3 1.87474,-9.859316 7.27683,-19.139097 7.90625,-29.21875 -8.3624,0.490945 -15.58786,6.120862 -23.40625,8.71875 -3.19942,1.72205 -6.8437,3.13256 -5.21875,-2.0625 0.29875,-8.263748 1.84585,-16.689658 0.84375,-24.90625 -3.47068,-3.010059 -7.04365,3.652336 -10.3125,4.8125 -4.88832,3.447496 -10.07698,8.395552 -15.09375,10.6875 -2.99429,-8.524686 -2.5226,-18.377103 -6.65625,-26.375 -4.54699,-2.424893 -6.8748,5.195985 -9.78125,7.375 -3.45573,4.331751 -6.79478,8.854684 -10.5625,12.8125 -5.09233,-7.827683 -7.28948,-17.778902 -13.34375,-24.8125 -0.24681,-0.162653 -0.59997,-0.25 -0.9375,-0.25 z m -0.625,96.09375 c -83.26931,0 -150.84375,67.57444 -150.84375,150.84375 0,83.26931 67.57444,150.87502 150.84375,150.875 83.26931,0 150.84373,-67.60569 150.84375,-150.875 0,-83.26931 -67.57444,-150.84375 -150.84375,-150.84375 z"
+ id="path2499"
+ style="fill:#f07905;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.86755997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <path
+ d="m 283.75551,118.69825 c 3.8326,-2.92327 6.59672,-7.30905 6.59672,-10.46691 0,-1.34297 -0.91624,-2.10791 -3.03159,-2.53098 -5.03084,-1.00617 -29.76323,-0.2524 -30.95725,0.94348 -2.45839,2.4622 3.48285,11.25959 9.48884,14.05044 4.86268,2.25958 13.60121,1.28532 17.90328,-1.99603 z m -121.40328,6.85736 c 1.375,-1.48313 5.425,-5.00387 9,-7.82385 3.575,-2.81999 6.82351,-5.58801 7.21891,-6.15116 0.39617,-0.56426 -2.40958,-4.17692 -6.25,-8.04744 -3.8329,-3.86293 -6.96891,-7.35043 -6.96891,-7.75 0,-0.39956 2.85899,-0.72648 6.35331,-0.72648 9.68177,0 18.64695,-1.1504 18.64458,-2.39246 -0.001,-0.60915 -2.70021,-5.15754 -5.99789,-10.10754 -8.49307,-12.74857 -8.48584,-12.76107 5.5,-9.5 9.10186,2.12228 13.5,2.51208 13.5,1.19648 0,-0.44193 -1.575,-5.48035 -3.5,-11.19648 -1.925,-5.716132 -3.5,-10.75455 -3.5,-11.196484 0,-1.628868 2.99886,-0.696708 11.89199,3.696484 12.59254,6.22069 12.53395,6.23695 11.71425,-3.25 -0.36829,-4.2625 -0.93833,-9.8875 -1.26676,-12.5 -0.4112,-3.270922 -0.2373,-4.75 0.55848,-4.75 0.63559,0 5.21065,3.375 10.16679,7.5 4.95614,4.125 9.4237,7.5 9.9279,7.5 0.9686,0 1.28832,-1.459199 3.26869,-14.918223 0.69491,-4.722809 1.77231,-8.595424 2.45433,-8.821889 0.66861,-0.222016 4.22099,3.678685 7.89417,8.668223 3.67319,4.989539 7.24664,9.071889 7.94102,9.071889 0.69438,0 2.62557,-3.2625 4.29153,-7.25 1.66597,-3.9875 3.75454,-8.974691 4.64127,-11.082648 2.17969,-5.181579 3.42785,-3.956447 8.16629,8.015595 3.82395,9.661498 5.73859,11.908239 7.74466,9.087976 12.20994,-17.165585 13.87349,-18.833994 14.97713,-15.020923 0.27858,0.9625 0.99821,5.35 1.59918,9.75 1.43433,10.50148 1.89914,12.5 2.90721,12.5 0.46201,0 4.61594,-3.145402 9.23095,-6.989783 11.34683,-9.452104 11.97892,-9.342636 10.73188,1.858597 -1.22969,11.045385 -1.04683,15.131186 0.67721,15.131186 0.83499,0 6.02051,-2.259383 11.52338,-5.020852 7.47785,-3.752561 10.1364,-4.679002 10.52453,-3.667553 0.28562,0.744314 -1.07491,5.757378 -3.02339,11.140145 -1.94848,5.38276 -3.54269,10.40816 -3.54269,11.16755 0,1.8498 2.71696,1.7257 13.90179,-0.63496 5.17098,-1.09138 9.78348,-1.98433 10.25,-1.98433 1.74445,0 0.6888,2.30419 -5.15179,11.24492 -3.3,5.05161 -6,9.70039 -6,10.33062 0,1.36134 7.65859,2.40367 17.75,2.41577 3.9875,0.005 7.25,0.35919 7.25,0.78758 0,0.42839 -2.925,3.67789 -6.5,7.22111 -3.575,3.54322 -6.5,6.76642 -6.5,7.16266 0,0.39625 2.8125,2.87597 6.25,5.5105 3.4375,2.63454 9.05115,7.38584 12.47478,10.55845 3.42362,3.17262 6.54497,5.76839 6.93632,5.76839 1.96193,0 20.39401,-11.33531 20.06133,-12.33727 -0.31695,-0.95457 -12.37571,-4.68026 -25.97243,-8.02445 -1.5125,-0.37201 -2.75,-1.30537 -2.75,-2.07412 0,-0.76876 4.77592,-5.89576 10.61316,-11.39334 6.00519,-5.65575 10.32132,-10.46781 9.94099,-11.08321 -0.40876,-0.66138 -4.46999,-1.09102 -10.36317,-1.0963 -12.08431,-0.0108 -20.19098,-0.94514 -20.19098,-2.32703 0,-0.58143 3.375,-6.30911 7.5,-12.72818 4.125,-6.41908 7.5,-12.231779 7.5,-12.917118 0,-1.475879 -5.24971,-0.85761 -17.5,2.061008 -8.11306,1.93293 -13.5,2.44367 -13.5,1.27994 0,-0.35204 2.025,-6.460874 4.5,-13.575178 4.72438,-13.580062 5.19919,-15.784752 3.39951,-15.784752 -0.60526,0 -6.74484,2.7 -13.6435,6 -6.89866,3.3 -12.92844,6 -13.39951,6 -1.18694,0 -1.07003,-8.050505 0.2907,-20.016962 0.67616,-5.946273 0.7788,-10.437646 0.25,-10.938626 -0.50832,-0.481563 -5.79404,3.225572 -12.19478,8.552804 -6.21368,5.171531 -11.8876,9.402784 -12.60873,9.402784 -0.91335,0 -2.03664,-4.452943 -3.70242,-14.677108 -1.3152,-8.07241 -2.86795,-14.831304 -3.45056,-15.019765 -0.58261,-0.18846 -5.02611,5.085074 -9.87443,11.718965 -4.84833,6.633891 -9.29756,11.900815 -9.88718,11.704274 -0.58962,-0.19654 -3.60758,-6.402876 -6.70657,-13.791856 -3.09899,-7.388981 -6.19526,-13.43451 -6.8806,-13.43451 -0.68534,0 -3.40443,5.210644 -6.04241,11.579209 -6.6252,15.994386 -6.83333,16.3451 -8.75412,14.750987 -0.86082,-0.714416 -5.15653,-6.163606 -9.54603,-12.109311 -4.3895,-5.945705 -8.49131,-10.64066 -9.11514,-10.433234 -0.62995,0.209463 -2.08921,6.704772 -3.28218,14.609363 -1.18138,7.827723 -2.41955,14.503823 -2.75151,14.835778 -0.99435,0.994348 -4.68014,-1.459487 -12.60054,-8.388879 -13.78758,-12.062461 -14.44707,-12.027309 -13.04987,0.69558 1.90971,17.389793 1.98663,20.047545 0.59566,20.581308 -0.72679,0.278895 -6.76499,-2.221691 -13.41823,-5.556859 -11.4611,-5.745273 -15.10486,-7.023738 -15.1453,-5.313942 -0.01,0.4125 2.11162,6.91613 4.71416,14.45251 2.60254,7.536381 4.38099,14.05341 3.95212,14.48228 -0.42888,0.42888 -6.72787,-0.44975 -13.99777,-1.952506 -14.48094,-2.993347 -16.65077,-3.220331 -16.65077,-1.741826 0,0.544752 3.375,6.188702 7.5,12.542112 4.125,6.3534 7.5,12.14502 7.5,12.87025 0,1.6575 -7.17092,2.57681 -20.19098,2.58849 -5.33004,0.005 -9.93756,0.40765 -10.23892,0.89527 -0.30136,0.48761 4.46569,5.68401 10.59344,11.54754 7.28363,6.96956 10.80171,11.00063 10.16039,11.64195 -0.53954,0.53954 -4.32065,1.89248 -8.40246,3.00652 -15.61864,4.26278 -20.92147,6.00563 -20.92147,6.87615 0,0.49564 3.2625,2.70155 7.25,4.90202 13.75669,7.59151 12.76761,7.26443 15.67205,5.18259 1.41787,-1.0163 3.70295,-3.06129 5.07795,-4.54442 z m 116.32772,52.1375 c 6.21918,-2.59854 8.82323,-9.33419 6.2319,-16.11948 -1.32921,-3.48048 -2.56557,-4.82551 -5.93502,-6.45663 -5.26956,-2.55095 -6.71546,-2.56478 -11.52683,-0.1102 -8.8964,4.53861 -9.34294,16.88095 -0.79922,22.09036 3.76575,2.29612 7.51549,2.48189 12.02917,0.59595 z m -14.32772,9.24514 c -3.51581,-1.39459 -8.82894,-6.70968 -11.08763,-11.09173 -2.50192,-4.85393 -2.50966,-13.90488 -0.0165,-19.28984 3.6453,-7.87347 11.08629,-12.5 20.10414,-12.5 12.54847,0 21.92612,9.29405 21.97804,21.78212 0.0375,9.01634 -4.30692,16.25553 -12.1882,20.30946 -4.0851,2.10128 -14.39162,2.5346 -18.78984,0.78999 z m 13.92327,37.52954 c 8.37671,-7.04854 -1.68036,-19.10963 -10.28841,-12.33853 -5.69971,4.48339 -1.87824,14.76223 5.53841,14.89701 0.92031,0.0167 3.05781,-1.13459 4.75,-2.55848 z m -12.42327,10.2322 c -5.86793,-2.71551 -10.52257,-10.20574 -10.47804,-16.86119 0.0353,-5.27144 3.37778,-11.35651 7.87164,-14.3304 3.64903,-2.41482 4.75759,-2.64062 11.18196,-2.27761 6.98,0.39441 7.22319,0.50015 11.45774,4.98195 4.65442,4.9262 6.1445,9.41744 5.05364,15.23219 -0.76894,4.09882 -4.10988,9.20408 -7.8235,11.95502 -3.45878,2.56216 -12.98582,3.27961 -17.26344,1.30004 z m 114.36335,104.81583 c 10.227,-11.18997 21.60848,-30.86393 27.22645,-47.06351 5.19823,-14.98922 7.25863,-28.09743 7.21407,-45.89563 -0.0603,-24.08431 -4.08687,-41.09285 -14.93452,-63.08463 -16.34302,-33.13269 -46.45087,-59.24979 -81.71803,-70.88642 -15.43414,-5.09259 -16.44217,-5.20925 -17.64628,-2.0422 -0.55277,1.4539 -1.00504,3.01652 -1.00504,3.4725 0,0.45597 5.9625,2.71466 13.25,5.01931 35.76077,11.30924 63.64553,34.83748 80.02378,67.52144 10.22567,20.40604 13.92278,36.2862 13.96881,60 0.0662,34.11089 -9.34457,60.19434 -31.49722,87.29949 -5.77277,7.06334 -5.90867,7.36259 -4.20058,9.25 0.97085,1.07278 2.32529,1.95051 3.00986,1.95051 0.68456,0 3.52348,-2.49339 6.3087,-5.54086 z m -205.69209,3.88587 c 1.00581,-0.91024 1.82874,-2.07292 1.82874,-2.58373 0,-0.51082 -2.63201,-4.15357 -5.84891,-8.09502 -14.63358,-17.92951 -23.6031,-36.73187 -28.71576,-60.19538 -2.42673,-11.13698 -2.45896,-39.78834 -0.0573,-50.97088 4.2612,-19.84118 13.1935,-40.10618 24.05507,-54.57452 12.18896,-16.23652 30.18715,-31.27508 48.18988,-40.26551 7.30272,-3.64692 22.54194,-9.03747 28.94511,-10.23871 4.30443,-0.80752 5.21481,-2.57753 3.036,-5.9028 -1.958,-2.9883 -3.54655,-2.79413 -18.01964,2.20251 -21.27489,7.34487 -38.57605,18.19197 -54.61522,34.24145 -20.39953,20.41264 -32.7968,43.46168 -39.14531,72.77907 -2.80784,12.96658 -3.05515,38.46814 -0.50195,51.75851 3.58768,18.67525 11.52311,38.42277 21.37736,53.19814 5.83969,8.75598 15.31468,20.30186 16.66046,20.30186 0.54052,0 1.8057,-0.74474 2.81151,-1.65499 z m 63.83532,-15.91082 c 15.67138,-15.71119 30.21346,-29.94977 32.31572,-31.64129 l 3.8223,-3.07549 31.78931,31.73223 31.7893,31.73222 3.88839,-1.99361 c 2.13862,-1.09649 4.9045,-3.08274 6.1464,-4.4139 l 2.258,-2.42028 -38.00974,-37.92703 c -20.90536,-20.85987 -38.51355,-38.09524 -39.12932,-38.30081 -1.29795,-0.43333 -76.87694,74.79013 -76.87694,76.5153 0,1.40138 9.90102,8.26028 12.00658,8.31751 0.82862,0.0225 14.32862,-12.81365 30,-28.52485 z m 116.73476,34.94403 c 2.89226,-1.99198 5.25866,-3.93853 5.25866,-4.32568 0,-0.38715 -1.08902,-1.72699 -2.42004,-2.97742 l -2.42003,-2.2735 -5.54202,3.84919 c -3.04812,2.11705 -5.5591,4.26376 -5.57997,4.77045 -0.0538,1.30643 3.06103,4.57874 4.35839,4.57874 0.59749,0 3.45275,-1.6298 6.34501,-3.62178 z m -153.74134,-2.42161 c -1.375,-1.07766 -4.44655,-3.12269 -6.82568,-4.5445 -4.13205,-2.46941 -4.4118,-2.50717 -6.25,-0.84362 -3.05881,2.76819 -2.33103,4.21226 4.27459,8.48168 l 6.19892,4.00655 2.55108,-2.57036 2.55109,-2.57036 -2.5,-1.95939 z m 100.28084,25.57404 c 14.49567,-2.98776 28.71916,-8.12289 28.71916,-10.36853 0,-1.74786 -53.77251,-56.16212 -55.49976,-56.16212 -1.98511,0 -57.97468,56.92568 -56.97196,57.92449 3.0777,3.06569 28.15674,9.52931 44.47172,11.46169 7.53063,0.89195 28.49235,-0.63187 39.28084,-2.85553 z M 224.9987,293.20072 c 23.01944,-23.02077 42.83645,-42.37077 44.03779,-43 5.92891,-3.10537 5.18763,-3.71608 50.80424,41.85596 23.67313,23.65 43.55992,43 44.19287,43 1.9432,0 11.52658,-11.38528 17.16943,-20.39769 6.71527,-10.72521 12.42692,-23.8951 15.79143,-36.41178 3.52441,-13.11156 4.47549,-39.90506 1.90583,-53.69053 -5.8373,-31.31537 -23.37566,-60.16462 -47.7345,-78.51955 -14.94825,-11.26385 -26.56227,-17.02054 -45.2778,-22.44271 l -8.96423,-2.59707 -2.78905,2.06203 c -7.30846,5.40338 -10.29113,6.9611 -15.33301,8.00779 -9.08811,1.88669 -15.89094,-0.24766 -26.99841,-8.47059 -1.85434,-1.37278 -2.85156,-1.29243 -10.5,0.84604 -12.51114,3.49807 -21.4908,7.12277 -30.45106,12.29177 -33.29597,19.2078 -55.04883,49.48194 -62.91392,87.55925 -2.09944,10.16404 -2.14356,36.3479 -0.0794,47.13488 3.08197,16.10609 10.04627,33.16984 19.08974,46.77315 4.72103,7.10145 13.99627,17.85501 15.40042,17.85501 0.43787,0 19.63022,-18.83518 42.64966,-41.85596 z m 26.3145,116.39371 c -13.41757,-1.95334 -23.67774,-4.45026 -33.96097,-8.26475 -53.67022,-19.90862 -91.52045,-63.25337 -104.5902,-119.773 -2.57257,-11.12502 -2.77864,-13.60412 -2.82616,-34 -0.0452,-19.38999 0.22598,-23.29899 2.28561,-32.94931 5.42694,-25.42767 15.84433,-48.32494 30.78186,-67.65802 4.02331,-5.20722 5.35439,-7.66039 4.71044,-8.68127 -0.49368,-0.78264 -8.28662,-5.53788 -17.31765,-10.56719 -9.03104,-5.02932 -16.44793,-9.58799 -16.48198,-10.13039 -0.0524,-0.83409 14.13749,-5.27085 30.18808,-9.43895 2.3375,-0.60702 4.25,-1.58421 4.25,-2.17153 0,-0.58733 -5.92016,-6.76835 -13.15592,-13.73561 l -13.15592,-12.66773 11.40592,-0.61844 c 6.27326,-0.34014 14.66842,-0.67764 18.65592,-0.75 5.70792,-0.10358 7.25,-0.44951 7.25,-1.62637 0,-0.82215 -4.05,-7.72656 -9,-15.34315 -4.95,-7.616579 -9,-14.368915 -9,-15.005185 0,-1.519175 1.80635,-1.459466 9.29448,0.307227 17.46435,4.120404 25.84557,5.729198 26.48996,5.084808 0.39267,-0.392671 -1.92663,-8.348367 -5.15401,-17.679325 -3.22737,-9.330958 -5.58601,-17.247316 -5.24142,-17.591906 0.34459,-0.34459 7.84837,2.891627 16.67507,7.191593 9.41482,4.586473 16.41674,7.448713 16.93929,6.924435 0.521,-0.52272 0.50612,-4.837107 -0.0358,-10.393687 -1.90746,-19.556685 -2.2458,-25.99992 -1.36506,-25.995728 0.49364,0.0023 6.81731,4.952349 14.0526,11 12.6624,10.583917 14.67165,11.894136 15.69664,10.235664 0.25836,-0.418034 1.44038,-7.505534 2.62671,-15.75 2.41317,-16.770562 2.95493,-19.491433 3.87999,-19.486549 0.35287,0.0019 5.36659,6.51928 11.14159,14.483149 5.775,7.963868 10.95,14.338764 11.5,14.166436 1.36768,-0.428529 2.60055,-2.981854 9.14362,-18.936915 3.109,-7.581169 6.1149,-13.629885 6.67978,-13.44159 0.56488,0.188295 4.01645,7.516069 7.67014,16.283943 3.6537,8.767875 7.18786,15.94159 7.85369,15.94159 0.66584,0 5.8101,-6.283603 11.43169,-13.963562 5.62159,-7.679959 10.67108,-13.979959 11.22108,-14 0.55,-0.02004 2.1992,7.838562 3.6649,17.463562 1.46569,9.625 2.70319,17.6125 2.75,17.75 0.46648,1.370372 4.60065,-1.444814 15.80023,-10.759263 7.26832,-6.044905 13.51823,-10.990737 13.8887,-10.990737 0.37047,0 0.40295,3.9375 0.0722,8.75 -0.33077,4.8125 -0.90931,13.1375 -1.28563,18.5 -0.44057,6.277885 -0.3288,9.75 0.31386,9.75 0.54894,0 8.07894,-3.411119 16.73332,-7.580264 8.65439,-4.169145 16.00184,-7.313665 16.32769,-6.987822 0.32584,0.325842 -1.97234,8.092659 -5.10708,17.259592 -3.13473,9.166933 -5.32382,17.042839 -4.86465,17.502014 0.45917,0.459174 8.56474,-0.825257 18.01237,-2.854293 9.44763,-2.029036 17.46801,-3.398662 17.82306,-3.043613 0.35505,0.355049 -3.51161,6.971258 -8.59257,14.702686 -5.08097,7.73143 -9.45165,14.87369 -9.71263,15.87169 -0.43269,1.65461 0.6037,1.87253 11.75787,2.47228 6.72781,0.36175 15.12423,0.65773 18.65871,0.65773 3.53449,0 6.27634,0.41284 6.093,0.91741 -0.18333,0.50458 -5.95833,6.2343 -12.83333,12.73271 -6.875,6.49841 -12.64069,12.36064 -12.81265,13.02717 -0.17933,0.69511 1.52635,1.70496 4,2.3682 17.3265,4.64561 29.03181,7.97193 29.86472,8.48669 0.5393,0.33331 0.744,0.98877 0.45488,1.45657 -0.28912,0.46781 -7.9898,5.01287 -17.11264,10.10014 -9.12283,5.08727 -16.79973,9.80403 -17.05977,10.48169 -0.26004,0.67766 2.71613,5.43901 6.61372,10.58077 12.46431,16.4431 24.22171,42.46825 28.44385,62.9608 5.90375,28.65437 4.1256,60.51234 -4.87756,87.38785 -15.13556,45.18148 -50.99084,82.75639 -95.86343,100.46107 -23.96807,9.45671 -56.39879,13.25862 -81.69015,9.57668 z"
+ id="path2887"
+ style="fill:#120d0a" />
+ </g>
+</svg>
Modified: code/branches/kicklib2/data/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/data/CMakeLists.txt 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/data/CMakeLists.txt 2011-04-21 17:43:10 UTC (rev 8285)
@@ -58,9 +58,5 @@
INSTALL(
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)
Deleted: code/branches/kicklib2/data/DataInstallScript.cmake
===================================================================
--- code/branches/kicklib2/data/DataInstallScript.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/data/DataInstallScript.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,37 +0,0 @@
- #
- # ORXONOX - the hottest 3D action shooter ever to exist
- # > www.orxonox.net <
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License along
- # with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- #
- # Author:
- # Reto Grieder
- # Description:
- # Joins both resources.oxr files together
- # Caution:
- # Variables are declared with @...@ because they don't exist anymore
- # during the installation. But we still require variables (_external_file)
- # so we can only replace @...@ but not ${...}
- #
-
-# Write some comment
-FILE(APPEND $ENV{DESTDIR}/@DATA_INSTALL_DIRECTORY@/DefaultResources.oxr "\n\n\n <!-- ---------------------------------------- -->")
-FILE(APPEND $ENV{DESTDIR}/@DATA_INSTALL_DIRECTORY@/DefaultResources.oxr "\n <!-- Content from the external data directory -->")
-FILE(APPEND $ENV{DESTDIR}/@DATA_INSTALL_DIRECTORY@/DefaultResources.oxr "\n <!-- ---------------------------------------- -->\n\n")
-
-# Append the external file
-FILE(READ @EXTERNAL_DATA_DIRECTORY@/resources.oxr _external_file)
-FILE(APPEND $ENV{DESTDIR}/@DATA_INSTALL_DIRECTORY@/DefaultResources.oxr ${_external_file})
Deleted: code/branches/kicklib2/data/levels/planets.oxw
===================================================================
--- code/branches/kicklib2/data/levels/planets.oxw 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/data/levels/planets.oxw 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,122 +0,0 @@
-<LevelInfo
-
- name = "Planets"
-
- description = "Planets Level"
-
- tags = "test"
-
-/>
-
-
-
-<?lua
-
- include("HUDTemplates3.oxo")
-
- include("stats.oxo")
-
- include("templates/spaceshipAssff.oxt")
-
- include("templates/lodInformation.oxt")
-
-?>
-
-
-
-<Level
-
- name = "Planets"
- description = "Planets Level"
-
->
-
- <templates>
-
- <Template link=lodtemplate_default />
-
- </templates>
-
-
-
- <Scene
-
- ambientlight = "0.3, 0.3, 0.3"
-
- skybox = "Orxonox/skypanoramagen1"
-
- >
-
-
- <?lua
-
- planetsize=4000
-
- ?>
- <Light
- type=directional
- position="-10000,-10000,0"
- direction="1, 1, 0"
- diffuse="1.0, 0.9, 0.9, 1.0"
- specular="1.0, 0.9, 0.9, 1.0"
- />
-
-
- <SpawnPoint
- position="<?lua print(math.sin(1.5) *(2)*planetsize) ?>,<?lua print(math.cos(1.5) *3*planetsize) ?>,<?lua print(500) ?>"
- lookat="0,0,0"
- spawnclass=SpaceShip
- pawndesign=spaceshipassff
- />
-
-
-
- <Planet
- position="0,0,0"
- scale="<?lua print(planetsize) ?>"
- pitch=-90
- mesh="Muunilinst.mesh"
- atmosphere="atmosphere1"
- rotationaxis="0,1,0"
- rotationrate="1"
- atmospheresize=300.0f
- imagesize=1024.0f
- />
-
-
- <Planet
- position="<?lua print(3*planetsize) ?>,0,0"
- scale="1000"
- pitch=0
- mesh="ganymede.mesh"
- atmosphere="atmosphere1"
- rotationaxis="0,1,0"
- rotationrate="1"
- atmospheresize=300.0f
- imagesize=1024.0f
- />
- <Planet
- position="0,<?lua print(3*planetsize) ?>,0"
- scale="1000"
- pitch=0
- mesh="jupiter.mesh"
- atmosphere="atmosphere1"
- rotationaxis="0,1,0"
- rotationrate="1"
- atmospheresize=300.0f
- imagesize=1024.0f
- />
- <Planet
- position="0,0,<?lua print(3*planetsize) ?>"
- scale="1000"
- pitch=0
- mesh="Planet3.mesh"
- atmosphere="atmosphere1"
- rotationaxis="0,1,0"
- rotationrate="1"
- atmospheresize=300.0f
- imagesize=1024.0f
- />
- </Scene>
-
-</Level>
Copied: code/branches/kicklib2/data/levels/planets.oxw (from rev 8271, code/branches/kicklib/data/levels/planets.oxw)
===================================================================
--- code/branches/kicklib2/data/levels/planets.oxw (rev 0)
+++ code/branches/kicklib2/data/levels/planets.oxw 2011-04-21 17:43:10 UTC (rev 8285)
@@ -0,0 +1,65 @@
+<?lua
+ include("HUDTemplates3.oxo")
+ include("stats.oxo")
+ include("templates/lodInformation.oxt")
+ include("templates/spaceshipSwallow.oxt")
+ include("templates/spaceshipPirate.oxt")
+?>
+
+
+
+<Level
+ name = "Planet_Demo"
+ description = "Demonstration of planets with high resolution."
+
+>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+
+ <Scene
+ ambientlight = "0.5, 0.5, 0.5"
+ skybox = "Orxonox/skypanoramagen1"
+ >
+
+<WorldAmbientSound ambientSource="AlphaCentauri.ogg" looping="true" playOnLoad="true" />
+<Light type=directional position="-10000,-10000,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+
+<?lua
+planetsize=40000
+?>
+
+<SpawnPoint position="<?lua print(math.sin(1.5) *(3)*planetsize) ?>,<?lua print(math.cos(1.5) *3*planetsize) ?>,<?lua print(500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow />
+
+
+<?lua
+max = 50
+
+for i = 1, max, 1
+do
+ x = math.sin(i/max*6)*(1.5)*planetsize
+ y = i*100
+ z = math.cos(i/max*6)*(1.5)*planetsize
+ ?>
+<?lua
+for k = 1, 25, 1
+do
+j = math.random()
+?>
+
+ <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+ <attached>
+ <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ </attached>
+ <?lua if i == 5 then ?><collisionShapes>
+ <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
+ </collisionShapes> <?lua end ?>
+ </MovableEntity>
+<?lua
+end
+?>
+<?lua end ?>
+ <Planet position="0,0,0" scale="<?lua print(planetsize) ?>" pitch=-90 mesh="jupiter.mesh" atmosphere="atmosphere1" rotationaxis="0,1,0" rotationrate="0.2" atmospheresize=300.0f imagesize=1024.0f />
+ <Planet position="<?lua print(5*planetsize) ?>,0,0" scale=10000 pitch=30 mesh="ganymede.mesh" atmosphere="atmosphere1" rotationaxis="1,0,1" rotationrate="1.5" atmospheresize=224.0f imagesize=1024.0f />
+ </Scene>
+</Level>
Deleted: code/branches/kicklib2/data/mac/English.lproj/InfoPlist.strings
===================================================================
--- code/branches/kicklib/data/mac/English.lproj/InfoPlist.strings 2011-04-20 18:49:58 UTC (rev 8277)
+++ code/branches/kicklib2/data/mac/English.lproj/InfoPlist.strings 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
Copied: code/branches/kicklib2/data/mac/English.lproj/InfoPlist.strings (from rev 8277, code/branches/kicklib/data/mac/English.lproj/InfoPlist.strings)
===================================================================
--- code/branches/kicklib2/data/mac/English.lproj/InfoPlist.strings (rev 0)
+++ code/branches/kicklib2/data/mac/English.lproj/InfoPlist.strings 2011-04-21 17:43:10 UTC (rev 8285)
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
Deleted: code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/designable.nib
===================================================================
--- code/branches/kicklib/data/mac/English.lproj/MainMenu.nib/designable.nib 2011-04-20 18:49:58 UTC (rev 8277)
+++ code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/designable.nib 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,734 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">823</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomObject" id="1021">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSCustomObject" id="1014">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="1050">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSCustomObject" id="163992474">
- <string key="NSClassName">NSFontManager</string>
- </object>
- <object class="NSMenu" id="649796088">
- <string key="NSTitle">Orxonox</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMenuItem" id="694149608">
- <reference key="NSMenu" ref="649796088"/>
- <string key="NSTitle">Orxonox</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <object class="NSCustomResource" key="NSOnImage" id="353210768">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage" id="549394948">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">submenuAction:</string>
- <object class="NSMenu" key="NSSubmenu" id="110575045">
- <string key="NSTitle">Orxonox</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMenuItem" id="238522557">
- <reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">About Orxonox</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="304266470">
- <reference key="NSMenu" ref="110575045"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="609285721">
- <reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">Preferences…</string>
- <string key="NSKeyEquiv">,</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="481834944">
- <reference key="NSMenu" ref="110575045"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="1046388886">
- <reference key="NSMenu" ref="110575045"/>
- <bool key="NSIsDisabled">YES</bool>
- <string key="NSTitle">Services</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- <string key="NSAction">submenuAction:</string>
- <object class="NSMenu" key="NSSubmenu" id="752062318">
- <string key="NSTitle">Services</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <string key="NSName">_NSServicesMenu</string>
- </object>
- </object>
- <object class="NSMenuItem" id="646227648">
- <reference key="NSMenu" ref="110575045"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="755159360">
- <reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">Hide Orxonox</string>
- <string key="NSKeyEquiv">h</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="342932134">
- <reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">Hide Others</string>
- <string key="NSKeyEquiv">h</string>
- <int key="NSKeyEquivModMask">1572864</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="908899353">
- <reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">Show All</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="1056857174">
- <reference key="NSMenu" ref="110575045"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="632727374">
- <reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">Quit Orxonox</string>
- <string key="NSKeyEquiv">q</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- </object>
- <string key="NSName">_NSAppleMenu</string>
- </object>
- </object>
- <object class="NSMenuItem" id="713487014">
- <reference key="NSMenu" ref="649796088"/>
- <string key="NSTitle">Window</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- <string key="NSAction">submenuAction:</string>
- <object class="NSMenu" key="NSSubmenu" id="835318025">
- <string key="NSTitle">Window</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMenuItem" id="1011231497">
- <reference key="NSMenu" ref="835318025"/>
- <string key="NSTitle">Minimize</string>
- <string key="NSKeyEquiv">m</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="575023229">
- <reference key="NSMenu" ref="835318025"/>
- <string key="NSTitle">Zoom</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="299356726">
- <reference key="NSMenu" ref="835318025"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="625202149">
- <reference key="NSMenu" ref="835318025"/>
- <string key="NSTitle">Bring All to Front</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- </object>
- <string key="NSName">_NSWindowsMenu</string>
- </object>
- </object>
- <object class="NSMenuItem" id="391199113">
- <reference key="NSMenu" ref="649796088"/>
- <string key="NSTitle">Help</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- <string key="NSAction">submenuAction:</string>
- <object class="NSMenu" key="NSSubmenu" id="374024848">
- <string key="NSTitle">Help</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMenuItem" id="238773614">
- <reference key="NSMenu" ref="374024848"/>
- <string key="NSTitle">Orxonox Help</string>
- <string key="NSKeyEquiv">?</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- </object>
- <string key="NSName">_NSHelpMenu</string>
- </object>
- </object>
- </object>
- <string key="NSName">_NSMainMenu</string>
- </object>
- <object class="NSCustomObject" id="505502289">
- <string key="NSClassName">OrxonoxAppDelegate</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">performMiniaturize:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="1011231497"/>
- </object>
- <int key="connectionID">37</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">arrangeInFront:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="625202149"/>
- </object>
- <int key="connectionID">39</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">orderFrontStandardAboutPanel:</string>
- <reference key="source" ref="1021"/>
- <reference key="destination" ref="238522557"/>
- </object>
- <int key="connectionID">142</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">performZoom:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="575023229"/>
- </object>
- <int key="connectionID">240</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">showHelp:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="238773614"/>
- </object>
- <int key="connectionID">360</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">hide:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="755159360"/>
- </object>
- <int key="connectionID">369</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">hideOtherApplications:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="342932134"/>
- </object>
- <int key="connectionID">370</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">unhideAllApplications:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="908899353"/>
- </object>
- <int key="connectionID">372</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="1021"/>
- <reference key="destination" ref="505502289"/>
- </object>
- <int key="connectionID">822</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">terminate:</string>
- <reference key="source" ref="1050"/>
- <reference key="destination" ref="632727374"/>
- </object>
- <int key="connectionID">823</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <object class="NSArray" key="object" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="children" ref="1048"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="1021"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="1014"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">First Responder</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-3</int>
- <reference key="object" ref="1050"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">Application</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">29</int>
- <reference key="object" ref="649796088"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="713487014"/>
- <reference ref="391199113"/>
- <reference ref="694149608"/>
- </object>
- <reference key="parent" ref="0"/>
- <string key="objectName">Orxonox Main Menu</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">19</int>
- <reference key="object" ref="713487014"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="835318025"/>
- </object>
- <reference key="parent" ref="649796088"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">56</int>
- <reference key="object" ref="694149608"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="110575045"/>
- </object>
- <reference key="parent" ref="649796088"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">103</int>
- <reference key="object" ref="391199113"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="374024848"/>
- </object>
- <reference key="parent" ref="649796088"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">106</int>
- <reference key="object" ref="374024848"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="238773614"/>
- </object>
- <reference key="parent" ref="391199113"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">111</int>
- <reference key="object" ref="238773614"/>
- <reference key="parent" ref="374024848"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">57</int>
- <reference key="object" ref="110575045"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="238522557"/>
- <reference ref="755159360"/>
- <reference ref="908899353"/>
- <reference ref="632727374"/>
- <reference ref="646227648"/>
- <reference ref="609285721"/>
- <reference ref="481834944"/>
- <reference ref="304266470"/>
- <reference ref="1046388886"/>
- <reference ref="1056857174"/>
- <reference ref="342932134"/>
- </object>
- <reference key="parent" ref="694149608"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">58</int>
- <reference key="object" ref="238522557"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">134</int>
- <reference key="object" ref="755159360"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">150</int>
- <reference key="object" ref="908899353"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">136</int>
- <reference key="object" ref="632727374"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">144</int>
- <reference key="object" ref="646227648"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">129</int>
- <reference key="object" ref="609285721"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">143</int>
- <reference key="object" ref="481834944"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">236</int>
- <reference key="object" ref="304266470"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">131</int>
- <reference key="object" ref="1046388886"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="752062318"/>
- </object>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">149</int>
- <reference key="object" ref="1056857174"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">145</int>
- <reference key="object" ref="342932134"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">130</int>
- <reference key="object" ref="752062318"/>
- <reference key="parent" ref="1046388886"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">24</int>
- <reference key="object" ref="835318025"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="299356726"/>
- <reference ref="625202149"/>
- <reference ref="575023229"/>
- <reference ref="1011231497"/>
- </object>
- <reference key="parent" ref="713487014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">92</int>
- <reference key="object" ref="299356726"/>
- <reference key="parent" ref="835318025"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object" ref="625202149"/>
- <reference key="parent" ref="835318025"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">239</int>
- <reference key="object" ref="575023229"/>
- <reference key="parent" ref="835318025"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">23</int>
- <reference key="object" ref="1011231497"/>
- <reference key="parent" ref="835318025"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">373</int>
- <reference key="object" ref="163992474"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">821</int>
- <reference key="object" ref="505502289"/>
- <reference key="parent" ref="0"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-3.IBPluginDependency</string>
- <string>103.IBPluginDependency</string>
- <string>103.ImportedFromIB2</string>
- <string>106.IBEditorWindowLastContentRect</string>
- <string>106.IBPluginDependency</string>
- <string>106.ImportedFromIB2</string>
- <string>106.editorWindowContentRectSynchronizationRect</string>
- <string>111.IBPluginDependency</string>
- <string>111.ImportedFromIB2</string>
- <string>129.IBPluginDependency</string>
- <string>129.ImportedFromIB2</string>
- <string>130.IBEditorWindowLastContentRect</string>
- <string>130.IBPluginDependency</string>
- <string>130.ImportedFromIB2</string>
- <string>130.editorWindowContentRectSynchronizationRect</string>
- <string>131.IBPluginDependency</string>
- <string>131.ImportedFromIB2</string>
- <string>134.IBPluginDependency</string>
- <string>134.ImportedFromIB2</string>
- <string>136.IBPluginDependency</string>
- <string>136.ImportedFromIB2</string>
- <string>143.IBPluginDependency</string>
- <string>143.ImportedFromIB2</string>
- <string>144.IBPluginDependency</string>
- <string>144.ImportedFromIB2</string>
- <string>145.IBPluginDependency</string>
- <string>145.ImportedFromIB2</string>
- <string>149.IBPluginDependency</string>
- <string>149.ImportedFromIB2</string>
- <string>150.IBPluginDependency</string>
- <string>150.ImportedFromIB2</string>
- <string>19.IBPluginDependency</string>
- <string>19.ImportedFromIB2</string>
- <string>23.IBPluginDependency</string>
- <string>23.ImportedFromIB2</string>
- <string>236.IBPluginDependency</string>
- <string>236.ImportedFromIB2</string>
- <string>239.IBPluginDependency</string>
- <string>239.ImportedFromIB2</string>
- <string>24.IBEditorWindowLastContentRect</string>
- <string>24.IBPluginDependency</string>
- <string>24.ImportedFromIB2</string>
- <string>24.editorWindowContentRectSynchronizationRect</string>
- <string>29.IBEditorWindowLastContentRect</string>
- <string>29.IBPluginDependency</string>
- <string>29.ImportedFromIB2</string>
- <string>29.WindowOrigin</string>
- <string>29.editorWindowContentRectSynchronizationRect</string>
- <string>5.IBPluginDependency</string>
- <string>5.ImportedFromIB2</string>
- <string>56.IBPluginDependency</string>
- <string>56.ImportedFromIB2</string>
- <string>57.IBEditorWindowLastContentRect</string>
- <string>57.IBPluginDependency</string>
- <string>57.ImportedFromIB2</string>
- <string>57.editorWindowContentRectSynchronizationRect</string>
- <string>58.IBPluginDependency</string>
- <string>58.ImportedFromIB2</string>
- <string>821.IBPluginDependency</string>
- <string>92.IBPluginDependency</string>
- <string>92.ImportedFromIB2</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{593, 709}, {166, 23}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{596, 852}, {216, 23}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{674, 654}, {64, 6}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{436, 809}, {64, 6}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{523, 657}, {194, 73}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{525, 802}, {197, 73}}</string>
- <string>{{431, 730}, {224, 20}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{74, 862}</string>
- <string>{{11, 977}, {478, 20}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{443, 547}, {195, 183}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{23, 794}, {245, 183}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">823</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">OrxonoxAppDelegate</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <nil key="IBDocument.LastKnownRelativeProjectPath"/>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSMenuCheckmark</string>
- <string>NSMenuMixedState</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{9, 8}</string>
- <string>{7, 2}</string>
- </object>
- </object>
- </data>
-</archive>
Copied: code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/designable.nib (from rev 8277, code/branches/kicklib/data/mac/English.lproj/MainMenu.nib/designable.nib)
===================================================================
--- code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/designable.nib (rev 0)
+++ code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/designable.nib 2011-04-21 17:43:10 UTC (rev 8285)
@@ -0,0 +1,734 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1060</int>
+ <string key="IBDocument.SystemVersion">10J567</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="NS.object.0">823</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSCustomObject" id="1021">
+ <string key="NSClassName">NSApplication</string>
+ </object>
+ <object class="NSCustomObject" id="1014">
+ <string key="NSClassName">FirstResponder</string>
+ </object>
+ <object class="NSCustomObject" id="1050">
+ <string key="NSClassName">NSApplication</string>
+ </object>
+ <object class="NSCustomObject" id="163992474">
+ <string key="NSClassName">NSFontManager</string>
+ </object>
+ <object class="NSMenu" id="649796088">
+ <string key="NSTitle">Orxonox</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMenuItem" id="694149608">
+ <reference key="NSMenu" ref="649796088"/>
+ <string key="NSTitle">Orxonox</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <object class="NSCustomResource" key="NSOnImage" id="353210768">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuCheckmark</string>
+ </object>
+ <object class="NSCustomResource" key="NSMixedImage" id="549394948">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuMixedState</string>
+ </object>
+ <string key="NSAction">submenuAction:</string>
+ <object class="NSMenu" key="NSSubmenu" id="110575045">
+ <string key="NSTitle">Orxonox</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMenuItem" id="238522557">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">About Orxonox</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="304266470">
+ <reference key="NSMenu" ref="110575045"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="609285721">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">Preferences…</string>
+ <string key="NSKeyEquiv">,</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="481834944">
+ <reference key="NSMenu" ref="110575045"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="1046388886">
+ <reference key="NSMenu" ref="110575045"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <string key="NSTitle">Services</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ <string key="NSAction">submenuAction:</string>
+ <object class="NSMenu" key="NSSubmenu" id="752062318">
+ <string key="NSTitle">Services</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <string key="NSName">_NSServicesMenu</string>
+ </object>
+ </object>
+ <object class="NSMenuItem" id="646227648">
+ <reference key="NSMenu" ref="110575045"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="755159360">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">Hide Orxonox</string>
+ <string key="NSKeyEquiv">h</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="342932134">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">Hide Others</string>
+ <string key="NSKeyEquiv">h</string>
+ <int key="NSKeyEquivModMask">1572864</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="908899353">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">Show All</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="1056857174">
+ <reference key="NSMenu" ref="110575045"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="632727374">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">Quit Orxonox</string>
+ <string key="NSKeyEquiv">q</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ </object>
+ <string key="NSName">_NSAppleMenu</string>
+ </object>
+ </object>
+ <object class="NSMenuItem" id="713487014">
+ <reference key="NSMenu" ref="649796088"/>
+ <string key="NSTitle">Window</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ <string key="NSAction">submenuAction:</string>
+ <object class="NSMenu" key="NSSubmenu" id="835318025">
+ <string key="NSTitle">Window</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMenuItem" id="1011231497">
+ <reference key="NSMenu" ref="835318025"/>
+ <string key="NSTitle">Minimize</string>
+ <string key="NSKeyEquiv">m</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="575023229">
+ <reference key="NSMenu" ref="835318025"/>
+ <string key="NSTitle">Zoom</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="299356726">
+ <reference key="NSMenu" ref="835318025"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="625202149">
+ <reference key="NSMenu" ref="835318025"/>
+ <string key="NSTitle">Bring All to Front</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ </object>
+ <string key="NSName">_NSWindowsMenu</string>
+ </object>
+ </object>
+ <object class="NSMenuItem" id="391199113">
+ <reference key="NSMenu" ref="649796088"/>
+ <string key="NSTitle">Help</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ <string key="NSAction">submenuAction:</string>
+ <object class="NSMenu" key="NSSubmenu" id="374024848">
+ <string key="NSTitle">Help</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMenuItem" id="238773614">
+ <reference key="NSMenu" ref="374024848"/>
+ <string key="NSTitle">Orxonox Help</string>
+ <string key="NSKeyEquiv">?</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ </object>
+ <string key="NSName">_NSHelpMenu</string>
+ </object>
+ </object>
+ </object>
+ <string key="NSName">_NSMainMenu</string>
+ </object>
+ <object class="NSCustomObject" id="505502289">
+ <string key="NSClassName">OrxonoxAppDelegate</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">performMiniaturize:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="1011231497"/>
+ </object>
+ <int key="connectionID">37</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">arrangeInFront:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="625202149"/>
+ </object>
+ <int key="connectionID">39</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">orderFrontStandardAboutPanel:</string>
+ <reference key="source" ref="1021"/>
+ <reference key="destination" ref="238522557"/>
+ </object>
+ <int key="connectionID">142</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">performZoom:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="575023229"/>
+ </object>
+ <int key="connectionID">240</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">showHelp:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="238773614"/>
+ </object>
+ <int key="connectionID">360</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">hide:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="755159360"/>
+ </object>
+ <int key="connectionID">369</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">hideOtherApplications:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="342932134"/>
+ </object>
+ <int key="connectionID">370</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">unhideAllApplications:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="908899353"/>
+ </object>
+ <int key="connectionID">372</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="1021"/>
+ <reference key="destination" ref="505502289"/>
+ </object>
+ <int key="connectionID">822</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">terminate:</string>
+ <reference key="source" ref="1050"/>
+ <reference key="destination" ref="632727374"/>
+ </object>
+ <int key="connectionID">823</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <object class="NSArray" key="object" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="children" ref="1048"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="1021"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="1014"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">First Responder</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-3</int>
+ <reference key="object" ref="1050"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">Application</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">29</int>
+ <reference key="object" ref="649796088"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="713487014"/>
+ <reference ref="391199113"/>
+ <reference ref="694149608"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">Orxonox Main Menu</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">19</int>
+ <reference key="object" ref="713487014"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="835318025"/>
+ </object>
+ <reference key="parent" ref="649796088"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">56</int>
+ <reference key="object" ref="694149608"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="110575045"/>
+ </object>
+ <reference key="parent" ref="649796088"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">103</int>
+ <reference key="object" ref="391199113"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="374024848"/>
+ </object>
+ <reference key="parent" ref="649796088"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">106</int>
+ <reference key="object" ref="374024848"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="238773614"/>
+ </object>
+ <reference key="parent" ref="391199113"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">111</int>
+ <reference key="object" ref="238773614"/>
+ <reference key="parent" ref="374024848"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">57</int>
+ <reference key="object" ref="110575045"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="238522557"/>
+ <reference ref="755159360"/>
+ <reference ref="908899353"/>
+ <reference ref="632727374"/>
+ <reference ref="646227648"/>
+ <reference ref="609285721"/>
+ <reference ref="481834944"/>
+ <reference ref="304266470"/>
+ <reference ref="1046388886"/>
+ <reference ref="1056857174"/>
+ <reference ref="342932134"/>
+ </object>
+ <reference key="parent" ref="694149608"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">58</int>
+ <reference key="object" ref="238522557"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">134</int>
+ <reference key="object" ref="755159360"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">150</int>
+ <reference key="object" ref="908899353"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">136</int>
+ <reference key="object" ref="632727374"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">144</int>
+ <reference key="object" ref="646227648"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">129</int>
+ <reference key="object" ref="609285721"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">143</int>
+ <reference key="object" ref="481834944"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">236</int>
+ <reference key="object" ref="304266470"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">131</int>
+ <reference key="object" ref="1046388886"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="752062318"/>
+ </object>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">149</int>
+ <reference key="object" ref="1056857174"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">145</int>
+ <reference key="object" ref="342932134"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">130</int>
+ <reference key="object" ref="752062318"/>
+ <reference key="parent" ref="1046388886"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">24</int>
+ <reference key="object" ref="835318025"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="299356726"/>
+ <reference ref="625202149"/>
+ <reference ref="575023229"/>
+ <reference ref="1011231497"/>
+ </object>
+ <reference key="parent" ref="713487014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">92</int>
+ <reference key="object" ref="299356726"/>
+ <reference key="parent" ref="835318025"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="625202149"/>
+ <reference key="parent" ref="835318025"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">239</int>
+ <reference key="object" ref="575023229"/>
+ <reference key="parent" ref="835318025"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">23</int>
+ <reference key="object" ref="1011231497"/>
+ <reference key="parent" ref="835318025"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">373</int>
+ <reference key="object" ref="163992474"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">821</int>
+ <reference key="object" ref="505502289"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-3.IBPluginDependency</string>
+ <string>103.IBPluginDependency</string>
+ <string>103.ImportedFromIB2</string>
+ <string>106.IBEditorWindowLastContentRect</string>
+ <string>106.IBPluginDependency</string>
+ <string>106.ImportedFromIB2</string>
+ <string>106.editorWindowContentRectSynchronizationRect</string>
+ <string>111.IBPluginDependency</string>
+ <string>111.ImportedFromIB2</string>
+ <string>129.IBPluginDependency</string>
+ <string>129.ImportedFromIB2</string>
+ <string>130.IBEditorWindowLastContentRect</string>
+ <string>130.IBPluginDependency</string>
+ <string>130.ImportedFromIB2</string>
+ <string>130.editorWindowContentRectSynchronizationRect</string>
+ <string>131.IBPluginDependency</string>
+ <string>131.ImportedFromIB2</string>
+ <string>134.IBPluginDependency</string>
+ <string>134.ImportedFromIB2</string>
+ <string>136.IBPluginDependency</string>
+ <string>136.ImportedFromIB2</string>
+ <string>143.IBPluginDependency</string>
+ <string>143.ImportedFromIB2</string>
+ <string>144.IBPluginDependency</string>
+ <string>144.ImportedFromIB2</string>
+ <string>145.IBPluginDependency</string>
+ <string>145.ImportedFromIB2</string>
+ <string>149.IBPluginDependency</string>
+ <string>149.ImportedFromIB2</string>
+ <string>150.IBPluginDependency</string>
+ <string>150.ImportedFromIB2</string>
+ <string>19.IBPluginDependency</string>
+ <string>19.ImportedFromIB2</string>
+ <string>23.IBPluginDependency</string>
+ <string>23.ImportedFromIB2</string>
+ <string>236.IBPluginDependency</string>
+ <string>236.ImportedFromIB2</string>
+ <string>239.IBPluginDependency</string>
+ <string>239.ImportedFromIB2</string>
+ <string>24.IBEditorWindowLastContentRect</string>
+ <string>24.IBPluginDependency</string>
+ <string>24.ImportedFromIB2</string>
+ <string>24.editorWindowContentRectSynchronizationRect</string>
+ <string>29.IBEditorWindowLastContentRect</string>
+ <string>29.IBPluginDependency</string>
+ <string>29.ImportedFromIB2</string>
+ <string>29.WindowOrigin</string>
+ <string>29.editorWindowContentRectSynchronizationRect</string>
+ <string>5.IBPluginDependency</string>
+ <string>5.ImportedFromIB2</string>
+ <string>56.IBPluginDependency</string>
+ <string>56.ImportedFromIB2</string>
+ <string>57.IBEditorWindowLastContentRect</string>
+ <string>57.IBPluginDependency</string>
+ <string>57.ImportedFromIB2</string>
+ <string>57.editorWindowContentRectSynchronizationRect</string>
+ <string>58.IBPluginDependency</string>
+ <string>58.ImportedFromIB2</string>
+ <string>821.IBPluginDependency</string>
+ <string>92.IBPluginDependency</string>
+ <string>92.ImportedFromIB2</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{593, 709}, {166, 23}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{596, 852}, {216, 23}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{674, 654}, {64, 6}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{436, 809}, {64, 6}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{523, 657}, {194, 73}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{525, 802}, {197, 73}}</string>
+ <string>{{431, 730}, {224, 20}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{74, 862}</string>
+ <string>{{11, 977}, {478, 20}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{443, 547}, {195, 183}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{23, 794}, {245, 183}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">823</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">OrxonoxAppDelegate</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <nil key="IBDocument.LastKnownRelativeProjectPath"/>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSMenuCheckmark</string>
+ <string>NSMenuMixedState</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{9, 8}</string>
+ <string>{7, 2}</string>
+ </object>
+ </object>
+ </data>
+</archive>
Deleted: code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Copied: code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/keyedobjects.nib (from rev 8277, code/branches/kicklib/data/mac/English.lproj/MainMenu.nib/keyedobjects.nib)
===================================================================
(Binary files differ)
Deleted: code/branches/kicklib2/data/mac/English.lproj/MainMenu.xib
===================================================================
--- code/branches/kicklib/data/mac/English.lproj/MainMenu.xib 2011-04-20 18:49:58 UTC (rev 8277)
+++ code/branches/kicklib2/data/mac/English.lproj/MainMenu.xib 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,734 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">823</string>
- </object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomObject" id="1021">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSCustomObject" id="1014">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="1050">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSCustomObject" id="163992474">
- <string key="NSClassName">NSFontManager</string>
- </object>
- <object class="NSMenu" id="649796088">
- <string key="NSTitle">Orxonox</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMenuItem" id="694149608">
- <reference key="NSMenu" ref="649796088"/>
- <string key="NSTitle">Orxonox</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <object class="NSCustomResource" key="NSOnImage" id="353210768">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage" id="549394948">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">submenuAction:</string>
- <object class="NSMenu" key="NSSubmenu" id="110575045">
- <string key="NSTitle">Orxonox</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMenuItem" id="238522557">
- <reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">About Orxonox</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="304266470">
- <reference key="NSMenu" ref="110575045"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="609285721">
- <reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">Preferences…</string>
- <string key="NSKeyEquiv">,</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="481834944">
- <reference key="NSMenu" ref="110575045"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="1046388886">
- <reference key="NSMenu" ref="110575045"/>
- <bool key="NSIsDisabled">YES</bool>
- <string key="NSTitle">Services</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- <string key="NSAction">submenuAction:</string>
- <object class="NSMenu" key="NSSubmenu" id="752062318">
- <string key="NSTitle">Services</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <string key="NSName">_NSServicesMenu</string>
- </object>
- </object>
- <object class="NSMenuItem" id="646227648">
- <reference key="NSMenu" ref="110575045"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="755159360">
- <reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">Hide Orxonox</string>
- <string key="NSKeyEquiv">h</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="342932134">
- <reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">Hide Others</string>
- <string key="NSKeyEquiv">h</string>
- <int key="NSKeyEquivModMask">1572864</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="908899353">
- <reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">Show All</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="1056857174">
- <reference key="NSMenu" ref="110575045"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="632727374">
- <reference key="NSMenu" ref="110575045"/>
- <string key="NSTitle">Quit Orxonox</string>
- <string key="NSKeyEquiv">q</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- </object>
- <string key="NSName">_NSAppleMenu</string>
- </object>
- </object>
- <object class="NSMenuItem" id="713487014">
- <reference key="NSMenu" ref="649796088"/>
- <string key="NSTitle">Window</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- <string key="NSAction">submenuAction:</string>
- <object class="NSMenu" key="NSSubmenu" id="835318025">
- <string key="NSTitle">Window</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMenuItem" id="1011231497">
- <reference key="NSMenu" ref="835318025"/>
- <string key="NSTitle">Minimize</string>
- <string key="NSKeyEquiv">m</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="575023229">
- <reference key="NSMenu" ref="835318025"/>
- <string key="NSTitle">Zoom</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="299356726">
- <reference key="NSMenu" ref="835318025"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- <object class="NSMenuItem" id="625202149">
- <reference key="NSMenu" ref="835318025"/>
- <string key="NSTitle">Bring All to Front</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- </object>
- <string key="NSName">_NSWindowsMenu</string>
- </object>
- </object>
- <object class="NSMenuItem" id="391199113">
- <reference key="NSMenu" ref="649796088"/>
- <string key="NSTitle">Help</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- <string key="NSAction">submenuAction:</string>
- <object class="NSMenu" key="NSSubmenu" id="374024848">
- <string key="NSTitle">Help</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMenuItem" id="238773614">
- <reference key="NSMenu" ref="374024848"/>
- <string key="NSTitle">Orxonox Help</string>
- <string key="NSKeyEquiv">?</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="353210768"/>
- <reference key="NSMixedImage" ref="549394948"/>
- </object>
- </object>
- <string key="NSName">_NSHelpMenu</string>
- </object>
- </object>
- </object>
- <string key="NSName">_NSMainMenu</string>
- </object>
- <object class="NSCustomObject" id="505502289">
- <string key="NSClassName">OrxonoxAppDelegate</string>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">performMiniaturize:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="1011231497"/>
- </object>
- <int key="connectionID">37</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">arrangeInFront:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="625202149"/>
- </object>
- <int key="connectionID">39</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">orderFrontStandardAboutPanel:</string>
- <reference key="source" ref="1021"/>
- <reference key="destination" ref="238522557"/>
- </object>
- <int key="connectionID">142</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">performZoom:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="575023229"/>
- </object>
- <int key="connectionID">240</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">showHelp:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="238773614"/>
- </object>
- <int key="connectionID">360</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">hide:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="755159360"/>
- </object>
- <int key="connectionID">369</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">hideOtherApplications:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="342932134"/>
- </object>
- <int key="connectionID">370</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">unhideAllApplications:</string>
- <reference key="source" ref="1014"/>
- <reference key="destination" ref="908899353"/>
- </object>
- <int key="connectionID">372</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="1021"/>
- <reference key="destination" ref="505502289"/>
- </object>
- <int key="connectionID">822</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">terminate:</string>
- <reference key="source" ref="1050"/>
- <reference key="destination" ref="632727374"/>
- </object>
- <int key="connectionID">823</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <object class="NSArray" key="object" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="children" ref="1048"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="1021"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="1014"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">First Responder</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-3</int>
- <reference key="object" ref="1050"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">Application</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">29</int>
- <reference key="object" ref="649796088"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="713487014"/>
- <reference ref="391199113"/>
- <reference ref="694149608"/>
- </object>
- <reference key="parent" ref="0"/>
- <string key="objectName">Orxonox Main Menu</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">19</int>
- <reference key="object" ref="713487014"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="835318025"/>
- </object>
- <reference key="parent" ref="649796088"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">56</int>
- <reference key="object" ref="694149608"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="110575045"/>
- </object>
- <reference key="parent" ref="649796088"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">103</int>
- <reference key="object" ref="391199113"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="374024848"/>
- </object>
- <reference key="parent" ref="649796088"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">106</int>
- <reference key="object" ref="374024848"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="238773614"/>
- </object>
- <reference key="parent" ref="391199113"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">111</int>
- <reference key="object" ref="238773614"/>
- <reference key="parent" ref="374024848"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">57</int>
- <reference key="object" ref="110575045"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="238522557"/>
- <reference ref="755159360"/>
- <reference ref="908899353"/>
- <reference ref="632727374"/>
- <reference ref="646227648"/>
- <reference ref="609285721"/>
- <reference ref="481834944"/>
- <reference ref="304266470"/>
- <reference ref="1046388886"/>
- <reference ref="1056857174"/>
- <reference ref="342932134"/>
- </object>
- <reference key="parent" ref="694149608"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">58</int>
- <reference key="object" ref="238522557"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">134</int>
- <reference key="object" ref="755159360"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">150</int>
- <reference key="object" ref="908899353"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">136</int>
- <reference key="object" ref="632727374"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">144</int>
- <reference key="object" ref="646227648"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">129</int>
- <reference key="object" ref="609285721"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">143</int>
- <reference key="object" ref="481834944"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">236</int>
- <reference key="object" ref="304266470"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">131</int>
- <reference key="object" ref="1046388886"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="752062318"/>
- </object>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">149</int>
- <reference key="object" ref="1056857174"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">145</int>
- <reference key="object" ref="342932134"/>
- <reference key="parent" ref="110575045"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">130</int>
- <reference key="object" ref="752062318"/>
- <reference key="parent" ref="1046388886"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">24</int>
- <reference key="object" ref="835318025"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="299356726"/>
- <reference ref="625202149"/>
- <reference ref="575023229"/>
- <reference ref="1011231497"/>
- </object>
- <reference key="parent" ref="713487014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">92</int>
- <reference key="object" ref="299356726"/>
- <reference key="parent" ref="835318025"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object" ref="625202149"/>
- <reference key="parent" ref="835318025"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">239</int>
- <reference key="object" ref="575023229"/>
- <reference key="parent" ref="835318025"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">23</int>
- <reference key="object" ref="1011231497"/>
- <reference key="parent" ref="835318025"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">373</int>
- <reference key="object" ref="163992474"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">821</int>
- <reference key="object" ref="505502289"/>
- <reference key="parent" ref="0"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-3.IBPluginDependency</string>
- <string>103.IBPluginDependency</string>
- <string>103.ImportedFromIB2</string>
- <string>106.IBEditorWindowLastContentRect</string>
- <string>106.IBPluginDependency</string>
- <string>106.ImportedFromIB2</string>
- <string>106.editorWindowContentRectSynchronizationRect</string>
- <string>111.IBPluginDependency</string>
- <string>111.ImportedFromIB2</string>
- <string>129.IBPluginDependency</string>
- <string>129.ImportedFromIB2</string>
- <string>130.IBEditorWindowLastContentRect</string>
- <string>130.IBPluginDependency</string>
- <string>130.ImportedFromIB2</string>
- <string>130.editorWindowContentRectSynchronizationRect</string>
- <string>131.IBPluginDependency</string>
- <string>131.ImportedFromIB2</string>
- <string>134.IBPluginDependency</string>
- <string>134.ImportedFromIB2</string>
- <string>136.IBPluginDependency</string>
- <string>136.ImportedFromIB2</string>
- <string>143.IBPluginDependency</string>
- <string>143.ImportedFromIB2</string>
- <string>144.IBPluginDependency</string>
- <string>144.ImportedFromIB2</string>
- <string>145.IBPluginDependency</string>
- <string>145.ImportedFromIB2</string>
- <string>149.IBPluginDependency</string>
- <string>149.ImportedFromIB2</string>
- <string>150.IBPluginDependency</string>
- <string>150.ImportedFromIB2</string>
- <string>19.IBPluginDependency</string>
- <string>19.ImportedFromIB2</string>
- <string>23.IBPluginDependency</string>
- <string>23.ImportedFromIB2</string>
- <string>236.IBPluginDependency</string>
- <string>236.ImportedFromIB2</string>
- <string>239.IBPluginDependency</string>
- <string>239.ImportedFromIB2</string>
- <string>24.IBEditorWindowLastContentRect</string>
- <string>24.IBPluginDependency</string>
- <string>24.ImportedFromIB2</string>
- <string>24.editorWindowContentRectSynchronizationRect</string>
- <string>29.IBEditorWindowLastContentRect</string>
- <string>29.IBPluginDependency</string>
- <string>29.ImportedFromIB2</string>
- <string>29.WindowOrigin</string>
- <string>29.editorWindowContentRectSynchronizationRect</string>
- <string>5.IBPluginDependency</string>
- <string>5.ImportedFromIB2</string>
- <string>56.IBPluginDependency</string>
- <string>56.ImportedFromIB2</string>
- <string>57.IBEditorWindowLastContentRect</string>
- <string>57.IBPluginDependency</string>
- <string>57.ImportedFromIB2</string>
- <string>57.editorWindowContentRectSynchronizationRect</string>
- <string>58.IBPluginDependency</string>
- <string>58.ImportedFromIB2</string>
- <string>821.IBPluginDependency</string>
- <string>92.IBPluginDependency</string>
- <string>92.ImportedFromIB2</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{593, 709}, {166, 23}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{596, 852}, {216, 23}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{674, 654}, {64, 6}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{436, 809}, {64, 6}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{523, 657}, {194, 73}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{525, 802}, {197, 73}}</string>
- <string>{{431, 730}, {224, 20}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{74, 862}</string>
- <string>{{11, 977}, {478, 20}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{443, 547}, {195, 183}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{23, 794}, {245, 183}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">823</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">OrxonoxAppDelegate</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <integer value="3000" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <nil key="IBDocument.LastKnownRelativeProjectPath"/>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSMenuCheckmark</string>
- <string>NSMenuMixedState</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{9, 8}</string>
- <string>{7, 2}</string>
- </object>
- </object>
- </data>
-</archive>
Copied: code/branches/kicklib2/data/mac/English.lproj/MainMenu.xib (from rev 8277, code/branches/kicklib/data/mac/English.lproj/MainMenu.xib)
===================================================================
--- code/branches/kicklib2/data/mac/English.lproj/MainMenu.xib (rev 0)
+++ code/branches/kicklib2/data/mac/English.lproj/MainMenu.xib 2011-04-21 17:43:10 UTC (rev 8285)
@@ -0,0 +1,734 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1060</int>
+ <string key="IBDocument.SystemVersion">10J567</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="NS.object.0">823</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSCustomObject" id="1021">
+ <string key="NSClassName">NSApplication</string>
+ </object>
+ <object class="NSCustomObject" id="1014">
+ <string key="NSClassName">FirstResponder</string>
+ </object>
+ <object class="NSCustomObject" id="1050">
+ <string key="NSClassName">NSApplication</string>
+ </object>
+ <object class="NSCustomObject" id="163992474">
+ <string key="NSClassName">NSFontManager</string>
+ </object>
+ <object class="NSMenu" id="649796088">
+ <string key="NSTitle">Orxonox</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMenuItem" id="694149608">
+ <reference key="NSMenu" ref="649796088"/>
+ <string key="NSTitle">Orxonox</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <object class="NSCustomResource" key="NSOnImage" id="353210768">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuCheckmark</string>
+ </object>
+ <object class="NSCustomResource" key="NSMixedImage" id="549394948">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuMixedState</string>
+ </object>
+ <string key="NSAction">submenuAction:</string>
+ <object class="NSMenu" key="NSSubmenu" id="110575045">
+ <string key="NSTitle">Orxonox</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMenuItem" id="238522557">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">About Orxonox</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="304266470">
+ <reference key="NSMenu" ref="110575045"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="609285721">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">Preferences…</string>
+ <string key="NSKeyEquiv">,</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="481834944">
+ <reference key="NSMenu" ref="110575045"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="1046388886">
+ <reference key="NSMenu" ref="110575045"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <string key="NSTitle">Services</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ <string key="NSAction">submenuAction:</string>
+ <object class="NSMenu" key="NSSubmenu" id="752062318">
+ <string key="NSTitle">Services</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <string key="NSName">_NSServicesMenu</string>
+ </object>
+ </object>
+ <object class="NSMenuItem" id="646227648">
+ <reference key="NSMenu" ref="110575045"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="755159360">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">Hide Orxonox</string>
+ <string key="NSKeyEquiv">h</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="342932134">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">Hide Others</string>
+ <string key="NSKeyEquiv">h</string>
+ <int key="NSKeyEquivModMask">1572864</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="908899353">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">Show All</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="1056857174">
+ <reference key="NSMenu" ref="110575045"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="632727374">
+ <reference key="NSMenu" ref="110575045"/>
+ <string key="NSTitle">Quit Orxonox</string>
+ <string key="NSKeyEquiv">q</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ </object>
+ <string key="NSName">_NSAppleMenu</string>
+ </object>
+ </object>
+ <object class="NSMenuItem" id="713487014">
+ <reference key="NSMenu" ref="649796088"/>
+ <string key="NSTitle">Window</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ <string key="NSAction">submenuAction:</string>
+ <object class="NSMenu" key="NSSubmenu" id="835318025">
+ <string key="NSTitle">Window</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMenuItem" id="1011231497">
+ <reference key="NSMenu" ref="835318025"/>
+ <string key="NSTitle">Minimize</string>
+ <string key="NSKeyEquiv">m</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="575023229">
+ <reference key="NSMenu" ref="835318025"/>
+ <string key="NSTitle">Zoom</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="299356726">
+ <reference key="NSMenu" ref="835318025"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ <object class="NSMenuItem" id="625202149">
+ <reference key="NSMenu" ref="835318025"/>
+ <string key="NSTitle">Bring All to Front</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ </object>
+ <string key="NSName">_NSWindowsMenu</string>
+ </object>
+ </object>
+ <object class="NSMenuItem" id="391199113">
+ <reference key="NSMenu" ref="649796088"/>
+ <string key="NSTitle">Help</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ <string key="NSAction">submenuAction:</string>
+ <object class="NSMenu" key="NSSubmenu" id="374024848">
+ <string key="NSTitle">Help</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMenuItem" id="238773614">
+ <reference key="NSMenu" ref="374024848"/>
+ <string key="NSTitle">Orxonox Help</string>
+ <string key="NSKeyEquiv">?</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="353210768"/>
+ <reference key="NSMixedImage" ref="549394948"/>
+ </object>
+ </object>
+ <string key="NSName">_NSHelpMenu</string>
+ </object>
+ </object>
+ </object>
+ <string key="NSName">_NSMainMenu</string>
+ </object>
+ <object class="NSCustomObject" id="505502289">
+ <string key="NSClassName">OrxonoxAppDelegate</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">performMiniaturize:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="1011231497"/>
+ </object>
+ <int key="connectionID">37</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">arrangeInFront:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="625202149"/>
+ </object>
+ <int key="connectionID">39</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">orderFrontStandardAboutPanel:</string>
+ <reference key="source" ref="1021"/>
+ <reference key="destination" ref="238522557"/>
+ </object>
+ <int key="connectionID">142</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">performZoom:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="575023229"/>
+ </object>
+ <int key="connectionID">240</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">showHelp:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="238773614"/>
+ </object>
+ <int key="connectionID">360</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">hide:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="755159360"/>
+ </object>
+ <int key="connectionID">369</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">hideOtherApplications:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="342932134"/>
+ </object>
+ <int key="connectionID">370</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">unhideAllApplications:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="908899353"/>
+ </object>
+ <int key="connectionID">372</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="1021"/>
+ <reference key="destination" ref="505502289"/>
+ </object>
+ <int key="connectionID">822</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">terminate:</string>
+ <reference key="source" ref="1050"/>
+ <reference key="destination" ref="632727374"/>
+ </object>
+ <int key="connectionID">823</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <object class="NSArray" key="object" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="children" ref="1048"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="1021"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="1014"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">First Responder</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-3</int>
+ <reference key="object" ref="1050"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">Application</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">29</int>
+ <reference key="object" ref="649796088"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="713487014"/>
+ <reference ref="391199113"/>
+ <reference ref="694149608"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">Orxonox Main Menu</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">19</int>
+ <reference key="object" ref="713487014"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="835318025"/>
+ </object>
+ <reference key="parent" ref="649796088"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">56</int>
+ <reference key="object" ref="694149608"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="110575045"/>
+ </object>
+ <reference key="parent" ref="649796088"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">103</int>
+ <reference key="object" ref="391199113"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="374024848"/>
+ </object>
+ <reference key="parent" ref="649796088"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">106</int>
+ <reference key="object" ref="374024848"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="238773614"/>
+ </object>
+ <reference key="parent" ref="391199113"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">111</int>
+ <reference key="object" ref="238773614"/>
+ <reference key="parent" ref="374024848"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">57</int>
+ <reference key="object" ref="110575045"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="238522557"/>
+ <reference ref="755159360"/>
+ <reference ref="908899353"/>
+ <reference ref="632727374"/>
+ <reference ref="646227648"/>
+ <reference ref="609285721"/>
+ <reference ref="481834944"/>
+ <reference ref="304266470"/>
+ <reference ref="1046388886"/>
+ <reference ref="1056857174"/>
+ <reference ref="342932134"/>
+ </object>
+ <reference key="parent" ref="694149608"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">58</int>
+ <reference key="object" ref="238522557"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">134</int>
+ <reference key="object" ref="755159360"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">150</int>
+ <reference key="object" ref="908899353"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">136</int>
+ <reference key="object" ref="632727374"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">144</int>
+ <reference key="object" ref="646227648"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">129</int>
+ <reference key="object" ref="609285721"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">143</int>
+ <reference key="object" ref="481834944"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">236</int>
+ <reference key="object" ref="304266470"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">131</int>
+ <reference key="object" ref="1046388886"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="752062318"/>
+ </object>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">149</int>
+ <reference key="object" ref="1056857174"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">145</int>
+ <reference key="object" ref="342932134"/>
+ <reference key="parent" ref="110575045"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">130</int>
+ <reference key="object" ref="752062318"/>
+ <reference key="parent" ref="1046388886"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">24</int>
+ <reference key="object" ref="835318025"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="299356726"/>
+ <reference ref="625202149"/>
+ <reference ref="575023229"/>
+ <reference ref="1011231497"/>
+ </object>
+ <reference key="parent" ref="713487014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">92</int>
+ <reference key="object" ref="299356726"/>
+ <reference key="parent" ref="835318025"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="625202149"/>
+ <reference key="parent" ref="835318025"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">239</int>
+ <reference key="object" ref="575023229"/>
+ <reference key="parent" ref="835318025"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">23</int>
+ <reference key="object" ref="1011231497"/>
+ <reference key="parent" ref="835318025"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">373</int>
+ <reference key="object" ref="163992474"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">821</int>
+ <reference key="object" ref="505502289"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-3.IBPluginDependency</string>
+ <string>103.IBPluginDependency</string>
+ <string>103.ImportedFromIB2</string>
+ <string>106.IBEditorWindowLastContentRect</string>
+ <string>106.IBPluginDependency</string>
+ <string>106.ImportedFromIB2</string>
+ <string>106.editorWindowContentRectSynchronizationRect</string>
+ <string>111.IBPluginDependency</string>
+ <string>111.ImportedFromIB2</string>
+ <string>129.IBPluginDependency</string>
+ <string>129.ImportedFromIB2</string>
+ <string>130.IBEditorWindowLastContentRect</string>
+ <string>130.IBPluginDependency</string>
+ <string>130.ImportedFromIB2</string>
+ <string>130.editorWindowContentRectSynchronizationRect</string>
+ <string>131.IBPluginDependency</string>
+ <string>131.ImportedFromIB2</string>
+ <string>134.IBPluginDependency</string>
+ <string>134.ImportedFromIB2</string>
+ <string>136.IBPluginDependency</string>
+ <string>136.ImportedFromIB2</string>
+ <string>143.IBPluginDependency</string>
+ <string>143.ImportedFromIB2</string>
+ <string>144.IBPluginDependency</string>
+ <string>144.ImportedFromIB2</string>
+ <string>145.IBPluginDependency</string>
+ <string>145.ImportedFromIB2</string>
+ <string>149.IBPluginDependency</string>
+ <string>149.ImportedFromIB2</string>
+ <string>150.IBPluginDependency</string>
+ <string>150.ImportedFromIB2</string>
+ <string>19.IBPluginDependency</string>
+ <string>19.ImportedFromIB2</string>
+ <string>23.IBPluginDependency</string>
+ <string>23.ImportedFromIB2</string>
+ <string>236.IBPluginDependency</string>
+ <string>236.ImportedFromIB2</string>
+ <string>239.IBPluginDependency</string>
+ <string>239.ImportedFromIB2</string>
+ <string>24.IBEditorWindowLastContentRect</string>
+ <string>24.IBPluginDependency</string>
+ <string>24.ImportedFromIB2</string>
+ <string>24.editorWindowContentRectSynchronizationRect</string>
+ <string>29.IBEditorWindowLastContentRect</string>
+ <string>29.IBPluginDependency</string>
+ <string>29.ImportedFromIB2</string>
+ <string>29.WindowOrigin</string>
+ <string>29.editorWindowContentRectSynchronizationRect</string>
+ <string>5.IBPluginDependency</string>
+ <string>5.ImportedFromIB2</string>
+ <string>56.IBPluginDependency</string>
+ <string>56.ImportedFromIB2</string>
+ <string>57.IBEditorWindowLastContentRect</string>
+ <string>57.IBPluginDependency</string>
+ <string>57.ImportedFromIB2</string>
+ <string>57.editorWindowContentRectSynchronizationRect</string>
+ <string>58.IBPluginDependency</string>
+ <string>58.ImportedFromIB2</string>
+ <string>821.IBPluginDependency</string>
+ <string>92.IBPluginDependency</string>
+ <string>92.ImportedFromIB2</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{593, 709}, {166, 23}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{596, 852}, {216, 23}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{674, 654}, {64, 6}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{436, 809}, {64, 6}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{523, 657}, {194, 73}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{525, 802}, {197, 73}}</string>
+ <string>{{431, 730}, {224, 20}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{74, 862}</string>
+ <string>{{11, 977}, {478, 20}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{443, 547}, {195, 183}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{23, 794}, {245, 183}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">823</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">OrxonoxAppDelegate</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <nil key="IBDocument.LastKnownRelativeProjectPath"/>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSMenuCheckmark</string>
+ <string>NSMenuMixedState</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{9, 8}</string>
+ <string>{7, 2}</string>
+ </object>
+ </object>
+ </data>
+</archive>
Deleted: code/branches/kicklib2/data/mac/Icon.icns
===================================================================
(Binary files differ)
Copied: code/branches/kicklib2/data/mac/Icon.icns (from rev 8277, code/branches/kicklib/data/mac/Icon.icns)
===================================================================
(Binary files differ)
Deleted: code/branches/kicklib2/data/mac/Orxonox-Info.plist
===================================================================
--- code/branches/kicklib/data/mac/Orxonox-Info.plist 2011-04-20 18:49:58 UTC (rev 8277)
+++ code/branches/kicklib2/data/mac/Orxonox-Info.plist 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>${EXECUTABLE_NAME}</string>
- <key>CFBundleIconFile</key>
- <string>Icon.icns</string>
- <key>CFBundleIdentifier</key>
- <string>net.orxonox.${PROJECT_NAME}</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <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>LSMinimumSystemVersion</key>
- <string>10.5</string>
- <key>NSMainNibFile</key>
- <string>MainMenu</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
-</dict>
-</plist>
Copied: code/branches/kicklib2/data/mac/Orxonox-Info.plist (from rev 8277, code/branches/kicklib/data/mac/Orxonox-Info.plist)
===================================================================
--- code/branches/kicklib2/data/mac/Orxonox-Info.plist (rev 0)
+++ code/branches/kicklib2/data/mac/Orxonox-Info.plist 2011-04-21 17:43:10 UTC (rev 8285)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIconFile</key>
+ <string>Icon.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>net.orxonox.${PROJECT_NAME}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <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>LSMinimumSystemVersion</key>
+ <string>10.5</string>
+ <key>NSMainNibFile</key>
+ <string>MainMenu</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+</dict>
+</plist>
Modified: code/branches/kicklib2/src/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/src/CMakeLists.txt 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/CMakeLists.txt 2011-04-21 17:43:10 UTC (rev 8285)
@@ -40,7 +40,6 @@
ADD_COMPILER_FLAGS("-DBOOST_ALL_DYN_LINK" WIN32 LINK_BOOST_DYNAMIC)
#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)
ADD_COMPILER_FLAGS("-DOGRE_STATIC_LIB" WIN32 NOT LINK_OGRE_DYNAMIC)
@@ -138,13 +137,20 @@
SET(ORXONOX_WIN32 WIN32)
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
${ORXONOX_WIN32}
LINK_LIBRARIES
orxonox
SOURCE_FILES
- Orxonox.cc
+ ${ORXONOX_MAIN_FILES}
OUTPUT_NAME orxonox
)
# Main executable should depend on all modules
@@ -178,6 +184,28 @@
ENDIF()
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 ####################
# Prepare include paths for Doxygen. This is necessary to display
Modified: code/branches/kicklib2/src/Orxonox.cc
===================================================================
--- code/branches/kicklib2/src/Orxonox.cc 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/Orxonox.cc 2011-04-21 17:43:10 UTC (rev 8285)
@@ -52,6 +52,8 @@
*/
#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
@@ -59,8 +61,17 @@
try
{
#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
Modified: code/branches/kicklib2/src/OrxonoxConfig.cmake
===================================================================
--- code/branches/kicklib2/src/OrxonoxConfig.cmake 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/OrxonoxConfig.cmake 2011-04-21 17:43:10 UTC (rev 8285)
@@ -110,3 +110,12 @@
${CMAKE_CURRENT_BINARY_DIR}/OrxonoxConfig.h
${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()
Modified: code/branches/kicklib2/src/OrxonoxConfig.h.in
===================================================================
--- code/branches/kicklib2/src/OrxonoxConfig.h.in 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/OrxonoxConfig.h.in 2011-04-21 17:43:10 UTC (rev 8285)
@@ -227,4 +227,14 @@
using boost::scoped_array;
}
+// 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__ */
Copied: code/branches/kicklib2/src/OrxonoxMac.h (from rev 8277, code/branches/kicklib/src/OrxonoxMac.h)
===================================================================
--- code/branches/kicklib2/src/OrxonoxMac.h (rev 0)
+++ code/branches/kicklib2/src/OrxonoxMac.h 2011-04-21 17:43:10 UTC (rev 8285)
@@ -0,0 +1,38 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Kevin J. Young (youngk) 2011
+ * Co-authors:
+ * Fabian Landau (x3n)
+ *
+ */
+
+#import <Cocoa/Cocoa.h>
+
+int main_mac(int argc, char** argv);
+int main(int argc, char** argv);
+
+ at interface OrxonoxAppDelegate : NSObject <NSApplicationDelegate>
+{
+}
+
+ at end
Copied: code/branches/kicklib2/src/OrxonoxMac.mm (from rev 8277, code/branches/kicklib/src/OrxonoxMac.mm)
===================================================================
--- code/branches/kicklib2/src/OrxonoxMac.mm (rev 0)
+++ code/branches/kicklib2/src/OrxonoxMac.mm 2011-04-21 17:43:10 UTC (rev 8285)
@@ -0,0 +1,51 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Kevin J. Young (youngk) 2011
+ * Co-authors:
+ * Fabian Landau (x3n)
+ *
+ */
+
+#import "OrxonoxMac.h"
+
+static int argc_s = 0;
+static char** argv_s = 0;
+
+int main(int argc, char** argv)
+{
+ argc_s = argc;
+ argv_s = argv;
+
+ int retVal = NSApplicationMain(argc, (const char**)argv);
+
+ return retVal;
+}
+
+ at implementation OrxonoxAppDelegate
+
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+ exit(main_mac(argc_s, argv_s));
+}
+
+ at end
Modified: code/branches/kicklib2/src/SpecialConfig.h.in
===================================================================
--- code/branches/kicklib2/src/SpecialConfig.h.in 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/SpecialConfig.h.in 2011-04-21 17:43:10 UTC (rev 8285)
@@ -91,30 +91,12 @@
const char moduleExtension[] = "@ORXONOX_MODULE_EXTENSION@";
// 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
} }
Modified: code/branches/kicklib2/src/external/ogreceguirenderer/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/src/external/ogreceguirenderer/CMakeLists.txt 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/external/ogreceguirenderer/CMakeLists.txt 2011-04-21 17:43:10 UTC (rev 8285)
@@ -34,9 +34,6 @@
DEFINE_SYMBOL
"OGRE_GUIRENDERER_EXPORTS"
LINK_LIBRARIES
- ${Boost_SYSTEM_LIBRARY}
- ${Boost_THREAD_LIBRARY}
- ${Boost_DATE_TIME_LIBRARY}
${OGRE_LIBRARY}
${CEGUI_LIBRARY}
SOURCE_FILES
Modified: code/branches/kicklib2/src/external/ois/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/src/external/ois/CMakeLists.txt 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/external/ois/CMakeLists.txt 2011-04-21 17:43:10 UTC (rev 8285)
@@ -53,7 +53,7 @@
ENDIF()
# 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
IF(MINGW)
Modified: code/branches/kicklib2/src/external/tinyxml/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/src/external/tinyxml/CMakeLists.txt 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/external/tinyxml/CMakeLists.txt 2011-04-21 17:43:10 UTC (rev 8285)
@@ -35,8 +35,6 @@
ORXONOX_ADD_LIBRARY(tinyxml_orxonox
ORXONOX_EXTERNAL
NO_DLL_INTERFACE
- VERSION
- 2.5.3
SOURCE_FILES
${TINYXML_FILES}
)
Modified: code/branches/kicklib2/src/external/tinyxml/VERSION
===================================================================
--- code/branches/kicklib2/src/external/tinyxml/VERSION 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/external/tinyxml/VERSION 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1 +1,2 @@
-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.
Modified: code/branches/kicklib2/src/external/tinyxml/changes_orxonox.diff
===================================================================
--- code/branches/kicklib2/src/external/tinyxml/changes_orxonox.diff 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/external/tinyxml/changes_orxonox.diff 2011-04-21 17:43:10 UTC (rev 8285)
@@ -1,18 +1,35 @@
---- 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
Modified: code/branches/kicklib2/src/external/tinyxml/ticpp.cpp
===================================================================
--- code/branches/kicklib2/src/external/tinyxml/ticpp.cpp 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/external/tinyxml/ticpp.cpp 2011-04-21 17:43:10 UTC (rev 8285)
@@ -369,7 +369,7 @@
return NodeFactory( pointer, false );
}
-Node* Node::InsertEndChild( Node& addThis )
+Node* Node::InsertEndChild( const Node& addThis )
{
if ( addThis.Type() == TiXmlNode::DOCUMENT )
{
@@ -403,7 +403,7 @@
return childNode;
}
-Node* Node::InsertBeforeChild( Node* beforeThis, Node& addThis )
+Node* Node::InsertBeforeChild( Node* beforeThis, const Node& addThis )
{
if ( addThis.Type() == TiXmlNode::DOCUMENT )
{
@@ -422,7 +422,7 @@
return NodeFactory( pointer );
}
-Node* Node::InsertAfterChild( Node* afterThis, Node& addThis )
+Node* Node::InsertAfterChild( Node* afterThis, const Node& addThis )
{
if ( addThis.Type() == TiXmlNode::DOCUMENT )
{
@@ -441,7 +441,7 @@
return NodeFactory( pointer );
}
-Node* Node::ReplaceChild( Node* replaceThis, Node& withThis )
+Node* Node::ReplaceChild( Node* replaceThis, const Node& withThis )
{
if ( withThis.Type() == TiXmlNode::DOCUMENT )
{
Modified: code/branches/kicklib2/src/external/tinyxml/ticpp.h
===================================================================
--- code/branches/kicklib2/src/external/tinyxml/ticpp.h 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/external/tinyxml/ticpp.h 2011-04-21 17:43:10 UTC (rev 8285)
@@ -224,7 +224,7 @@
{
return ( GetBasePointer() == rhs.GetBasePointer() );
}
-
+
/**
Compare internal TiXml pointers to determine is both are wrappers around the same node
*/
@@ -232,7 +232,7 @@
{
return ( GetBasePointer() != rhs.GetBasePointer() );
}
-
+
/**
Builds detailed error string using TiXmlDocument::Error() and others
*/
@@ -249,8 +249,8 @@
if ( doc->Error() )
{
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();
}
}
@@ -286,7 +286,7 @@
{
TICPPTHROW( "Internal TiXml Pointer is NULL" );
}
- }
+ }
/**
@internal
@@ -616,7 +616,7 @@
@see LinkEndChild
@see TiXmlNode::InsertEndChild
*/
- Node* InsertEndChild( Node& addThis );
+ Node* InsertEndChild( const Node& addThis );
/**
Adds a child past the LastChild.
@@ -641,7 +641,7 @@
@see InsertAfterChild
@see TiXmlNode::InsertBeforeChild
*/
- Node* InsertBeforeChild( Node* beforeThis, Node& addThis );
+ Node* InsertBeforeChild( Node* beforeThis, const Node& addThis );
/**
Adds a child after the specified child.
@@ -654,7 +654,7 @@
@see InsertBeforeChild
@see TiXmlNode::InsertAfterChild
*/
- Node* InsertAfterChild( Node* afterThis, Node& addThis );
+ Node* InsertAfterChild( Node* afterThis, const Node& addThis );
/**
Replace a child of this node.
@@ -666,7 +666,7 @@
@see TiXmlNode::ReplaceChild
*/
- Node* ReplaceChild( Node* replaceThis, Node& withThis );
+ Node* ReplaceChild( Node* replaceThis, const Node& withThis );
/**
Delete a child of this node.
@@ -1162,7 +1162,7 @@
/** Sets internal pointer to the Previous Sibling, or Iterator::END, if there are no prior siblings */
Iterator operator--(int)
- {
+ {
Iterator tmp(*this);
--(*this);
return tmp;
@@ -1229,7 +1229,7 @@
T* m_tiXmlPointer; /**< Internal pointer to the TiXml Class which is being wrapped */
- public:
+ public:
/**
@internal
Gets the internal TinyXML pointer.
@@ -1241,7 +1241,7 @@
ValidatePointer();
return m_tiXmlPointer;
}
- protected:
+ protected:
/**
@internal
@@ -1399,11 +1399,12 @@
Document( const char* documentName );
/**
- 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 );
/**
@@ -1748,7 +1749,8 @@
{
if ( throwIfNotFound )
{
- TICPPTHROW( "Attribute does not exist" );
+ const std::string error( std::string( "Attribute '" ) + name + std::string( "' does not exist" ) );
+ TICPPTHROW( error );
}
}
else
@@ -1780,7 +1782,8 @@
{
if ( throwIfNotFound )
{
- TICPPTHROW( "Attribute does not exist" );
+ const std::string error( std::string( "Attribute '" ) + name + std::string( "' does not exist" ) );
+ TICPPTHROW( error );
}
else
{
Modified: code/branches/kicklib2/src/libraries/core/CorePrereqs.h
===================================================================
--- code/branches/kicklib2/src/libraries/core/CorePrereqs.h 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/libraries/core/CorePrereqs.h 2011-04-21 17:43:10 UTC (rev 8285)
@@ -261,14 +261,18 @@
// Boost
namespace boost
{
-#if BOOST_VERSION < 104400
+#if (BOOST_VERSION < 104400)
+
namespace filesystem
{
struct path_traits;
template <class String, class Traits> class basic_path;
typedef basic_path<std::string, path_traits> path;
}
-#elif BOOST_VERSION < 104600
+
+#elif (BOOST_VERSION < 104800)
+
+# if BOOST_FILESYSTEM_VERSION == 2
namespace filesystem2
{
struct path_traits;
@@ -281,7 +285,7 @@
using filesystem2::path_traits;
using filesystem2::path;
}
-#else
+# elif BOOST_FILESYSTEM_VERSION == 3
namespace filesystem3
{
class path;
@@ -290,7 +294,18 @@
{
using filesystem3::path;
}
+# endif
+
+#else
+
+ // TODO: Check this once boost 1.48 is released
+ namespace filesystem
+ {
+ class path;
+ }
+
#endif
+
class thread;
class mutex;
class shared_mutex;
Modified: code/branches/kicklib2/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/kicklib2/src/libraries/core/GraphicsManager.cc 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/libraries/core/GraphicsManager.cc 2011-04-21 17:43:10 UTC (rev 8285)
@@ -29,6 +29,7 @@
#include "GraphicsManager.h"
+#include <cstdlib>
#include <fstream>
#include <sstream>
#include <boost/filesystem.hpp>
@@ -119,13 +120,12 @@
// 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)
{
// Reads the ogre config and creates the render window
@@ -149,16 +149,13 @@
// Undeclare the resources
Loader::unload(resources_.get());
- if (PathConfig::isDevelopmentRun())
- Loader::unload(extResources_.get());
+ Loader::unload(extResources_.get());
}
void GraphicsManager::setConfigValues()
{
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.");
SetConfigValue(ogreLogFile_, "ogre.log")
@@ -250,20 +247,34 @@
void GraphicsManager::loadOgrePlugins()
{
- // just to make sure the next statement doesn't segfault
- if (ogrePluginsDirectory_.empty())
- 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
- boost::filesystem::path folder(ogrePluginsDirectory_);
+#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]);
}
void GraphicsManager::loadRenderer()
@@ -290,15 +301,6 @@
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
// Note: This may throw when adding a viewport with an existing z-order!
// But in our case we only have one viewport for now anyway, therefore
Modified: code/branches/kicklib2/src/libraries/core/GraphicsManager.h
===================================================================
--- code/branches/kicklib2/src/libraries/core/GraphicsManager.h 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/libraries/core/GraphicsManager.h 2011-04-21 17:43:10 UTC (rev 8285)
@@ -127,7 +127,6 @@
// 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
int ogreLogLevelTrivial_; //!< Corresponding Orxonox debug level for LL_TRIVIAL
Modified: code/branches/kicklib2/src/libraries/core/Identifier.h
===================================================================
--- code/branches/kicklib2/src/libraries/core/Identifier.h 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/libraries/core/Identifier.h 2011-04-21 17:43:10 UTC (rev 8285)
@@ -394,7 +394,7 @@
void ClassIdentifier<T>::initialiseIdentifier()
{
// 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.
ClassIdentifier<T>* proposal = new ClassIdentifier<T>();
Modified: code/branches/kicklib2/src/libraries/core/PathConfig.cc
===================================================================
--- code/branches/kicklib2/src/libraries/core/PathConfig.cc 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/libraries/core/PathConfig.cc 2011-04-21 17:43:10 UTC (rev 8285)
@@ -32,7 +32,6 @@
#include <cstdlib>
#include <cstdio>
#include <vector>
-#include <boost/version.hpp>
#include <boost/filesystem.hpp>
#ifdef ORXONOX_PLATFORM_WINDOWS
@@ -55,13 +54,15 @@
#include "util/Exception.h"
#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
namespace orxonox
@@ -241,7 +242,7 @@
if (bf::exists(it->first) && !bf::is_directory(it->first))
{
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?)
{
@@ -258,9 +259,14 @@
const std::string& moduleextension = specialConfig::moduleExtension;
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
if (!boost::filesystem::exists(modulePath_))
@@ -272,7 +278,7 @@
// Iterate through all files
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
if (filename.size() > moduleextensionlength)
@@ -281,11 +287,7 @@
{
// 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);
}
}
++file;
@@ -296,36 +298,36 @@
/*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() + '/';
}
}
Modified: code/branches/kicklib2/src/libraries/core/PathConfig.h
===================================================================
--- code/branches/kicklib2/src/libraries/core/PathConfig.h 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/libraries/core/PathConfig.h 2011-04-21 17:43:10 UTC (rev 8285)
@@ -112,7 +112,7 @@
//! Returns the path to the modules as std::string
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_; }
private:
Modified: code/branches/kicklib2/src/libraries/core/Resource.cc
===================================================================
--- code/branches/kicklib2/src/libraries/core/Resource.cc 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/libraries/core/Resource.cc 2011-04-21 17:43:10 UTC (rev 8285)
@@ -33,6 +33,13 @@
#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
{
const std::string& Resource::getDefaultResourceGroup()
@@ -97,7 +104,7 @@
{
boost::filesystem::path base(it->archive->getName());
base /= it->filename;
- ptr->fileSystemPath = base.string();
+ ptr->fileSystemPath = base.BF_GENERIC_STRING();
}
return ptr;
}
Modified: code/branches/kicklib2/src/libraries/core/command/ArgumentCompletionFunctions.cc
===================================================================
--- code/branches/kicklib2/src/libraries/core/command/ArgumentCompletionFunctions.cc 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/libraries/core/command/ArgumentCompletionFunctions.cc 2011-04-21 17:43:10 UTC (rev 8285)
@@ -34,7 +34,6 @@
#include "ArgumentCompletionFunctions.h"
#include <map>
-#include <boost/version.hpp>
#include <boost/filesystem.hpp>
#include "util/Convert.h"
@@ -46,16 +45,15 @@
#include "ConsoleCommand.h"
#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
namespace orxonox
@@ -249,7 +247,7 @@
#ifdef ORXONOX_PLATFORM_WINDOWS
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 + '/';
}
@@ -261,9 +259,9 @@
while (file != end)
{
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;
}
}
Modified: code/branches/kicklib2/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/kicklib2/src/orxonox/sound/SoundManager.cc 2011-04-21 16:58:23 UTC (rev 8284)
+++ code/branches/kicklib2/src/orxonox/sound/SoundManager.cc 2011-04-21 17:43:10 UTC (rev 8285)
@@ -329,6 +329,7 @@
alListener3f(AL_POSITION, position.x, position.y, position.z);
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;
}
More information about the Orxonox-commit
mailing list