diff --git a/CMakeLists.txt b/CMakeLists.txt index 47864ee2a..ac5f3993b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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_RESOURCE_FILES "/usr/share/games/openmw/resources/" CACHE PATH "location of Morrowind data files") else() - if (APPLE) - # set path inside bundle - 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") + if (APPLE) + # set path inside bundle + 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") else() - 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_DATA_FILES "data" CACHE PATH "location of Morrowind data files") + set(MORROWIND_RESOURCE_FILES "resources" CACHE PATH "location of Morrowind data files") endif(APPLE) endif(DPKG_PROGRAM) @@ -226,7 +226,7 @@ if (MSVC10) endif() if (APPLE) - set(Boost_USE_STATIC_LIBS ON) + set(Boost_USE_STATIC_LIBS ON) endif (APPLE) # Dependencies @@ -278,7 +278,7 @@ configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.linux endif (LINUX) if (APPLE) configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.mac - "${OpenMW_BINARY_DIR}/plugins.cfg") + "${OpenMW_BINARY_DIR}/plugins.cfg") endif (APPLE) configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg @@ -293,8 +293,8 @@ endif (CMAKE_COMPILER_IS_GNUCC) # Apple bundling if (APPLE) set(MISC_FILES - ${OpenMW_BINARY_DIR}/openmw.cfg - ${OpenMW_BINARY_DIR}/plugins.cfg) + ${OpenMW_BINARY_DIR}/openmw.cfg + ${OpenMW_BINARY_DIR}/plugins.cfg) install(FILES ${MISC_FILES} DESTINATION ../MacOS) install(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION ../Resources) set(CPACK_GENERATOR "Bundle") diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index b6b71fc87..50e3f6e0a 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -243,9 +243,9 @@ if (APPLE) find_library(CARBON_FRAMEWORK Carbon) target_link_libraries(openmw ${CARBON_FRAMEWORK}) install(TARGETS openmw - BUNDLE DESTINATION . - RUNTIME DESTINATION ../MacOS - COMPONENT Runtime) + BUNDLE DESTINATION . + RUNTIME DESTINATION ../MacOS + COMPONENT Runtime) endif (APPLE) if(DPKG_PROGRAM) diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index a4544a006..2fafabc05 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -259,7 +259,7 @@ void OMW::Engine::setDataDir (const boost::filesystem::path& dataDir) // Set resource dir 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) diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp index e26d81969..4d7e6595c 100644 --- a/apps/openmw/main.cpp +++ b/apps/openmw/main.cpp @@ -112,15 +112,15 @@ bool parseOptions (int argc, char**argv, OMW::Engine& engine) int main(int argc, char**argv) { #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE - // set current dir to bundle path - boost::filesystem::path bundlePath = boost::filesystem::path(Ogre::macBundlePath()); - boost::filesystem::current_path(bundlePath); + // set current dir to bundle path + boost::filesystem::path bundlePath = boost::filesystem::path(Ogre::macBundlePath()); + boost::filesystem::current_path(bundlePath); #endif try { OMW::Engine engine; - + if (parseOptions (argc, argv, engine)) { engine.go();