Skip to content

Commit 2170c33

Browse files
build: Support compilation with MinGW
1 parent 54587dc commit 2170c33

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

scripts/update_deps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ def CMakeConfig(self, repos):
498498

499499
# Use the CMake -A option to select the platform architecture
500500
# without needing a Visual Studio generator.
501-
if platform.system() == 'Windows' and self._args.generator != "Ninja":
501+
if platform.system() == 'Windows' and not self._args.generator in ["Ninja", "MinGW Makefiles"]:
502502
cmake_cmd.append('-A')
503503
if self._args.arch.lower() == '64' or self._args.arch == 'x64' or self._args.arch == 'win64':
504504
cmake_cmd.append('x64')

tests/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if (ANDROID)
2929
return()
3030
endif()
3131

32+
# Testing isn't supported with mingw
33+
if (MINGW)
34+
return()
35+
endif()
36+
3237
find_package(VulkanLoader CONFIG)
3338

3439
find_package(GTest REQUIRED CONFIG QUIET)

0 commit comments

Comments
 (0)