PATH environment split char is ';' on windows and ':' on unix

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8bb526e790d9d322e522ca31b243473fb3b810b5..d5a945dc7a54a99d056be8e8af4ae920498e684a 100644 (file)
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -26,6 +26,17 @@
                        "stopAtEntry": false,
                        "console": "internalConsole"
                },
+               {
+                       "name": ".NET Core Launch (Textured)",
+                       "type": "coreclr",
+                       "request": "launch",
+                       "preLaunchTask": "build Textured",
+                       "program": "${workspaceFolder}/build/Debug/netcoreapp3.1/Textured",
+                       "args": [],
+                       "cwd": "${workspaceFolder}/build/Debug/netcoreapp3.1/",
+                       "stopAtEntry": false,
+                       "console": "internalConsole"
+               },
                {
                        "name": ".NET Core Launch (pbr)",
                        "type": "coreclr",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 1c80658a5f473942fac221f21334354ba07616f6..9f2434f1d7d1a1d889bb2a99114abe7ddec68d6c 100644 (file)
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -15,6 +15,20 @@
                        ],
                        "problemMatcher": "$msCompile"
                },
+               {
+                       "label": "build Textured",
+                       "command": "dotnet",
+                       "type": "process",
+                       "args": [
+                               "build",
+                               "${workspaceFolder}/samples/Textured/Textured.csproj",
+                               "/property:GenerateFullPaths=true",
+                               "/property:SolutionDir=${workspaceFolder}/",
+                               "/property:Configuration=Debug",
+                               "/consoleloggerparameters:NoSummary"
+                       ],
+                       "problemMatcher": "$msCompile"
+               },
                {
                        "label": "build ClearScreen",
                        "command": "dotnet",

diff --git a/SpirVTasks/CompileGLSLTask.cs b/SpirVTasks/CompileGLSLTask.cs
index ea71ca9d2e11496aa04851913cf9af70ebc89f03..51e840cc31c12cad9b7be5187113fc5164e10644 100644 (file)
--- a/SpirVTasks/CompileGLSLTask.cs
+++ b/SpirVTasks/CompileGLSLTask.cs
@@ -144,7 +144,7 @@ namespace SpirVTasks {
                        }
 
                        string glslcExec = "glslc";
-                       if (Environment.OSVersion.Platform.ToString ().StartsWith ("Win", StringComparison.Ordinal))
+                       if (Environment.OSVersion.Platform.ToString ().StartsWith ("Win", StringComparison.Ordinal)) 
                                glslcExec = glslcExec + ".exe";
 
                        string vkSdk = Environment.GetEnvironmentVariable ("VULKAN_SDK");
@@ -157,7 +157,7 @@ namespace SpirVTasks {
 
                        string envStrPathes = Environment.GetEnvironmentVariable ("PATH");
                        if (!string.IsNullOrEmpty (envStrPathes)) {
-                               foreach (string path in envStrPathes.Split (':')) {
+                               foreach (string path in envStrPathes.Split (Environment.OSVersion.Platform == PlatformID.Unix  ? ':' : ';')) {
                                        glslcPath = Path.Combine (path, glslcExec);
                                        if (File.Exists (glslcPath))
                                                return true;