X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=CMakeLists.txt;h=7a55bda573c9c5773458a48dfb92dfbed0daf0ad;hb=b468f24797ff9f29d0949abed89cb3117ea2b08d;hp=700e9f49debf96fdbb681c44f12c269821405d32;hpb=d4fc2f86e43ce4e3e00ee033203f664a4a3d20a5;p=lugaru.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 700e9f4..7a55bda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,184 +1,230 @@
 project(lugaru)
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.5)
+cmake_policy(SET CMP0004 OLD)
+
+INCLUDE(FindPkgConfig)
 
 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)
-endif(NOT CMAKE_BUILD_TYPE)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 --std=c++11")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -g -pg --std=c++11")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -O2 -std=c++11")
 
 if(NOT LUGARU_INSTALL_PREFIX)
-  if(WIN32)
-     set(LUGARU_INSTALL_PREFIX C:\Lugaru CACHE PATH
-     "LUGARU_INSTALL_PREFIX: Install path prefix, prepended onto install directories."
-      FORCE)
-  else(WIN32)
-     set(LUGARU_INSTALL_PREFIX /usr/local/lugaru CACHE PATH
-     "CMAKE_INSTALL_PREFIX: Install path prefix, prepended onto install directories."
-      FORCE)
-  endif(WIN32)
+    if(WIN32)
+        set(LUGARU_INSTALL_PREFIX "C:/Lugaru" CACHE PATH
+        "LUGARU_INSTALL_PREFIX: Install path prefix, prepended onto install directories."
+        FORCE)
+    else(WIN32)
+        set(LUGARU_INSTALL_PREFIX "/usr/local/lugaru" CACHE PATH
+        "CMAKE_INSTALL_PREFIX: Install path prefix, prepended onto install directories."
+        FORCE)
+    endif(WIN32)
 endif(NOT LUGARU_INSTALL_PREFIX)
 
 set(CMAKE_INSTALL_PREFIX "${LUGARU_INSTALL_PREFIX}" CACHE INTERNAL "Prefix prepended to install directories" FORCE)
 
