diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-04-23 17:19:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-23 17:19:20 -0400 |
| commit | 9cb75371f5ea45640ae0e3998eb27bcda0a22cd9 (patch) | |
| tree | 8e4c18099888d88860c54c0a23c5fe345f3fd4b7 /source/slang | |
| parent | 7a71b86aadda83d16dadf809be137c7551f31464 (diff) | |
Feature/premake build (#951)
* * Remove Makefile
* Document how to create build using premake5
* Added support for finding the executable path
* If binDir not set on command line use the executable path
* Fix getting exe path on linux.
* Removed CalcExecutablePath from Path:: interface, made implementation internal.
* Documentation improvements.
* Fixes based on review
* Fix some typos
* Removed unused/needed global
Diffstat (limited to 'source/slang')
| -rw-r--r-- | source/slang/slang.vcxproj | 1 | ||||
| -rw-r--r-- | source/slang/slang.vcxproj.filters | 11 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source/slang/slang.vcxproj b/source/slang/slang.vcxproj index bb4aa66ff..128b0b481 100644 --- a/source/slang/slang.vcxproj +++ b/source/slang/slang.vcxproj @@ -225,7 +225,6 @@ <ClInclude Include="syntax-defs.h" /> <ClInclude Include="syntax-visitors.h" /> <ClInclude Include="syntax.h" /> - <ClInclude Include="tmpC85.tmp.h" /> <ClInclude Include="token-defs.h" /> <ClInclude Include="token.h" /> <ClInclude Include="type-defs.h" /> diff --git a/source/slang/slang.vcxproj.filters b/source/slang/slang.vcxproj.filters index 18530d11a..b88fbcc25 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"> @@ -42,6 +42,9 @@ <ClInclude Include="hlsl.meta.slang.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="image-format-defs.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="ir-bind-existentials.h"> <Filter>Header Files</Filter> </ClInclude> @@ -171,9 +174,6 @@ <ClInclude Include="syntax.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="tmpC85.tmp.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="token-defs.h"> <Filter>Header Files</Filter> </ClInclude> @@ -195,9 +195,6 @@ <ClInclude Include="visitor.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="image-format-defs.h"> - <Filter>Header Files</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="check.cpp"> |