X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=CMakeLists.txt;h=e09a14908b9dd0ac429f56d4ceefe8bbf6b0c528;hb=735daf95aba0eef54d151daae01285f0959825d0;hp=ee5c085bb58d4505b031c3e982d2294ec74662db;hpb=9d23e169c127a4e291aa317e0811d42895b6dd3a;p=lugaru.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee5c085..e09a149 100644
--- 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 
@@ -52,6 +52,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 set(LUGARU_SRCS
 	${SRCDIR}/Frustum.cpp
+	${SRCDIR}/Account.cpp
+	${SRCDIR}/Game.cpp
 	${SRCDIR}/GameDraw.cpp
 	${SRCDIR}/GameInitDispose.cpp
 	${SRCDIR}/GameTick.cpp
@@ -76,12 +78,15 @@ set(LUGARU_SRCS
 	${SRCDIR}/Weapons.cpp
 	${SRCDIR}/OpenGL_Windows.cpp
 	${SRCDIR}/openal_wrapper.cpp
-	${SRCDIR}/WinInput.cpp
+	${SRCDIR}/Input.cpp
+	${SRCDIR}/Settings.cpp
+	${SRCDIR}/Stereo.cpp
 )
 
 set(LUGARU_H
 	${SRCDIR}/Constants.h
 	${SRCDIR}/Frustum.h
+	${SRCDIR}/Account.h
 	${SRCDIR}/Game.h
 	${SRCDIR}/Lights.h
 	${SRCDIR}/LinkedList.h
@@ -99,7 +104,7 @@ set(LUGARU_H
 	${SRCDIR}/Terrain.h
 	${SRCDIR}/Text.h
 	${SRCDIR}/Weapons.h
-	${SRCDIR}/WinInput.h
+	${SRCDIR}/Input.h
 	${SRCDIR}/alstubs.h
 	${SRCDIR}/binio.h
 	${SRCDIR}/openal_wrapper.h
@@ -110,6 +115,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 +198,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)