diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 00:11:59 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 00:11:59 +0000 |
| commit | af4acda6cc24136f95d9ab99841b759a71687c2f (patch) | |
| tree | d47ea7e11caed8bbd8219ce4ff042fabdff0a9b0 /o3d | |
| parent | 5fe1572eaaec0f18f8126b9d6d48e7f575e9bcb2 (diff) | |
| download | chromium_src-af4acda6cc24136f95d9ab99841b759a71687c2f.zip chromium_src-af4acda6cc24136f95d9ab99841b759a71687c2f.tar.gz chromium_src-af4acda6cc24136f95d9ab99841b759a71687c2f.tar.bz2 | |
Linux: Update DEPS to pick up statically linked libGLEW.
BUG=none
TEST=built and ran O3D on Linux (64-bit)
Review URL: http://codereview.chromium.org/3978003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63452 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/DEPS | 2 | ||||
| -rw-r--r-- | o3d/build/libs.gyp | 24 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 5 |
3 files changed, 25 insertions, 6 deletions
@@ -5,7 +5,7 @@ vars = { # revs to match the version pulled-in by Chromium's own DEPS in the new rev. "chromium_rev": "51794", "chromium_breakpad_rev": "47985", - "o3d_code_rev": "213", + "o3d_code_rev": "226", "skia_rev": "586", "gyp_rev": "820", "gtest_rev": "408", diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp index f94cf26..bdee033 100644 --- a/o3d/build/libs.gyp +++ b/o3d/build/libs.gyp @@ -60,13 +60,23 @@ 'defines': [ 'GL_GLEXT_PROTOTYPES', ], + 'conditions': [ + [ 'target_arch=="x64"', + { + 'variables': { 'libdir': 'lib64' } + }, { + 'variables': { 'libdir': 'lib' } + } + ], + ], 'ldflags': [ '-L<(PRODUCT_DIR)', + '-L<(glewdir)/<(libdir)', ], 'libraries': [ '-lGL', - '-lGLEW', '-lX11', + '-l:libGLEW.so.a', ], }, }, @@ -118,13 +128,23 @@ 'defines': [ 'GL_GLEXT_PROTOTYPES', ], + 'conditions': [ + [ 'target_arch=="x64"', + { + 'variables': { 'libdir': 'lib64' } + }, { + 'variables': { 'libdir': 'lib' } + } + ], + ], 'ldflags': [ '-L<(PRODUCT_DIR)', + '-L<(glewdir)/<(libdir)', ], 'libraries': [ '-lGL', - '-lGLEW', '-lX11', + '-l:libGLEW.so.a', ], }, }, diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 0f6f6b7..ba35b5f 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -115,7 +115,6 @@ # --as-needed, so we have to specify the out-of-order ones before # the --as-needed flag. '-lCgGL', - '-lGLEW', '-ldl', # Used by breakpad '-lrt', ] @@ -218,7 +217,7 @@ '$(SDKROOT)/System/Library/Frameworks/QuickTime.framework', 'libbreakpad.a', 'libbreakpad_utilities.a', - '../../third_party/glew/files/lib/libMacStaticGLEW.a', + '../../<(glewdir)/lib/libMacStaticGLEW.a', ], }, 'postbuilds': [ @@ -474,7 +473,7 @@ '$(SDKROOT)/System/Library/Frameworks/QuickTime.framework', 'libbreakpad.a', 'libbreakpad_utilities.a', - '../../third_party/glew/files/lib/libMacStaticGLEW.a', + '../../<(glewdir)/lib/libMacStaticGLEW.a', ], }, }, |