diff options
Diffstat (limited to 'o3d/build')
| -rw-r--r-- | o3d/build/all.gyp | 5 | ||||
| -rw-r--r-- | o3d/build/libs.gyp | 36 | ||||
| -rw-r--r-- | o3d/build/nacl.gyp | 2 |
3 files changed, 40 insertions, 3 deletions
diff --git a/o3d/build/all.gyp b/o3d/build/all.gyp index 2229b2e3..bda0373 100644 --- a/o3d/build/all.gyp +++ b/o3d/build/all.gyp @@ -25,9 +25,10 @@ '../import/import.gyp:o3dImport', '../plugin/idl/idl.gyp:o3dPluginIdl', '../plugin/plugin.gyp:add_version', - '../plugin/plugin.gyp:o3dPlugin', + '../plugin/plugin.gyp:npo3dautoplugin', '../plugin/plugin.gyp:o3dPluginLogging', '../serializer/serializer.gyp:o3dSerializer', + '../samples/samples.gyp:*', '../statsreport/statsreport.gyp:o3dStatsReport', '../tests/tests.gyp:unit_tests', '../utils/utils.gyp:o3dUtils', @@ -36,7 +37,7 @@ ['OS=="win"', { 'dependencies': [ - '../plugin/plugin.gyp:o3dActiveXHost', + '../plugin/plugin.gyp:o3d_host', ], }, ], diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp new file mode 100644 index 0000000..64e597a --- /dev/null +++ b/o3d/build/libs.gyp @@ -0,0 +1,36 @@ +# 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. + +{ + 'variables': { + 'chromium_code': 1, + }, + 'includes': [ + 'common.gypi', + ], + 'targets': [ + { + 'target_name': 'cg_libs', + 'type': 'none', + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'conditions' : [ + [ 'OS=="win"', + { + 'files': [ + "../../<(cgdir)/bin/cg.dll", + "../../<(cgdir)/bin/cgD3D9.dll", + "../../<(cgdir)/bin/cgGL.dll", + "../../<(cgdir)/bin/cgc.exe", + "../../<(cgdir)/bin/glut32.dll", + ], + }, + ], + ], + }, + ], + }, + ], +} diff --git a/o3d/build/nacl.gyp b/o3d/build/nacl.gyp index 29304ba..19b4de5 100644 --- a/o3d/build/nacl.gyp +++ b/o3d/build/nacl.gyp @@ -40,7 +40,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '<(nacldir)', + '../../<(nacldir)', ], 'libraries': [ '<(nacl_output_dir)/google_nacl_imc<(LIBRARY_SUFFIX)', |