diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 17:25:00 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 17:25:00 +0000 |
| commit | 37a625a6cefff0972bc95d2add8a797a37dbb3f9 (patch) | |
| tree | 43e4b5f31e2d44b6a456fee666b3988d4b2f212d /o3d/converter | |
| parent | e6060447254932d459c6c6fa6061c11a01432c7d (diff) | |
| download | chromium_src-37a625a6cefff0972bc95d2add8a797a37dbb3f9.zip chromium_src-37a625a6cefff0972bc95d2add8a797a37dbb3f9.tar.gz chromium_src-37a625a6cefff0972bc95d2add8a797a37dbb3f9.tar.bz2 | |
This adds in targets for selenium and updated several other problems,
including some problems with the samples and idl generation.
Selenium targets launch selenium on all platforms, but the tests don't
pass anywhere but Windows yet because the plugin isn't found.
I'll work on that next.
Review URL: http://codereview.chromium.org/197014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/converter')
| -rw-r--r-- | o3d/converter/converter.gyp | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/o3d/converter/converter.gyp b/o3d/converter/converter.gyp index 0e15f54..fea5c1a 100644 --- a/o3d/converter/converter.gyp +++ b/o3d/converter/converter.gyp @@ -35,7 +35,6 @@ '../import/import.gyp:o3dImport', '../serializer/serializer.gyp:o3dSerializer', '../utils/utils.gyp:o3dUtils', - '../build/libs.gyp:cg_libs', ], 'sources': [ 'cross/buffer_stub.cc', @@ -56,6 +55,13 @@ 'cross/texture_stub.h', ], 'conditions' : [ + ['renderer == "gl"', + { + 'dependencies': [ + '../build/libs.gyp:cg_libs', + ], + }, + ], ['OS == "mac"', { 'postbuilds': [ @@ -83,19 +89,28 @@ }, }, ], + ['OS == "linux"', + { + 'link_settings': { + 'libraries': [ + '-lGL', + ], + }, + }, + ], ['OS == "win"', { 'dependencies': [ '../build/libs.gyp:dx_dll', + '../build/libs.gyp:cg_libs', ], + 'link_settings': { + 'libraries': [ + '-lrpcrt4.lib', + ], + }, 'msvs_settings': { 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'rpcrt4.lib', - '"$(DXSDK_DIR)/Lib/x86/d3dx9.lib"', - '../../<(cgdir)/lib/cg.lib', - '../../<(cgdir)/lib/cgGL.lib', - ], # Set /SUBSYSTEM:CONSOLE for converter.exe, since # it is a console app. 'SubSystem': '1', |