From b26926d7402cd2252e86f54eb45a6d4e59762803 Mon Sep 17 00:00:00 2001 From: "C. J. Howard" Date: Fri, 24 May 2019 19:21:35 +0800 Subject: [PATCH] Add OpenAL submodule --- .gitmodules | 3 +++ CMakeLists.txt | 14 ++++++++++++++ modules/antkeeper-source | 2 +- modules/openal-soft | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) create mode 160000 modules/openal-soft diff --git a/.gitmodules b/.gitmodules index bfc2f95..a223ce5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [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 7a989e7..317f004 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,6 +96,20 @@ ExternalProject_Add(glfw "-DGLFW_VULKAN_STATIC=OFF" BUILD_ALWAYS 0) +# Build OpenAL Soft module +ExternalProject_Add(openal-soft + SOURCE_DIR ${MODULE_SOURCE_DIR}/openal-soft + BINARY_DIR ${MODULE_BUILD_DIR}/openal-soft + INSTALL_DIR ${MODULE_INSTALL_DIR} + CMAKE_ARGS + "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" + "-DCMAKE_INSTALL_PREFIX=${MODULE_INSTALL_DIR}" + "-DLIBTYPE=SHARED" + "-DALSOFT_UTILS=OFF" + "-DALSOFT_EXAMPLES=OFF" + "-DALSOFT_TESTS=OFF" + BUILD_ALWAYS 0) + # Build VMQ module ExternalProject_Add(vmq SOURCE_DIR ${MODULE_SOURCE_DIR}/vmq diff --git a/modules/antkeeper-source b/modules/antkeeper-source index 8e15f86..1a3e8c7 160000 --- a/modules/antkeeper-source +++ b/modules/antkeeper-source @@ -1 +1 @@ -Subproject commit 8e15f86aef9a90c556c69f1fd5a558acb27527fe +Subproject commit 1a3e8c727ce82f61bcf7466790454341c3a433e4 diff --git a/modules/openal-soft b/modules/openal-soft new file mode 160000 index 0000000..9e2ac62 --- /dev/null +++ b/modules/openal-soft @@ -0,0 +1 @@ +Subproject commit 9e2ac6240a383d76f57ed42bc54ae5ac6f782b51