Skip to content

Commit 3dab5f6

Browse files
disable glfw_build_wayland
1 parent b246aeb commit 3dab5f6

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

Scripts/BuildEngine.ps1

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,19 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
123123
}
124124

125125
# Define CMake Generator arguments
126-
$cMakeOptions = " -DCMAKE_SYSTEM_NAME=$systemName", " -DCMAKE_BUILD_TYPE=$configuration"
126+
$cMakeOptions = " -DCMAKE_SYSTEM_NAME=$systemName", " -DCMAKE_BUILD_TYPE=$configuration", "-DBUILD_SHARED_LIBS=OFF"
127127
$submoduleCMakeOptions = @{
128128
'ENTT' = @("-DENTT_INCLUDE_HEADERS=ON")
129-
'SPDLOG' = @("-DSPDLOG_BUILD_SHARED=OFF", "-DBUILD_STATIC_LIBS=ON", "-DSPDLOG_FMT_EXTERNAL=ON", "-DSPDLOG_FMT_EXTERNAL_HO=OFF");
130-
'GLFW ' = @("-DGLFW_BUILD_DOCS=OFF", "-DGLFW_INSTALL=OFF");
131-
'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", "-DBUILD_SHARED_LIBS=OFF");
129+
'SPDLOG' = @("-DSPDLOG_BUILD_SHARED=OFF", "-DSPDLOG_FMT_EXTERNAL=ON", "-DSPDLOG_FMT_EXTERNAL_HO=OFF");
130+
'GLFW ' = @("-DGLFW_BUILD_DOCS=OFF", "-DGLFW_INSTALL=OFF", "-DGLFW_BUILD_WAYLAND=OFF");
131+
'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");
132132
'STDUUID' = @("-DUUID_BUILD_TESTS=OFF", "-DUUID_USING_CXX20_SPAN=ON", "-DUUID_SYSTEM_GENERATOR=OFF");
133133
'YAMLCPP' = @("-DYAML_CPP_BUILD_TOOLS=OFF", "-DYAML_CPP_BUILD_TESTS=OFF", "-DYAML_CPP_FORMAT_SOURCE=OFF", "-DYAML_BUILD_SHARED_LIBS=OFF");
134134
'FRAMEWORK' = @("-DBUILD_FRAMEWORK=ON");
135135
'VULKAN_LOADER' = @("-DVULKAN_HEADERS_INSTALL_DIR=$ExternalVulkanHeadersInstallDir", "-DUSE_MASM=OFF", "-DUSE_GAS=OFF")
136136
'SPIRV_TOOLS' = @("-DSPIRV_SKIP_EXECUTABLES=ON", "-DSPIRV_SKIP_TESTS=ON", "-DSPIRV_WERROR=OFF")
137137
'SPIRV_CROSS' = @("-DSPIRV_CROSS_ENABLE_TESTS=OFF")
138138
'LAUNCHER_ONLY' = @("-DLAUNCHER_ONLY=ON")
139-
# 'GLM' = @("-DCMAKE_POLICY_VERSION_MINIMUM=3.5")
140139
}
141140

142141
$cMakeCacheVariableOverride = $cMakeOptions -join ' '
@@ -158,7 +157,7 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
158157
$cMakeGenerator = "-G Ninja"
159158
}
160159
"Darwin" {
161-
$cMakeGenerator = "-G `"Xcode`""
160+
$cMakeGenerator = "-G Xcode"
162161
$cMakeCacheVariableOverride += ' ' + $submoduleCMakeOptions.FRAMEWORK -join ' '
163162
}
164163
Default {

0 commit comments

Comments
 (0)