From: j-p <jp_bruyere@hotmail.com>
Date: Tue, 28 Sep 2021 13:51:47 +0000 (+0200)
Subject: debug SpirVglslcPath global property usage in SpirVTasks
X-Git-Tag: v0.2.2-beta~2
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=f2f9783bb1164637b8e9c8e7d1bb7fe8bdfe24df;p=jp%2Fvke.net.git

debug SpirVglslcPath global property usage in SpirVTasks
---

diff --git a/Directory.Build.props b/Directory.Build.props
index 12b32f3..2457375 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<RootDirectory>$(MSBuildThisFileDirectory)</RootDirectory>
 		<RestoreAdditionalProjectSources Condition="Exists('$(SolutionDir)build\$(Configuration)\')">$(SolutionDir)build\$(Configuration)\</RestoreAdditionalProjectSources>
-		<SpirVTasksReleaseVersion>0.1.44</SpirVTasksReleaseVersion>
+		<SpirVTasksReleaseVersion>0.1.45</SpirVTasksReleaseVersion>
 		<SpirVTasksPackageVersion>$(SpirVTasksReleaseVersion)</SpirVTasksPackageVersion>
 		<VkeReleaseVersion>0.2.1</VkeReleaseVersion>
 		<VkePackageVersion>$(VkeReleaseVersion)-beta</VkePackageVersion>
diff --git a/SpirVTasks/CompileGLSLTask.cs b/SpirVTasks/CompileGLSLTask.cs
index 51e840c..db19af0 100644
--- a/SpirVTasks/CompileGLSLTask.cs
+++ b/SpirVTasks/CompileGLSLTask.cs
@@ -139,8 +139,9 @@ namespace SpirVTasks {
 			glslcPath = "";
 			if (!string.IsNullOrEmpty (SpirVCompilerPath?.ItemSpec)) {
 				glslcPath = SpirVCompilerPath.ItemSpec;
-				if (!File.Exists (glslcPath))
-					return false;
+				glslcPath = glslcPath.Replace('"', ' ').Trim();
+				if (File.Exists (glslcPath))
+					return true;
 			}
 
 			string glslcExec = "glslc";
diff --git a/SpirVTasks/SpirVTasks.targets b/SpirVTasks/SpirVTasks.targets
index c1176e6..0dfd391 100644
--- a/SpirVTasks/SpirVTasks.targets
+++ b/SpirVTasks/SpirVTasks.targets
@@ -8,6 +8,7 @@
   </ItemGroup>
   <Target Name="CompileShaders" BeforeTargets="BeforeBuild" Condition="'@(GLSLShader)'!=''" Outputs="@(CompiledShaders)">				
 	<CompileGLSLTask SourceFile="%(GLSLShader.Identity)"
+                     SpirVCompilerPath="$(SpirVglslcPath)"
 					 AdditionalIncludeDirectories="%(GLSLShader.AdditionalIncludeDirectories);$(SpirVAdditionalIncludeDirectories)"
 					 DefineConstants="%(GLSLShader.DefineConstants);$(DefineConstants)"					 
 					 TempDirectory="$(IntermediateOutputPath)"