Fix some ports

hrydgard · Nov 9, 2017 · b689e8e · b689e8e
1 parent 4e04780
commit b689e8e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 21 deletions.
diff --git a/UWP/glslang_UWP/glslang_UWP.vcxproj b/UWP/glslang_UWP/glslang_UWP.vcxproj
@@ -323,7 +323,6 @@
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslGrammar.h" />
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslOpMap.h" />
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslParseables.h" />
-    <ClInclude Include="..\..\ext\glslang\hlsl\hlslParseHelper.h" />
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslScanContext.h" />
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslTokens.h" />
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslTokenStream.h" />
@@ -365,9 +364,7 @@
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\Pp.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp" />
-    <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpMemory.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp" />
-    <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpSymbols.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\propagateNoContraction.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\reflection.cpp" />
@@ -381,7 +378,6 @@
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslGrammar.cpp" />
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslOpMap.cpp" />
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslParseables.cpp" />
-    <ClCompile Include="..\..\ext\glslang\hlsl\hlslParseHelper.cpp" />
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslScanContext.cpp" />
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslTokenStream.cpp" />
     <ClCompile Include="..\..\ext\glslang\OGLCompilersDLL\InitializeDll.cpp" />
@@ -407,4 +403,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/UWP/glslang_UWP/glslang_UWP.vcxproj.filters b/UWP/glslang_UWP/glslang_UWP.vcxproj.filters
@@ -103,15 +103,9 @@
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp">
       <Filter>glslang\MachineIndependent\Preprocessor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpMemory.cpp">
-      <Filter>glslang\MachineIndependent\Preprocessor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp">
       <Filter>glslang\MachineIndependent\Preprocessor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpSymbols.cpp">
-      <Filter>glslang\MachineIndependent\Preprocessor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp">
       <Filter>glslang\MachineIndependent\Preprocessor</Filter>
     </ClCompile>
@@ -154,9 +148,6 @@
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslParseables.cpp">
       <Filter>hlsl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\glslang\hlsl\hlslParseHelper.cpp">
-      <Filter>hlsl</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslScanContext.cpp">
       <Filter>hlsl</Filter>
     </ClCompile>
@@ -314,9 +305,6 @@
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslParseables.h">
       <Filter>hlsl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ext\glslang\hlsl\hlslParseHelper.h">
-      <Filter>hlsl</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslScanContext.h">
       <Filter>hlsl</Filter>
     </ClInclude>
@@ -330,4 +318,4 @@
       <Filter>OGLCompilersDLL</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/ext/glslang-build/Android.mk b/ext/glslang-build/Android.mk
@@ -33,16 +33,13 @@ LOCAL_SRC_FILES := \
     ../glslang/glslang/MachineIndependent/preprocessor/Pp.cpp \
     ../glslang/glslang/MachineIndependent/preprocessor/PpAtom.cpp \
     ../glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp \
-    ../glslang/glslang/MachineIndependent/preprocessor/PpMemory.cpp \
     ../glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp \
-    ../glslang/glslang/MachineIndependent/preprocessor/PpSymbols.cpp \
     ../glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp \
     ../glslang/glslang/OSDependent/Unix/ossource.cpp \
     ../glslang/hlsl/hlslAttributes.cpp \
     ../glslang/hlsl/hlslGrammar.cpp \
     ../glslang/hlsl/hlslOpMap.cpp \
     ../glslang/hlsl/hlslParseables.cpp \
-    ../glslang/hlsl/hlslParseHelper.cpp \
     ../glslang/hlsl/hlslScanContext.cpp \
     ../glslang/hlsl/hlslTokenStream.cpp \
     ../glslang/SPIRV/disassemble.cpp \