Merge pull request #191 from tfoleyNV/ir-work

More work on IR-based lowering and cross-compilation

2 files changed, 6 insertions, 10 deletions

diff --git a/tools/render-test/render-test.vcxproj b/tools/render-test/render-test.vcxproj
index dfe610681..94af429e8 100644
--- a/tools/render-test/render-test.vcxproj
+++ b/tools/render-test/render-test.vcxproj
@@ -164,6 +164,11 @@
     <ClInclude Include="slang-support.h" />
     <ClInclude Include="window.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\source\slang\slang.vcxproj">
+      <Project>{db00da62-0533-4afd-b59f-a67d5b3a0808}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/tools/render-test/slang-support.cpp b/tools/render-test/slang-support.cpp
index d87f693eb..dbddd9c4f 100644
--- a/tools/render-test/slang-support.cpp
+++ b/tools/render-test/slang-support.cpp
@@ -1,9 +1,8 @@
 // slang-support.cpp
 
-#define SLANG_INCLUDE_IMPLEMENTATION
-
 #include "slang-support.h"
 
+#include <assert.h>
 #include <stdio.h>
 
 namespace renderer_test {
@@ -133,11 +132,3 @@ ShaderCompiler* createSlangShaderCompiler(
 
 
 } // renderer_test
-
-//
-// In order to actually use Slang in our application, we need to link in its
-// implementation. The easiest way to accomplish this is by directly inlcuding
-// the (concatenated) Slang source code into our app.
-//
-
-#include <slang.h>