diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 20:22:14 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 20:22:14 +0000 |
| commit | 4332504927997c940b153385ad5c093995eae608 (patch) | |
| tree | c45c116efa045c8ba80cbbbda5cf9d2e567bd4d0 /o3d/import | |
| parent | 8c792422985f8063505e77a1b252d229acc8f330 (diff) | |
| download | chromium_src-4332504927997c940b153385ad5c093995eae608.zip chromium_src-4332504927997c940b153385ad5c093995eae608.tar.gz chromium_src-4332504927997c940b153385ad5c093995eae608.tar.bz2 | |
Changes for Mac GYP build: fix source that causes compiler warnings, fix includes and defines.
Review URL: http://codereview.chromium.org/164129
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/import')
| -rw-r--r-- | o3d/import/import.gyp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/o3d/import/import.gyp b/o3d/import/import.gyp index 9943b00..01d3dc3 100644 --- a/o3d/import/import.gyp +++ b/o3d/import/import.gyp @@ -49,6 +49,7 @@ 'cross/zip_archive.cc', 'cross/zip_archive.h', ], + 'conditions' : [ ['renderer == "d3d9" and OS == "win"', { @@ -69,6 +70,9 @@ 'sources': [ 'mac/collada_conditioner_mac.mm', ], + 'include_dirs': [ + '../../third_party/glew/files/include', + ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', @@ -81,6 +85,9 @@ 'sources': [ 'linux/collada_conditioner_linux.cc', ], + 'include_dirs': [ + '../../third_party/glew/files/include', + ], }, ], ], |