Skip to content

Commit d41827b

Browse files
make imgui include path flexible
1 parent 8d6f311 commit d41827b

3 files changed

Lines changed: 2 additions & 2 deletions

File tree

Scripts/BuildEngine.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
141141
$cMakeOptions = " -DCMAKE_SYSTEM_NAME=$systemName", " -DCMAKE_BUILD_TYPE=$configuration"
142142
$submoduleCMakeOptions = @{
143143
'ENTT' = @("-DENTT_INCLUDE_HEADERS=ON")
144-
'SPDLOG' = @("-DSPDLOG_BUILD_SHARED=OFF", "-DBUILD_STATIC_LIBS=ON", "-DSPDLOG_FMT_EXTERNAL=ON", "-DSPDLOG_FMT_EXTERNAL_HO=OFF");
144+
'SPDLOG' = @("-DSPDLOG_BUILD_SHARED=OFF", "-DBUILD_SHARED_LIBS=OFF", "-DSPDLOG_FMT_EXTERNAL=ON", "-DSPDLOG_FMT_EXTERNAL_HO=OFF");
145145
'GLFW ' = @("-DGLFW_BUILD_DOCS=OFF", "-DGLFW_BUILD_EXAMPLES=OFF", "-DGLFW_INSTALL=OFF");
146146
'ASSIMP' = @("-DASSIMP_BUILD_TESTS=OFF", "-DASSIMP_INSTALL=OFF", "-DASSIMP_BUILD_SAMPLES=OFF", "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF", "-DASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT=OFF", "-DASSIMP_BUILD_OBJ_IMPORTER=ON", "-DASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT=OFF", "-DASSIMP_BUILD_OBJ_EXPORTER=ON");
147147
'STDUUID' = @("-DUUID_BUILD_TESTS=OFF", "-DUUID_USING_CXX20_SPAN=ON", "-DUUID_SYSTEM_GENERATOR=OFF");

__externals/externals.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ target_link_libraries(ZEngineLibs INTERFACE
6969
spirv-cross-glsl
7070
GPUOpen::VulkanMemoryAllocator
7171
glslang
72-
SPIRV
7372
SPIRV-Tools
7473
tlsf
7574
rapidhash

__externals/imgui/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ add_library (imgui STATIC ${IMGUI_SOURCE})
1818
#
1919
target_include_directories (imgui
2020
PUBLIC
21+
.
2122
./imgui
2223
)
2324

0 commit comments

Comments
 (0)