Fix more relative #include paths (mostly header files)
Trac #11408
Signed-off-by: Andrew Lewycky
Signed-off-by: Nicolas Capens
git-svn-id: http://angleproject.googlecode.com/svn/trunk@171 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/compiler/Common.h b/src/compiler/Common.h
index 1ab2e91..4ddef72 100644
--- a/src/compiler/Common.h
+++ b/src/compiler/Common.h
@@ -45,7 +45,7 @@
#include <assert.h>
-#include "PoolAlloc.h"
+#include "compiler/PoolAlloc.h"
//
// Put POOL_ALLOCATOR_NEW_DELETE in base classes to make them use this scheme.
diff --git a/src/compiler/glslang.l b/src/compiler/glslang.l
index 5167cfb..c5a719a 100644
--- a/src/compiler/glslang.l
+++ b/src/compiler/glslang.l
@@ -30,8 +30,8 @@
%{
#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 @@
//Including Pre-processor.
extern "C" {
- #include "./preprocessor/preprocess.h"
+ #include "compiler/preprocessor/preprocess.h"
}
//
diff --git a/src/compiler/glslang.y b/src/compiler/glslang.y
index 73d5d56..0e85a88 100644
--- a/src/compiler/glslang.y
+++ b/src/compiler/glslang.y
@@ -25,8 +25,8 @@
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
diff --git a/src/compiler/preprocessor/atom.c b/src/compiler/preprocessor/atom.c
index 204fb0d..b0212d7 100644
--- a/src/compiler/preprocessor/atom.c
+++ b/src/compiler/preprocessor/atom.c
@@ -56,7 +56,7 @@
#include <stdio.h>
#include <string.h>
-#include "slglobals.h"
+#include "compiler/preprocessor/slglobals.h"
#undef malloc
#undef realloc
diff --git a/src/compiler/preprocessor/cpp.c b/src/compiler/preprocessor/cpp.c
index 08e9eab..92e8443 100644
--- a/src/compiler/preprocessor/cpp.c
+++ b/src/compiler/preprocessor/cpp.c
@@ -56,7 +56,7 @@
#include <string.h>
#include <ctype.h>
-#include "slglobals.h"
+#include "compiler/preprocessor/slglobals.h"
static int CPPif(yystypepp * yylvalpp);
diff --git a/src/compiler/preprocessor/cpp.h b/src/compiler/preprocessor/cpp.h
index 85abbb5..2eb0fb3 100644
--- a/src/compiler/preprocessor/cpp.h
+++ b/src/compiler/preprocessor/cpp.h
@@ -53,8 +53,8 @@
#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);
diff --git a/src/compiler/preprocessor/cppstruct.c b/src/compiler/preprocessor/cppstruct.c
index 5144b6c..afbc477 100644
--- a/src/compiler/preprocessor/cppstruct.c
+++ b/src/compiler/preprocessor/cppstruct.c
@@ -53,7 +53,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "slglobals.h"
+#include "compiler/preprocessor/slglobals.h"
CPPStruct *cpp = NULL;
static int refCount = 0;
diff --git a/src/compiler/preprocessor/memory.c b/src/compiler/preprocessor/memory.c
index 1a70231..c41d6d7 100644
--- a/src/compiler/preprocessor/memory.c
+++ b/src/compiler/preprocessor/memory.c
@@ -59,7 +59,7 @@
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)
diff --git a/src/compiler/preprocessor/preprocess.h b/src/compiler/preprocessor/preprocess.h
index 323cd1e..3dd605b 100644
--- a/src/compiler/preprocessor/preprocess.h
+++ b/src/compiler/preprocessor/preprocess.h
@@ -47,7 +47,7 @@
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);
diff --git a/src/compiler/preprocessor/scanner.c b/src/compiler/preprocessor/scanner.c
index fcdf751..16dfb94 100644
--- a/src/compiler/preprocessor/scanner.c
+++ b/src/compiler/preprocessor/scanner.c
@@ -62,7 +62,7 @@
((*(int *)&(x) & 0x007fffffL)==0000000000L))
#endif
-#include "slglobals.h"
+#include "compiler/preprocessor/slglobals.h"
typedef struct StringInputSrc {
diff --git a/src/compiler/preprocessor/scanner.h b/src/compiler/preprocessor/scanner.h
index 288a090..c422b3a 100644
--- a/src/compiler/preprocessor/scanner.h
+++ b/src/compiler/preprocessor/scanner.h
@@ -56,7 +56,7 @@
#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...
diff --git a/src/compiler/preprocessor/slglobals.h b/src/compiler/preprocessor/slglobals.h
index 852502f..a535180 100644
--- a/src/compiler/preprocessor/slglobals.h
+++ b/src/compiler/preprocessor/slglobals.h
@@ -65,15 +65,15 @@
#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)
diff --git a/src/compiler/preprocessor/symbols.c b/src/compiler/preprocessor/symbols.c
index d97bae0..5b88e76 100644
--- a/src/compiler/preprocessor/symbols.c
+++ b/src/compiler/preprocessor/symbols.c
@@ -55,7 +55,7 @@
#include <stdio.h>
#include <string.h>
-#include "slglobals.h"
+#include "compiler/preprocessor/slglobals.h"
///////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////// Symbol Table Variables: ///////////////////////////////////
diff --git a/src/compiler/preprocessor/symbols.h b/src/compiler/preprocessor/symbols.h
index a94adbf..41e0778 100644
--- a/src/compiler/preprocessor/symbols.h
+++ b/src/compiler/preprocessor/symbols.h
@@ -53,7 +53,7 @@
#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 @@
// 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;
diff --git a/src/compiler/preprocessor/tokens.c b/src/compiler/preprocessor/tokens.c
index b508f03..09f56aa 100644
--- a/src/compiler/preprocessor/tokens.c
+++ b/src/compiler/preprocessor/tokens.c
@@ -56,7 +56,7 @@
#include <string.h>
#include <ctype.h>
-#include "slglobals.h"
+#include "compiler/preprocessor/slglobals.h"
///////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////// Preprocessor and Token Recorder and Playback: ////////////////////////
diff --git a/src/compiler/preprocessor/tokens.h b/src/compiler/preprocessor/tokens.h
index 19938d7..8d7e712 100644
--- a/src/compiler/preprocessor/tokens.h
+++ b/src/compiler/preprocessor/tokens.h
@@ -53,7 +53,7 @@
#if !defined(__TOKENS_H)
#define __TOKENS_H 1
-#include "parser.h"
+#include "compiler/preprocessor/parser.h"
#define EOF_SY (-1)
diff --git a/src/libEGL/Display.h b/src/libEGL/Display.h
index 1cee5e3..d472316 100644
--- a/src/libEGL/Display.h
+++ b/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
{
diff --git a/src/libEGL/libEGL.vcproj b/src/libEGL/libEGL.vcproj
index 7b7e317..8f0b67f 100644
--- a/src/libEGL/libEGL.vcproj
+++ b/src/libEGL/libEGL.vcproj
@@ -210,7 +210,7 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\Config.h"
+ RelativePath=".\Config.h"
>
</File>
<File
diff --git a/src/libGLESv2/Program.h b/src/libGLESv2/Program.h
index d848af6..3d37f09 100644
--- a/src/libGLESv2/Program.h
+++ b/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;
diff --git a/src/libGLESv2/Shader.h b/src/libGLESv2/Shader.h
index 5f5a327..c3b7da9 100644
--- a/src/libGLESv2/Shader.h
+++ b/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
diff --git a/src/libGLESv2/Texture.h b/src/libGLESv2/Texture.h
index d5a0647..0463984 100644
--- a/src/libGLESv2/Texture.h
+++ b/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;
diff --git a/src/libGLESv2/main.h b/src/libGLESv2/main.h
index 8bc190c..dec112a 100644
--- a/src/libGLESv2/main.h
+++ b/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
