diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 16:29:41 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 16:29:41 +0000 |
| commit | d73053211c5db825ad997b7900e69b2dd05f8b0c (patch) | |
| tree | fe5a5467ae1d08356918b569543d09e402234463 /o3d/build/common.gypi | |
| parent | e01087a666ae4be9e183484c7c7e4b5e127f0874 (diff) | |
| download | chromium_src-d73053211c5db825ad997b7900e69b2dd05f8b0c.zip chromium_src-d73053211c5db825ad997b7900e69b2dd05f8b0c.tar.gz chromium_src-d73053211c5db825ad997b7900e69b2dd05f8b0c.tar.bz2 | |
These are gyp file changes that start to make the Mac GYP build work.
It still doesn't but I want to checkpoint these changes.
Review URL: http://codereview.chromium.org/155890
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build/common.gypi')
| -rw-r--r-- | o3d/build/common.gypi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index 08f3906..0d0f714 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -10,6 +10,7 @@ 'antlrdir': 'third_party/antlr3', 'breakpaddir': 'breakpad/src', 'fcolladadir': 'third_party/fcollada/files', + 'glewdir': 'third_party/glew/files', 'gtestdir': 'testing/gtest/include', 'jpegdir': 'third_party/libjpeg', 'nacldir': 'third_party/native_client/googleclient', @@ -39,6 +40,7 @@ '_CRT_SECURE_NO_WARNINGS', 'RENDERER_D3D9', 'OS_WIN', + 'UNICODE', 'NACL_WINDOWS', ], 'msvs_disabled_warnings': [4355], @@ -62,7 +64,19 @@ 'defines': [ 'RENDERER_GL', 'OS_MACOSX', + 'UNICODE', + 'GTEST_NOT_MAC_FRAMEWORK_MODE', + 'NACL_OSX=1', + 'MAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_4', + 'SK_BUILD_FOR_MAC', ], + 'xcode_settings': { + 'CFLAGS': ['-gstabs+', + '-fno-eliminate-unused-debug-symbols', + '-mmacosx-version-min=1.4'], + 'WARNING_CXXFLAGS': ['-Wstrict-aliasing', + '-Wno-deprecated'], + }, }, }, ], |