From b7c006b898ba93388742f053a3ffb39039525a94 Mon Sep 17 00:00:00 2001 From: Nikolay Kasyanov Date: Sun, 26 Jun 2011 21:15:29 +0400 Subject: [PATCH] Mac: further fixes for new resource folder location --- extern/caelum/CMakeLists.txt | 6 +----- extern/mygui_3.0.1/CMakeLists.txt | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/extern/caelum/CMakeLists.txt b/extern/caelum/CMakeLists.txt index 88ed51fad..b747fefc8 100755 --- a/extern/caelum/CMakeLists.txt +++ b/extern/caelum/CMakeLists.txt @@ -19,11 +19,7 @@ add_library(caelum STATIC ${SOURCES}) # # Resources # -if (APPLE) - SET(CAELUM_RES_DEST "${APP_BUNDLE_DIR}/Contents/Resources") -else (APPLE) - SET(CAELUM_RES_DEST "${OpenMW_BINARY_DIR}") -endif (APPLE) +SET(CAELUM_RES_DEST "${OpenMW_BINARY_DIR}") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/AtmosphereDepth.png "${CAELUM_RES_DEST}/resources/caelum/AtmosphereDepth.png" COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resources/CaelumGroundFog.cg "${CAELUM_RES_DEST}/resources/caelum/CaelumGroundFog.cg" COPYONLY) diff --git a/extern/mygui_3.0.1/CMakeLists.txt b/extern/mygui_3.0.1/CMakeLists.txt index 8101ad91a..d7e0bd483 100644 --- a/extern/mygui_3.0.1/CMakeLists.txt +++ b/extern/mygui_3.0.1/CMakeLists.txt @@ -22,11 +22,7 @@ add_subdirectory(OgrePlatform) # Copy resource files into the build directory set(SDIR ${CMAKE_CURRENT_SOURCE_DIR}/openmw_resources) -if (APPLE) - set(DDIR ${APP_BUNDLE_DIR}/Contents/Resources/resources/mygui) -else (APPLE) - set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui) -endif (APPLE) +set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui) configure_file("${SDIR}/bigbars.png" "${DDIR}/bigbars.png" COPYONLY) configure_file("${SDIR}/black.png" "${DDIR}/black.png" COPYONLY)