Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2680 for code


Ignore:
Timestamp:
Feb 16, 2009, 11:10:47 PM (16 years ago)
Author:
rgrieder
Message:
  • Removed run script completely for Linux
  • Removed root dir run script on windows
  • Added run scripts for the 4 different visual studio output directories
Location:
code/branches/buildsystem3
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem3/bin/CMakeLists.txt

    r2664 r2680  
    113113################ Run Scripts ##################
    114114
    115 # Create a run script for both Windows and Linux in the source root path if
    116 # CMake is not used to create multi-configuration project files
    117 IF(NOT CMAKE_CONFIGURATION_TYPES)
    118   IF(WIN32)
    119     SET(RUN_SCRIPT run.bat)
     115# Create a run script for Windows to manually add the DLL path when executing
     116IF(WIN32)
     117  IF(NOT CMAKE_CONFIGURATION_TYPES)
     118    SET(_config_types ".")
     119  ELSE()
     120    SET(_config_types ${CMAKE_CONFIGURATION_TYPES})
     121  ENDIF()
     122  FOREACH(_configuration ${_config_types})
     123    GET_FILENAME_COMPONENT(CURRENT_RUNTIME_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_configuration} ABSOLUTE)
     124
    120125    # Note: Do not use FILE(TO_NATIVE_PATH) because it doesn't work for MinGW
    121     STRING(REGEX REPLACE "^([A-Z]\\:)\\/.*$" "\\1" WINDOWS_DRIVE_CHANGE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
    122     STRING(REPLACE "/" "\\" CMAKE_RUNTIME_OUTPUT_DIRECTORY_WINDOWS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
     126    STRING(REGEX REPLACE "^([A-Z]\\:)\\/.*$" "\\1" WINDOWS_DRIVE_CHANGE ${CURRENT_RUNTIME_DIR})
     127    STRING(REPLACE "/" "\\" CURRENT_RUNTIME_DIR_WINDOWS ${CURRENT_RUNTIME_DIR})
    123128    STRING(REPLACE "/" "\\" ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY})
    124   ELSE(UNIX)
    125     SET(RUN_SCRIPT run)
    126   ENDIF(WIN32)
    127   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT} ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT} @ONLY)
    128   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${RUN_SCRIPT} @ONLY)
    129 ENDIF(NOT CMAKE_CONFIGURATION_TYPES)
     129
     130    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/run.bat ${CURRENT_RUNTIME_DIR}/run.bat @ONLY)
     131  ENDFOREACH(_configuration)
     132ENDIF(WIN32)
  • code/branches/buildsystem3/bin/run.bat

    r2664 r2680  
    22path @ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
    33@WINDOWS_DRIVE_CHANGE@
    4 cd @CMAKE_RUNTIME_OUTPUT_DIRECTORY_WINDOWS@
     4cd @CURRENT_RUNTIME_DIR_WINDOWS@
    55@ORXONOX_EXECUTABLE_NAME@
    66pause
  • code/branches/buildsystem3/cmake/BuildConfig.cmake

    r2679 r2680  
    113113OPTION(NETWORK_TESTING_ENABLED "Build network testing tools: i.e. chatclient chatserver and alike.")
    114114OPTION(NETWORKTRAFFIC_TESTING_ENABLED "Build dummyserver4 and dummyclient4.")
     115
     116
    115117############# Installation Settings #############
    116118
Note: See TracChangeset for help on using the changeset viewer.