Changeset 5695 for code/trunk/bin

Timestamp:

Aug 30, 2009, 2:22:00 AM (15 years ago)

Author:

rgrieder

Message:

Merged resource2 branch back to trunk.

IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• bin/CMakeLists.txt (modified) (2 diffs)
• bin/client1.bat.in (modified) (1 diff)
• bin/client2.bat.in (modified) (1 diff)
• bin/dedicated.bat.in (modified) (1 diff)
• bin/run.bat.in (modified) (1 diff)
• bin/server.bat.in (modified) (1 diff)
• bin/standalone.bat.in (modified) (1 diff)

code/trunk/bin/CMakeLists.txt

@@ -45 +45 @@
   SEt(_default_subdir) # No default subdir
 ENDIF()
-STRING(REPLACE "/" "\\" ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY})
+STRING(REPLACE "/" "\\" RUNTIME_LIBRARY_DIRECTORY_WINDOWS ${RUNTIME_LIBRARY_DIRECTORY})
 FOREACH(_subdir ${_subdirs})
   GET_FILENAME_COMPONENT(CURRENT_RUNTIME_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_subdir} ABSOLUTE)
@@ -69 +69 @@
 # Make a symlink to be able to run from the root directory when installing copyable on Unix
 IF(UNIX AND INSTALL_COPYABLE)
-  INSTAll(CODE "EXECUTE_PROCESS(COMMAND ln -sf ${ORXONOX_RUNTIME_INSTALL_PATH}/${ORXONOX_EXECUTABLE_NAME} ${CMAKE_INSTALL_PREFIX}/orxonox)")
+  INSTAll(CODE "EXECUTE_PROCESS(COMMAND ln -sf ${RUNTIME_INSTALL_DIRECTORY}/${ORXONOX_EXECUTABLE_NAME} ${CMAKE_INSTALL_PREFIX}/orxonox)")
 ENDIF()

code/trunk/bin/client1.bat.in

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

code/trunk/bin/client2.bat.in

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

code/trunk/bin/dedicated.bat.in

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

code/trunk/bin/run.bat.in

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

code/trunk/bin/server.bat.in

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

code/trunk/bin/standalone.bat.in

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