X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=CMakeLists.txt;h=e54642168ae520b8b5afbd3583fb50349aaf958e;hb=7f163bd6e10df1c2f03756d550ed6ca4278577f8;hp=4775a5ec9eeb1a6d75139967d163090259844df7;hpb=2ff81b0a43f256cb92f04ced2bc415eae11459ca;p=lugaru.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 4775a5e..e546421 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,15 +1,13 @@ project(lugaru) -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.5) 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) @@ -32,9 +30,9 @@ 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 + 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 + 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) @@ -46,6 +44,7 @@ if(APPLE) 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/") @@ -59,6 +58,7 @@ set(LUGARU_SRCS ${SRCDIR}/GameTick.cpp ${SRCDIR}/Globals.cpp ${SRCDIR}/Lights.cpp + ${SRCDIR}/Menu.cpp ${SRCDIR}/Models.cpp ${SRCDIR}/Objects.cpp ${SRCDIR}/pack.c @@ -69,6 +69,7 @@ set(LUGARU_SRCS ${SRCDIR}/Skybox.cpp ${SRCDIR}/Sprite.cpp ${SRCDIR}/Terrain.cpp + ${SRCDIR}/Texture.cpp ${SRCDIR}/Text.cpp ${SRCDIR}/TGALoader.cpp ${SRCDIR}/unpack.c @@ -88,6 +89,7 @@ set(LUGARU_H ${SRCDIR}/Account.h ${SRCDIR}/Game.h ${SRCDIR}/Lights.h + ${SRCDIR}/Menu.h ${SRCDIR}/Models.h ${SRCDIR}/Objects.h ${SRCDIR}/Person.h @@ -99,6 +101,7 @@ set(LUGARU_H ${SRCDIR}/Sprite.h ${SRCDIR}/TGALoader.h ${SRCDIR}/Terrain.h + ${SRCDIR}/Texture.h ${SRCDIR}/Text.h ${SRCDIR}/Weapons.h ${SRCDIR}/Input.h @@ -111,9 +114,7 @@ set(LUGARU_H ${SRCDIR}/Settings.h ${SRCDIR}/Stereo.h ${SRCDIR}/Animation.h - ${SRCDIR}/Animation.def ${SRCDIR}/Sounds.h - ${SRCDIR}/Sounds.def ) if(UNIX) @@ -136,40 +137,13 @@ if(MSVC) # MSVC non-C99 support biting us hard 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}/win-res - -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj - -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}/win-res - -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj - -i${SRCDIR}/win-res/Lugaru.rc - DEPENDS ${SRCDIR}/win-res/Lugaru.rc - ) - endif(MINGW) - endif(NOT CMAKE_CROSSCOMPILING) - - # !!! FIXME: get rid of this. + ENABLE_LANGUAGE(RC) + + # !!! FIXME: get rid of WinDefs.{cpp,h} set(LUGARU_SRCS ${LUGARU_SRCS} - ${SRCDIR}/WinDefs.cpp) + ${SRCDIR}/WinDefs.cpp + ${SRCDIR}/win-res/Lugaru.rc) set(LUGARU_H ${LUGARU_H} @@ -215,16 +189,11 @@ if (NOT OPENAL_FOUND OR LUGARU_FORCE_INTERNAL_OPENAL) if (WIN32) set(LUGARU_HAS_INTERNAL_OPENAL True) - if (MSVC80) - set(OPENAL_LIBRARY - ${OPENALDIR}/lib/win32/msvc2005/OpenAL32.lib - ) - endif (MSVC80) - if (MSVC90) + if (MSVC) set(OPENAL_LIBRARY ${OPENALDIR}/lib/win32/msvc2008/OpenAL32.lib ) - endif (MSVC90) + endif (MSVC) if (MINGW) set(OPENAL_LIBRARY ${OPENALDIR}/lib/win32/mingw/libOpenAL32.dll.a @@ -260,18 +229,12 @@ if (NOT SDL_FOUND) if (WIN32) set(LUGARU_HAS_INTERNAL_SDL True) - if (MSVC80) - set(SDL_LIBRARY - ${SDLDIR}/lib/win32/msvc2005/SDLmain.lib - ${SDLDIR}/lib/win32/msvc2005/SDL.lib - ) - endif (MSVC80) - if (MSVC90) + if (MSVC) set(SDL_LIBRARY ${SDLDIR}/lib/win32/msvc2008/SDLmain.lib ${SDLDIR}/lib/win32/msvc2008/SDL.lib ) - endif (MSVC90) + endif (MSVC) if (MINGW) set(SDL_LIBRARY "mingw32" @@ -499,16 +462,15 @@ include_directories( set(LUGARU_LIBS ${OPENAL_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARIES} ${SDL_LIBRARY} ${OPENGL_glu_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY} ${PLATFORM_LIBS}) -if(WIN32) - add_executable(lugaru ${LUGARU_SRCS} ${LUGARU_H} lugaru_resource.obj) -else(WIN32) - add_executable(lugaru ${LUGARU_SRCS} ${LUGARU_H}) -endif(WIN32) +add_executable(lugaru ${LUGARU_SRCS} ${LUGARU_H}) target_link_libraries(lugaru ${LUGARU_LIBS}) if(WIN32) add_definitions(-DUSE_OPENAL=1 -DUSE_SDL=1 -DBinIO_STDINT_HEADER=) + 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=) endif(WIN32) @@ -522,14 +484,10 @@ endif(APPLE) if(WIN32) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru.exe DESTINATION ${CMAKE_INSTALL_PREFIX}) - 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) + if(MSVC) 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) + endif(MSVC) 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})