Changeset 5679 for code/branches/resource3/bin

Timestamp:

Aug 24, 2009, 8:17:56 PM (15 years ago)

Author:

rgrieder

Message:

Merged revision 5641 to resource3:

• Prepared build system for an external media directory.

Location:

code/branches/resource3/bin

Files:

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

code/branches/resource3/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/branches/resource3/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/branches/resource3/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/branches/resource3/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/branches/resource3/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/branches/resource3/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/branches/resource3/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