mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-22 05:39:43 +00:00
Mac Build - adding architectures and Apple build locations
This commit is contained in:
parent
25ba9933f6
commit
bace14c45e
2 changed files with 7 additions and 4 deletions
|
@ -151,6 +151,7 @@ set(CPACK_PACKAGE_VERSION_PATCH "")
|
||||||
|
|
||||||
include(CPack)
|
include(CPack)
|
||||||
|
|
||||||
|
set(CMAKE_EXE_LINKER_FLAGS "-arch i386")
|
||||||
|
set(CMAKE_CXX_FLAGS "-arch i386")
|
||||||
|
|
||||||
endif (APPLE)
|
endif (APPLE)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -99,9 +99,11 @@ void OMW::Engine::go()
|
||||||
std::string ogre_cfg_location = "ogre.cfg";
|
std::string ogre_cfg_location = "ogre.cfg";
|
||||||
|
|
||||||
#ifdef OGRE_PLATFORM == OGRE_PLATFORM_APPLE
|
#ifdef OGRE_PLATFORM == OGRE_PLATFORM_APPLE
|
||||||
std::cout << "[Apple]" << std::endl;
|
|
||||||
plugin_cfg_location = macBundlePath() + "/Contents/MacOS/" + plugin_cfg_location;
|
plugin_cfg_location = macBundlePath() + "/Contents/MacOS/" + plugin_cfg_location;
|
||||||
ogre_cfg_location = macBundlePath() + "/Contents/MacOS/" + ogre_cfg_location;
|
ogre_cfg_location = macBundlePath() + "/Contents/Resources/" + ogre_cfg_location;
|
||||||
|
std::cout << "[Apple]" << std::endl;
|
||||||
|
std::cout << "[Apple] plugins.cfg location: " << plugin_cfg_location << std::endl;
|
||||||
|
std::cout << "[Apple] ogre.cfg location: " << ogre_cfg_location << std::endl;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
mOgre.configure(!isFile(ogre_cfg_location.c_str()), plugin_cfg_location.c_str(), false);
|
mOgre.configure(!isFile(ogre_cfg_location.c_str()), plugin_cfg_location.c_str(), false);
|
||||||
|
|
Loading…
Reference in a new issue