diff --git a/.gitmodules b/.gitmodules index 81c8ed32..2bba2042 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "external/freetype-gl"] path = external/freetype-gl url = https://github.com/rougier/freetype-gl.git +[submodule "external/stb"] + path = external/stb + url = https://github.com/nothings/stb.git diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 37fbfe4c..221957b0 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -6,8 +6,10 @@ set_property(DIRECTORY PROPERTY CMAKE_CONFIGURE_DEPENDS freetype-gl.cmake hsluv-c.cmake - mapbox-gl-native.cmake) + mapbox-gl-native.cmake + stb.cmake) include(freetype-gl.cmake) include(hsluv-c.cmake) include(mapbox-gl-native.cmake) +include(stb.cmake) diff --git a/external/stb b/external/stb new file mode 160000 index 00000000..8b5f1f37 --- /dev/null +++ b/external/stb @@ -0,0 +1 @@ +Subproject commit 8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55 diff --git a/external/stb.cmake b/external/stb.cmake new file mode 100644 index 00000000..52bbf5f2 --- /dev/null +++ b/external/stb.cmake @@ -0,0 +1,4 @@ +cmake_minimum_required(VERSION 3.19) +set(PROJECT_NAME scwx-stb) + +set(STB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/stb PARENT_SCOPE) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 5901935e..7fef2526 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -231,7 +231,8 @@ endif() target_include_directories(scwx-qt PUBLIC ${scwx-qt_SOURCE_DIR}/source ${FTGL_INCLUDE_DIR} - ${MBGL_INCLUDE_DIR}) + ${MBGL_INCLUDE_DIR} + ${STB_INCLUDE_DIR}) target_include_directories(supercell-wx PUBLIC ${scwx-qt_SOURCE_DIR}/source)