project(lugaru)
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.0)
cmake_policy(SET CMP0004 OLD)
include(FindPkgConfig)
endif(NOT CMAKE_BUILD_TYPE)
message("CMake build type: ${CMAKE_BUILD_TYPE}")
-set(CMAKE_CXX_FLAGS "-Wall -Wno-parentheses -pedantic --std=c++11 ${CMAKE_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-parentheses -pedantic --std=gnu++11 ${CMAKE_CXX_FLAGS}")
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architectures for OSX")
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" 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.10.sdk" CACHE PATH
+ set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.11.sdk" CACHE PATH
"The product will be built against the headers and libraries located inside the indicated SDK.")
endif(APPLE)
option(SYSTEM_INSTALL "Enable system-wide installation, with hardcoded data directory defined with CMAKE_INSTALL_DATADIR" OFF)
endif(LINUX)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/Modules/")
### Sources
${SRCDIR}/Environment/Lights.cpp
${SRCDIR}/Environment/Skybox.cpp
${SRCDIR}/Environment/Terrain.cpp
+ ${SRCDIR}/Graphic/Decal.cpp
${SRCDIR}/Graphic/Models.cpp
${SRCDIR}/Graphic/Sprite.cpp
${SRCDIR}/Graphic/Stereo.cpp
${SRCDIR}/Math/Frustum.cpp
${SRCDIR}/Math/Quaternions.cpp
${SRCDIR}/Menu/Menu.cpp
- ${SRCDIR}/Objects/Objects.cpp
+ ${SRCDIR}/Objects/Object.cpp
${SRCDIR}/Objects/Person.cpp
${SRCDIR}/Objects/Weapons.cpp
${SRCDIR}/User/Account.cpp
${SRCDIR}/GameInitDispose.cpp
${SRCDIR}/GameTick.cpp
${SRCDIR}/Globals.cpp
+ ${SRCDIR}/Tutorial.cpp
)
${SRCDIR}/Environment/Lights.hpp
${SRCDIR}/Environment/Skybox.hpp
${SRCDIR}/Environment/Terrain.hpp
+ ${SRCDIR}/Graphic/Decal.hpp
${SRCDIR}/Graphic/gamegl.hpp
${SRCDIR}/Graphic/Models.hpp
${SRCDIR}/Graphic/Sprite.hpp
${SRCDIR}/Math/Quaternions.hpp
${SRCDIR}/Math/Random.hpp
${SRCDIR}/Menu/Menu.hpp
- ${SRCDIR}/Objects/Objects.hpp
+ ${SRCDIR}/Objects/Object.hpp
${SRCDIR}/Objects/Person.hpp
${SRCDIR}/Objects/Weapons.hpp
${SRCDIR}/Thirdparty/optionparser.h
${SRCDIR}/Utils/Input.hpp
${SRCDIR}/Utils/private.h
${SRCDIR}/Game.hpp
+ ${SRCDIR}/Tutorial.hpp
)
find_package(OpenAL REQUIRED)
endif(WIN32)
-find_package(sdl2 REQUIRED)
+# macOS has problems with using pkgconfig to find SDL2
+if(APPLE)
+ find_package(sdl2 REQUIRED)
+else(APPLE)
+ pkg_check_modules(SDL2 sdl2 REQUIRED)
+endif(APPLE)
+
find_package(PNG REQUIRED)
find_package(JPEG REQUIRED)
find_package(ZLIB REQUIRED)
if(APPLE)
set(LUGARU_APP_ROOT ${CMAKE_INSTALL_PREFIX}/Lugaru.app)
set(LUGARU_BINDIR ${LUGARU_APP_ROOT}/Contents/MacOS)
- set(LUGARU_RESDIR ${LUGARU_APP_ROOT}/Resources)
+ set(LUGARU_RESDIR ${LUGARU_APP_ROOT}/Contents/Resources)
endif(APPLE)
# Actual installation instructions
if(APPLE)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru DESTINATION ${LUGARU_BINDIR})
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${LUGARU_APP_ROOT})
- install(FILES ${CMAKE_SOURCE_DIR}/Dist/OSX/lugaru.icns DESTINATION ${LUGARU_RESDIR})
+ install(FILES ${CMAKE_SOURCE_DIR}/Dist/OSX/Lugaru.icns DESTINATION ${LUGARU_RESDIR})
install(FILES ${CMAKE_SOURCE_DIR}/Dist/OSX/Info.plist DESTINATION ${LUGARU_APP_ROOT}/Contents)
endif(APPLE)
install(FILES ${CMAKE_SOURCE_DIR}/AUTHORS
${CMAKE_SOURCE_DIR}/CONTENT-LICENSE.txt
${CMAKE_SOURCE_DIR}/COPYING.txt
- ${CMAKE_SOURCE_DIR}/DEVTOOLS.txt
${CMAKE_SOURCE_DIR}/README.md
+ ${CMAKE_SOURCE_DIR}/RELEASE-NOTES.md
+ ${CMAKE_SOURCE_DIR}/Docs/DEVTOOLS.txt
+ ${CMAKE_SOURCE_DIR}/Docs/README.Empire.txt
+ ${CMAKE_SOURCE_DIR}/Docs/README.SevenTasks.txt
+ ${CMAKE_SOURCE_DIR}/Docs/README.Temple.txt
DESTINATION ${LUGARU_DOCDIR})