-if(WIN32)
-	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)
-
-
+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(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_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)
+    set(LUGARU_FORCE_INTERNAL_OPENAL True)
+endif(APPLE)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 set(LUGARU_SRCS
-	${SRCDIR}/Frustum.cpp
-	${SRCDIR}/GameDraw.cpp
-	${SRCDIR}/GameInitDispose.cpp
-	${SRCDIR}/GameTick.cpp
-	${SRCDIR}/Globals.cpp
-	${SRCDIR}/Lights.cpp
-	${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}/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}/MacCompatibility.cpp
+    ${SRCDIR}/Frustum.cpp
+    ${SRCDIR}/Account.cpp
+    ${SRCDIR}/Game.cpp
+    ${SRCDIR}/GameDraw.cpp
+    ${SRCDIR}/GameInitDispose.cpp
+    ${SRCDIR}/GameTick.cpp
+    ${SRCDIR}/Globals.cpp
+    ${SRCDIR}/Lights.cpp
+    ${SRCDIR}/Menu.cpp
+    ${SRCDIR}/Models.cpp
+    ${SRCDIR}/Objects.cpp
+    ${SRCDIR}/pack.c
+    ${SRCDIR}/Person.cpp
+    ${SRCDIR}/private.c
+    ${SRCDIR}/Quaternions.cpp
+    ${SRCDIR}/Skeleton.cpp
+    ${SRCDIR}/Skybox.cpp
+    ${SRCDIR}/Sprite.cpp
+    ${SRCDIR}/Terrain.cpp
+    ${SRCDIR}/Texture.cpp
+    ${SRCDIR}/Text.cpp
+    ${SRCDIR}/TGALoader.cpp
+    ${SRCDIR}/unpack.c
+    ${SRCDIR}/Weapons.cpp
+    ${SRCDIR}/OpenGL_Windows.cpp
+    ${SRCDIR}/openal_wrapper.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}/Game.h
-	${SRCDIR}/Lights.h
-	${SRCDIR}/LinkedList.h
-	${SRCDIR}/MacCompatibility.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}/TGALoader.h
-	${SRCDIR}/Terrain.h
-	${SRCDIR}/Text.h
-	${SRCDIR}/Weapons.h
-	${SRCDIR}/WinInput.h
-	${SRCDIR}/alstubs.h
-	${SRCDIR}/binio.h
-	${SRCDIR}/fmod.h
-	${SRCDIR}/fmod_errors.h
-	${SRCDIR}/fmod_header.h
-	${SRCDIR}/fmoddyn.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}/Frustum.h
+    ${SRCDIR}/Account.h
+    ${SRCDIR}/Game.h
+    ${SRCDIR}/Lights.h
+    ${SRCDIR}/Menu.h
+    ${SRCDIR}/Models.h
+    ${SRCDIR}/Objects.h
+    ${SRCDIR}/Person.h
+    ${SRCDIR}/PhysicsMath.h
+    ${SRCDIR}/Quaternions.h
+    ${SRCDIR}/Random.h
+    ${SRCDIR}/Skeleton.h
+    ${SRCDIR}/Skybox.h
+    ${SRCDIR}/Sprite.h
+    ${SRCDIR}/TGALoader.h
+    ${SRCDIR}/Terrain.h
+    ${SRCDIR}/Texture.h
+    ${SRCDIR}/Text.h
+    ${SRCDIR}/Weapons.h
+    ${SRCDIR}/Input.h
+    ${SRCDIR}/alstubs.h
+    ${SRCDIR}/binio.h
+    ${SRCDIR}/openal_wrapper.h
+    ${SRCDIR}/gamegl.h
+    ${SRCDIR}/glstubs.h
+    ${SRCDIR}/private.h
+    ${SRCDIR}/Settings.h
+    ${SRCDIR}/Stereo.h
+    ${SRCDIR}/Animation.h
+    ${SRCDIR}/Sounds.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${CMAKE_CURRENT_SOURCE_DIR}/res
-							  -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
-							  -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc
-					      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc
-						  )
-  endif(CMAKE_CROSSCOMPILING)
-  if(NOT CMAKE_CROSSCOMPILING)
     ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
