diff options
| author | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-07 02:47:52 +0000 |
|---|---|---|
| committer | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-07 02:47:52 +0000 |
| commit | 7978508d53990b762518d993a1f42dbd3dfc429a (patch) | |
| tree | 3ca60b437795532555867dd8be567458dc1c1245 /o3d/build/libs.gyp | |
| parent | fc6fb7fbf9aca6b58f8c99a08a6c376b95bbc1a3 (diff) | |
| download | chromium_src-7978508d53990b762518d993a1f42dbd3dfc429a.zip chromium_src-7978508d53990b762518d993a1f42dbd3dfc429a.tar.gz chromium_src-7978508d53990b762518d993a1f42dbd3dfc429a.tar.bz2 | |
Revert "linux: 64-bit"
This reverts svn://chrome-svn/chrome/trunk/src/o3d@31356
Review URL: http://codereview.chromium.org/372043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31364 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build/libs.gyp')
| -rw-r--r-- | o3d/build/libs.gyp | 48 |
1 files changed, 12 insertions, 36 deletions
diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp index 0695316..122c6d6 100644 --- a/o3d/build/libs.gyp +++ b/o3d/build/libs.gyp @@ -27,9 +27,11 @@ 'defines': [ 'GL_GLEXT_PROTOTYPES', ], - 'ldflags': [ - '-L<(PRODUCT_DIR)', - ], + 'scons_variable_settings': { + 'LIBPATH': [ + '../../<(glewdir)/lib', + ], + }, 'libraries': [ '-lGL', '-lGLEW', @@ -80,9 +82,11 @@ [ 'OS=="linux"', { 'all_dependent_settings': { - 'ldflags': [ - '-L<(PRODUCT_DIR)', - ], + 'scons_variable_settings': { + 'LIBPATH': [ + '<(PRODUCT_DIR)', + ], + }, 'libraries': [ "-lCg", "-lCgGL", @@ -121,21 +125,9 @@ [ 'OS=="linux"', { 'destination': '<(PRODUCT_DIR)', - 'conditions': [ - [ 'target_arch=="x64"', - { - 'variables': { 'libdir': 'lib64' } - }, { - 'variables': { 'libdir': 'lib' } - } - ], - ], 'files': [ - '../../<(glewdir)/<(libdir)/libGLEW.so', - '../../<(glewdir)/<(libdir)/libGLEW.so.1.5', - '../../<(glewdir)/<(libdir)/libGLEW.so.1.5.1', - "../../<(cgdir)/<(libdir)/libCg.so", - "../../<(cgdir)/<(libdir)/libCgGL.so", + "../../<(cgdir)/lib/libCg.so", + "../../<(cgdir)/lib/libCgGL.so", "../../<(cgdir)/bin/cgc", ], }, @@ -162,22 +154,6 @@ ], ], }, - { - 'conditions' : [ - [ 'OS=="linux"', - { - 'destination': '<(SHARED_LIB_DIR)', - 'files': [ - '<(PRODUCT_DIR)/libGLEW.so', - '<(PRODUCT_DIR)/libGLEW.so.1.5', - '<(PRODUCT_DIR)/libGLEW.so.1.5.1', - "<(PRODUCT_DIR)/libCg.so", - "<(PRODUCT_DIR)/libCgGL.so", - ], - }, - ], - ] - } ], }, ], |