summaryrefslogtreecommitdiff
path: root/build/visual-studio/slang
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2021-04-01 13:39:11 -0400
committerGitHub <noreply@github.com>2021-04-01 10:39:11 -0700
commitfa31d21ba92669a521a7768467246918e3947e02 (patch)
treeaf98a593e24bc6309ac4d11a59562be4b22c93d7 /build/visual-studio/slang
parent3f1632a1450a5879f337b4bd178e48880cd583f8 (diff)
Added compiler-core project (#1775)
* #include an absolute path didn't work - because paths were taken to always be relative. * Split out compiler-core initially with just slang-source-loc.cpp * More lexer, name, token to compiler-core. * Split Lexer and Core diagnostics. * Move slang-file-system to core. * Add slang-file-system to core. * More DownstreamCompiler into compiler-core * Fix typo. * Add compiler-core to bootstrap proj. * Small fixes to premake * For linux try with compiler-core * Remove compiler-core from examples. * Added NameConventionUtil to compiler-core * Add global function to CharUtil to *hopefully* avoid linking issue. * Hack to make linkage of CharUtil work on linux.
Diffstat (limited to 'build/visual-studio/slang')
-rw-r--r--build/visual-studio/slang/slang.vcxproj14
-rw-r--r--build/visual-studio/slang/slang.vcxproj.filters33
2 files changed, 3 insertions, 44 deletions
diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj
index eb0a8e819..714c318de 100644
--- a/build/visual-studio/slang/slang.vcxproj
+++ b/build/visual-studio/slang/slang.vcxproj
@@ -217,7 +217,6 @@
<ClInclude Include="..\..\..\source\slang\slang-emit-precedence.h" />
<ClInclude Include="..\..\..\source\slang\slang-emit-source-writer.h" />
<ClInclude Include="..\..\..\source\slang\slang-emit.h" />
- <ClInclude Include="..\..\..\source\slang\slang-file-system.h" />
<ClInclude Include="..\..\..\source\slang\slang-glsl-extension-tracker.h" />
<ClInclude Include="..\..\..\source\slang\slang-hlsl-intrinsic-set.h" />
<ClInclude Include="..\..\..\source\slang\slang-image-format-defs.h" />
@@ -275,12 +274,10 @@
<ClInclude Include="..\..\..\source\slang\slang-ir-wrap-structured-buffers.h" />
<ClInclude Include="..\..\..\source\slang\slang-ir.h" />
<ClInclude Include="..\..\..\source\slang\slang-legalize-types.h" />
- <ClInclude Include="..\..\..\source\slang\slang-lexer.h" />
<ClInclude Include="..\..\..\source\slang\slang-lookup.h" />
<ClInclude Include="..\..\..\source\slang\slang-lower-to-ir.h" />
<ClInclude Include="..\..\..\source\slang\slang-mangle.h" />
<ClInclude Include="..\..\..\source\slang\slang-mangled-lexer.h" />
- <ClInclude Include="..\..\..\source\slang\slang-name.h" />
<ClInclude Include="..\..\..\source\slang\slang-options.h" />
<ClInclude Include="..\..\..\source\slang\slang-parameter-binding.h" />
<ClInclude Include="..\..\..\source\slang\slang-parser.h" />
@@ -302,10 +299,7 @@
<ClInclude Include="..\..\..\source\slang\slang-serialize-types.h" />
<ClInclude Include="..\..\..\source\slang\slang-serialize-value-type-info.h" />
<ClInclude Include="..\..\..\source\slang\slang-serialize.h" />
- <ClInclude Include="..\..\..\source\slang\slang-source-loc.h" />
<ClInclude Include="..\..\..\source\slang\slang-syntax.h" />
- <ClInclude Include="..\..\..\source\slang\slang-token-defs.h" />
- <ClInclude Include="..\..\..\source\slang\slang-token.h" />
<ClInclude Include="..\..\..\source\slang\slang-type-layout.h" />
<ClInclude Include="..\..\..\source\slang\slang-type-system-shared.h" />
<ClInclude Include="..\..\..\source\slang\slang-value-reflect.h" />
@@ -350,7 +344,6 @@
<ClCompile Include="..\..\..\source\slang\slang-emit-source-writer.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-emit-spirv.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-emit.cpp" />
- <ClCompile Include="..\..\..\source\slang\slang-file-system.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-glsl-extension-tracker.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-hlsl-intrinsic-set.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-include-system.cpp" />
@@ -407,12 +400,10 @@
<ClCompile Include="..\..\..\source\slang\slang-ir-wrap-structured-buffers.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-ir.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-legalize-types.cpp" />
- <ClCompile Include="..\..\..\source\slang\slang-lexer.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-lookup.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-lower-to-ir.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-mangle.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-mangled-lexer.cpp" />
- <ClCompile Include="..\..\..\source\slang\slang-name.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-options.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-parameter-binding.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-parser.cpp" />
@@ -430,11 +421,9 @@
<ClCompile Include="..\..\..\source\slang\slang-serialize-source-loc.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-serialize-types.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-serialize.cpp" />
- <ClCompile Include="..\..\..\source\slang\slang-source-loc.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-stdlib-api.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-stdlib.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-syntax.cpp" />
- <ClCompile Include="..\..\..\source\slang\slang-token.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-type-layout.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-type-system-shared.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-value-reflect.cpp" />
@@ -452,6 +441,9 @@
<ProjectReference Include="..\core\core.vcxproj">
<Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
</ProjectReference>
+ <ProjectReference Include="..\compiler-core\compiler-core.vcxproj">
+ <Project>{12C1E89D-F5D0-41D3-8E8D-FB3F358F8126}</Project>
+ </ProjectReference>
<ProjectReference Include="..\miniz\miniz.vcxproj">
<Project>{E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}</Project>
</ProjectReference>
diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters
index e0eaa9f21..00b9a44c2 100644
--- a/build/visual-studio/slang/slang.vcxproj.filters
+++ b/build/visual-studio/slang/slang.vcxproj.filters
@@ -102,9 +102,6 @@
<ClInclude Include="..\..\..\source\slang\slang-emit.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\source\slang\slang-file-system.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\source\slang\slang-glsl-extension-tracker.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -276,9 +273,6 @@
<ClInclude Include="..\..\..\source\slang\slang-legalize-types.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\source\slang\slang-lexer.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\source\slang\slang-lookup.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -291,9 +285,6 @@
<ClInclude Include="..\..\..\source\slang\slang-mangled-lexer.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\source\slang\slang-name.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\source\slang\slang-options.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -357,18 +348,9 @@
<ClInclude Include="..\..\..\source\slang\slang-serialize.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\source\slang\slang-source-loc.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\source\slang\slang-syntax.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\source\slang\slang-token-defs.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\source\slang\slang-token.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\source\slang\slang-type-layout.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -497,9 +479,6 @@
<ClCompile Include="..\..\..\source\slang\slang-emit.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\slang\slang-file-system.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\slang\slang-glsl-extension-tracker.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -668,9 +647,6 @@
<ClCompile Include="..\..\..\source\slang\slang-legalize-types.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\slang\slang-lexer.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\slang\slang-lookup.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -683,9 +659,6 @@
<ClCompile Include="..\..\..\source\slang\slang-mangled-lexer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\slang\slang-name.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\slang\slang-options.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -737,9 +710,6 @@
<ClCompile Include="..\..\..\source\slang\slang-serialize.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\slang\slang-source-loc.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\slang\slang-stdlib-api.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -749,9 +719,6 @@
<ClCompile Include="..\..\..\source\slang\slang-syntax.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\source\slang\slang-token.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\source\slang\slang-type-layout.cpp">
<Filter>Source Files</Filter>
</ClCompile>