diff --git a/CMakeLists.txt b/CMakeLists.txt index 7393a2c..4f3cad0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -265,18 +265,6 @@ ExternalProject_Add(ogrewater-static DEPENDS SDL-static zlib-static ogre-static ) -ExternalProject_Add(miniaudio - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/miniaudio - CMAKE_ARGS -DMINIAUDIO_BUILD_EXAMPLES=ON -DMINIAUDIO_BUILD_TESTS=ON MINIAUDIO_FORCE_C89=ON -DSDL2_LIBRARY=SDL2_LIBRARY-NOTFOUND - ${CUSTOM_OPTS} -DBUILD_SHARED_LIBS=OFF -) - -ExternalProject_Add(miniaudio-static - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/miniaudio - CMAKE_ARGS -DMINIAUDIO_BUILD_EXAMPLES=ON -DMINIAUDIO_BUILD_TESTS=ON MINIAUDIO_FORCE_C89=ON -DSDL2_LIBRARY=SDL2_LIBRARY-NOTFOUND - ${CUSTOM_OPTS_STATIC} -DBUILD_SHARED_LIBS=OFF -) - ExternalProject_Add(flecs SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/flecs CMAKE_ARGS -DFLECS_STATIC=ON -DFLECS_SHARED=OFF -DFLECS_PIC=ON -DFLECS_TESTS=OFF @@ -292,12 +280,12 @@ ExternalProject_Add(flecs-static ExternalProject_Add(world2 SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ogre-projects/world2 CMAKE_ARGS ${CUSTOM_OPTS} - DEPENDS ogre ogre-procedural ogre-pagedgeometry flecs SDL miniaudio + DEPENDS ogre ogre-procedural ogre-pagedgeometry flecs SDL ) ExternalProject_Add(world2-static SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ogre-projects/world2 CMAKE_ARGS ${CUSTOM_OPTS_STATIC} - DEPENDS ogre-static ogre-procedural-static ogre-pagedgeometry-static flecs-static SDL-static miniaudio-static + DEPENDS ogre-static ogre-procedural-static ogre-pagedgeometry-static flecs-static SDL-static )