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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a17e52..e09a149 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,10 +5,10 @@ cmake_minimum_required(VERSION 2.6)
 set(SRCDIR "${CMAKE_CURRENT_SOURCE_DIR}/Source")
 set(DEPDIR "${CMAKE_CURRENT_SOURCE_DIR}/Dependencies")
 
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
-      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel"
-      FORCE)
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel"
+      FORCE)
 endif(NOT CMAKE_BUILD_TYPE)
 
 if(NOT LUGARU_INSTALL_PREFIX)
@@ -25,17 +25,35 @@ endif(NOT LUGARU_INSTALL_PREFIX)
 
 set(CMAKE_INSTALL_PREFIX "${LUGARU_INSTALL_PREFIX}" CACHE INTERNAL "Prefix prepended to install directories" FORCE)
 
-if(WIN32)
+if(MINGW)
 	set(OPENGL_gl_LIBRARY "-lopengl32" CACHE STRING "OpenGL library for Win32" FORCE)
 	set(OPENGL_glu_LIBRARY "-lglu32" CACHE STRING "GLU library for Win32" FORCE)
-endif(WIN32)
-
-
+endif(MINGW)
+
+if(APPLE)
+	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 
+		"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/")
 
 set(LUGARU_SRCS
 	${SRCDIR}/Frustum.cpp
+	${SRCDIR}/Account.cpp
+	${SRCDIR}/Game.cpp
 	${SRCDIR}/GameDraw.cpp
 	${SRCDIR}/GameInitDispose.cpp
 	${SRCDIR}/GameTick.cpp
@@ -60,23 +78,18 @@ 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
 )
 
-if(UNIX)
-	set(LUGARU_SRCS
-		${LUGARU_SRCS}
-		${SRCDIR}/MacCompatibility.cpp
-	)
-endif(UNIX)
-
 set(LUGARU_H
 	${SRCDIR}/Constants.h
 	${SRCDIR}/Frustum.h
+	${SRCDIR}/Account.h
 	${SRCDIR}/Game.h
 	${SRCDIR}/Lights.h
 	${SRCDIR}/LinkedList.h
-	${SRCDIR}/MacCompatibility.h
 	${SRCDIR}/Models.h
 	${SRCDIR}/Objects.h
 	${SRCDIR}/Person.h
@@ -91,38 +104,69 @@ 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
 	${SRCDIR}/gamegl.h
 	${SRCDIR}/glstubs.h
-	${SRCDIR}/md5.h
 	${SRCDIR}/mmgr.h
 	${SRCDIR}/nommgr.h
 	${SRCDIR}/pack_private.h
 	${SRCDIR}/private.h
 	${SRCDIR}/unpack_private.h
+	${SRCDIR}/Settings.h
+	${SRCDIR}/Stereo.h
 )
 
+if(UNIX)
+	set(LUGARU_SRCS
+		${LUGARU_SRCS}
+		${SRCDIR}/MacCompatibility.cpp
+	)
+	set(LUGARU_H
+		${LUGARU_H}
+		${SRCDIR}/MacCompatibility.h
+	)
+endif(UNIX)
+
+if(MSVC) # MSVC non-C99 support biting us hard
+	set(LUGARU_H
+		${LUGARU_H}
+		${DEPDIR}/msinttypes/stdint.h
+		${DEPDIR}/msinttypes/inttypes.h
+	)
+endif(MSVC)
+
 if(WIN32)
   if(CMAKE_CROSSCOMPILING)
     ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
 						  COMMAND i686-pc-mingw32-windres
-							  -I${SRCDIR}/res
+							  -I${SRCDIR}/win-res
 							  -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
-							  -i${SRCDIR}/res/Lugaru.rc
-					      DEPENDS ${SRCDIR}/res/Lugaru.rc
+							  -i${SRCDIR}/win-res/Lugaru.rc
+					      DEPENDS ${SRCDIR}/win-res/Lugaru.rc
 						  )
   endif(CMAKE_CROSSCOMPILING)
   if(NOT CMAKE_CROSSCOMPILING)
