From 929e42c6d7232c83e2e368326c3ff3d4acde27bf Mon Sep 17 00:00:00 2001 From: "C. J. Howard" Date: Sat, 25 May 2019 07:11:02 +0800 Subject: [PATCH] Remove the glfw module --- .gitmodules | 3 --- CMakeLists.txt | 16 ---------------- modules/antkeeper-source | 2 +- modules/glfw | 1 - 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 160000 modules/glfw diff --git a/.gitmodules b/.gitmodules index a223ce5..84a5d4d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,6 @@ [submodule "modules/SDL2"] path = modules/SDL2 url = git@cjhoward.org:SDL2.git -[submodule "modules/glfw"] - path = modules/glfw - url = git@cjhoward.org:glfw.git [submodule "modules/openal-soft"] path = modules/openal-soft url = git@cjhoward.org:openal-soft.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 317f004..deda0d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,22 +80,6 @@ ExternalProject_Add(SDL2 "-DVIDEO_VULKAN=OFF" BUILD_ALWAYS 0) -# Build glfw module -ExternalProject_Add(glfw - SOURCE_DIR ${MODULE_SOURCE_DIR}/glfw - BINARY_DIR ${MODULE_BUILD_DIR}/glfw - INSTALL_DIR ${MODULE_INSTALL_DIR} - CMAKE_ARGS - "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" - "-DCMAKE_INSTALL_PREFIX=${MODULE_INSTALL_DIR}" - "-DBUILD_SHARED_LIBS=ON" - "-DGLFW_BUILD_EXAMPLES=OFF" - "-DGLFW_BUILD_TESTS=OFF" - "-DGLFW_BUILD_DOCS=OFF" - "-DGLFW_INSTALL=ON" - "-DGLFW_VULKAN_STATIC=OFF" - BUILD_ALWAYS 0) - # Build OpenAL Soft module ExternalProject_Add(openal-soft SOURCE_DIR ${MODULE_SOURCE_DIR}/openal-soft diff --git a/modules/antkeeper-source b/modules/antkeeper-source index 952c505..074d131 160000 --- a/modules/antkeeper-source +++ b/modules/antkeeper-source @@ -1 +1 @@ -Subproject commit 952c505b98bf14c724137a8c0153dc99ac1df7c9 +Subproject commit 074d1318c77c5017ececbbaa00e430a281dfc8c2 diff --git a/modules/glfw b/modules/glfw deleted file mode 160000 index 57bf6b2..0000000 --- a/modules/glfw +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 57bf6b2f75e46369e83b6d727541991533b1dc2d