teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge remote-tracking branch 'swick/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-09-20 09:21:38 +02:00
commit 8353cab28b
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/CMakeLists.txt
View file

@ -57,7 +57,12 @@ add_component_dir (misc
utf8stream stringops resourcehelpers
)
add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
add_definitions(-DGLOBAL_DATA_PATH="${CMAKE_INSTALL_PREFIX}/share/games/")
if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
add_definitions(-DGLOBAL_CONFIG_PATH="/etc/")
else()
add_definitions(-DGLOBAL_CONFIG_PATH="${CMAKE_INSTALL_PREFIX}/etc/")
endif()
add_component_dir (files
linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager
constrainedfiledatastream lowlevelfile

4
components/files/linuxpath.cpp
View file

@ -69,7 +69,7 @@ boost::filesystem::path LinuxPath::getCachePath() const
boost::filesystem::path LinuxPath::getGlobalConfigPath() const
{
boost::filesystem::path globalPath(INSTALL_PREFIX "/etc/");
boost::filesystem::path globalPath(GLOBAL_CONFIG_PATH);
return globalPath / mName;
}
@ -80,7 +80,7 @@ boost::filesystem::path LinuxPath::getLocalPath() const
boost::filesystem::path LinuxPath::getGlobalDataPath() const
{
boost::filesystem::path globalDataPath(INSTALL_PREFIX "/share/games/");
boost::filesystem::path globalDataPath(GLOBAL_DATA_PATH);
return globalDataPath / mName;
}