+   if(MSVC)
+    ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
+						  COMMAND rc
+							  -I${SRCDIR}/win-res
+							  -fo${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
+							  ${SRCDIR}/win-res/Lugaru.rc
+					      DEPENDS ${SRCDIR}/win-res/Lugaru.rc
+						  )
+   endif(MSVC)
+   if(MINGW)
     ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
 						  COMMAND windres
-							  -I${SRCDIR}/res
+							  -I${SRCDIR}/win-res
 							  -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
-							  -i${SRCDIR}/res/Lugaru.rc
-					      DEPENDS ${SRCDIR}/res/Lugaru.rc
+							  -i${SRCDIR}/win-res/Lugaru.rc
+					      DEPENDS ${SRCDIR}/win-res/Lugaru.rc
 						  )
+   endif(MINGW)
   endif(NOT CMAKE_CROSSCOMPILING)
 
   # !!! FIXME: get rid of this.
@@ -133,56 +177,76 @@ if(WIN32)
   set(LUGARU_H
 	${LUGARU_H}
 	${SRCDIR}/WinDefs.h
-	${SRCDIR}/res/resource.h)
+	${SRCDIR}/win-res/resource.h)
 endif(WIN32)
 
 if (APPLE)
     set(PLATFORM_LIBS "-framework Carbon -framework Cocoa -framework OpenGL -framework OpenAL")
 endif (APPLE)
 
-
-
 # Deal with dependencies...
-
 find_package(OpenGL REQUIRED)
-# force this include dir no matter what, so we get sane headers.
-include_directories("${DEPDIR}/OpenGL")
+# force this include dir no matter what on Windows, so we get sane headers.
+if(NOT WIN32)
+	option (LUGARU_FORCE_INTERNAL_OPENGL "Force internal OpenGL headers, even if there's a system version" True)
+	if (LUGARU_FORCE_INTERNAL_OPENGL)
+		include_directories("${DEPDIR}/OpenGL")
+	endif (LUGARU_FORCE_INTERNAL_OPENGL)
+endif(NOT WIN32)
+
+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)
+	find_package(OpenAL REQUIRED)
+else(NOT LUGARU_FORCE_INTERNAL_OPENAL)
+	set(OPENAL_FOUND False)
 endif (NOT LUGARU_FORCE_INTERNAL_OPENAL)
 
-if (NOT OPENAL_FOUND)
+if (NOT OPENAL_FOUND OR LUGARU_FORCE_INTERNAL_OPENAL)
     message(STATUS "Using internal copy of OpenAL")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} OpenAL")
     set(OPENALDIR "${DEPDIR}/OpenAL")
     set(OPENAL_INCLUDE_DIR "${OPENALDIR}/include/AL")
     set(OPENAL_LIBRARY "")
 
-    if (WINDOWS)
+    if (WIN32)
         set(LUGARU_HAS_INTERNAL_OPENAL True)
-#        if (MSVC)                     # !!! FIXME: package MSVC .dll and .lib for Windows?
-#            set(OPENAL_LIBRARY
-#                ${OPENALDIR}/lib/win32/msvc/OpenAL32.lib
-#            )
-#        endif (MSVC)
+        if (MSVC80)
+            set(OPENAL_LIBRARY
+                ${OPENALDIR}/lib/win32/msvc2005/OpenAL32.lib
+            )
+        endif (MSVC80)
+        if (MSVC90)
+            set(OPENAL_LIBRARY
+                ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.lib
+            )
+        endif (MSVC90)
         if (MINGW)
             set(OPENAL_LIBRARY
                 ${OPENALDIR}/lib/win32/mingw/libOpenAL32.dll.a
             )
         endif (MINGW)
-     endif(WINDOWS)
+     endif(WIN32)
 
     if (NOT LUGARU_HAS_INTERNAL_OPENAL)
         message(ERROR "We don't have a prebuilt OpenAL for this platform.")
     endif (NOT LUGARU_HAS_INTERNAL_OPENAL)
