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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe7c8b6..4775a5e 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
@@ -60,56 +62,58 @@ set(LUGARU_SRCS
 	${SRCDIR}/Models.cpp
 	${SRCDIR}/Objects.cpp
 	${SRCDIR}/pack.c
-	${SRCDIR}/pack_private.c
 	${SRCDIR}/Person.cpp
 	${SRCDIR}/private.c
 	${SRCDIR}/Quaternions.cpp
-	${SRCDIR}/Random.c
 	${SRCDIR}/Skeleton.cpp
 	${SRCDIR}/Skybox.cpp
-	${SRCDIR}/Sprites.cpp
+	${SRCDIR}/Sprite.cpp
 	${SRCDIR}/Terrain.cpp
 	${SRCDIR}/Text.cpp
 	${SRCDIR}/TGALoader.cpp
 	${SRCDIR}/unpack.c
-	${SRCDIR}/unpack_private.c
 	${SRCDIR}/Weapons.cpp
 	${SRCDIR}/OpenGL_Windows.cpp
 	${SRCDIR}/openal_wrapper.cpp
-	${SRCDIR}/WinInput.cpp
+	${SRCDIR}/Input.cpp
+	${SRCDIR}/Settings.cpp
+	${SRCDIR}/Stereo.cpp
+	${SRCDIR}/Animation.cpp
+	${SRCDIR}/Sounds.cpp
+	${SRCDIR}/Awards.cpp
 )
 
 set(LUGARU_H
-	${SRCDIR}/Constants.h
 	${SRCDIR}/Frustum.h
+	${SRCDIR}/Account.h
 	${SRCDIR}/Game.h
 	${SRCDIR}/Lights.h
-	${SRCDIR}/LinkedList.h
 	${SRCDIR}/Models.h
 	${SRCDIR}/Objects.h
 	${SRCDIR}/Person.h
 	${SRCDIR}/PhysicsMath.h
-	${SRCDIR}/Pointer.h
 	${SRCDIR}/Quaternions.h
 	${SRCDIR}/Random.h
 	${SRCDIR}/Skeleton.h
 	${SRCDIR}/Skybox.h
-	${SRCDIR}/Sprites.h
+	${SRCDIR}/Sprite.h
 	${SRCDIR}/TGALoader.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
 	${SRCDIR}/gamegl.h
 	${SRCDIR}/glstubs.h
-	${SRCDIR}/mmgr.h
-	${SRCDIR}/nommgr.h
-	${SRCDIR}/pack_private.h
 	${SRCDIR}/private.h
-	${SRCDIR}/unpack_private.h
+	${SRCDIR}/Settings.h
+	${SRCDIR}/Stereo.h
+	${SRCDIR}/Animation.h
+	${SRCDIR}/Animation.def
+	${SRCDIR}/Sounds.h
+	${SRCDIR}/Sounds.def
 )
 
 if(UNIX)
@@ -492,7 +496,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/Source
 )
 
-set(LUGARU_LIBS ${OPENAL_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARIES} ${SDL_LIBRARY} ${GLU_LIBRARY} ${OPENGL_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY} ${PLATFORM_LIBS})
+set(LUGARU_LIBS ${OPENAL_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARIES} ${SDL_LIBRARY} ${OPENGL_glu_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY} ${PLATFORM_LIBS})
 
 
 if(WIN32)