summaryrefslogtreecommitdiffstats
path: root/o3d/build/libs.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'o3d/build/libs.gyp')
-rw-r--r--o3d/build/libs.gyp48
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",
- ],
- },
- ],
- ]
- }
],
},
],