diff options
| -rw-r--r-- | o3d/build/libs.gyp | 10 | ||||
| -rw-r--r-- | o3d/core/core.gyp | 3 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp index 0244c48..2d53b5d 100644 --- a/o3d/build/libs.gyp +++ b/o3d/build/libs.gyp @@ -48,6 +48,16 @@ }, }, ], + [ 'OS=="win"', + { + 'direct_dependent_settings': { + 'libraries': [ + '-lOpenGL32.lib', + '../../<(glewdir)/lib/glew32.lib', + ], + }, + }, + ], ], }, { diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp index 13f50a1..c1224d1 100644 --- a/o3d/core/core.gyp +++ b/o3d/core/core.gyp @@ -359,6 +359,9 @@ 'cross/gl/utils_gl.cc', 'cross/gl/utils_gl.h', ], + 'dependencies': [ + '../build/libs.gyp:gl_libs', + ], }, ], ['renderer == "d3d9" and OS == "win"', diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 397dceb..fdd4f09 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -36,7 +36,6 @@ '../core/core.gyp:o3dCore', '../core/core.gyp:o3dCorePlatform', '../import/archive.gyp:o3dArchive', - '../serializer/serializer.gyp:o3dSerializer', '../utils/utils.gyp:o3dUtils', '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc', 'idl/idl.gyp:o3dPluginIdl', @@ -76,6 +75,7 @@ ['renderer == "gl"', { 'dependencies': [ + '../build/libs.gyp:gl_libs', '../build/libs.gyp:cg_libs', ], }, @@ -237,7 +237,7 @@ }, ], 'conditions': [ - ['o3d_in_chrome != 0', + ['o3d_in_chrome == "True"', { 'variables': { 'o3d_main_lib_type': 'static_library', |