diff options
| -rw-r--r-- | o3d/build/common.gypi | 1 | ||||
| -rw-r--r-- | o3d/core/core.gyp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index fe7e0d9..7f39a0d 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -9,6 +9,7 @@ 'fcolladadir': 'third_party/fcollada/files', 'glewdir': 'third_party/glew/files', 'gtestdir': 'testing/gtest/include', + 'internaldir':'o3d-internal', 'jpegdir': 'third_party/libjpeg', 'nacldir': 'third_party/native_client/googleclient', 'nixysadir': 'o3d/third_party/nixysa', diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp index 9216f36..fe72c17 100644 --- a/o3d/core/core.gyp +++ b/o3d/core/core.gyp @@ -8,6 +8,9 @@ }, 'target_defaults': { 'include_dirs': [ + # The internal dir is first so that headers in internal can replace those + # in external + '../../<(internaldir)', '..', '../..', '../../<(gtestdir)', |