-endif (NOT OPENAL_FOUND)
+endif (NOT OPENAL_FOUND OR LUGARU_FORCE_INTERNAL_OPENAL)
 
 option (LUGARU_FORCE_INTERNAL_SDL "Force internal libSDL, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_SDL)
     find_package(SDL)
+else(NOT LUGARU_FORCE_INTERNAL_SDL)
+	set(SDL_FOUND False)
 endif (NOT LUGARU_FORCE_INTERNAL_SDL)
+
 if (NOT SDL_FOUND)
     message(STATUS "Using internal copy of SDL")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} SDL")
@@ -197,21 +261,29 @@ if (NOT SDL_FOUND)
         )
     endif (APPLE)
 
-    if (WINDOWS)
+    if (WIN32)
         set(LUGARU_HAS_INTERNAL_SDL True)
-        if (MSVC)
+        if (MSVC80)
           set(SDL_LIBRARY
-              ${SDLDIR}/lib/win32/msvc/SDL.lib
-              ${SDLDIR}/lib/win32/msvc/SDLmain.lib
+              ${SDLDIR}/lib/win32/msvc2005/SDLmain.lib
+              ${SDLDIR}/lib/win32/msvc2005/SDL.lib
           )
-        endif (MSVC)
+        endif (MSVC80)
+        if (MSVC90)
+          set(SDL_LIBRARY
+              ${SDLDIR}/lib/win32/msvc2008/SDLmain.lib
+              ${SDLDIR}/lib/win32/msvc2008/SDL.lib
+          )
+        endif (MSVC90)
         if (MINGW)
           set(SDL_LIBRARY
-              ${SDLDIR}/lib/win32/mingw/libSDL.dll.a
+              "mingw32"
               ${SDLDIR}/lib/win32/mingw/libSDLmain.a
+              ${SDLDIR}/lib/win32/mingw/libSDL.dll.a
+              "-mwindows"
           )
         endif (MINGW)
-    endif (WINDOWS)
+    endif (WIN32)
 
     if (NOT LUGARU_HAS_INTERNAL_SDL)
         message(ERROR "We don't have a prebuilt SDL for this platform.")
@@ -221,7 +293,10 @@ endif (NOT SDL_FOUND)
 option (LUGARU_FORCE_INTERNAL_PNG "Force internal libPNG, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_PNG)
     find_package(PNG)
+else(NOT LUGARU_FORCE_INTERNAL_PNG)
+	set(PNG_FOUND False)
 endif (NOT LUGARU_FORCE_INTERNAL_PNG)
+
 if (NOT PNG_FOUND)
     message(STATUS "Using internal copy of libpng")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} PNG")
@@ -251,7 +326,10 @@ endif (NOT PNG_FOUND)
 option (LUGARU_FORCE_INTERNAL_JPEG "Force internal libJPEG, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_JPEG)
     find_package(JPEG)
+else(NOT LUGARU_FORCE_INTERNAL_JPEG)
+	set(JPEG_FOUND False)
 endif (NOT LUGARU_FORCE_INTERNAL_JPEG)
+
 if (NOT JPEG_FOUND)
     message(STATUS "Using internal copy of libjpeg")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} JPEG")
@@ -311,7 +389,10 @@ endif (NOT JPEG_FOUND)
 option (LUGARU_FORCE_INTERNAL_ZLIB "Force internal zlib, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_ZLIB)
     find_package(ZLIB)
+else(NOT LUGARU_FORCE_INTERNAL_ZLIB)
+	set(ZLIB_FOUND False)
 endif (NOT LUGARU_FORCE_INTERNAL_ZLIB)
+
 if (NOT ZLIB_FOUND)
     message(STATUS "Using internal copy of zlib")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} ZLIB")
@@ -335,10 +416,11 @@ if (NOT ZLIB_FOUND)
 endif (NOT ZLIB_FOUND)
 
 option (LUGARU_FORCE_INTERNAL_GLU "Force internal libGLU, even if there's a system version" False)
