mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-21 05:14:10 +00:00
Code Issues Releases Wiki Activity

Oops. Used tabs instead of 4 spaces. Fixed.

Browse source
This commit is contained in:
Nikolay Kasyanov 2011-03-12 03:00:42 +03:00
parent 86515a6eef
commit edcac879d7
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
CMakeLists.txt
View file

@ -12,13 +12,13 @@ if(DPKG_PROGRAM)
set(MORROWIND_DATA_FILES "/usr/share/games/openmw/data/" CACHE PATH "location of Morrowind data files") set(MORROWIND_DATA_FILES "/usr/share/games/openmw/data/" CACHE PATH "location of Morrowind data files")
set(MORROWIND_RESOURCE_FILES "/usr/share/games/openmw/resources/" CACHE PATH "location of Morrowind data files") set(MORROWIND_RESOURCE_FILES "/usr/share/games/openmw/resources/" CACHE PATH "location of Morrowind data files")
else() else()
if (APPLE) if (APPLE)
# set path inside bundle # set path inside bundle
set(MORROWIND_DATA_FILES "Contents/Resources/data" CACHE PATH "location of Morrowind data files") set(MORROWIND_DATA_FILES "Contents/Resources/data" CACHE PATH "location of Morrowind data files")
set(MORROWIND_RESOURCE_FILES "Contents/Resources/resources" CACHE PATH "location of Morrowind data files") set(MORROWIND_RESOURCE_FILES "Contents/Resources/resources" CACHE PATH "location of Morrowind data files")
else() else()
set(MORROWIND_DATA_FILES "data" CACHE PATH "location of Morrowind data files") set(MORROWIND_DATA_FILES "data" CACHE PATH "location of Morrowind data files")
set(MORROWIND_RESOURCE_FILES "resources" CACHE PATH "location of Morrowind data files") set(MORROWIND_RESOURCE_FILES "resources" CACHE PATH "location of Morrowind data files")
endif(APPLE) endif(APPLE)
endif(DPKG_PROGRAM) endif(DPKG_PROGRAM)
@ -226,7 +226,7 @@ if (MSVC10)
endif() endif()
if (APPLE) if (APPLE)
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
endif (APPLE) endif (APPLE)
# Dependencies # Dependencies
@ -278,7 +278,7 @@ configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.linux
endif (LINUX) endif (LINUX)
if (APPLE) if (APPLE)
configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.mac configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.mac
"${OpenMW_BINARY_DIR}/plugins.cfg") "${OpenMW_BINARY_DIR}/plugins.cfg")
endif (APPLE) endif (APPLE)
configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
@ -293,8 +293,8 @@ endif (CMAKE_COMPILER_IS_GNUCC)
# Apple bundling # Apple bundling
if (APPLE) if (APPLE)
set(MISC_FILES set(MISC_FILES
${OpenMW_BINARY_DIR}/openmw.cfg ${OpenMW_BINARY_DIR}/openmw.cfg
${OpenMW_BINARY_DIR}/plugins.cfg) ${OpenMW_BINARY_DIR}/plugins.cfg)
install(FILES ${MISC_FILES} DESTINATION ../MacOS) install(FILES ${MISC_FILES} DESTINATION ../MacOS)
install(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION ../Resources) install(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION ../Resources)
set(CPACK_GENERATOR "Bundle") set(CPACK_GENERATOR "Bundle")

6
apps/openmw/CMakeLists.txt
View file

@ -243,9 +243,9 @@ if (APPLE)
find_library(CARBON_FRAMEWORK Carbon) find_library(CARBON_FRAMEWORK Carbon)
target_link_libraries(openmw ${CARBON_FRAMEWORK}) target_link_libraries(openmw ${CARBON_FRAMEWORK})
install(TARGETS openmw install(TARGETS openmw
BUNDLE DESTINATION . BUNDLE DESTINATION .
RUNTIME DESTINATION ../MacOS RUNTIME DESTINATION ../MacOS
COMPONENT Runtime) COMPONENT Runtime)
endif (APPLE) endif (APPLE)
if(DPKG_PROGRAM) if(DPKG_PROGRAM)

2
apps/openmw/engine.cpp
View file

@ -259,7 +259,7 @@ void OMW::Engine::setDataDir (const boost::filesystem::path& dataDir)
// Set resource dir // Set resource dir
void OMW::Engine::setResourceDir (const boost::filesystem::path& parResDir) void OMW::Engine::setResourceDir (const boost::filesystem::path& parResDir)
{ {
mResDir = boost::filesystem::system_complete(parResDir); mResDir = boost::filesystem::system_complete(parResDir);
} }
// Set start cell name (only interiors for now) // Set start cell name (only interiors for now)

6
apps/openmw/main.cpp
View file

@ -112,9 +112,9 @@ bool parseOptions (int argc, char**argv, OMW::Engine& engine)
int main(int argc, char**argv) int main(int argc, char**argv)
{ {
#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
// set current dir to bundle path // set current dir to bundle path
boost::filesystem::path bundlePath = boost::filesystem::path(Ogre::macBundlePath()); boost::filesystem::path bundlePath = boost::filesystem::path(Ogre::macBundlePath());
boost::filesystem::current_path(bundlePath); boost::filesystem::current_path(bundlePath);
#endif #endif
try try