diff options
| author | Charles Giessen <charles@lunarg.com> | 2025-12-05 17:35:24 -0600 |
|---|---|---|
| committer | Charles Giessen <46324611+charles-lunarg@users.noreply.github.com> | 2025-12-08 13:21:47 -0700 |
| commit | 2170c33bb3d2af976a1894666bfd3dc80cbe4da8 (patch) | |
| tree | 44a1141102c6a1ea99cf2f875ac0969ce331a835 | |
| parent | 54587dc9ccc739b1b2649d71de20583c3e12ddcb (diff) | |
| download | usermoji-2170c33bb3d2af976a1894666bfd3dc80cbe4da8.tar.xz | |
build: Support compilation with MinGW
| -rwxr-xr-x | scripts/update_deps.py | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/update_deps.py b/scripts/update_deps.py index 47810a00..7d300865 100755 --- a/scripts/update_deps.py +++ b/scripts/update_deps.py @@ -498,7 +498,7 @@ class GoodRepo(object): # Use the CMake -A option to select the platform architecture # without needing a Visual Studio generator. - if platform.system() == 'Windows' and self._args.generator != "Ninja": + if platform.system() == 'Windows' and not self._args.generator in ["Ninja", "MinGW Makefiles"]: cmake_cmd.append('-A') if self._args.arch.lower() == '64' or self._args.arch == 'x64' or self._args.arch == 'win64': cmake_cmd.append('x64') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8a35ae36..a1b7250f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -29,6 +29,11 @@ if (ANDROID) return() endif() +# Testing isn't supported with mingw +if (MINGW) + return() +endif() + find_package(VulkanLoader CONFIG) find_package(GTest REQUIRED CONFIG QUIET) |