-if (NOT LUGARU_FORCE_INTERNAL_GLU)
-    find_package(GLU)
-endif (NOT LUGARU_FORCE_INTERNAL_GLU)
-if (NOT GLU_FOUND)
+if (LUGARU_FORCE_INTERNAL_GLU)
+	set(OPENGL_GLU_FOUND False)
+endif (LUGARU_FORCE_INTERNAL_GLU)
+
+if (NOT OPENGL_GLU_FOUND)
     message(STATUS "Using internal copy of libGLU")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} GLU")
     set(GLUDIR "${DEPDIR}/GLU")
@@ -359,13 +441,16 @@ if (NOT GLU_FOUND)
         ${GLUDIR}/tessmono.c
         ${GLUDIR}/util.c
     )
-endif (NOT GLU_FOUND)
+endif (NOT OPENGL_GLU_FOUND)
 
 option (LUGARU_FORCE_INTERNAL_VORBIS "Force internal Vorbis, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_VORBIS)
     find_package(OggVorbis)
+else(NOT LUGARU_FORCE_INTERNAL_VORBIS)
+	set(OGGVORBIS_FOUND False)
 endif (NOT LUGARU_FORCE_INTERNAL_VORBIS)
-if (NOT OggVorbis_FOUND)
+
+if (NOT OGGVORBIS_FOUND)
     message(STATUS "Using internal copy of Ogg Vorbis")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} OggVorbis")
     set(OGGDIR "${DEPDIR}/libogg")
@@ -399,7 +484,7 @@ if (NOT OggVorbis_FOUND)
         ${VORBISDIR}/lib/vorbisfile.c
         ${VORBISDIR}/lib/window.c
     )
-endif (NOT OggVorbis_FOUND)
+endif (NOT OGGVORBIS_FOUND)
 
 include_directories(
     ${OPENAL_INCLUDE_DIR}
@@ -432,21 +517,45 @@ else(WIN32)
 endif(WIN32)
 
 # Install target
+if(APPLE)
+	set(APPS_ROOT "${CMAKE_INSTALL_PREFIX}/Lugaru.app")
+	set(APPS_BIN "${APPS_ROOT}/Contents/MacOS")
+	set(APPS_DATA "${APPS_ROOT}/Contents/Resources")
+endif(APPLE)
+
 if(WIN32)
 	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru.exe DESTINATION ${CMAKE_INSTALL_PREFIX})
-	if(MSVC)
-		install(FILES ${SDLDIR}/lib/win32/msvc/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
-		#install(FILES ${OPENALDIR}/lib/win32/msvc/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX}) # FIXME: Add MSVC OpenAL library!
-	endif(MSVC)
+	if(MSVC80)
+		install(FILES ${SDLDIR}/lib/win32/msvc2005/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
+		install(FILES ${OPENALDIR}/lib/win32/msvc2005/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
+	endif(MSVC80)
+	if(MSVC90)
+		install(FILES ${SDLDIR}/lib/win32/msvc2008/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
+		install(FILES ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
+	endif(MSVC90)
 	if(MINGW)
 		install(FILES ${SDLDIR}/lib/win32/mingw/SDL.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
 		install(FILES ${OPENALDIR}/lib/win32/mingw/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
 	endif(MINGW)
 else(WIN32)
+	if(APPLE)
+		set(CMAKE_INSTALL_PREFIX "${APPS_BIN}")
+		install(FILES ${SRCDIR}/mac-res/lugaru.icns DESTINATION ${APPS_DATA})
+		install(FILES ${SRCDIR}/mac-res/Info.plist DESTINATION ${APPS_ROOT}/Contents)
+	endif(APPLE)
 	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru DESTINATION ${CMAKE_INSTALL_PREFIX})
+	if(APPLE AND LUGARU_HAS_INTERNAL_SDL)
+		install(FILES ${SDLDIR}/lib/macosx/libSDL-1.2.0.dylib DESTINATION ${CMAKE_INSTALL_PREFIX})
+	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}")