Add missing force internal command for OSX and refactor CI file

[lugaru.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe7c8b683def7a80e24aa7414edb7c8ae78c7b5f..a082391123dafb920fa7caa745e88181f6a6fcc9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,11 +5,9 @@ cmake_minimum_required(VERSION 2.6)
 set(SRCDIR "${CMAKE_CURRENT_SOURCE_DIR}/Source")
 set(DEPDIR "${CMAKE_CURRENT_SOURCE_DIR}/Dependencies")
 
 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 -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)
 
 if(NOT LUGARU_INSTALL_PREFIX)
   if(WIN32)


@@ -31,10 +29,10 @@ if(MINGW)
 endif(MINGW)
 
 if(APPLE)
 endif(MINGW)
 
 if(APPLE)

-       set(CMAKE_OSX_ARCHITECTURES "i386;ppc" CACHE STRING "Build architectures for OSX")
-       set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING 
+       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")
                "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 
+       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)
 
                "The product will be built against the headers and libraries located inside the indicated SDK.")
 endif(APPLE)
 


@@ -46,70 +44,77 @@ if(APPLE)
        set(LUGARU_FORCE_INTERNAL_PNG True)
        set(LUGARU_FORCE_INTERNAL_VORBIS True)
        set(LUGARU_FORCE_INTERNAL_ZLIB 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
 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
        ${SRCDIR}/Globals.cpp
        ${SRCDIR}/Lights.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}/Models.cpp
        ${SRCDIR}/Objects.cpp
        ${SRCDIR}/pack.c

-       ${SRCDIR}/pack_private.c

        ${SRCDIR}/Person.cpp
        ${SRCDIR}/private.c
        ${SRCDIR}/Quaternions.cpp
        ${SRCDIR}/Person.cpp
        ${SRCDIR}/private.c
        ${SRCDIR}/Quaternions.cpp

-       ${SRCDIR}/Random.c

        ${SRCDIR}/Skeleton.cpp
        ${SRCDIR}/Skybox.cpp
        ${SRCDIR}/Skeleton.cpp
        ${SRCDIR}/Skybox.cpp

-       ${SRCDIR}/Sprites.cpp
+       ${SRCDIR}/Sprite.cpp

        ${SRCDIR}/Terrain.cpp
        ${SRCDIR}/Terrain.cpp

+       ${SRCDIR}/Texture.cpp

        ${SRCDIR}/Text.cpp
        ${SRCDIR}/TGALoader.cpp
        ${SRCDIR}/unpack.c
        ${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}/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
 )
 
 set(LUGARU_H

-       ${SRCDIR}/Constants.h

        ${SRCDIR}/Frustum.h
        ${SRCDIR}/Frustum.h

+       ${SRCDIR}/Account.h

        ${SRCDIR}/Game.h
        ${SRCDIR}/Lights.h
        ${SRCDIR}/Game.h
        ${SRCDIR}/Lights.h

-       ${SRCDIR}/LinkedList.h
+       ${SRCDIR}/Menu.h

        ${SRCDIR}/Models.h
        ${SRCDIR}/Objects.h
        ${SRCDIR}/Person.h
        ${SRCDIR}/PhysicsMath.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}/Quaternions.h
        ${SRCDIR}/Random.h
        ${SRCDIR}/Skeleton.h
        ${SRCDIR}/Skybox.h

-       ${SRCDIR}/Sprites.h
+       ${SRCDIR}/Sprite.h

        ${SRCDIR}/TGALoader.h
        ${SRCDIR}/Terrain.h
        ${SRCDIR}/TGALoader.h
        ${SRCDIR}/Terrain.h

+       ${SRCDIR}/Texture.h

        ${SRCDIR}/Text.h
        ${SRCDIR}/Weapons.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}/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}/private.h

-       ${SRCDIR}/unpack_private.h
+       ${SRCDIR}/Settings.h
+       ${SRCDIR}/Stereo.h
+       ${SRCDIR}/Animation.h
+       ${SRCDIR}/Sounds.h

 )
 
 if(UNIX)
 )
 
 if(UNIX)


@@ -134,7 +139,7 @@ endif(MSVC)
 if(WIN32)
   if(CMAKE_CROSSCOMPILING)
     ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
 if(WIN32)
   if(CMAKE_CROSSCOMPILING)
     ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj

-                                                 COMMAND i686-pc-mingw32-windres
+                                                 COMMAND i686-w64-mingw32-windres

                                                          -I${SRCDIR}/win-res
                                                          -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
                                                          -i${SRCDIR}/win-res/Lugaru.rc
                                                          -I${SRCDIR}/win-res
                                                          -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj
                                                          -i${SRCDIR}/win-res/Lugaru.rc


@@ -492,7 +497,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/Source
 )
 
     ${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)
 
 
 if(WIN32)