Remove obsolete unistd.h file

The presence of this file can cause build issues when integrating glslang
into other projects.

diff --git a/glslang.vcxproj b/glslang.vcxproj
index e576c45..59d3327 100644 (file)
--- a/glslang.vcxproj
+++ b/glslang.vcxproj
@@ -643,7 +643,6 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test</Command>
     <ClInclude Include="glslang\MachineIndependent\SymbolTable.h" />\r
     <ClInclude Include="glslang\Include\Types.h" />\r
     <ClInclude Include="glslang\Include\intermediate.h" />\r
-    <ClInclude Include="glslang\MachineIndependent\unistd.h" />\r
     <ClInclude Include="glslang\Public\ShaderLang.h" />\r
     <ClInclude Include="glslang\OSDependent\Windows\osinclude.h" />\r
     <ClInclude Include="glslang\OSDependent\Linux\osinclude.h" />\r
@@ -704,4 +703,4 @@ cd %(RootDir)%(Directory)
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/glslang.vcxproj.filters b/glslang.vcxproj.filters
index 2f3b2be..5110dea 100644 (file)
--- a/glslang.vcxproj.filters
+++ b/glslang.vcxproj.filters
@@ -165,9 +165,6 @@
     <ClInclude Include="glslang\Include\intermediate.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="glslang\MachineIndependent\unistd.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="glslang\Public\ShaderLang.h">\r
       <Filter>Public</Filter>\r
     </ClInclude>\r
@@ -204,4 +201,4 @@
       <Filter>Machine Independent</Filter>\r
     </CustomBuild>\r
   </ItemGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index 96abc2a..f8b1799 100644 (file)
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -63,7 +63,6 @@ set(HEADERS
     MachineIndependent/Scan.h
     MachineIndependent/ScanContext.h
     MachineIndependent/SymbolTable.h
-    MachineIndependent/unistd.h
     MachineIndependent/Versions.h
     MachineIndependent/preprocessor/PpContext.h
     MachineIndependent/preprocessor/PpTokens.h)

diff --git a/glslang/MachineIndependent/unistd.h b/glslang/MachineIndependent/unistd.h
deleted file mode 100644 (file)
index c7c9147..0000000
--- a/glslang/MachineIndependent/unistd.h
+++ /dev/null
@@ -1 +0,0 @@
-// This is a NULL file and is meant to be empty

diff --git a/glslang_vs2010.vcxproj b/glslang_vs2010.vcxproj
index a6cb6e2..64e0466 100644 (file)
--- a/glslang_vs2010.vcxproj
+++ b/glslang_vs2010.vcxproj
@@ -366,7 +366,6 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test</Command>
     <ClInclude Include="glslang\MachineIndependent\SymbolTable.h" />\r
     <ClInclude Include="glslang\Include\Types.h" />\r
     <ClInclude Include="glslang\Include\intermediate.h" />\r
-    <ClInclude Include="glslang\MachineIndependent\unistd.h" />\r
     <ClInclude Include="glslang\Public\ShaderLang.h" />\r
     <ClInclude Include="glslang\OSDependent\Windows\osinclude.h" />\r
     <ClInclude Include="glslang\OSDependent\Linux\osinclude.h" />\r
@@ -403,4 +402,4 @@ cd %(RootDir)%(Directory)
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/glslang_vs2013.vcxproj b/glslang_vs2013.vcxproj
index 3b8d2c9..df9bb2a 100644 (file)
--- a/glslang_vs2013.vcxproj
+++ b/glslang_vs2013.vcxproj
@@ -366,7 +366,6 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test</Command>
     <ClInclude Include="glslang\MachineIndependent\SymbolTable.h" />\r
     <ClInclude Include="glslang\Include\Types.h" />\r
     <ClInclude Include="glslang\Include\intermediate.h" />\r
-    <ClInclude Include="glslang\MachineIndependent\unistd.h" />\r
     <ClInclude Include="glslang\Public\ShaderLang.h" />\r
     <ClInclude Include="glslang\OSDependent\Windows\osinclude.h" />\r
     <ClInclude Include="glslang\OSDependent\Linux\osinclude.h" />\r
@@ -403,4 +402,4 @@ cd %(RootDir)%(Directory)
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r