idk

SupinePandora43 · Jul 20, 2023 · fa12796 · fa12796
1 parent 4c99bb9
commit fa12796
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -7,7 +7,8 @@
 			"type": "process",
 			"args": [
 				"build",
-				"-c", "Debug",
+				"-c",
+				"Debug",
 				"${workspaceFolder}/Examples/gpu/UltralightNet.OpenGL.TestApp/UltralightNet.OpenGL.TestApp.csproj",
 				"/property:GenerateFullPaths=true",
 				"/consoleloggerparameters:NoSummary"
@@ -24,9 +25,11 @@
 			"type": "process",
 			"args": [
 				"build",
+				//"-f",
+				//"net7.0",
 				"${workspaceFolder}/Examples/gpu/UltralightNet.Vulkan.TestApp/UltralightNet.Vulkan.TestApp.csproj",
-				"/property:GenerateFullPaths=true",
-				"/consoleloggerparameters:NoSummary"
+				//"/property:GenerateFullPaths=true",
+				//"/consoleloggerparameters:NoSummary"
 			],
 			"problemMatcher": "$msCompile"
 		},

diff --git a/gpu/libs/CompileShaders.targets b/gpu/libs/CompileShaders.targets
@@ -1,10 +1,10 @@
 <Project>
 	<ItemGroup>
-		<Shaders Include="../../shaders/*.*"/>
+		<Shaders Include="../../shaders/*.frag;../../shaders/*.vert"/>
 	</ItemGroup>
-	<Target Name="CompileShaders" Inputs="@(Shaders)" Outputs="../../shaders/compiled/**" BeforeTargets="ResolveReferences">
+	<Target Name="CompileShaders" Inputs="@(Shaders)" Outputs="@(Shaders -> '%(RelativeDir)compiled/spirv/%(filename).%(extension).spv;%(RelativeDir)compiled/spirv_vd/%(filename).%(extension).spv;%(RelativeDir)compiled/glsl/%(filename).%(extension)')" BeforeTargets="Build">
         <MakeDir Directories="../../shaders/compiled;../../shaders/compiled/spirv;../../shaders/compiled/spirv_vd;../../shaders/compiled/glsl" />
-        <Exec Command="glslc -O -g -o ../../shaders/compiled/spirv/%(Shaders.Filename)%(Shaders.Extension).spv %(Shaders.Identity)" EchoOff="false" />
+		<Exec Command="glslc -O -g -o ../../shaders/compiled/spirv/%(Shaders.Filename)%(Shaders.Extension).spv %(Shaders.Identity)" EchoOff="false" />
         <Exec Command="glslc -O -g -DVELDRID=1 -o ../../shaders/compiled/spirv_vd/%(Shaders.Filename)%(Shaders.Extension).spv %(Shaders.Identity)" EchoOff="false" />
         <Exec Command="spirv-cross --version 420 ../../shaders/compiled/spirv/%(Shaders.Filename)%(Shaders.Extension).spv --output ../../shaders/compiled/glsl/%(Shaders.Filename)%(Shaders.Extension)" EchoOff="false" />
     </Target>

diff --git a/gpu/libs/UltralightNet.Vulkan/UltralightNet.Vulkan.csproj b/gpu/libs/UltralightNet.Vulkan/UltralightNet.Vulkan.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0</TargetFrameworks>
+		<TargetFrameworks>net7.0</TargetFrameworks>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<LangVersion>preview</LangVersion>
 

diff --git a/src/UltralightNet.AppCore/UltralightNet.AppCore.csproj b/src/UltralightNet.AppCore/UltralightNet.AppCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0;net6.0;net471;net46;net451;net45;netstandard2.1;netstandard2</TargetFrameworks>
+		<TargetFrameworks>net7.0;net6.0;net471;netstandard2.1;</TargetFrameworks>
 
 		<!-- <Authors>Ultralight, Inc.</Authors> -->
 		<PackageId>UltralightNet.AppCore</PackageId>