Fix more relative #include paths (mostly header files)

src/compiler/Common.h

@@ -45,7 +45,7 @@ typedef int TSourceLoc;
 
 	#include <assert.h>
 
-#include "PoolAlloc.h"
+#include "compiler/PoolAlloc.h"
 
 //
 // Put POOL_ALLOCATOR_NEW_DELETE in base classes to make them use this scheme.

src/compiler/glslang.l

@@ -30,8 +30,8 @@ O           [0-7]
 %{
 #include <stdio.h>
 #include <stdlib.h>
-#include "ParseHelper.h"
-#include "glslang_tab.h"
+#include "compiler/ParseHelper.h"
+#include "compiler/glslang_tab.h"
 
 /* windows only pragma */
 #ifdef _MSC_VER
@@ -245,7 +245,7 @@ BEGIN(INITIAL);
 
 //Including Pre-processor.
 extern "C" {
-  #include "./preprocessor/preprocess.h"
+  #include "compiler/preprocessor/preprocess.h"
 } 
 
 //

src/compiler/glslang.y

@@ -25,8 +25,8 @@ possible; please let me know if you discover discrepancies.
 Jutta Degener, 1995
 */
 
-#include "SymbolTable.h"
-#include "ParseHelper.h"
+#include "compiler/SymbolTable.h"
+#include "compiler/ParseHelper.h"
 #include "GLSLANG/ShaderLang.h"
 
 #define YYPARSE_PARAM parseContextLocal

src/compiler/preprocessor/atom.c

@@ -56,7 +56,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stdio.h>
 #include <string.h>
 
-#include "slglobals.h"
+#include "compiler/preprocessor/slglobals.h"
 
 #undef malloc
 #undef realloc

src/compiler/preprocessor/cpp.c

@@ -56,7 +56,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string.h>
 #include <ctype.h>
 
-#include "slglobals.h"
+#include "compiler/preprocessor/slglobals.h"
 
 static int CPPif(yystypepp * yylvalpp);
 

src/compiler/preprocessor/cpp.h

@@ -53,8 +53,8 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #if !defined(__CPP_H)
 #define __CPP_H 1
 
-#include "parser.h"
-#include "tokens.h"
+#include "compiler/preprocessor/parser.h"
+#include "compiler/preprocessor/tokens.h"
 
 int InitCPP(void);
 int FinalCPP(void);

src/compiler/preprocessor/cppstruct.c

@@ -53,7 +53,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "slglobals.h"
+#include "compiler/preprocessor/slglobals.h"
 
 CPPStruct  *cpp      = NULL;
 static int  refCount = 0;

src/compiler/preprocessor/memory.c

@@ -59,7 +59,7 @@ typedef unsigned __int64 uintptr_t;
 typedef unsigned int uintptr_t;
 #endif
 
-#include "memory.h"
+#include "compiler/preprocessor/memory.h"
 
 // default alignment and chunksize, if called with 0 arguments
 #define CHUNKSIZE       (64*1024)

src/compiler/preprocessor/preprocess.h

@@ -47,7 +47,7 @@ TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
 NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \****************************************************************************/
 
-# include "slglobals.h"
+# include "compiler/preprocessor/slglobals.h"
 extern CPPStruct *cpp;
 int InitCPPStruct(void);
 int InitScanner(CPPStruct *cpp);

src/compiler/preprocessor/scanner.c

@@ -62,7 +62,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                        ((*(int *)&(x) & 0x007fffffL)==0000000000L))
 #endif
 
