| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 '../build/common.gypi', | 10 '../build/common.gypi', |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 'dependencies': [ | 29 'dependencies': [ |
| 30 '../../<(jpegdir)/libjpeg.gyp:libjpeg', | 30 '../../<(jpegdir)/libjpeg.gyp:libjpeg', |
| 31 '../../<(pngdir)/libpng.gyp:libpng', | 31 '../../<(pngdir)/libpng.gyp:libpng', |
| 32 '../../<(zlibdir)/zlib.gyp:zlib', | 32 '../../<(zlibdir)/zlib.gyp:zlib', |
| 33 '../../base/base.gyp:base', | 33 '../../base/base.gyp:base', |
| 34 '../../skia/skia.gyp:skia', | 34 '../../skia/skia.gyp:skia', |
| 35 '../../v8/tools/gyp/v8.gyp:v8', | 35 '../../v8/tools/gyp/v8.gyp:v8', |
| 36 '../core/core.gyp:o3dCore', | 36 '../core/core.gyp:o3dCore', |
| 37 '../core/core.gyp:o3dCorePlatform', | 37 '../core/core.gyp:o3dCorePlatform', |
| 38 '../import/archive.gyp:o3dArchive', | 38 '../import/archive.gyp:o3dArchive', |
| 39 '../serializer/serializer.gyp:o3dSerializer', | |
| 40 '../utils/utils.gyp:o3dUtils', | 39 '../utils/utils.gyp:o3dUtils', |
| 41 '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc', | 40 '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc', |
| 42 'idl/idl.gyp:o3dPluginIdl', | 41 'idl/idl.gyp:o3dPluginIdl', |
| 43 ], | 42 ], |
| 44 'sources': [ | 43 'sources': [ |
| 45 'cross/async_loading.cc', | 44 'cross/async_loading.cc', |
| 46 'cross/async_loading.h', | 45 'cross/async_loading.h', |
| 47 'cross/blacklist.cc', | 46 'cross/blacklist.cc', |
| 48 'cross/config.h', | 47 'cross/config.h', |
| 49 'cross/config_common.cc', | 48 'cross/config_common.cc', |
| (...skipping 19 matching lines...) Expand all Loading... |
| 69 'dependencies': [ | 68 'dependencies': [ |
| 70 '../statsreport/statsreport.gyp:o3dStatsReport', | 69 '../statsreport/statsreport.gyp:o3dStatsReport', |
| 71 'add_version', | 70 'add_version', |
| 72 'o3dPluginLogging', | 71 'o3dPluginLogging', |
| 73 ], | 72 ], |
| 74 }, | 73 }, |
| 75 ], | 74 ], |
| 76 ['renderer == "gl"', | 75 ['renderer == "gl"', |
| 77 { | 76 { |
| 78 'dependencies': [ | 77 'dependencies': [ |
| 78 '../build/libs.gyp:gl_libs', |
| 79 '../build/libs.gyp:cg_libs', | 79 '../build/libs.gyp:cg_libs', |
| 80 ], | 80 ], |
| 81 }, | 81 }, |
| 82 ], | 82 ], |
| 83 ['OS == "mac"', | 83 ['OS == "mac"', |
| 84 { | 84 { |
| 85 'mac_bundle': 1, | 85 'mac_bundle': 1, |
| 86 'product_extension': 'plugin', | 86 'product_extension': 'plugin', |
| 87 'product_name': 'O3D', | 87 'product_name': 'O3D', |
| 88 'dependencies': [ | 88 'dependencies': [ |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 'libraries': [ | 230 'libraries': [ |
| 231 '"$(DXSDK_DIR)/Lib/x86/DxErr.lib"', | 231 '"$(DXSDK_DIR)/Lib/x86/DxErr.lib"', |
| 232 ], | 232 ], |
| 233 }, | 233 }, |
| 234 }, | 234 }, |
| 235 ], | 235 ], |
| 236 ], | 236 ], |
| 237 }, | 237 }, |
| 238 ], | 238 ], |
| 239 'conditions': [ | 239 'conditions': [ |
| 240 ['o3d_in_chrome != 0', | 240 ['o3d_in_chrome == "True"', |
| 241 { | 241 { |
| 242 'variables': { | 242 'variables': { |
| 243 'o3d_main_lib_type': 'static_library', | 243 'o3d_main_lib_type': 'static_library', |
| 244 }, | 244 }, |
| 245 'target_defaults': { | 245 'target_defaults': { |
| 246 'defines': [ | 246 'defines': [ |
| 247 'O3D_INTERNAL_PLUGIN=1', | 247 'O3D_INTERNAL_PLUGIN=1', |
| 248 ], | 248 ], |
| 249 }, | 249 }, |
| 250 }, | 250 }, |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 403 '<(_inputs)', | 403 '<(_inputs)', |
| 404 ], | 404 ], |
| 405 }, | 405 }, |
| 406 ], | 406 ], |
| 407 }, | 407 }, |
| 408 ], | 408 ], |
| 409 }, | 409 }, |
| 410 ], | 410 ], |
| 411 ], | 411 ], |
| 412 } | 412 } |
| OLD | NEW |