diff options
Diffstat (limited to 'o3d/build')
| -rw-r--r-- | o3d/build/common_global.gypi | 25 | ||||
| -rwxr-xr-x | o3d/build/gyp_o3d | 2 | ||||
| -rw-r--r-- | o3d/build/libs.gyp | 48 |
3 files changed, 12 insertions, 63 deletions
diff --git a/o3d/build/common_global.gypi b/o3d/build/common_global.gypi deleted file mode 100644 index e3b5429..0000000 --- a/o3d/build/common_global.gypi +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file contains flags that are specific to o3d, but affect the build as a -# whole (e.g. build flags that change the ABI). -# For example, on linux amd64, all the libraries that will be linked into the -# plugin (skia, v8, ...) need to be compiled with -fPIC but we don't want to do -# that generally in Chrome (so it can't be lumped into the top-level -# build/common.gypi). -{ - 'target_defaults': { - 'conditions': [ - [ 'OS == "linux" and target_arch=="x64"', { - 'cflags': [ - '-m64', - '-fPIC', - ], - 'ldflags': [ - '-m64', - ], - }], - ], - }, -} diff --git a/o3d/build/gyp_o3d b/o3d/build/gyp_o3d index 229b4bc..598dd70 100755 --- a/o3d/build/gyp_o3d +++ b/o3d/build/gyp_o3d @@ -11,7 +11,6 @@ import os import sys chrome_src = os.path.join(os.path.dirname(sys.argv[0]), os.pardir, os.pardir) -o3d_src = os.path.join(os.path.dirname(sys.argv[0]), os.pardir) try: import gyp @@ -25,7 +24,6 @@ if __name__ == '__main__': # Always include common.gypi args += ['--depth', '.', '-I', os.path.join(chrome_src, 'build', 'common.gypi'), - '-I', os.path.join(o3d_src, 'build', 'common_global.gypi'), '-D', 'mac_deployment_target=10.4'] # Off we go... 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", - ], - }, - ], - ] - } ], }, ], |