X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=CMakeLists.txt;h=fe7c8b683def7a80e24aa7414edb7c8ae78c7b5f;hb=bbf7582c00138ab38f84b6acf52e76175bfebb79;hp=d2a8c2994ecb927290a90aa16b46124da26aaccd;hpb=c608c3e5c837583b23f517fa4cb209c2b53e39f3;p=lugaru.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2a8c29..fe7c8b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,6 +191,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 +542,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}")