From 42ef3f0632ebc54da817391e950075798dfee16a Mon Sep 17 00:00:00 2001 From: "C. J. Howard" Date: Fri, 24 May 2019 04:19:23 +0800 Subject: [PATCH] Add SDL2 submodule --- .gitmodules | 3 +++ CMakeLists.txt | 46 +++++++++++++++++++++++++++++++++++++--- modules/SDL2 | 1 + modules/antkeeper-source | 2 +- 4 files changed, 48 insertions(+), 4 deletions(-) create mode 160000 modules/SDL2 diff --git a/.gitmodules b/.gitmodules index b1226ba..77bb862 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "modules/antkeeper-data"] path = modules/antkeeper-data url = git@cjhoward.org:antkeeper-data.git +[submodule "modules/SDL2"] + path = modules/SDL2 + url = git@cjhoward.org:SDL2.git diff --git a/CMakeLists.txt b/CMakeLists.txt index d155639..cb9d0a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,37 @@ set(MODULE_INSTALL_DIR "${CMAKE_BINARY_DIR}/modules/install") # Include ExternalProject_Add macro include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) -# Build vmq module +# Build SDL2 module +ExternalProject_Add(SDL2 + SOURCE_DIR ${MODULE_SOURCE_DIR}/SDL2 + BINARY_DIR ${MODULE_BUILD_DIR}/SDL2 + INSTALL_DIR ${MODULE_INSTALL_DIR} + CMAKE_ARGS + "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" + "-DCMAKE_INSTALL_PREFIX=${MODULE_INSTALL_DIR}" + "-DSDL_ATOMIC=OFF" + "-DSDL_AUDIO=OFF" + "-DSDL_CPUINFO=ON" + "-DSDL_DLOPEN=ON" + "-DSDL_EVENTS=ON" + "-DSDL_FILE=OFF" + "-DSDL_FILESYSTEM=OFF" + "-DSDL_HAPTIC=ON" + "-DSDL_JOYSTICK=ON" + "-DSDL_LOADSO=ON" + "-DSDL_POWER=ON" + "-DSDL_RENDER=OFF" + "-DSDL_SHARED=ON" + "-DSDL_STATIC=OFF" + "-DSDL_STATIC_PIC=OFF" + "-DSDL_TEST=OFF" + "-DSDL_THREADS=OFF" + "-DSDL_TIMERS=ON" + "-DSDL_VIDEO=ON" + "-DVIDEO_VULKAN=OFF" + BUILD_ALWAYS 0) + +# Build VMQ module ExternalProject_Add(vmq SOURCE_DIR ${MODULE_SOURCE_DIR}/vmq BINARY_DIR ${MODULE_BUILD_DIR}/vmq @@ -59,11 +89,21 @@ ExternalProject_Add(vmq "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-DCMAKE_INSTALL_PREFIX=${MODULE_INSTALL_DIR}" "-DBUILD_EXAMPLES=OFF" - BUILD_ALWAYS 1) + BUILD_ALWAYS 0) + +# Build EnTT module +ExternalProject_Add(entt + SOURCE_DIR ${MODULE_SOURCE_DIR}/entt + BINARY_DIR ${MODULE_BUILD_DIR}/entt + INSTALL_DIR ${MODULE_INSTALL_DIR} + CMAKE_ARGS + "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" + "-DCMAKE_INSTALL_PREFIX=${MODULE_INSTALL_DIR}" + BUILD_ALWAYS 0) # Build antkeeper-source module ExternalProject_Add(antkeeper-source - DEPENDS vmq + DEPENDS vmq entt SOURCE_DIR ${MODULE_SOURCE_DIR}/antkeeper-source BINARY_DIR ${MODULE_BUILD_DIR}/antkeeper-source INSTALL_DIR ${PACKAGE_INSTALL_DIR} diff --git a/modules/SDL2 b/modules/SDL2 new file mode 160000 index 0000000..417eeb5 --- /dev/null +++ b/modules/SDL2 @@ -0,0 +1 @@ +Subproject commit 417eeb55b6b31c09ca4179458fda30cddc770a55 diff --git a/modules/antkeeper-source b/modules/antkeeper-source index 03e321f..d59f0df 160000 --- a/modules/antkeeper-source +++ b/modules/antkeeper-source @@ -1 +1 @@ -Subproject commit 03e321ffbef7da575ea74921df625743c3a5c70a +Subproject commit d59f0df5b43c33ab932f5da5f9f02b9b7909c586