move public include file to /include

OGLCompilersDLL/InitializeDll.cpp

@@ -66,13 +66,11 @@
 //POSSIBILITY OF SUCH DAMAGE.
 //
 
-#define SH_EXPORTING
-
 #include "InitializeDll.h"
 #include "Include/InitializeGlobals.h"
 #include "Include/InitializeParseContext.h"
 
-#include "Public/HLSL2GLSL.h"
+#include "../../include/hlsl2glsl.h"
 
 OS_TLSIndex ThreadInitializeIndex = OS_INVALID_TLS_INDEX;
 

hlslang.vcproj

@@ -85,7 +85,6 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description=""
 				CommandLine=""
 			/>
 		</Configuration>
@@ -165,7 +164,6 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description=""
 				CommandLine=""
 			/>
 		</Configuration>
@@ -449,10 +447,10 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Public"
+			Name="include"
 			>
 			<File
-				RelativePath=".\hlslang\Public\HLSL2GLSL.h"
+				RelativePath=".\include\hlsl2glsl.h"
 				>
 			</File>
 		</Filter>

hlslang/Include/ShHandle.h

@@ -77,9 +77,7 @@
 // This should not be included by driver code.
 //
 
-
-#define SH_EXPORTING   
-#include "../Public/HLSL2GLSL.h"
+#include "../../include/hlsl2glsl.h"
 
 #include "InfoSink.h"
 

hlslang/MachineIndependent/HLSL2GLSL.cpp

@@ -83,8 +83,7 @@
 #include "../Include/ShHandle.h"
 #include "InitializeDll.h"
 
-#define SH_EXPORTING
-#include "../Public/HLSL2GLSL.h"
+#include "../../include/hlsl2glsl.h"
 #include "Initialize.h"
 #include "../GLSLCodeGen/hlslSupportLib.h"
 

hlslang/MachineIndependent/hlslang.y

@@ -89,7 +89,7 @@ Jutta Degener, 1995
 
 #include "SymbolTable.h"
 #include "ParseHelper.h"
-#include "../Public/HLSL2GLSL.h"
+#include "../../include/hlsl2glsl.h"
 
 #ifdef _WIN32
     #define YYPARSE_PARAM parseContext

hlslang/MachineIndependent/localintermediate.h

@@ -70,7 +70,7 @@
 #define _LOCAL_INTERMEDIATE_INCLUDED_
 
 #include "../Include/intermediate.h"
-#include "../Public/HLSL2GLSL.h"
+#include "../../include/hlsl2glsl.h"
 #include "SymbolTable.h"
 
 struct TVectorFields