-						  COMMAND windres
-							  -I${CMAKE_CURRENT_SOURCE_DIR}/res
-							  -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
-							  -i${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc
-					      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/lugaru.rc
-						  )
-  endif(NOT CMAKE_CROSSCOMPILING)
-
-  # !!! FIXME: get rid of this.
-  set(LUGARU_SRCS
-	${LUGARU_SRCS}
-	${SRCDIR}/WinDefs.cpp)
-
-  set(LUGARU_H
-	${LUGARU_H}
-	${SRCDIR}/WinDefs.h
-	${SRCDIR}/res/resource.h)
+                        COMMAND ${CMAKE_RC_COMPILER}
+                        -I${SRCDIR}/win-res
+                        -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
+                        -i${SRCDIR}/win-res/Lugaru.rc
+                        DEPENDS ${SRCDIR}/win-res/Lugaru.rc
+    )
+
+    # !!! FIXME: get rid of this.
+    set(LUGARU_SRCS
+        ${LUGARU_SRCS}
+        ${SRCDIR}/WinDefs.cpp)
+
+    set(LUGARU_H
+        ${LUGARU_H}
+        ${SRCDIR}/WinDefs.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.
-set(OPENGL_INCLUDE_DIR "${DEPDIR}/OpenGL")
-
-find_package(OpenAL REQUIRED)  # !!! FIXME: package a .dll for Windows?
-
-find_package(SDL)
-if (NOT SDL)
-    set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} SDL")
-    message(STATUS "SDL not found, using internal copy")
-    set(SDLDIR "${DEPDIR}/SDL12")
-    set(SDL_INCLUDE_DIR "${SDLDIR}/include")
-    set(SDL_LIBRARY "")
-    if (APPLE)
-        set(LUGARU_HAS_INTERNAL_SDL True)
-        set(SDL_LIBRARY
-            ${SDLDIR}/lib/macosx/libSDL-1.2.0.dylib
-            ${SDLDIR}/lib/macosx/libSDLmain-osx.a
-        )
-    endif (APPLE)
-
-    if (WINDOWS)
-        set(LUGARU_HAS_INTERNAL_SDL True)
-        set(SDL_LIBRARY
-            ${SDLDIR}/lib/win32/SDL.lib
-            ${SDLDIR}/lib/win32/SDLmain.lib
-        )
-    endif (WINDOWS)
-
-    if (NOT LUGARU_HAS_INTERNAL_SDL)
-        message(ERROR "We don't have a prebuilt SDL for this platform.")
-    endif (NOT LUGARU_HAS_INTERNAL_SDL)
-endif (NOT SDL)
-
-find_package(PNG)
-if (NOT PNG)
+# force this include dir no matter what on Windows, so we get sane headers.
+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)
+
+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)
+    # FIXME: We should remove bundled libs and allow building OpenAL from source, for all platforms
+    if (WIN32)
+        pkg_check_modules(OPENAL openal)
+        set(OPENAL_LIBRARY ${OPENAL_LIBRARIES})
+    else (WIN32)
+        find_package(OpenAL REQUIRED)
+    endif()
+else(NOT LUGARU_FORCE_INTERNAL_OPENAL)
+    set(OPENAL_FOUND False)
+endif (NOT LUGARU_FORCE_INTERNAL_OPENAL)
+
+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")
+    set(OPENAL_LIBRARY "")
+
+    if (WIN32)
+        set(LUGARU_HAS_INTERNAL_OPENAL True)
+        if (MSVC)
+            set(OPENAL_LIBRARY
+                ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.lib
+            )
+        endif (MSVC)
+        if (MINGW)
+            set(OPENAL_LIBRARY
+                ${OPENALDIR}/lib/win32/mingw/libOpenAL32.dll.a
+            )
+        endif (MINGW)
+    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 OR LUGARU_FORCE_INTERNAL_OPENAL)
+
+find_package(sdl2 REQUIRED)
+
+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")
-    message(STATUS "libpng not found, using internal copy")
     set(PNGDIR "${DEPDIR}/libpng")
     set(PNG_INCLUDE_DIR "${PNGDIR}")
     set(PNG_LIBRARY "")
@@ -200,12 +246,18 @@ if (NOT PNG)
         ${PNGDIR}/pngwtran.c
         ${PNGDIR}/pngwutil.c
     )
-endif (NOT PNG)
+endif (NOT PNG_FOUND)
 
-find_package(JPEG)
-if (NOT JPEG)
+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")
-    message(STATUS "libjpeg not found, using internal copy")
     set(JPEGDIR "${DEPDIR}/libjpeg")
     set(JPEG_INCLUDE_DIR "${JPEGDIR}")
     set(JPEG_LIBRARY "")
@@ -257,12 +309,18 @@ if (NOT JPEG)
         ${JPEGDIR}/jdarith.c
         ${JPEGDIR}/jaricom.c
     )
-endif (NOT JPEG)
+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)
 
-find_package(ZLIB)
-if (NOT ZLIB)
+if (NOT ZLIB_FOUND)
+    message(STATUS "Using internal copy of zlib")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} ZLIB")
-    message(STATUS "zlib not found, using internal copy")
     set(ZLIBDIR "${DEPDIR}/zlib")
     set(ZLIB_INCLUDE_DIR "${ZLIBDIR}")
     set(ZLIB_LIBRARIES "")
@@ -280,12 +338,16 @@ if (NOT ZLIB)
         ${ZLIBDIR}/uncompr.c
         ${ZLIBDIR}/zutil.c
     )
