Update glslang

OpenXRay · May 28, 2018 · 37b44a7 · 37b44a7
1 parent d21e34a
commit 37b44a7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 26 deletions.
diff --git a/Externals/SPIRV.vcxproj b/Externals/SPIRV.vcxproj
@@ -95,21 +95,17 @@
     <ClInclude Include="glslang\SPIRV\SPVRemapper.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="glslang.vcxproj">
+      <Project>{8559bc92-bc07-32ef-beed-0c50fe6ca3c3}</Project>
+    </ProjectReference>
     <ProjectReference Include="HLSL.vcxproj">
-      <Project>63CEEE7D-2A82-3FDB-AF79-23F77BB29AC1</Project>
-      <Name>HLSL</Name>
+      <Project>{63ceee7d-2a82-3fdb-af79-23f77bb29ac1}</Project>
     </ProjectReference>
     <ProjectReference Include="OGLCompiler.vcxproj">
-      <Project>D4C49E20-DE3E-36FE-8BFA-0517A87FDB47</Project>
-      <Name>OGLCompiler</Name>
+      <Project>{d4c49e20-de3e-36fe-8bfa-0517a87fdb47}</Project>
     </ProjectReference>
     <ProjectReference Include="OSDependent.vcxproj">
-      <Project>0165B392-9E93-3AA3-89F3-20ACB545095D</Project>
-      <Name>OSDependent</Name>
-    </ProjectReference>
-    <ProjectReference Include="glslang.vcxproj">
-      <Project>8559BC92-BC07-32EF-BEED-0C50FE6CA3C3</Project>
-      <Name>glslang</Name>
+      <Project>{0165b392-9e93-3aa3-89f3-20acb545095d}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/Externals/glslang b/Externals/glslang
diff --git a/Externals/glslang.vcxproj b/Externals/glslang.vcxproj
@@ -72,6 +72,7 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="glslang\glslang\MachineIndependent\attribute.cpp" />
     <ClCompile Include="glslang\glslang\MachineIndependent\Constant.cpp" />
     <ClCompile Include="glslang\glslang\MachineIndependent\glslang_tab.cpp" />
     <ClCompile Include="glslang\glslang\MachineIndependent\InfoSink.cpp" />
@@ -98,6 +99,7 @@
     <ClCompile Include="glslang\glslang\MachineIndependent\ShaderLang.cpp" />
     <ClCompile Include="glslang\glslang\MachineIndependent\SymbolTable.cpp" />
     <ClCompile Include="glslang\glslang\MachineIndependent\Versions.cpp" />
+    <ClInclude Include="glslang\glslang\MachineIndependent\attribute.h" />
     <ClInclude Include="glslang\glslang\MachineIndependent\glslang_tab.cpp.h" />
     <ClInclude Include="glslang\glslang\MachineIndependent\gl_types.h" />
     <ClInclude Include="glslang\glslang\MachineIndependent\Initialize.h" />
@@ -131,23 +133,20 @@
     <ClCompile Include="glslang\glslang\GenericCodeGen\CodeGen.cpp" />
     <ClCompile Include="glslang\glslang\GenericCodeGen\Link.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="glslang\glslang\MachineIndependent\glslang.y" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="HLSL.vcxproj">
-      <Project>63CEEE7D-2A82-3FDB-AF79-23F77BB29AC1</Project>
-      <Name>HLSL</Name>
+      <Project>{63ceee7d-2a82-3fdb-af79-23f77bb29ac1}</Project>
     </ProjectReference>
     <ProjectReference Include="OGLCompiler.vcxproj">
-      <Project>D4C49E20-DE3E-36FE-8BFA-0517A87FDB47</Project>
-      <Name>OGLCompiler</Name>
+      <Project>{d4c49e20-de3e-36fe-8bfa-0517a87fdb47}</Project>
     </ProjectReference>
     <ProjectReference Include="OSDependent.vcxproj">
-      <Project>0165B392-9E93-3AA3-89F3-20ACB545095D</Project>
-      <Name>OSDependent</Name>
+      <Project>{0165b392-9e93-3aa3-89f3-20acb545095d}</Project>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="glslang\glslang\MachineIndependent\glslang.y" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/Externals/glslang.vcxproj.filters b/Externals/glslang.vcxproj.filters
@@ -85,6 +85,9 @@
     <ClCompile Include="glslang\glslang\MachineIndependent\Versions.cpp">
       <Filter>MachineIndependent</Filter>
     </ClCompile>
+    <ClCompile Include="glslang\glslang\MachineIndependent\attribute.cpp">
+      <Filter>MachineIndependent</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="glslang\glslang\Public\ShaderLang.h">
@@ -177,6 +180,9 @@
     <ClInclude Include="glslang\glslang\MachineIndependent\Versions.h">
       <Filter>MachineIndependent</Filter>
     </ClInclude>
+    <ClInclude Include="glslang\glslang\MachineIndependent\attribute.h">
+      <Filter>MachineIndependent</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Public">

diff --git a/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj b/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj
@@ -81,7 +81,7 @@
       <PreprocessorDefinitions>_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>nvapi.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>oalib.lib;opengl32.lib;glu32.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -91,7 +91,7 @@
       <PreprocessorDefinitions>_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>nvapi64.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>oalib.lib;opengl32.lib;glu32.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\amd64;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -101,7 +101,7 @@
       <PreprocessorDefinitions>_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>nvapi.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>oalib.lib;opengl32.lib;glu32.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -112,7 +112,7 @@
       <FloatingPointModel>Precise</FloatingPointModel>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>nvapi64.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>oalib.lib;opengl32.lib;glu32.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\amd64;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -122,7 +122,7 @@
       <PreprocessorDefinitions>_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>nvapi.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>oalib.lib;opengl32.lib;glu32.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -132,7 +132,7 @@
       <PreprocessorDefinitions>_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>nvapi64.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>oalib.lib;opengl32.lib;glu32.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\amd64;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -474,6 +474,9 @@
     <ProjectReference Include="..\..\..\Externals\glslang.vcxproj">
       <Project>{8559bc92-bc07-32ef-beed-0c50fe6ca3c3}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Externals\SPIRV.vcxproj">
+      <Project>{3af44175-2eed-3c67-b324-93b1572b7edd}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
       <Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
     </ProjectReference>