summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/activex_shim_dll/activex_shim_dll.gyp2
2 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index f323de5..e1a4891 100644
--- a/DEPS
+++ b/DEPS
@@ -26,7 +26,7 @@ deps = {
# TODO(mark): Remove once this has moved into depot_tools.
"src/tools/gyp":
- "http://gyp.googlecode.com/svn/trunk@476",
+ "http://gyp.googlecode.com/svn/trunk@478",
"src/v8":
"http://v8.googlecode.com/svn/trunk@1918",
diff --git a/webkit/activex_shim_dll/activex_shim_dll.gyp b/webkit/activex_shim_dll/activex_shim_dll.gyp
index 29c12ef..5ba9b67 100644
--- a/webkit/activex_shim_dll/activex_shim_dll.gyp
+++ b/webkit/activex_shim_dll/activex_shim_dll.gyp
@@ -20,12 +20,12 @@
'../../third_party/npapi/npapi.gyp:npapi',
'../activex_shim/activex_shim.gyp:activex_shim',
],
+ 'product_name': 'npaxshim',
'msvs_guid': '494E414B-1655-48CE-996D-6413ECFB7829',
'msvs_settings': {
'VCLinkerTool': {
'RegisterOutput': 'false',
'IgnoreImportLibrary': 'true',
- 'OutputFile': '$(OutDir)/npaxshim.dll',
},
},
'sources': [