From c608c3e5c837583b23f517fa4cb209c2b53e39f3 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 15 May 2010 22:17:45 -0500 Subject: [PATCH] Took off some FORCE markers to allow configuration on OSX --- CMakeLists.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aafeabb..d2a8c29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,11 +31,21 @@ if(MINGW) endif(MINGW) if(APPLE) - set(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE) + set(CMAKE_OSX_ARCHITECTURES "i386;ppc" CACHE STRING "Build architectures for OSX") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING - "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value" FORCE) + "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value") set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk" CACHE PATH - "The product will be built against the headers and libraries located inside the indicated SDK." FORCE) + "The product will be built against the headers and libraries located inside the indicated SDK.") +endif(APPLE) + +if(APPLE) + # Save our sanity; Set all available libraries to internal by default + set(LUGARU_FORCE_INTERNAL_SDL True) + set(LUGARU_FORCE_INTERNAL_GLU True) + set(LUGARU_FORCE_INTERNAL_JPEG True) + set(LUGARU_FORCE_INTERNAL_PNG True) + set(LUGARU_FORCE_INTERNAL_VORBIS True) + set(LUGARU_FORCE_INTERNAL_ZLIB True) endif(APPLE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") @@ -465,16 +475,6 @@ if (NOT OGGVORBIS_FOUND) ) endif (NOT OGGVORBIS_FOUND) -if(APPLE) - # Save our sanity; Set all available libraries to internal by default - set(LUGARU_FORCE_INTERNAL_SDL True) - set(LUGARU_FORCE_INTERNAL_GLU True) - set(LUGARU_FORCE_INTERNAL_JPEG True) - set(LUGARU_FORCE_INTERNAL_PNG True) - set(LUGARU_FORCE_INTERNAL_VORBIS True) - set(LUGARU_FORCE_INTERNAL_ZLIB True) -endif(APPLE) - include_directories( ${OPENAL_INCLUDE_DIR} ${JPEG_INCLUDE_DIR} -- 2.39.5