merge

[lugaru.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2a8c2994ecb927290a90aa16b46124da26aaccd..766bd3768640f4d3152b7458b5168d6b8a442499 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ if(MINGW)
 endif(MINGW)
 
 if(APPLE)
-       set(CMAKE_OSX_ARCHITECTURES "i386;ppc" CACHE STRING "Build architectures for OSX")
+       set(CMAKE_OSX_ARCHITECTURES "i386;x86_64;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")
        set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk" CACHE PATH 
@@ -77,6 +77,8 @@ set(LUGARU_SRCS
        ${SRCDIR}/OpenGL_Windows.cpp
        ${SRCDIR}/openal_wrapper.cpp
        ${SRCDIR}/WinInput.cpp
+       ${SRCDIR}/Settings.cpp
+       ${SRCDIR}/Stereo.cpp
 )
 
 set(LUGARU_H
@@ -110,6 +112,8 @@ set(LUGARU_H
        ${SRCDIR}/pack_private.h
        ${SRCDIR}/private.h
        ${SRCDIR}/unpack_private.h
+       ${SRCDIR}/Settings.h
+       ${SRCDIR}/Stereo.h
 )
 
 if(UNIX)
@@ -191,6 +195,10 @@ if(WIN32)
        include_directories("${DEPDIR}/OpenGL")
 endif(WIN32)
 
+if(MSVC) # More Visual Studio annoyances
+       include_directories("${DEPDIR}/msinttypes")
+endif(MSVC)
+
 option (LUGARU_FORCE_INTERNAL_OPENAL "Force internal libOpenAL, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_OPENAL)
        find_package(OpenAL REQUIRED)
@@ -538,7 +546,13 @@ else(WIN32)
        endif(APPLE AND LUGARU_HAS_INTERNAL_SDL)
 endif(WIN32)
 
+if(NOT APPLE)
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif(NOT APPLE)
+
+if(APPLE)
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${APPS_ROOT})
+endif(APPLE)
 
 if (LUGARU_MISSING_DEPS)
     message(STATUS "Using our copy of these libs: ${LUGARU_MISSING_DEPS}")