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 | |
| 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')
| -rw-r--r-- | o3d/build/all.gyp | 25 | ||||
| -rw-r--r-- | o3d/build/common.gypi | 14 | ||||
| -rw-r--r-- | o3d/build/nacl.gyp | 7 |
3 files changed, 30 insertions, 16 deletions
diff --git a/o3d/build/all.gyp b/o3d/build/all.gyp index 43ea2ae..dfb41e1 100644 --- a/o3d/build/all.gyp +++ b/o3d/build/all.gyp @@ -17,17 +17,20 @@ '../../<(jpegdir)/libjpeg.gyp:*', '../../<(pngdir)/libpng.gyp:*', '../../<(zlibdir)/zlib.gyp:*', - '../../base/base.gyp:base', - '../../breakpad/breakpad.gyp:*', - '../compiler/technique/technique.gyp:*', - '../converter/converter.gyp:*', - '../core/core.gyp:*', - '../import/import.gyp:*', - '../tests/tests.gyp:*', - '../plugin/idl/idl.gyp:*', - '../plugin/plugin.gyp:*', - '../serializer/serializer.gyp:*', - '../utils/utils.gyp:*', + '../compiler/technique/technique.gyp:technique', + '../converter/converter.gyp:o3dConverter', + '../core/core.gyp:o3dCore', + '../core/core.gyp:o3dCorePlatform', + '../import/archive.gyp:o3dArchive', + '../import/import.gyp:o3dImport', + '../plugin/idl/idl.gyp:o3dPluginIdl', + '../plugin/plugin.gyp:add_version', + '../plugin/plugin.gyp:npo3dautoplugin', + '../plugin/plugin.gyp:o3dPluginLogging', + '../serializer/serializer.gyp:o3dSerializer', + '../statsreport/statsreport.gyp:o3dStatsReport', + '../tests/tests.gyp:unit_tests', + '../utils/utils.gyp:o3dUtils', ], }, ], 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'], + }, }, }, ], diff --git a/o3d/build/nacl.gyp b/o3d/build/nacl.gyp index cf77898..29304ba 100644 --- a/o3d/build/nacl.gyp +++ b/o3d/build/nacl.gyp @@ -14,10 +14,6 @@ 'target_name': 'build_nacl', 'type': 'none', 'variables': { - 'nacl_libs': [ - 'google_nacl_imc', - 'google_nacl_imc_c', - ], 'nacl_output_dir': '<(SHARED_INTERMEDIATE_DIR)/nacl_libs', }, 'actions': [ @@ -37,7 +33,8 @@ '--output="<(nacl_output_dir)"', '--configuration="<(CONFIGURATION)"', '--platform=<(OS)', - '<@(nacl_libs)', + 'google_nacl_imc', + 'google_nacl_imc_c', ], }, ], |