diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-20 20:32:17 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-20 20:32:17 +0000 |
| commit | 569820dba13c87bd7da7789a31d830034e9b7b4e (patch) | |
| tree | 52565b0f74de528e258b931b5023dadc01c6a920 /o3d | |
| parent | 73fa6399bd9198863d7d9e01db6fcc8cdfcc8837 (diff) | |
| download | chromium_src-569820dba13c87bd7da7789a31d830034e9b7b4e.zip chromium_src-569820dba13c87bd7da7789a31d830034e9b7b4e.tar.gz chromium_src-569820dba13c87bd7da7789a31d830034e9b7b4e.tar.bz2 | |
Update the nacl part of the gyp build so it works correctly for tests,
and so it doesn't have a hard-coded path to python...
Review URL: http://codereview.chromium.org/159093
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/build/nacl.gyp | 10 | ||||
| -rw-r--r-- | o3d/tests/tests.gyp | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/o3d/build/nacl.gyp b/o3d/build/nacl.gyp index 8b84e89..cf77898 100644 --- a/o3d/build/nacl.gyp +++ b/o3d/build/nacl.gyp @@ -5,7 +5,6 @@ { 'variables': { 'chromium_code': 1, - 'nacl_scons_dir': '../../third_party/native_client/googleclient/native_client/scons-out', }, 'includes': [ 'common.gypi', @@ -19,7 +18,6 @@ 'google_nacl_imc', 'google_nacl_imc_c', ], - 'nacl_lib_dir': '<(nacl_scons_dir)/<(CONFIGURATION)-<(OS)/lib', 'nacl_output_dir': '<(SHARED_INTERMEDIATE_DIR)/nacl_libs', }, 'actions': [ @@ -34,7 +32,7 @@ 'dummy_file_that_never_gets_built_so_scons_always_runs', ], 'action': [ - 'C:/Python24/python.exe', + 'python', '<@(_inputs)', '--output="<(nacl_output_dir)"', '--configuration="<(CONFIGURATION)"', @@ -43,13 +41,13 @@ ], }, ], - 'all_dependent_settings': { + 'direct_dependent_settings': { 'include_dirs': [ '<(nacldir)', ], 'libraries': [ - '-l<(nacl_output_dir)/google_nacl_imc<(LIBRARY_SUFFIX)', - '-l<(nacl_output_dir)/google_nacl_imc_c<(LIBRARY_SUFFIX)', + '<(nacl_output_dir)/google_nacl_imc<(LIBRARY_SUFFIX)', + '<(nacl_output_dir)/google_nacl_imc_c<(LIBRARY_SUFFIX)', ], }, }, diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp index 895f2e5..c55befe 100644 --- a/o3d/tests/tests.gyp +++ b/o3d/tests/tests.gyp @@ -28,10 +28,11 @@ '../../base/base.gyp:base', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../build/nacl.gyp:build_nacl', '../compiler/technique/technique.gyp:technique', '../core/core.gyp:o3dCoreTest', - '../import/import.gyp:o3dImportTest', '../import/archive.gyp:o3dArchiveTest', + '../import/import.gyp:o3dImportTest', '../serializer/serializer.gyp:o3dSerializerTest', '../statsreport/statsreport.gyp:o3dStatsReportTest', '../utils/utils.gyp:o3dUtils', |