-endif (NOT ZLIB)
+endif (NOT ZLIB_FOUND)
 
-find_package(GLU)
-if (NOT GLU)
+option (LUGARU_FORCE_INTERNAL_GLU "Force internal libGLU, even if there's a system version" False)
+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")
-    message(STATUS "GLU not found, using internal copy")
     set(GLUDIR "${DEPDIR}/GLU")
     set(GLU_INCLUDE_DIR "${GLUDIR}")
     set(GLU_LIBRARY "")
@@ -304,12 +366,18 @@ if (NOT GLU)
         ${GLUDIR}/tessmono.c
         ${GLUDIR}/util.c
     )
-endif (NOT GLU)
+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)
 
-find_package(OggVorbis)
-if (NOT OggVorbis)
+if (NOT OGGVORBIS_FOUND)
+    message(STATUS "Using internal copy of Ogg Vorbis")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} OggVorbis")
-    message(STATUS "Ogg Vorbis not found, using internal copy")
     set(OGGDIR "${DEPDIR}/libogg")
     set(OGG_INCLUDE_DIR "${OGGDIR}/include")
     set(OGG_LIBRARY "")
@@ -341,7 +409,7 @@ if (NOT OggVorbis)
         ${VORBISDIR}/lib/vorbisfile.c
         ${VORBISDIR}/lib/window.c
     )
-endif (NOT OggVorbis)
+endif (NOT OGGVORBIS_FOUND)
 
 include_directories(
     ${OPENAL_INCLUDE_DIR}
@@ -350,13 +418,13 @@ include_directories(
     ${ZLIB_INCLUDE_DIR}
     ${OPENGL_INCLUDE_DIR}
     ${GLU_INCLUDE_DIR}
-    ${SDL_INCLUDE_DIR}
+    ${SDL2_INCLUDE_DIRS}
     ${VORBISFILE_INCLUDE_DIR}
     ${OGG_INCLUDE_DIR}
     ${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} ${SDL2_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY} ${PLATFORM_LIBS})
 
 
 if(WIN32)
@@ -368,21 +436,46 @@ endif(WIN32)
 target_link_libraries(lugaru ${LUGARU_LIBS})
 
 if(WIN32)
-	add_definitions(-DUSE_OPENAL=1 -DUSE_SDL=1 -DBinIO_STDINT_HEADER=<stdint.h>)
+    add_definitions(-DUSE_OPENAL=1 -DUSE_SDL=1 -DBinIO_STDINT_HEADER=<stdint.h>)
+    if(MINGW)
+        add_definitions(-DWIN32)
+    endif(MINGW)
 else(WIN32)
-	add_definitions(-DPLATFORM_LINUX=1 -DPLATFORM_UNIX=1 -DUSE_OPENAL=1 -DUSE_SDL=1 -DBinIO_STDINT_HEADER=<stdint.h>)
+    add_definitions(-DPLATFORM_LINUX=1 -DPLATFORM_UNIX=1 -DUSE_OPENAL=1 -DUSE_SDL=1 -DBinIO_STDINT_HEADER=<stdint.h>)
 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}/Source/lugaru.exe DESTINATION ${CMAKE_INSTALL_PREFIX})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru.exe DESTINATION ${CMAKE_INSTALL_PREFIX})
+    if(MSVC)
+        install(FILES ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
+    endif(MSVC)
+    if(MINGW)
+        install(FILES ${OPENALDIR}/lib/win32/mingw/OpenAL32.dll DESTINATION ${CMAKE_INSTALL_PREFIX})
+    endif(MINGW)
 else(WIN32)
-	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/Source/lugaru DESTINATION ${CMAKE_INSTALL_PREFIX})
+    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})
 endif(WIN32)
 
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${CMAKE_INSTALL_PREFIX})
+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}")
 endif (LUGARU_MISSING_DEPS)
-