- Timestamp:
- Feb 28, 2009, 7:15:37 PM (16 years ago)
- Location:
- code/branches/buildsystem3
- Files:
-
- 3 edited
- 6 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/buildsystem3/bin/CMakeLists.txt
r2685 r2709 21 21 # Reto Grieder 22 22 # Description: 23 # Creates a run-script in the root directory of the build tree. 23 # Creates run scripts in the root directory of the build tree and 24 # the runtime output directory. 24 25 # 25 26 26 ############ Configure Dev Build ############## 27 28 29 ################ Run Scripts ################## 30 31 # Create a run script for Windows to manually add the DLL path when executing 27 # Create run scripts for Windows to manually add the DLL path when executing 32 28 IF(WIN32) 33 SET(RUN_SCRIPT run.bat)29 SET(RUN_SCRIPTS run.bat client1.bat client2.bat server.bat) 34 30 ELSEIF(UNIX) 35 SET(RUN_SCRIPT run)31 SET(RUN_SCRIPTS run client1 client1 server) 36 32 ENDIF() 37 33 … … 51 47 STRING(REPLACE "/" "\\" CURRENT_RUNTIME_DIR_WINDOWS ${CURRENT_RUNTIME_DIR}) 52 48 53 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT}.in ${CURRENT_RUNTIME_DIR}/${RUN_SCRIPT} @ONLY) 54 IF(_subdir STREQUAL _default_subdir) 55 # Convenience script to be used when sitting in the binary directory. Defaults to Debug for msvc. 56 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT}.in ${CMAKE_BINARY_DIR}/${RUN_SCRIPT} @ONLY) 57 ENDIF() 49 FOREACH(_script ${RUN_SCRIPTS}) 50 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_script}.in ${CURRENT_RUNTIME_DIR}/${_script} @ONLY) 51 IF(_subdir STREQUAL _default_subdir) 52 # Convenience script to be used when sitting in the binary directory. Defaults to Debug for msvc. 53 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_script}.in ${CMAKE_BINARY_DIR}/${_script} @ONLY) 54 ENDIF() 55 ENDFOREACH(_script) 58 56 59 57 # In order to evaluate at run time whether it is a dev build in the build tree, -
code/branches/buildsystem3/bin/client1.bat.in
r2707 r2709 3 3 @WINDOWS_DRIVE_CHANGE@ 4 4 cd @CURRENT_RUNTIME_DIR_WINDOWS@ 5 @ORXONOX_EXECUTABLE_NAME@ 5 @ORXONOX_EXECUTABLE_NAME@ --state client --directory client1 6 6 pause -
code/branches/buildsystem3/bin/client1.in
r2707 r2709 2 2 # convenience script for starting orxonox on Linux 3 3 4 cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ $@4 cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ --state client --directory client1 $@ -
code/branches/buildsystem3/bin/client2.bat.in
r2707 r2709 3 3 @WINDOWS_DRIVE_CHANGE@ 4 4 cd @CURRENT_RUNTIME_DIR_WINDOWS@ 5 @ORXONOX_EXECUTABLE_NAME@ 5 @ORXONOX_EXECUTABLE_NAME@ --state client --directory client2 6 6 pause -
code/branches/buildsystem3/bin/client2.in
r2707 r2709 2 2 # convenience script for starting orxonox on Linux 3 3 4 cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ $@4 cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ --state client --directory client2 $@ -
code/branches/buildsystem3/bin/server.bat.in
r2707 r2709 3 3 @WINDOWS_DRIVE_CHANGE@ 4 4 cd @CURRENT_RUNTIME_DIR_WINDOWS@ 5 @ORXONOX_EXECUTABLE_NAME@ 5 @ORXONOX_EXECUTABLE_NAME@ --state server --directory server 6 6 pause -
code/branches/buildsystem3/bin/server.in
r2707 r2709 2 2 # convenience script for starting orxonox on Linux 3 3 4 cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ $@4 cd @CURRENT_RUNTIME_DIR@ && exec ./@ORXONOX_EXECUTABLE_NAME@ --state server --directory server $@ -
code/branches/buildsystem3/src/core/Core.cc
r2703 r2709 77 77 78 78 SetCommandLineArgument(mediaPath, "").information("PATH"); 79 SetCommandLineArgument(directory, "").information("DIR"); 79 80 80 81 /** … … 426 427 #endif 427 428 } 429 430 // Option to put all the config and log files in a separate folder 431 if (!CommandLine::getArgument("directory")->hasDefaultValue()) 432 { 433 std::string directory(CommandLine::getValue("directory")); 434 configPath_g = configPath_g / directory; 435 logPath_g = logPath_g / directory; 436 } 428 437 } 429 438 -
code/branches/buildsystem3/src/orxonox/Main.cc
r2702 r2709 92 92 using namespace orxonox; 93 93 94 Core::postMainInitialisation();95 96 94 // create a signal handler (only active for linux) 97 95 SignalHandler signalHandler; … … 108 106 COUT(0) << "Usage:" << std::endl << "orxonox " << CommandLine::getUsageInformation() << std::endl; 109 107 } 108 109 // Do this after parsing the command line to allow customisation 110 Core::postMainInitialisation(); 110 111 111 112 // Create the ConfigFileManager before creating the GameStates in order to have
Note: See TracChangeset
for help on using the changeset viewer.