diff --git a/Externals/SPIRV.vcxproj b/Externals/SPIRV.vcxproj
index e4f9ec0dfe4..0f6cd4dd73d 100644
--- a/Externals/SPIRV.vcxproj
+++ b/Externals/SPIRV.vcxproj
@@ -95,21 +95,17 @@
+
+ {8559bc92-bc07-32ef-beed-0c50fe6ca3c3}
+
- 63CEEE7D-2A82-3FDB-AF79-23F77BB29AC1
- HLSL
+ {63ceee7d-2a82-3fdb-af79-23f77bb29ac1}
- D4C49E20-DE3E-36FE-8BFA-0517A87FDB47
- OGLCompiler
+ {d4c49e20-de3e-36fe-8bfa-0517a87fdb47}
- 0165B392-9E93-3AA3-89F3-20ACB545095D
- OSDependent
-
-
- 8559BC92-BC07-32EF-BEED-0C50FE6CA3C3
- glslang
+ {0165b392-9e93-3aa3-89f3-20acb545095d}
diff --git a/Externals/glslang b/Externals/glslang
index 82ead04c39c..4f88853412a 160000
--- a/Externals/glslang
+++ b/Externals/glslang
@@ -1 +1 @@
-Subproject commit 82ead04c39c6a4b7fa153d692b26181091c43c15
+Subproject commit 4f88853412a037c379c5c22cfe5c3bf76cc03144
diff --git a/Externals/glslang.vcxproj b/Externals/glslang.vcxproj
index e562f849262..3e3b85d099e 100644
--- a/Externals/glslang.vcxproj
+++ b/Externals/glslang.vcxproj
@@ -72,6 +72,7 @@
+
@@ -98,6 +99,7 @@
+
@@ -131,23 +133,20 @@
+
+
+
- 63CEEE7D-2A82-3FDB-AF79-23F77BB29AC1
- HLSL
+ {63ceee7d-2a82-3fdb-af79-23f77bb29ac1}
- D4C49E20-DE3E-36FE-8BFA-0517A87FDB47
- OGLCompiler
+ {d4c49e20-de3e-36fe-8bfa-0517a87fdb47}
- 0165B392-9E93-3AA3-89F3-20ACB545095D
- OSDependent
+ {0165b392-9e93-3aa3-89f3-20acb545095d}
-
-
-
diff --git a/Externals/glslang.vcxproj.filters b/Externals/glslang.vcxproj.filters
index 6f0bd1648b1..a8f8d75af01 100644
--- a/Externals/glslang.vcxproj.filters
+++ b/Externals/glslang.vcxproj.filters
@@ -85,6 +85,9 @@
MachineIndependent
+
+ MachineIndependent
+
@@ -177,6 +180,9 @@
MachineIndependent
+
+ MachineIndependent
+
diff --git a/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj b/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj
index 37661f6e875..a8e4f79f8eb 100644
--- a/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj
+++ b/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj
@@ -81,7 +81,7 @@
_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)
- nvapi.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)
+ oalib.lib;opengl32.lib;glu32.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)
$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)
@@ -91,7 +91,7 @@
_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)
- nvapi64.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)
+ oalib.lib;opengl32.lib;glu32.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)
$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\amd64;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)
@@ -101,7 +101,7 @@
_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)
- nvapi.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)
+ oalib.lib;opengl32.lib;glu32.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)
$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)
@@ -112,7 +112,7 @@
Precise
- nvapi64.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)
+ oalib.lib;opengl32.lib;glu32.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)
$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\amd64;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)
@@ -122,7 +122,7 @@
_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)
- nvapi.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)
+ oalib.lib;opengl32.lib;glu32.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)
$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)
@@ -132,7 +132,7 @@
_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)
- nvapi64.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)
+ oalib.lib;opengl32.lib;glu32.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)
$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\amd64;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)
@@ -474,6 +474,9 @@
{8559bc92-bc07-32ef-beed-0c50fe6ca3c3}
+
+ {3af44175-2eed-3c67-b324-93b1572b7edd}
+
{7885cf3c-ee04-4c67-9467-1fbf9a36b037}