summaryrefslogtreecommitdiff
path: root/tools/render-test/render-test.vcxproj.filters
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2018-05-11 16:34:19 -0700
committerGitHub <noreply@github.com>2018-05-11 16:34:19 -0700
commite2c2c220c642cc5f1c622f909d0ddfd22e6c04d4 (patch)
tree2f8b2faa3ff61d07e106d4f049aa600b14ad8cf8 /tools/render-test/render-test.vcxproj.filters
parent34ecdb71c04232fba4b097f04fc358c57e704e26 (diff)
Generate Visual Studio projects using Premake (#557)
* Generate Visual Studio projects using Premake This change adds a `premake5.lua` file that allows us to generate our Visual Studio solution using Premake 5 (https://premake.github.io/). The existing Visual Studio solution/projects are now replaced with the Premake-generated ones, and project contributors will be expected to update these by running premake after adding/removing files. I have *not* changed the Linux `Makefile` build at all, because that file is also used for things like running our tests, so that clobbering it with a premake-generated `Makefile` would break our continuous testing. Hopefully future changes can switch to a generated `Makefile` and perhaps even add an XCode project as well. Notes: * The `build/slang-build.props` file is no longer needed/used, so it has been removed. * The `slang-eval-test` test fixture wasn't following our naming conventions for its directory path, so it was updated to streamline the Premake build configuration work. This required changes to the `Makefile` as well * Some seemingly unncessary preprocessor definitions that were specified for `core` and `slang-glslang` have been dropped. We will see if anything breaks from that. * Possible fixup for Premake vpath issue Premake's `vpath` feature seems to be nondeterministic about the order it applies filters (because Lua isn't deterministic about the order of entries in a key/value table), and as a result we can end up in a weird case where it decides that a `foo.cpp.h` file matches the `**.cpp` filter (I'm not sure why) before it tests against the `**.h` filter. This change uses an (undocumented) Premake facility to set `vpath` using a list of singleton tables, which seems to fix the order in which things get tested. * Remove support for "single-file" build of Slang The `hello` example was the only bit of code that uses the "single-file" way of building Slang, and this had already run up against limitations of the Visual Studio compilers in its Debug|x64 build. Rather than mess with Premake to make it pass through the `/bigobj` linker flag that is needed to work around the issue, it makes more sense just to stop using/supporting the feature since we wouldn't want users to depend on it anyway (our documentation no longer refers to it). While I was at it I went ahead and made sure that the `SLANG_DYNAMIC` flag doesn't need to be set manually, so that instead there is a non-default `SLANG_STATIC` option (not that we have a static-library build of Slang at the moment).
Diffstat (limited to 'tools/render-test/render-test.vcxproj.filters')
-rw-r--r--tools/render-test/render-test.vcxproj.filters180
1 files changed, 87 insertions, 93 deletions
diff --git a/tools/render-test/render-test.vcxproj.filters b/tools/render-test/render-test.vcxproj.filters
index a8453035b..b2f48a397 100644
--- a/tools/render-test/render-test.vcxproj.filters
+++ b/tools/render-test/render-test.vcxproj.filters
@@ -1,147 +1,141 @@
-<?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="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
<Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
</Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="main.cpp">
+ <ClInclude Include="circular-resource-heap-d3d12.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="d3d-util.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="descriptor-heap-d3d12.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="options.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="png-serialize-util.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="render-d3d11.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="render-d3d12.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="render-gl.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="render-vk.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="render.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="resource-d3d12.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="shader-input-layout.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="shader-renderer-util.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="slang-support.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="surface.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="vk-api.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="vk-device-queue.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="vk-module.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="vk-swap-chain.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="vk-util.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="window.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="circular-resource-heap-d3d12.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="render-d3d11.cpp">
+ <ClCompile Include="d3d-util.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="options.cpp">
+ <ClCompile Include="descriptor-heap-d3d12.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="render-gl.cpp">
+ <ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="slang-support.cpp">
+ <ClCompile Include="options.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="shader-input-layout.cpp">
+ <ClCompile Include="png-serialize-util.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="render-vk.cpp">
+ <ClCompile Include="render-d3d11.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="render-d3d12.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="d3d-util.cpp">
+ <ClCompile Include="render-gl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="resource-d3d12.cpp">
+ <ClCompile Include="render-vk.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="circular-resource-heap-d3d12.cpp">
+ <ClCompile Include="render.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="descriptor-heap-d3d12.cpp">
+ <ClCompile Include="resource-d3d12.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="render.cpp">
+ <ClCompile Include="shader-input-layout.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="shader-renderer-util.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="vk-api.cpp">
+ <ClCompile Include="slang-support.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="vk-module.cpp">
+ <ClCompile Include="surface.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="vk-swap-chain.cpp">
+ <ClCompile Include="vk-api.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="vk-device-queue.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="vk-util.cpp">
+ <ClCompile Include="vk-module.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="surface.cpp">
+ <ClCompile Include="vk-swap-chain.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="png-serialize-util.cpp">
+ <ClCompile Include="vk-util.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
- <ItemGroup>
- <ClInclude Include="options.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="render-d3d11.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="render-gl.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="render.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="window.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="slang-support.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="shader-input-layout.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="render-vk.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="render-d3d12.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="d3d-util.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="resource-d3d12.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="circular-resource-heap-d3d12.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="descriptor-heap-d3d12.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="shader-renderer-util.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="vk-api.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="vk-module.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="vk-swap-chain.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="vk-device-queue.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="vk-util.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="surface.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="png-serialize-util.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
</Project> \ No newline at end of file