AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-30 15:41:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ace/win_fix'

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-09-09 18:15:03 +02:00
commit a3869980a4
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -630,6 +630,7 @@ if (APPLE)
include(CPack) include(CPack)
endif (APPLE) endif (APPLE)
if (NOT WIN32)
## Linux building ## Linux building
# paths # paths
set(BINDIR "${CMAKE_INSTALL_PREFIX}/usr/bin" CACHE PATH "Where to install binaries") set(BINDIR "${CMAKE_INSTALL_PREFIX}/usr/bin" CACHE PATH "Where to install binaries")
@ -660,3 +661,4 @@ INSTALL(FILES "${OpenMW_BINARY_DIR}/launcher.cfg" DESTINATION "${SYSCONFDIR}" )
# Install resources # Install resources
INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION "${DATADIR}" ) INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION "${DATADIR}" )
INSTALL(FILES "${OpenMW_BINARY_DIR}/launcher.qss" DESTINATION "${DATADIR}/resources" ) INSTALL(FILES "${OpenMW_BINARY_DIR}/launcher.qss" DESTINATION "${DATADIR}/resources" )
endif(NOT WIN32)

2
components/files/fixedpath.hpp
View File

@ -69,7 +69,7 @@ struct FixedPath
* \param [in] application_name - Name of the application * \param [in] application_name - Name of the application
*/ */
FixedPath(const std::string& application_name) FixedPath(const std::string& application_name)
: mPath(application_name) : mPath(application_name + "/")
, mUserPath(mPath.getUserPath()) , mUserPath(mPath.getUserPath())
, mGlobalPath(mPath.getGlobalPath()) , mGlobalPath(mPath.getGlobalPath())
, mLocalPath(mPath.getLocalPath()) , mLocalPath(mPath.getLocalPath())