summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/activex_shim_dll/SConscript1
-rw-r--r--webkit/webkit_sln.scons8
2 files changed, 3 insertions, 6 deletions
diff --git a/webkit/activex_shim_dll/SConscript b/webkit/activex_shim_dll/SConscript
index 40b423e..c8bd329 100644
--- a/webkit/activex_shim_dll/SConscript
+++ b/webkit/activex_shim_dll/SConscript
@@ -51,6 +51,7 @@ env.Alias('webkit', i)
env.ChromeMSVSProject('$WEBKIT_DIR/activex_shim_dll/activex_shim_dll.vcproj',
dependencies = [
+ '$BASE_DIR/build/base.vcproj',
'$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
],
guid='{494E414B-1655-48CE-996D-6413ECFB7829}')
diff --git a/webkit/webkit_sln.scons b/webkit/webkit_sln.scons
index c186837..3257d20 100644
--- a/webkit/webkit_sln.scons
+++ b/webkit/webkit_sln.scons
@@ -41,6 +41,7 @@ env.ChromeMSVSFolder('webkit dependencies',
'$V8_DIR/tools/visual_studio/v8_base.vcproj',
'$GOOGLEURL_DIR/build/googleurl.vcproj',
'$SDCH_DIR/sdch.vcproj',
+ '$NET_DIR/build/net_resources.vcproj',
],
guid='{2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}')
@@ -97,6 +98,7 @@ env.ChromeMSVSFolder('webkit (ours)',
solution = env.ChromeMSVSSolution('webkit.sln',
+ dest='$CHROME_SRC_DIR/webkit/webkit.sln',
entries = [
'webkit dependencies',
'$WEBKIT_DIR/build/glue/glue.vcproj',
@@ -160,9 +162,3 @@ solution = env.ChromeMSVSSolution('webkit.sln',
'Debug|Win32',
'Release|Win32',
])
-
-env.AlwaysBuild(solution)
-
-i = env.Command('$CHROME_SRC_DIR/webkit/webkit.sln', solution,
- Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)