From ea9112e0a5f4933a85768a48c7bf19b4d8dc6879 Mon Sep 17 00:00:00 2001 From: Mark Adams Date: Tue, 27 Oct 2015 14:27:18 -0400 Subject: [PATCH] Remove obsolete unistd.h file The presence of this file can cause build issues when integrating glslang into other projects. --- glslang.vcxproj | 3 +-- glslang.vcxproj.filters | 5 +---- glslang/CMakeLists.txt | 1 - glslang/MachineIndependent/unistd.h | 1 - glslang_vs2010.vcxproj | 3 +-- glslang_vs2013.vcxproj | 3 +-- 6 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 glslang/MachineIndependent/unistd.h diff --git a/glslang.vcxproj b/glslang.vcxproj index e576c45c..59d33279 100644 --- a/glslang.vcxproj +++ b/glslang.vcxproj @@ -643,7 +643,6 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - @@ -704,4 +703,4 @@ cd %(RootDir)%(Directory) - \ No newline at end of file + diff --git a/glslang.vcxproj.filters b/glslang.vcxproj.filters index 2f3b2be5..5110deae 100644 --- a/glslang.vcxproj.filters +++ b/glslang.vcxproj.filters @@ -165,9 +165,6 @@ Header Files - - Header Files - Public @@ -204,4 +201,4 @@ Machine Independent - \ No newline at end of file + diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt index 96abc2ad..f8b1799b 100644 --- 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 index c7c91470..00000000 --- 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 a6cb6e22..64e04660 100644 --- a/glslang_vs2010.vcxproj +++ b/glslang_vs2010.vcxproj @@ -366,7 +366,6 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - @@ -403,4 +402,4 @@ cd %(RootDir)%(Directory) - \ No newline at end of file + diff --git a/glslang_vs2013.vcxproj b/glslang_vs2013.vcxproj index 3b8d2c95..df9bb2a2 100644 --- a/glslang_vs2013.vcxproj +++ b/glslang_vs2013.vcxproj @@ -366,7 +366,6 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - @@ -403,4 +402,4 @@ cd %(RootDir)%(Directory) - \ No newline at end of file +