-#include "slglobals.h"
+#include "compiler/preprocessor/slglobals.h"
 
 
 typedef struct StringInputSrc {

src/compiler/preprocessor/scanner.h

@@ -56,7 +56,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define MAX_SYMBOL_NAME_LEN 128
 #define MAX_STRING_LEN 512
 
-#include "parser.h"
+#include "compiler/preprocessor/parser.h"
 
 // Not really atom table stuff but needed first...
 

src/compiler/preprocessor/slglobals.h

@@ -65,15 +65,15 @@ extern CPPStruct *cpp;
 #undef  CPPC_ENABLE_TOOLS
 #define CPPC_ENABLE_TOOLS 1
 
-#include "memory.h"
-#include "atom.h"
-#include "scanner.h"
-#include "cpp.h"
-#include "tokens.h"
-#include "symbols.h"
-#include "compile.h"
+#include "compiler/preprocessor/memory.h"
+#include "compiler/preprocessor/atom.h"
+#include "compiler/preprocessor/scanner.h"
+#include "compiler/preprocessor/cpp.h"
+#include "compiler/preprocessor/tokens.h"
+#include "compiler/preprocessor/symbols.h"
+#include "compiler/preprocessor/compile.h"
 #if !defined(NO_PARSER)
-#include "parser.h"
+#include "compiler/preprocessor/parser.h"
 #endif
 
 #if !defined(NULL)

src/compiler/preprocessor/symbols.c

@@ -55,7 +55,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stdio.h>
 #include <string.h>
 
-#include "slglobals.h"
+#include "compiler/preprocessor/slglobals.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////// Symbol Table Variables: ///////////////////////////////////

src/compiler/preprocessor/symbols.h

@@ -53,7 +53,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #if !defined(__SYMBOLS_H)
 #define __SYMBOLS_H 1
 
-#include "memory.h"
+#include "compiler/preprocessor/memory.h"
 
 typedef enum symbolkind {
    MACRO_S
@@ -85,7 +85,7 @@ struct Scope_Rec {
 
 // Symbol table is a simple binary tree.
 
-#include "cpp.h"        // to get MacroSymbol def
+#include "compiler/preprocessor/cpp.h"        // to get MacroSymbol def
 
 struct Symbol_Rec {
     Symbol *left, *right;

src/compiler/preprocessor/tokens.c

@@ -56,7 +56,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string.h>
 #include <ctype.h>
 
-#include "slglobals.h"
+#include "compiler/preprocessor/slglobals.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
 //////////////////////// Preprocessor and Token Recorder and Playback: ////////////////////////

src/compiler/preprocessor/tokens.h

@@ -53,7 +53,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #if !defined(__TOKENS_H)
 #define __TOKENS_H 1
 
-#include "parser.h"
+#include "compiler/preprocessor/parser.h"
 
 #define EOF_SY (-1)
 

src/libEGL/Display.h

@@ -17,11 +17,12 @@
 #include <windows.h>
 #include <d3d9.h>
 
-#include "Config.h"
-#include "Surface.h"
+#include <set>
+
 #include "libGLESv2/Context.h"
 
-#include <set>
+#include "libEGL/Config.h"
+#include "libEGL/Surface.h"
 
 namespace egl
 {

src/libEGL/libEGL.vcproj

@@ -210,7 +210,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\Config.h"
+				RelativePath=".\Config.h"
 				>
 			</File>
 			<File

src/libGLESv2/Program.h

@@ -10,12 +10,12 @@
 #ifndef LIBGLESV2_PROGRAM_H_
 #define LIBGLESV2_PROGRAM_H_
 
-#include "Context.h"
-
 #include <d3dx9.h>
 #include <string>
 #include <vector>
 
+#include "libGLESv2/Context.h"
+
 namespace gl
 {
 class FragmentShader;

src/libGLESv2/Shader.h

@@ -12,12 +12,12 @@
 #ifndef LIBGLESV2_SHADER_H_
 #define LIBGLESV2_SHADER_H_
 
-#include "Context.h"
-
 #define GL_APICALL
 #include <GLES2/gl2.h>
 #include <d3dx9.h>
 
+#include "libGLESv2/Context.h"
+
 namespace gl
 {
 class Shader

src/libGLESv2/Texture.h

@@ -11,14 +11,14 @@
 #ifndef LIBGLESV2_TEXTURE_H_
 #define LIBGLESV2_TEXTURE_H_
 
-#include "Renderbuffer.h"
-
 #define GL_APICALL
 #include <GLES2/gl2.h>
 #include <d3d9.h>
 
 #include <vector>
 
+#include "libGLESv2/Renderbuffer.h"
+
 namespace gl
 {
 class Context;

src/libGLESv2/main.h

@@ -12,10 +12,11 @@
 #define GL_APICALL
 #include <GLES2/gl2.h>
 
-#include "Context.h"
 #include "common/debug.h"
 #include "libEGL/Display.h"
 
+#include "libGLESv2/Context.h"
+
 namespace gl
 {
 struct Current