detect python dependency glslang

refix vs2026
2025-10-12 21:33:10 +03:00 · 2025-10-12 21:32:57 +03:00
2 changed files with 4 additions and 2 deletions
--- a/Source/Tools/Flax.Build/Deps/Dependencies/glslang.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/glslang.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Wojciech Figat. All rights reserved.

+using System;
 using System.IO;
 using Flax.Build;

@@ -82,7 +83,8 @@ namespace Flax.Deps.Dependencies

            // Setup the external sources
            // Requires distutils (pip install setuptools)
-            Utilities.Run(BuildPlatform == TargetPlatform.Mac ? "python3" : "python", "update_glslang_sources.py", null, root, Utilities.RunOptions.ConsoleLogOutput);
+            if (Utilities.Run(BuildPlatform == TargetPlatform.Mac ? "python3" : "python", "update_glslang_sources.py", null, root, Utilities.RunOptions.ConsoleLogOutput) != 0)
+                throw new Exception("Failed to run update_glslang_sources.py");

            foreach (var platform in options.Platforms)
            {
--- a/Source/Tools/Flax.Build/Deps/Dependency.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependency.cs
@@ -366,7 +366,7 @@ namespace Flax.Deps
                if (CMakeVersion.Major > 4 || (CMakeVersion.Major == 4 && CMakeVersion.Minor >= 2))
                {
                    // This generates both .sln and .slnx solution files
-                    cmdLine = string.Format("CMakeLists.txt -G \"Visual Studio 18 2026\" -G \"Visual Studio 17 2022\" -A {0}", arch);
+                    cmdLine = string.Format("CMakeLists.txt -G \"Visual Studio 17 2022\" -G \"Visual Studio 18 2026\" -A {0}", arch);
                }
                else
                    cmdLine = string.Format("CMakeLists.txt -G \"Visual Studio 17 2022\" -A {0}", arch);
Author	SHA1	Message	Date
Ari Vuollet	3d23babb37	detect python dependency glslang Some checks failed Build Android / Game (Android, Release ARM64) (push) Has been cancelled Details Build iOS / Game (iOS, Release ARM64) (push) Has been cancelled Details Build Linux / Editor (Linux, Development x64) (push) Has been cancelled Details Build Linux / Game (Linux, Release x64) (push) Has been cancelled Details Build macOS / Editor (Mac, Development ARM64) (push) Has been cancelled Details Build macOS / Game (Mac, Release ARM64) (push) Has been cancelled Details Build Windows / Editor (Windows, Development x64) (push) Has been cancelled Details Build Windows / Game (Windows, Release x64) (push) Has been cancelled Details Cooker / Cook (Mac) (push) Has been cancelled Details Tests / Tests (Linux) (push) Has been cancelled Details Tests / Tests (Windows) (push) Has been cancelled Details	2025-10-12 21:33:10 +03:00
Ari Vuollet	5070bc52c1	refix vs2026	2025-10-12 21:32:57 +03:00