Nick Kastellanos 4 年之前
父節點
當前提交
b90a3503fd

+ 7 - 0
Samples.WINDOWS.sln

@@ -59,6 +59,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Tilemaps.WINDOWS",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Tilemap.NET4", "Tilemap\Aether.Tilemap.NET4.csproj", "{7BD9F460-F3F9-40A0-B298-066EA975C06C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Lighting.NET4", "Shaders\Lighting\Aether.Shaders.Lighting.NET4.csproj", "{5E31EE65-EEE7-400F-A31F-3D0EAF0CC416}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -153,6 +155,10 @@ Global
 		{7BD9F460-F3F9-40A0-B298-066EA975C06C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7BD9F460-F3F9-40A0-B298-066EA975C06C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7BD9F460-F3F9-40A0-B298-066EA975C06C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E31EE65-EEE7-400F-A31F-3D0EAF0CC416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E31EE65-EEE7-400F-A31F-3D0EAF0CC416}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E31EE65-EEE7-400F-A31F-3D0EAF0CC416}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E31EE65-EEE7-400F-A31F-3D0EAF0CC416}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -175,5 +181,6 @@ Global
 		{C9FA924B-DA91-4641-8B7D-CBC09E5560AE} = {A921886B-C6F7-4FF8-8668-EC20004C464A}
 		{DC1BD888-3D11-4557-AC59-8271DC991ED1} = {584E505E-859A-4DA8-9235-EE6C61C03479}
 		{9B99798B-72F3-4E4B-9B99-DE15F7C955E9} = {584E505E-859A-4DA8-9235-EE6C61C03479}
+		{5E31EE65-EEE7-400F-A31F-3D0EAF0CC416} = {13D47E11-4A7C-49C8-942E-2543E9C0098A}
 	EndGlobalSection
 EndGlobal

+ 3 - 0
Shaders/Lighting/Aether.Shaders.Lighting.NET4.csproj

@@ -56,4 +56,7 @@
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>$(ProjectDir)Shaders\BuildShaders.bat</PreBuildEvent>
+  </PropertyGroup>
 </Project>

+ 2 - 2
Shaders/Lighting/Shaders/BuildShaders.bat

@@ -8,12 +8,12 @@ SET XNAFX="..\..\Tools\CompileEffect\CompileEffect.exe"
 
 @echo Build dx11
 @for /f %%f IN ('dir /b *.fx') do (
-    call %MGFX% %%~nf.fx ..\Resources\%%~nf.dx11.fxo /Platform:Windows
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.dx11.fxo.10 /Platform:Windows
 )
 
 @echo Build ogl
 @for /f %%f IN ('dir /b *.fx') do (
-    call %MGFX% %%~nf.fx ..\Resources\%%~nf.ogl.fxo /Platform:DesktopGL
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.ogl.fxo.10 /Platform:DesktopGL
 )
 
 @echo Build dx9/xna Reach