Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: plugin/plugin.gyp

Issue 147129: Adding in most of the unit tests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « import/import.gyp ('k') | plugin/win/main_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: plugin/plugin.gyp
===================================================================
--- plugin/plugin.gyp (revision 19743)
+++ plugin/plugin.gyp (working copy)
@@ -21,6 +21,7 @@
'O3D_PLUGIN_MIME_TYPE="<!(python version_info.py --mimetype)"',
],
},
+
'targets': [
{
'target_name': 'npo3dautoplugin',
@@ -108,16 +109,21 @@
'msvs_settings': {
'VCLinkerTool': {
'AdditionalDependencies': [
+ 'rpcrt4.lib',
+ ],
+ },
+ },
+ },
+ ],
+ ['OS == "win" and renderer == "d3d9"',
+ {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'AdditionalDependencies': [
'"$(DXSDK_DIR)/Lib/x86/DxErr9.lib"',
'"$(DXSDK_DIR)/Lib/x86/d3dx9.lib"',
- '../../<(cgdir)/lib/cg.lib',
- '../../<(cgdir)/lib/cgGL.lib',
'd3d9.lib',
- 'rpcrt4.lib',
],
- # Set /SUBSYSTEM:CONSOLE for converter.exe, since
- # it is a console app.
- 'SubSystem': '1',
},
},
},
« no previous file with comments | « import/import.gyp ('k') | plugin/win/main_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698