From bace14c45e0117429c0de66d6634aa6ec94918d2 Mon Sep 17 00:00:00 2001 From: Ardekantur Date: Sun, 4 Jul 2010 17:07:22 -0400 Subject: [PATCH] Mac Build - adding architectures and Apple build locations --- CMakeLists.txt | 5 +++-- game/engine.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a8c9864d..ca8c61d13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,6 +151,7 @@ set(CPACK_PACKAGE_VERSION_PATCH "") include(CPack) -endif (APPLE) - +set(CMAKE_EXE_LINKER_FLAGS "-arch i386") +set(CMAKE_CXX_FLAGS "-arch i386") +endif (APPLE) diff --git a/game/engine.cpp b/game/engine.cpp index 9cb3d90b6..f87f5096f 100644 --- a/game/engine.cpp +++ b/game/engine.cpp @@ -99,9 +99,11 @@ void OMW::Engine::go() std::string ogre_cfg_location = "ogre.cfg"; #ifdef OGRE_PLATFORM == OGRE_PLATFORM_APPLE - std::cout << "[Apple]" << std::endl; 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 mOgre.configure(!isFile(ogre_cfg_location.c_str()), plugin_cfg_location.c_str(), false);