[Orxonox-commit 956] r5679 - in code/branches/resource3: . bin cmake doc/api media src src/ceguilua src/core src/orxonox src/orxonox/gamestates src/orxonox/objects src/orxonox/sound
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Aug 24 20:17:57 CEST 2009
Author: rgrieder
Date: 2009-08-24 20:17:56 +0200 (Mon, 24 Aug 2009)
New Revision: 5679
Added:
code/branches/resource3/media/
code/branches/resource3/media/CMakeLists.txt
Removed:
code/branches/resource3/cmake/Media.cmake
Modified:
code/branches/resource3/CMakeLists.txt
code/branches/resource3/bin/CMakeLists.txt
code/branches/resource3/bin/client1.bat.in
code/branches/resource3/bin/client2.bat.in
code/branches/resource3/bin/dedicated.bat.in
code/branches/resource3/bin/run.bat.in
code/branches/resource3/bin/server.bat.in
code/branches/resource3/bin/standalone.bat.in
code/branches/resource3/cmake/BuildConfig.cmake
code/branches/resource3/cmake/GenerateToluaBindings.cmake
code/branches/resource3/cmake/PackageConfig.cmake
code/branches/resource3/cmake/PackageConfigMSVC.cmake
code/branches/resource3/cmake/PackageConfigMinGW.cmake
code/branches/resource3/cmake/TargetUtilities.cmake
code/branches/resource3/doc/api/CMakeLists.txt
code/branches/resource3/src/SpecialConfig.h.in
code/branches/resource3/src/ceguilua/CMakeLists.txt
code/branches/resource3/src/core/ConfigFileManager.cc
code/branches/resource3/src/core/Core.cc
code/branches/resource3/src/core/Core.h
code/branches/resource3/src/core/GUIManager.cc
code/branches/resource3/src/core/GraphicsManager.cc
code/branches/resource3/src/core/GraphicsManager.h
code/branches/resource3/src/core/LuaBind.cc
code/branches/resource3/src/core/TclBind.cc
code/branches/resource3/src/orxonox/LevelManager.cc
code/branches/resource3/src/orxonox/gamestates/GSGraphics.cc
code/branches/resource3/src/orxonox/gamestates/GSLevel.cc
code/branches/resource3/src/orxonox/objects/Level.cc
code/branches/resource3/src/orxonox/orxonox.vcproj.user.in
code/branches/resource3/src/orxonox/sound/SoundBase.cc
Log:
Merged revision 5641 to resource3:
- Prepared build system for an external media directory.
Modified: code/branches/resource3/CMakeLists.txt
===================================================================
--- code/branches/resource3/CMakeLists.txt 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/CMakeLists.txt 2009-08-24 18:17:56 UTC (rev 5679)
@@ -46,7 +46,7 @@
INCLUDE(BuildConfig)
# Configure media directory location and installation
-INCLUDE(Media)
+ADD_SUBDIRECTORY(media)
# Create the actual project
ADD_SUBDIRECTORY(src)
Modified: code/branches/resource3/bin/CMakeLists.txt
===================================================================
--- code/branches/resource3/bin/CMakeLists.txt 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/bin/CMakeLists.txt 2009-08-24 18:17:56 UTC (rev 5679)
@@ -44,7 +44,7 @@
SET(_subdirs ${CMAKE_CONFIGURATION_TYPES})
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)
@@ -68,5 +68,5 @@
# 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()
Modified: code/branches/resource3/bin/client1.bat.in
===================================================================
--- code/branches/resource3/bin/client1.bat.in 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/bin/client1.bat.in 2009-08-24 18:17:56 UTC (rev 5679)
@@ -1,4 +1,4 @@
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
Modified: code/branches/resource3/bin/client2.bat.in
===================================================================
--- code/branches/resource3/bin/client2.bat.in 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/bin/client2.bat.in 2009-08-24 18:17:56 UTC (rev 5679)
@@ -1,4 +1,4 @@
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
Modified: code/branches/resource3/bin/dedicated.bat.in
===================================================================
--- code/branches/resource3/bin/dedicated.bat.in 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/bin/dedicated.bat.in 2009-08-24 18:17:56 UTC (rev 5679)
@@ -1,4 +1,4 @@
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
Modified: code/branches/resource3/bin/run.bat.in
===================================================================
--- code/branches/resource3/bin/run.bat.in 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/bin/run.bat.in 2009-08-24 18:17:56 UTC (rev 5679)
@@ -1,4 +1,4 @@
title @PROJECT_NAME@
-path @ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
+path @RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
@CURRENT_RUNTIME_DIR_WINDOWS@\@ORXONOX_EXECUTABLE_NAME@
pause
Modified: code/branches/resource3/bin/server.bat.in
===================================================================
--- code/branches/resource3/bin/server.bat.in 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/bin/server.bat.in 2009-08-24 18:17:56 UTC (rev 5679)
@@ -1,4 +1,4 @@
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
Modified: code/branches/resource3/bin/standalone.bat.in
===================================================================
--- code/branches/resource3/bin/standalone.bat.in 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/bin/standalone.bat.in 2009-08-24 18:17:56 UTC (rev 5679)
@@ -1,4 +1,4 @@
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
Modified: code/branches/resource3/cmake/BuildConfig.cmake
===================================================================
--- code/branches/resource3/cmake/BuildConfig.cmake 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/cmake/BuildConfig.cmake 2009-08-24 18:17:56 UTC (rev 5679)
@@ -39,8 +39,8 @@
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${DEFAULT_RUNTIME_PATH})
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${DEFAULT_LIBRARY_PATH})
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${DEFAULT_ARCHIVE_PATH})
-# Do not set doc and media, rather check in the two subdirectories
-# whether they concur with the DEFAULT_..._PATH
+SET(CMAKE_DOC_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${DEFAULT_DOC_PATH})
+# Media directories are only inputs
SET(CMAKE_CONFIG_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${DEFAULT_CONFIG_PATH})
SET(CMAKE_LOG_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${DEFAULT_LOG_PATH})
@@ -49,8 +49,8 @@
# Sets where to find the external libraries like OgreMain.dll at runtime
# On Unix you should not have to change this at all.
-IF(NOT ORXONOX_RUNTIME_LIBRARY_DIRECTORY)
- SET(ORXONOX_RUNTIME_LIBRARY_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+IF(NOT RUNTIME_LIBRARY_DIRECTORY)
+ SET(RUNTIME_LIBRARY_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
ENDIF()
# Set Debug build to default when not having multi-config generator like msvc
@@ -125,37 +125,28 @@
OPTION(INSTALL_COPYABLE "${_info_text}" TRUE)
ENDIF()
-IF(INSTALL_COPYABLE)
- # Note the relative paths. They will be resolved at runtime.
- # For CMake operations CMAKE_INSTALL_PREFIX is always appended.
- SET(ORXONOX_RUNTIME_INSTALL_PATH ${DEFAULT_RUNTIME_PATH})
- SET(ORXONOX_LIBRARY_INSTALL_PATH ${DEFAULT_LIBRARY_PATH})
- SET(ORXONOX_ARCHIVE_INSTALL_PATH ${DEFAULT_ARCHIVE_PATH})
- SET(ORXONOX_DOC_INSTALL_PATH ${DEFAULT_DOC_PATH})
- SET(ORXONOX_MEDIA_INSTALL_PATH ${DEFAULT_MEDIA_PATH})
- SET(ORXONOX_CONFIG_INSTALL_PATH ${DEFAULT_CONFIG_PATH})
- SET(ORXONOX_LOG_INSTALL_PATH ${DEFAULT_LOG_PATH})
+# Default installation paths
+SET(RUNTIME_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${DEFAULT_RUNTIME_PATH})
+SET(LIBRARY_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${DEFAULT_LIBRARY_PATH})
+SET(ARCHIVE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${DEFAULT_ARCHIVE_PATH})
+SET(DOC_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${DEFAULT_DOC_PATH})
+SET(MEDIA_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${DEFAULT_MEDIA_PATH})
+SET(CONFIG_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${DEFAULT_CONFIG_PATH})
+SET(LOG_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${DEFAULT_LOG_PATH})
-ELSEIF(UNIX) # Apple too?
- # Using absolute paths
- SET(ORXONOX_RUNTIME_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/bin)
- SET(ORXONOX_LIBRARY_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/orxonox)
- SET(ORXONOX_ARCHIVE_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/orxonox/static)
- SET(ORXONOX_DOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/orxonox)
- SET(ORXONOX_MEDIA_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/orxonox)
- # These two paths are user and therefore runtime dependent --> only set relatively
- SET(ORXONOX_CONFIG_INSTALL_PATH ${DEFAULT_CONFIG_PATH})
- SET(ORXONOX_LOG_INSTALL_PATH ${DEFAULT_LOG_PATH})
+IF(NOT INSTALL_COPYABLE)
+ IF(UNIX) # Apple too?
+ # Using absolute paths
+ SET(RUNTIME_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin)
+ SET(LIBRARY_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/orxonox)
+ SET(ARCHIVE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/orxonox/static)
+ SET(DOC_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/doc/orxonox)
+ SET(MEDIA_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/orxonox)
+ ENDIF()
-ELSEIF(WIN32)
- SET(ORXONOX_RUNTIME_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${DEFAULT_RUNTIME_PATH})
- SET(ORXONOX_LIBRARY_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${DEFAULT_LIBRARY_PATH})
- SET(ORXONOX_ARCHIVE_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${DEFAULT_ARCHIVE_PATH})
- SET(ORXONOX_DOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${DEFAULT_DOC_PATH})
- SET(ORXONOX_MEDIA_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${DEFAULT_MEDIA_PATH})
# Leave empty because it is user and therefore runtime dependent
- SET(ORXONOX_CONFIG_INSTALL_PATH ${DEFAULT_CONFIG_PATH})
- SET(ORXONOX_LOG_INSTALL_PATH ${DEFAULT_LOG_PATH})
+ SET(CONFIG_INSTALL_DIRECTORY)
+ SET(LOG_INSTALL_DIRECTORY)
ENDIF()
@@ -169,7 +160,11 @@
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
# the RPATH to be used when installing
-SET(CMAKE_INSTALL_RPATH ${ORXONOX_LIBRARY_INSTALL_PATH})
+IF(INSTALL_COPYABLE)
+ SET(CMAKE_INSTALL_RPATH ${DEFAULT_LIBRARY_PATH})
+ELSE()
+ SET(CMAKE_INSTALL_RPATH ${LIBRARY_INSTALL_DIRECTORY})
+ENDIF()
# add the automatically determined parts of the RPATH
# which point to directories outside the build tree to the install RPATH
Modified: code/branches/resource3/cmake/GenerateToluaBindings.cmake
===================================================================
--- code/branches/resource3/cmake/GenerateToluaBindings.cmake 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/cmake/GenerateToluaBindings.cmake 2009-08-24 18:17:56 UTC (rev 5679)
@@ -29,7 +29,7 @@
# Global Variables: (need to be set before)
# TOLUA_PARSER_SOURCE - Lua file with the parser source code
# TOLUA_PARSER_DEPENDENCIES - All the dependent lua files
- # ORXONOX_RUNTIME_LIBRARY_DIRECTORY - Working directory
+ # RUNTIME_LIBRARY_DIRECTORY - Working directory
#
FUNCTION(GENERATE_TOLUA_BINDINGS _tolua_package _target_source_files)
@@ -73,7 +73,7 @@
${_tolua_pkgfile}
DEPENDS ${TOLUA_PARSER_DEPENDENCIES}
IMPLICIT_DEPENDS ${_implicit_dependencies}
- WORKING_DIRECTORY ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}
+ WORKING_DIRECTORY ${RUNTIME_LIBRARY_DIRECTORY}
COMMENT "Generating tolua bind files for package ${_tolua_package}"
)
ENDFUNCTION(GENERATE_TOLUA_BINDINGS)
Deleted: code/branches/resource3/cmake/Media.cmake
===================================================================
--- code/branches/resource3/cmake/Media.cmake 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/cmake/Media.cmake 2009-08-24 18:17:56 UTC (rev 5679)
@@ -1,51 +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:
- # Finds the media directory and configures it's installation.
- #
-
-# Specify media directory
-GET_FILENAME_COMPONENT(_search_path_1 ${CMAKE_SOURCE_DIR}/../${DEFAULT_MEDIA_PATH} ABSOLUTE)
-FIND_PATH(MEDIA_PATH resources.cfg
- PATHS
- ${CMAKE_SOURCE_DIR}/${DEFAULT_MEDIA_PATH}
- ${_search_path_1}
- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
-)
-
-# For consistency with other variables for config, log, bin, etc.
-SET(CMAKE_MEDIA_OUTPUT_DIRECTORY ${MEDIA_PATH})
-
-IF(NOT CMAKE_MEDIA_OUTPUT_DIRECTORY)
- MESSAGE(STATUS "Warning: Media directory not found. If you want to compile while downloading the media files, you will have to recompile about four files afterwards and relink everything. Default location is orxonox_root/media")
- # Temporary override to the default location.
- SET(CMAKE_MEDIA_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/media)
-ENDIF()
-
-
-################ Installation #################
-
-INSTALL(
- DIRECTORY ${CMAKE_MEDIA_OUTPUT_DIRECTORY}/
- DESTINATION ${ORXONOX_MEDIA_INSTALL_PATH}
- REGEX "\\.svn$|_svn$|backToPNG" EXCLUDE
-)
Modified: code/branches/resource3/cmake/PackageConfig.cmake
===================================================================
--- code/branches/resource3/cmake/PackageConfig.cmake 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/cmake/PackageConfig.cmake 2009-08-24 18:17:56 UTC (rev 5679)
@@ -1,5 +1,28 @@
-# General package configuration. Merely sets the include paths.
-# Library files are treated separately.
+ #
+ # 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:
+ # General package configuration. Merely sets the include paths.
+ # Library files are treated separately.
+ #
# Check package version info
# MAJOR: Interface breaking change somewhere (library version changed, etc.)
Modified: code/branches/resource3/cmake/PackageConfigMSVC.cmake
===================================================================
--- code/branches/resource3/cmake/PackageConfigMSVC.cmake 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/cmake/PackageConfigMSVC.cmake 2009-08-24 18:17:56 UTC (rev 5679)
@@ -46,7 +46,7 @@
ENDIF()
# Also the directory with the runtime libraries
- SET(ORXONOX_RUNTIME_LIBRARY_DIRECTORY ${DEP_BINARY_DIR})
+ SET(RUNTIME_LIBRARY_DIRECTORY ${DEP_BINARY_DIR})
# Sets the library path for the FIND_LIBRARY
SET(CMAKE_LIBRARY_PATH ${DEP_LIBRARY_DIR})
Modified: code/branches/resource3/cmake/PackageConfigMinGW.cmake
===================================================================
--- code/branches/resource3/cmake/PackageConfigMinGW.cmake 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/cmake/PackageConfigMinGW.cmake 2009-08-24 18:17:56 UTC (rev 5679)
@@ -39,7 +39,7 @@
SET(DEP_BINARY_DIR ${DEPENDENCY_PACKAGE_DIR}/bin/mingw-${BINARY_POSTFIX})
# Also the directory with the runtime libraries
- SET(ORXONOX_RUNTIME_LIBRARY_DIRECTORY ${DEP_BINARY_DIR})
+ SET(RUNTIME_LIBRARY_DIRECTORY ${DEP_BINARY_DIR})
# Sets the library path for the FIND_LIBRARY
SET(CMAKE_LIBRARY_PATH ${DEP_LIBRARY_DIR} ${DEP_BINARY_DIR})
Modified: code/branches/resource3/cmake/TargetUtilities.cmake
===================================================================
--- code/branches/resource3/cmake/TargetUtilities.cmake 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/cmake/TargetUtilities.cmake 2009-08-24 18:17:56 UTC (rev 5679)
@@ -174,9 +174,9 @@
IF(NOT _arg_STATIC AND NOT _arg_NO_INSTALL)
INSTALL(TARGETS ${_target_name}
- RUNTIME DESTINATION ${ORXONOX_RUNTIME_INSTALL_PATH}
- LIBRARY DESTINATION ${ORXONOX_LIBRARY_INSTALL_PATH}
- #ARCHIVE DESTINATION ${ORXONOX_ARCHIVE_INSTALL_PATH}
+ RUNTIME DESTINATION ${RUNTIME_INSTALL_DIRECTORY}
+ LIBRARY DESTINATION ${LIBRARY_INSTALL_DIRECTORY}
+ #ARCHIVE DESTINATION ${ARCHIVE_INSTALL_DIRECTORY}
)
ENDIF()
Modified: code/branches/resource3/doc/api/CMakeLists.txt
===================================================================
--- code/branches/resource3/doc/api/CMakeLists.txt 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/doc/api/CMakeLists.txt 2009-08-24 18:17:56 UTC (rev 5679)
@@ -75,8 +75,7 @@
# Installation
INSTALL(
FILES ${DOXY_CONFIG} ${CMAKE_CURRENT_BINARY_DIR}/doxy.log
- DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
- OPTIONAL
+ DESTINATION ${DOC_INSTALL_DIRECTORY}/api OPTIONAL
)
# Install command always needs the directory
IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/html)
@@ -84,6 +83,6 @@
ENDIF()
INSTALL(
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
- DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
+ DESTINATION ${DOC_INSTALL_DIRECTORY}/api
)
ENDIF(DOXYGEN_FOUND)
Copied: code/branches/resource3/media/CMakeLists.txt (from rev 5675, code/branches/resource3/cmake/Media.cmake)
===================================================================
--- code/branches/resource3/media/CMakeLists.txt (rev 0)
+++ code/branches/resource3/media/CMakeLists.txt 2009-08-24 18:17:56 UTC (rev 5679)
@@ -0,0 +1,56 @@
+ #
+ # 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:
+ # Finds the external media directory and configures the media installation.
+ # Default search paths are: ../../media and ../media_extern
+ #
+
+# For dev runs we've got two media directory. The one from the other repository root folder
+# is called EXTERNAL_MEDIA
+SET(MEDIA_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+SET(MEDIA_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+
+# Specify media directory
+GET_FILENAME_COMPONENT(_search_path_1 ${CMAKE_SOURCE_DIR}/../${DEFAULT_MEDIA_PATH} ABSOLUTE)
+FIND_PATH(EXTERNAL_MEDIA_DIRECTORY resources.oxr
+ PATHS
+ ${CMAKE_SOURCE_DIR}/media_extern
+ ${_search_path_1}
+ NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
+)
+
+IF(NOT EXTERNAL_MEDIA_DIRECTORY)
+ MESSAGE(STATUS "Warning: External media directory not found. If you want to compile while downloading the data files, you will have to recompile about four files afterwards and relink everything.")
+ MESSAGE(STATUS "You can specify your own folder with the EXTERNAL_MEDIA_DIRECTORY variable. Default location for the path is orxonox_root/media_extern")
+ # Temporary override to the default location.
+ SET(EXTERNAL_MEDIA_DIRECTORY ${CMAKE_SOURCE_DIR}/media_extern)
+ENDIF()
+
+
+################ Installation #################
+
+# External directory
+INSTALL(
+ DIRECTORY ${EXTERNAL_MEDIA_DIRECTORY}/
+ DESTINATION ${MEDIA_INSTALL_DIRECTORY}
+ REGEX "\\.svn$|_svn$" EXCLUDE
+)
Modified: code/branches/resource3/src/SpecialConfig.h.in
===================================================================
--- code/branches/resource3/src/SpecialConfig.h.in 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/SpecialConfig.h.in 2009-08-24 18:17:56 UTC (rev 5679)
@@ -69,45 +69,55 @@
#cmakedefine CMAKE_CONFIGURATION_TYPES
// Handle default ConfigValues
-namespace orxonox
+namespace orxonox { namespace specialConfig
{
+ // DEFAULT RELATIVE PATHS (might not be used at all)
+ const char defaultRuntimePath[] = "@DEFAULT_RUNTIME_PATH@";
+ const char defaultLibraryPath[] = "@DEFAULT_LIBRARY_PATH@";
+ const char defaultArchivePath[] = "@DEFAULT_ARCHIVE_PATH@";
+ const char defaultDocPath[] = "@DEFAULT_DOC_PATH@";
+ const char defaultMediaPath[] = "@DEFAULT_MEDIA_PATH@";
+ const char defaultConfigPath[] = "@DEFAULT_CONFIG_PATH@";
+ const char defaultLogPath[] = "@DEFAULT_LOG_PATH@";
+
// INSTALLATION PATHS
- const char ORXONOX_RUNTIME_INSTALL_PATH[] = "@ORXONOX_RUNTIME_INSTALL_PATH@";
- const char ORXONOX_MEDIA_INSTALL_PATH[] = "@ORXONOX_MEDIA_INSTALL_PATH@";
- /* Config and Log path might be relative because they could be user and therefore runtime dependent */
- const char ORXONOX_CONFIG_INSTALL_PATH[] = "@ORXONOX_CONFIG_INSTALL_PATH@";
- const char ORXONOX_LOG_INSTALL_PATH[] = "@ORXONOX_LOG_INSTALL_PATH@";
+ const char runtimeInstallDirectory[] = "@RUNTIME_INSTALL_DIRECTORY@";
+ const char mediaInstallDirectory[] = "@MEDIA_INSTALL_DIRECTORY@";
+ const char configInstallDirectory[] = "@CONFIG_INSTALL_DIRECTORY@";
+ const char logInstallDirectory[] = "@LOG_INSTALL_DIRECTORY@";
// DEVELOPMENT RUN PATHS
- const char ORXONOX_MEDIA_DEV_PATH[] = "@CMAKE_MEDIA_OUTPUT_DIRECTORY@";
+ const char mediaDevDirectory[] = "@MEDIA_DIRECTORY@";
+ const char externalMediaDevDirectory[] = "@EXTERNAL_MEDIA_DIRECTORY@";
#ifdef CMAKE_CONFIGURATION_TYPES
- const char ORXONOX_CONFIG_DEV_PATH[] = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@/" BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
- const char ORXONOX_LOG_DEV_PATH[] = "@CMAKE_LOG_OUTPUT_DIRECTORY@/" BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
+ const char configDevDirectory[] = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@/" BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
+ const char logDevDirectory[] = "@CMAKE_LOG_OUTPUT_DIRECTORY@/" BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
#else
- const char ORXONOX_CONFIG_DEV_PATH[] = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@";
- const char ORXONOX_LOG_DEV_PATH[] = "@CMAKE_LOG_OUTPUT_DIRECTORY@";
+ const char configDevDirectory[] = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@";
+ const char logDevDirectory[] = "@CMAKE_LOG_OUTPUT_DIRECTORY@";
#endif
+
#ifdef DEPENDENCY_PACKAGE_ENABLE
- const char ORXONOX_DEP_LIB_PATH[] = "@DEP_LIBRARY_DIR@";
+ const char dependencyLibraryDirectory[] = "@DEP_LIBRARY_DIR@";
#endif
// OGRE PLUGINS
#ifdef NDEBUG
- const char ORXONOX_OGRE_PLUGINS[] = "@OGRE_PLUGINS_RELEASE@";
+ const char ogrePlugins[] = "@OGRE_PLUGINS_RELEASE@";
# ifdef DEPENDENCY_PACKAGE_ENABLE
- const char ORXONOX_OGRE_PLUGINS_FOLDER[] = ".";
+ const char ogrePluginsDirectory[] = ".";
# else
- const char ORXONOX_OGRE_PLUGINS_FOLDER[] = "@OGRE_PLUGINS_FOLDER_RELEASE@";
+ const char ogrePluginsDirectory[] = "@OGRE_PLUGINS_FOLDER_RELEASE@";
# endif
#else
- const char ORXONOX_OGRE_PLUGINS[] = "@OGRE_PLUGINS_DEBUG@";
+ const char ogrePlugins[] = "@OGRE_PLUGINS_DEBUG@";
# ifdef DEPENDENCY_PACKAGE_ENABLE
- const char ORXONOX_OGRE_PLUGINS_FOLDER[] = ".";
+ const char ogrePluginsDirectory[] = ".";
# else
- const char ORXONOX_OGRE_PLUGINS_FOLDER[] = "@OGRE_PLUGINS_FOLDER_DEBUG@";
+ const char ogrePluginsDirectory[] = "@OGRE_PLUGINS_FOLDER_DEBUG@";
# endif
#endif
-}
+} }
/**
@def ORXONOX_USE_WINMAIN
Modified: code/branches/resource3/src/ceguilua/CMakeLists.txt
===================================================================
--- code/branches/resource3/src/ceguilua/CMakeLists.txt 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/ceguilua/CMakeLists.txt 2009-08-24 18:17:56 UTC (rev 5679)
@@ -62,7 +62,7 @@
-s ${TOLUA_PARSER_SOURCE}
CEGUI.pkg
DEPENDS ${TOLUA_PARSER_DEPENDENCIES}
- WORKING_DIRECTORY ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}
+ WORKING_DIRECTORY ${RUNTIME_LIBRARY_DIRECTORY}
COMMENT "Generating tolua bind files for package CEGUILua"
)
Modified: code/branches/resource3/src/core/ConfigFileManager.cc
===================================================================
--- code/branches/resource3/src/core/ConfigFileManager.cc 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/core/ConfigFileManager.cc 2009-08-24 18:17:56 UTC (rev 5679)
@@ -229,7 +229,7 @@
if (!boost::filesystem::exists(filepath))
{
// Try to get default one from the media folder
- boost::filesystem::path defaultFilepath(Core::getMediaPath() / "defaultConfig" / this->filename_);
+ boost::filesystem::path defaultFilepath(Core::getExternalMediaPath() / "defaultConfig" / this->filename_);
if (boost::filesystem::exists(defaultFilepath))
{
COUT(3) << "Copied " << this->filename_ << " from the defaultConfig folder." << std::endl;
Modified: code/branches/resource3/src/core/Core.cc
===================================================================
--- code/branches/resource3/src/core/Core.cc 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/core/Core.cc 2009-08-24 18:17:56 UTC (rev 5679)
@@ -84,7 +84,7 @@
//! Static pointer to the singleton
Core* Core::singletonPtr_s = 0;
- SetCommandLineArgument(mediaPath, "").information("Path to the media/data files");
+ SetCommandLineArgument(externalMediaPath, "").information("Path to the external media files");
SetCommandLineOnlyArgument(writingPathSuffix, "").information("Additional subfolder for config and log files");
SetCommandLineArgument(settingsFile, "orxonox.ini").information("THE configuration file");
#ifdef ORXONOX_PLATFORM_WINDOWS
@@ -109,9 +109,13 @@
RegisterRootObject(CoreConfiguration);
this->setConfigValues();
- // Possible media path override by the command line
- if (!CommandLine::getArgument("mediaPath")->hasDefaultValue())
- tsetMediaPath(CommandLine::getValue("mediaPath"));
+ // External media directory only exists for dev runs
+ if (Core::isDevelopmentRun())
+ {
+ // Possible media path override by the command line
+ if (!CommandLine::getArgument("externalMediaPath")->hasDefaultValue())
+ tsetExternalMediaPath(CommandLine::getValue("externalMediaPath"));
+ }
}
/**
@@ -144,14 +148,6 @@
SetConfigValue(bInitializeRandomNumberGenerator_, true)
.description("If true, all random actions are different each time you start the game")
.callback(this, &CoreConfiguration::initializeRandomNumberGenerator);
-
- // Only show this config value for development builds
- if (Core::isDevelopmentRun())
- {
- SetConfigValue(mediaPathString_, mediaPath_.string())
- .description("Relative path to the game data.")
- .callback(this, &CoreConfiguration::mediaPathChanged);
- }
}
/**
@@ -182,15 +178,6 @@
}
/**
- @brief
- Callback function if the media path has changed.
- */
- void mediaPathChanged()
- {
- mediaPath_ = boost::filesystem::path(this->mediaPathString_);
- }
-
- /**
@brief Sets the language in the config-file back to the default.
*/
void resetLanguage()
@@ -204,18 +191,9 @@
@param path
The new media path
*/
- void tsetMediaPath(const std::string& path)
+ void tsetExternalMediaPath(const std::string& path)
{
- if (Core::isDevelopmentRun())
- {
- ModifyConfigValue(mediaPathString_, tset, path);
- }
- else
- {
- // Manual 'config' value without the file entry
- mediaPathString_ = path;
- this->mediaPathChanged();
- }
+ mediaPath_ = boost::filesystem::path(path);
}
void initializeRandomNumberGenerator()
@@ -235,12 +213,12 @@
int softDebugLevelShell_; //!< The debug level for the ingame shell
std::string language_; //!< The language
bool bInitializeRandomNumberGenerator_; //!< If true, srand(time(0)) is called
- std::string mediaPathString_; //!< Path to the data/media file folder as string
//! Path to the parent directory of the ones above if program was installed with relativ pahts
boost::filesystem::path rootPath_;
boost::filesystem::path executablePath_; //!< Path to the executable
boost::filesystem::path mediaPath_; //!< Path to the media file folder
+ boost::filesystem::path externalMediaPath_; //!< Path to the media file folder
boost::filesystem::path configPath_; //!< Path to the config file folder
boost::filesystem::path logPath_; //!< Path to the log file folder
};
@@ -310,7 +288,7 @@
this->graphicsManager_.reset(new GraphicsManager(false));
// initialise Tcl
- this->tclBind_.reset(new TclBind(Core::getMediaPathString()));
+ this->tclBind_.reset(new TclBind(Core::getExternalMediaPathString()));
this->tclThreadManager_.reset(new TclThreadManager(tclBind_->getTclInterpreter()));
// create a shell
@@ -426,9 +404,9 @@
Core::getInstance().configuration_->resetLanguage();
}
- /*static*/ void Core::tsetMediaPath(const std::string& path)
+ /*static*/ void Core::tsetExternalMediaPath(const std::string& path)
{
- getInstance().configuration_->tsetMediaPath(path);
+ getInstance().configuration_->tsetExternalMediaPath(path);
}
/*static*/ const boost::filesystem::path& Core::getMediaPath()
@@ -440,6 +418,15 @@
return getInstance().configuration_->mediaPath_.string() + '/';
}
+ /*static*/ const boost::filesystem::path& Core::getExternalMediaPath()
+ {
+ return getInstance().configuration_->externalMediaPath_;
+ }
+ /*static*/ std::string Core::getExternalMediaPathString()
+ {
+ return getInstance().configuration_->externalMediaPath_.string() + '/';
+ }
+
/*static*/ const boost::filesystem::path& Core::getConfigPath()
{
return getInstance().configuration_->configPath_;
@@ -577,15 +564,16 @@
{
COUT(1) << "Running from the build tree." << std::endl;
Core::bDevRun_ = true;
- configuration_->mediaPath_ = ORXONOX_MEDIA_DEV_PATH;
- configuration_->configPath_ = ORXONOX_CONFIG_DEV_PATH;
- configuration_->logPath_ = ORXONOX_LOG_DEV_PATH;
+ configuration_->mediaPath_ = specialConfig::mediaDevDirectory;
+ configuration_->externalMediaPath_ = specialConfig::externalMediaDevDirectory;
+ configuration_->configPath_ = specialConfig::configDevDirectory;
+ configuration_->logPath_ = specialConfig::logDevDirectory;
}
else
{
#ifdef INSTALL_COPYABLE // --> relative paths
// Also set the root path
- boost::filesystem::path relativeExecutablePath(ORXONOX_RUNTIME_INSTALL_PATH);
+ boost::filesystem::path relativeExecutablePath(specialConfig::defaultRuntimePath);
configuration_->rootPath_ = configuration_->executablePath_;
while (!boost::filesystem::equivalent(configuration_->rootPath_ / relativeExecutablePath, configuration_->executablePath_)
&& !configuration_->rootPath_.empty())
@@ -594,13 +582,13 @@
ThrowException(General, "Could not derive a root directory. Might the binary installation directory contain '..' when taken relative to the installation prefix path?");
// Using paths relative to the install prefix, complete them
- configuration_->mediaPath_ = configuration_->rootPath_ / ORXONOX_MEDIA_INSTALL_PATH;
- configuration_->configPath_ = configuration_->rootPath_ / ORXONOX_CONFIG_INSTALL_PATH;
- configuration_->logPath_ = configuration_->rootPath_ / ORXONOX_LOG_INSTALL_PATH;
+ configuration_->mediaPath_ = configuration_->rootPath_ / specialConfig::defaultMediaPath;
+ configuration_->configPath_ = configuration_->rootPath_ / specialConfig::defaultConfigPath;
+ configuration_->logPath_ = configuration_->rootPath_ / specialConfig::defaultLogPath;
#else
// There is no root path, so don't set it at all
- configuration_->mediaPath_ = ORXONOX_MEDIA_INSTALL_PATH;
+ configuration_->mediaPath_ = specialConfig::mediaInstallDirectory;
// Get user directory
# ifdef ORXONOX_PLATFORM_UNIX /* Apple? */
@@ -613,8 +601,8 @@
boost::filesystem::path userDataPath(userDataPathPtr);
userDataPath /= ".orxonox";
- configuration_->configPath_ = userDataPath / ORXONOX_CONFIG_INSTALL_PATH;
- configuration_->logPath_ = userDataPath / ORXONOX_LOG_INSTALL_PATH;
+ configuration_->configPath_ = userDataPath / specialConfig::defaultConfigPath;
+ configuration_->logPath_ = userDataPath / specialConfig::defaultLogPath;
#endif
}
Modified: code/branches/resource3/src/core/Core.h
===================================================================
--- code/branches/resource3/src/core/Core.h 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/core/Core.h 2009-08-24 18:17:56 UTC (rev 5679)
@@ -88,17 +88,21 @@
static const std::string& getLanguage();
static void resetLanguage();
- static void tsetMediaPath(const std::string& path);
- //! Returns the path to the config files as boost::filesystem::path
+ static void tsetExternalMediaPath(const std::string& path);
+ //! Returns the path to the data files as boost::filesystem::path
static const boost::filesystem::path& getMediaPath();
+ //! Returns the path to the external data files as boost::filesystem::path
+ static const boost::filesystem::path& getExternalMediaPath();
//! Returns the path to the config files as boost::filesystem::path
static const boost::filesystem::path& getConfigPath();
//! Returns the path to the log files as boost::filesystem::path
static const boost::filesystem::path& getLogPath();
+ //! Returns the path to the data files as std::string
//! Returns the path to the root folder as boost::filesystem::path
static const boost::filesystem::path& getRootPath();
- //! Returns the path to the data files as std::string
static std::string getMediaPathString();
+ //! Returns the path to the external data files as std::string
+ static std::string getExternalMediaPathString();
//! Returns the path to the config files as std::string
static std::string getConfigPathString();
//! Returns the path to the log files as std::string
Modified: code/branches/resource3/src/core/GUIManager.cc
===================================================================
--- code/branches/resource3/src/core/GUIManager.cc 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/core/GUIManager.cc 2009-08-24 18:17:56 UTC (rev 5679)
@@ -170,7 +170,7 @@
void GUIManager::loadLuaCode()
{
// set datapath for GUI data
- lua_pushfstring(this->scriptModule_->getLuaState(), Core::getMediaPathString().c_str());
+ lua_pushfstring(this->scriptModule_->getLuaState(), Core::getExternalMediaPathString().c_str());
lua_setglobal(this->scriptModule_->getLuaState(), "datapath");
// call main Lua script
this->scriptModule_->executeScriptFile("loadGUI_3.lua", "GUI");
Modified: code/branches/resource3/src/core/GraphicsManager.cc
===================================================================
--- code/branches/resource3/src/core/GraphicsManager.cc 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/core/GraphicsManager.cc 2009-08-24 18:17:56 UTC (rev 5679)
@@ -116,9 +116,9 @@
.description("Location of the resources file in the data path.");
SetConfigValue(ogreConfigFile_, "ogre.cfg")
.description("Location of the Ogre config file");
- SetConfigValue(ogrePluginsFolder_, ORXONOX_OGRE_PLUGINS_FOLDER)
+ SetConfigValue(ogrePluginsDirectory_, specialConfig::ogrePluginsDirectory)
.description("Folder where the Ogre plugins are located.");
- SetConfigValue(ogrePlugins_, ORXONOX_OGRE_PLUGINS)
+ SetConfigValue(ogrePlugins_, specialConfig::ogrePlugins)
.description("Comma separated list of all plugins to load.");
SetConfigValue(ogreLogFile_, "ogre.log")
.description("Logfile for messages from Ogre. Use \"\" to suppress log file creation.");
@@ -203,10 +203,10 @@
void GraphicsManager::loadOgrePlugins()
{
// just to make sure the next statement doesn't segfault
- if (ogrePluginsFolder_ == "")
- ogrePluginsFolder_ = ".";
+ if (ogrePluginsDirectory_ == "")
+ ogrePluginsDirectory_ = ".";
- boost::filesystem::path folder(ogrePluginsFolder_);
+ boost::filesystem::path folder(ogrePluginsDirectory_);
// 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.
@@ -230,7 +230,7 @@
Ogre::ConfigFile cf;
try
{
- cf.load((Core::getMediaPath() / resourceFile_).string());
+ cf.load((Core::getExternalMediaPath() / resourceFile_).string());
}
catch (...)
{
@@ -256,7 +256,7 @@
archName = i->second; // name (and location) of archive
Ogre::ResourceGroupManager::getSingleton().addResourceLocation(
- (Core::getMediaPath() / archName).string(), typeName, secName);
+ (Core::getExternalMediaPath() / archName).string(), typeName, secName);
}
}
catch (Ogre::Exception& ex)
Modified: code/branches/resource3/src/core/GraphicsManager.h
===================================================================
--- code/branches/resource3/src/core/GraphicsManager.h 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/core/GraphicsManager.h 2009-08-24 18:17:56 UTC (rev 5679)
@@ -100,7 +100,7 @@
// config values
std::string resourceFile_; //!< resources file name
std::string ogreConfigFile_; //!< ogre config file name
- std::string ogrePluginsFolder_; //!< Folder where the Ogre plugins are located
+ 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 file name for Ogre log messages
int ogreLogLevelTrivial_; //!< Corresponding Orxonx debug level for LL_TRIVIAL
Modified: code/branches/resource3/src/core/LuaBind.cc
===================================================================
--- code/branches/resource3/src/core/LuaBind.cc 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/core/LuaBind.cc 2009-08-24 18:17:56 UTC (rev 5679)
@@ -46,7 +46,7 @@
LuaBind::LuaBind()
{
- this->includePath_ = Core::getMediaPathString();
+ this->includePath_ = Core::getExternalMediaPathString();
luaState_ = lua_open();
luaSource_ = "";
Modified: code/branches/resource3/src/core/TclBind.cc
===================================================================
--- code/branches/resource3/src/core/TclBind.cc 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/core/TclBind.cc 2009-08-24 18:17:56 UTC (rev 5679)
@@ -126,7 +126,7 @@
{
#ifdef DEPENDENCY_PACKAGE_ENABLE
if (Core::isDevelopmentRun())
- return (std::string(ORXONOX_DEP_LIB_PATH) + "/tcl");
+ return (std::string(specialConfig::dependencyLibraryDirectory) + "/tcl");
else
return (Core::getRootPathString() + "lib/tcl");
#else
Modified: code/branches/resource3/src/orxonox/LevelManager.cc
===================================================================
--- code/branches/resource3/src/orxonox/LevelManager.cc 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/orxonox/LevelManager.cc 2009-08-24 18:17:56 UTC (rev 5679)
@@ -134,7 +134,7 @@
{
availableLevels_.clear();
- boost::filesystem::directory_iterator file(Core::getMediaPathString() + "levels");
+ boost::filesystem::directory_iterator file(Core::getExternalMediaPathString() + "levels");
boost::filesystem::directory_iterator end;
while (file != end)
Modified: code/branches/resource3/src/orxonox/gamestates/GSGraphics.cc
===================================================================
--- code/branches/resource3/src/orxonox/gamestates/GSGraphics.cc 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/orxonox/gamestates/GSGraphics.cc 2009-08-24 18:17:56 UTC (rev 5679)
@@ -95,7 +95,7 @@
{
// load debug overlay
COUT(3) << "Loading Debug Overlay..." << std::endl;
- this->debugOverlay_ = new XMLFile(Core::getMediaPathString() + "overlay/debug.oxo");
+ this->debugOverlay_ = new XMLFile(Core::getExternalMediaPathString() + "overlay/debug.oxo");
Loader::open(debugOverlay_);
masterKeyBinder_->loadBindings("masterKeybindings.ini");
Modified: code/branches/resource3/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- code/branches/resource3/src/orxonox/gamestates/GSLevel.cc 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/orxonox/gamestates/GSLevel.cc 2009-08-24 18:17:56 UTC (rev 5679)
@@ -245,7 +245,7 @@
{
// call the loader
COUT(0) << "Loading level..." << std::endl;
- startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + LevelManager::getInstance().getDefaultLevel());
+ startFile_s = new XMLFile(Core::getExternalMediaPathString() + "levels" + '/' + LevelManager::getInstance().getDefaultLevel());
Loader::open(startFile_s);
}
Modified: code/branches/resource3/src/orxonox/objects/Level.cc
===================================================================
--- code/branches/resource3/src/orxonox/objects/Level.cc 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/orxonox/objects/Level.cc 2009-08-24 18:17:56 UTC (rev 5679)
@@ -53,8 +53,8 @@
this->registerVariables();
this->xmlfilename_ = this->getFilename();
- if (this->xmlfilename_.length() >= Core::getMediaPathString().length())
- this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPathString().length());
+ if (this->xmlfilename_.length() >= Core::getExternalMediaPathString().length())
+ this->xmlfilename_ = this->xmlfilename_.substr(Core::getExternalMediaPathString().length());
}
Level::~Level()
@@ -100,7 +100,7 @@
mask.include(Class(Template));
mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay
- this->xmlfile_ = new XMLFile(Core::getMediaPathString() + this->xmlfilename_, mask);
+ this->xmlfile_ = new XMLFile(Core::getExternalMediaPathString() + this->xmlfilename_, mask);
Loader::open(this->xmlfile_);
}
Modified: code/branches/resource3/src/orxonox/orxonox.vcproj.user.in
===================================================================
--- code/branches/resource3/src/orxonox/orxonox.vcproj.user.in 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/orxonox/orxonox.vcproj.user.in 2009-08-24 18:17:56 UTC (rev 5679)
@@ -10,7 +10,7 @@
>
<DebugSettings
WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
- Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
+ Environment="Path=${RUNTIME_LIBRARY_DIRECTORY}"
EnvironmentMerge="true"
/>
</Configuration>
@@ -19,7 +19,7 @@
>
<DebugSettings
WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
- Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
+ Environment="Path=${RUNTIME_LIBRARY_DIRECTORY}"
EnvironmentMerge="true"
/>
</Configuration>
@@ -28,7 +28,7 @@
>
<DebugSettings
WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
- Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
+ Environment="Path=${RUNTIME_LIBRARY_DIRECTORY}"
EnvironmentMerge="true"
/>
</Configuration>
@@ -37,7 +37,7 @@
>
<DebugSettings
WorkingDirectory="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(OutDir)"
- Environment="Path=${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}"
+ Environment="Path=${RUNTIME_LIBRARY_DIRECTORY}"
EnvironmentMerge="true"
/>
</Configuration>
Modified: code/branches/resource3/src/orxonox/sound/SoundBase.cc
===================================================================
--- code/branches/resource3/src/orxonox/sound/SoundBase.cc 2009-08-24 17:19:58 UTC (rev 5678)
+++ code/branches/resource3/src/orxonox/sound/SoundBase.cc 2009-08-24 18:17:56 UTC (rev 5679)
@@ -134,7 +134,7 @@
}
bool SoundBase::loadFile(std::string filename) {
- filename = Core::getMediaPathString() + "/audio/" + filename;
+ filename = Core::getExternalMediaPathString() + "/audio/" + filename;
if(!SoundManager::getInstance().isSoundAvailable())
{
More information about the Orxonox-commit
mailing list