Removed unnecessary include paths. Removed the dependency on unistd.h. Moved the…

Removed unnecessary include paths. Removed the dependency on unistd.h. Moved the generated files to intermediate directory so that the source is not polluted. These changes only affect the gyp build system because they required flex-bison options that are not supported by old binaries in compiler/tools. Another reason to switch to gyp build system. Review URL: http://codereview.appspot.com/994041 git-svn-id: https://angleproject.googlecode.com/svn/trunk@186 736b8ea6-26fd-11df-bfd4-992fa37f6226

Removed unnecessary include paths. Removed the dependency on unistd.h. Moved the…
eab1ef12 · alokp@chromium.org · a72f9eef · eab1ef12 · eab1ef12
Commit eab1ef12 authored Apr 23, 2010 by alokp@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 12 deletions

build_angle.gyp src/build_angle.gyp +7 -11

glslang.l src/compiler/glslang.l +2 -1

No files found.
--- a/src/build_angle.gyp
+++ b/src/build_angle.gyp
@@ -8,7 +8,6 @@
      'target_name': 'translator_common',
      'type': 'static_library',
      'include_dirs': [
-        'compiler',
        '.',
        '../include',
      ],
@@ -68,9 +67,9 @@
        'compiler/preprocessor/tokens.c',
        'compiler/preprocessor/tokens.h',
        # Generated files
-        'compiler/Gen_glslang.cpp',
-        'compiler/Gen_glslang_tab.cpp',
-        'compiler/glslang_tab.h',
+        '<(INTERMEDIATE_DIR)/Gen_glslang.cpp',
+        '<(INTERMEDIATE_DIR)/Gen_glslang_tab.cpp',
+        '<(INTERMEDIATE_DIR)/glslang_tab.h',
      ],
      'conditions': [
        ['OS=="win"', {
@@ -83,10 +82,11 @@
        {
          'action_name': 'flex_glslang',
          'inputs': ['compiler/glslang.l'],
-          'outputs': ['compiler/Gen_glslang.cpp'],
+          'outputs': ['<(INTERMEDIATE_DIR)/Gen_glslang.cpp'],
          'action': [
            'flex',
            '--noline',
+            '--nounistd',
            '--outfile=<(_outputs)',
            '<(_inputs)',
          ],
@@ -94,11 +94,11 @@
        {
          'action_name': 'bison_glslang',
          'inputs': ['compiler/glslang.y'],
-          'outputs': ['compiler/Gen_glslang_tab.cpp'],
+          'outputs': ['<(INTERMEDIATE_DIR)/Gen_glslang_tab.cpp'],
          'action': [
            'bison',
            '--no-lines',
-            '--defines=compiler/glslang_tab.h',
+            '--defines=<(INTERMEDIATE_DIR)/glslang_tab.h',
            '--skeleton=yacc.c',
            '--output=<(_outputs)',
            '<(_inputs)',
@@ -111,7 +111,6 @@
      'type': 'static_library',
      'dependencies': ['translator_common'],
      'include_dirs': [
-        'compiler',
        '.',
        '../include',
      ],
@@ -128,7 +127,6 @@
      'type': 'static_library',
      'dependencies': ['translator_common'],
      'include_dirs': [
-        'compiler',
        '.',
        '../include',
      ],
@@ -147,7 +145,6 @@
      'type': 'shared_library',
      'dependencies': ['translator_hlsl'],
      'include_dirs': [
-        'libGLESv2',
        '.',
        '../include',
        '$(DXSDK_DIR)/include',
@@ -201,7 +198,6 @@
      'type': 'shared_library',
      'dependencies': ['libGLESv2'],
      'include_dirs': [
-        'libEGL',
        '.',
        '../include',
      ],

--- a/src/compiler/glslang.l
+++ b/src/compiler/glslang.l
@@ -30,8 +30,9 @@ O           [0-7]
 %{
 #include <stdio.h>
 #include <stdlib.h>
+
 #include "compiler/ParseHelper.h"
-#include "compiler/glslang_tab.h"
+#include "glslang_tab.h"

 /* windows only pragma */
 #ifdef _MSC_VER