diff options
Diffstat (limited to 'source/slang')
| -rw-r--r-- | source/slang/slang.vcxproj | 26 | ||||
| -rw-r--r-- | source/slang/slang.vcxproj.filters | 90 |
2 files changed, 64 insertions, 52 deletions
diff --git a/source/slang/slang.vcxproj b/source/slang/slang.vcxproj index bc129a2c6..9b2b4d7ea 100644 --- a/source/slang/slang.vcxproj +++ b/source/slang/slang.vcxproj @@ -109,6 +109,9 @@ <ImportLibrary>..\..\bin\windows-x86\debug\slang.lib</ImportLibrary> <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> </Link> + <PostBuildEvent> + <Command>IF EXIST ..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\bin\windows-x86\debug > nul) ELSE (xcopy /Q /Y /I ..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\bin\windows-x86\debug > nul)</Command> + </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> @@ -126,6 +129,9 @@ <ImportLibrary>..\..\bin\windows-x64\debug\slang.lib</ImportLibrary> <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> </Link> + <PostBuildEvent> + <Command>IF EXIST ..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\bin\windows-x64\debug > nul) ELSE (xcopy /Q /Y /I ..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\bin\windows-x64\debug > nul)</Command> + </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> @@ -147,6 +153,9 @@ <ImportLibrary>..\..\bin\windows-x86\release\slang.lib</ImportLibrary> <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> </Link> + <PostBuildEvent> + <Command>IF EXIST ..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\bin\windows-x86\release > nul) ELSE (xcopy /Q /Y /I ..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\bin\windows-x86\release > nul)</Command> + </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> @@ -168,6 +177,9 @@ <ImportLibrary>..\..\bin\windows-x64\release\slang.lib</ImportLibrary> <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> </Link> + <PostBuildEvent> + <Command>IF EXIST ..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\bin\windows-x64\release > nul) ELSE (xcopy /Q /Y /I ..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\bin\windows-x64\release > nul)</Command> + </PostBuildEvent> </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\slang.h" /> @@ -312,19 +324,13 @@ <ClCompile Include="slang.cpp" /> </ItemGroup> <ItemGroup> - <Natvis Include="..\core\core.natvis" /> - <Natvis Include="slang.natvis"> - <FileType>Document</FileType> - </Natvis> - </ItemGroup> - <ItemGroup> <CustomBuild Include="core.meta.slang"> <FileType>Document</FileType> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../bin/windows-x86/debug/slang-generate" %(Identity)</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../bin/windows-x64/debug/slang-generate" %(Identity)</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../bin/windows-x86/release/slang-generate" %(Identity)</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../bin/windows-x64/release/slang-generate" %(Identity)</Command> - <Outputs>%(Identity).h</Outputs> + <Outputs>../../core.meta.slang.h</Outputs> <Message>slang-generate %(Identity)</Message> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/windows-x86/debug/slang-generate.exe</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/windows-x64/debug/slang-generate.exe</AdditionalInputs> @@ -337,7 +343,7 @@ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../bin/windows-x64/debug/slang-generate" %(Identity)</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../bin/windows-x86/release/slang-generate" %(Identity)</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../bin/windows-x64/release/slang-generate" %(Identity)</Command> - <Outputs>%(Identity).h</Outputs> + <Outputs>../../hlsl.meta.slang.h</Outputs> <Message>slang-generate %(Identity)</Message> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/windows-x86/debug/slang-generate.exe</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/windows-x64/debug/slang-generate.exe</AdditionalInputs> @@ -346,6 +352,10 @@ </CustomBuild> </ItemGroup> <ItemGroup> + <Natvis Include="..\core\core.natvis" /> + <Natvis Include="slang.natvis" /> + </ItemGroup> + <ItemGroup> <ProjectReference Include="..\core\core.vcxproj"> <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project> </ProjectReference> diff --git a/source/slang/slang.vcxproj.filters b/source/slang/slang.vcxproj.filters index 943ce8281..b2c045fa8 100644 --- a/source/slang/slang.vcxproj.filters +++ b/source/slang/slang.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Header Files"> @@ -21,6 +21,9 @@ <ClInclude Include="hlsl.meta.slang.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="slang-check-impl.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="slang-check.h"> <Filter>Header Files</Filter> </ClInclude> @@ -123,6 +126,9 @@ <ClInclude Include="slang-ir-ssa.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="slang-ir-strip.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="slang-ir-union.h"> <Filter>Header Files</Filter> </ClInclude> @@ -162,6 +168,9 @@ <ClInclude Include="slang-object-meta-end.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="slang-options.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="slang-parameter-binding.h"> <Filter>Header Files</Filter> </ClInclude> @@ -219,17 +228,38 @@ <ClInclude Include="slang-visitor.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="slang-ir-strip.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="slang-check-impl.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="slang-options.h"> - <Filter>Header Files</Filter> - </ClInclude> </ItemGroup> <ItemGroup> + <ClCompile Include="slang-check-conformance.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-check-constraint.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-check-conversion.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-check-decl.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-check-expr.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-check-modifier.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-check-overload.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-check-shader.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-check-stmt.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="slang-check-type.cpp"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="slang-check.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -320,6 +350,9 @@ <ClCompile Include="slang-ir-ssa.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="slang-ir-strip.cpp"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="slang-ir-union.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -392,39 +425,6 @@ <ClCompile Include="slang.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="slang-ir-strip.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="slang-check-expr.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="slang-check-stmt.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="slang-check-decl.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="slang-check-type.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="slang-check-shader.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="slang-check-modifier.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="slang-check-constraint.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="slang-check-conformance.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="slang-check-overload.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="slang-check-conversion.cpp"> - <Filter>Source Files</Filter> - </ClCompile> </ItemGroup> <ItemGroup> <CustomBuild Include="core.meta.slang"> @@ -438,6 +438,8 @@ <Natvis Include="..\core\core.natvis"> <Filter>Source Files</Filter> </Natvis> - <Natvis Include="slang.natvis" /> + <Natvis Include="slang.natvis"> + <Filter>Source Files</Filter> + </Natvis> </ItemGroup> </Project>
\ No newline at end of file |