summaryrefslogtreecommitdiffstats
path: root/webkit/build
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/build')
-rw-r--r--webkit/build/glue/glue.vsprops2
-rw-r--r--webkit/build/localized_strings/SConscript5
-rw-r--r--webkit/build/localized_strings/localized_strings.vcproj2
3 files changed, 5 insertions, 4 deletions
diff --git a/webkit/build/glue/glue.vsprops b/webkit/build/glue/glue.vsprops
index 54cd1aa..29633cf 100644
--- a/webkit/build/glue/glue.vsprops
+++ b/webkit/build/glue/glue.vsprops
@@ -7,7 +7,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\glue;&quot;$(OutDir)&quot;;&quot;$(IntDir)\..\localized_strings&quot;;&quot;$(IntDir)\..\generated_resources&quot;"
+ AdditionalIncludeDirectories="..\..\glue;&quot;$(OutDir)&quot;;&quot;$(OutDir)\grit_derived_sources&quot;;"
PreprocessorDefinitions="_SCL_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=1"
WarnAsError="true"
/>
diff --git a/webkit/build/localized_strings/SConscript b/webkit/build/localized_strings/SConscript
index d964e49..5d7cef2 100644
--- a/webkit/build/localized_strings/SConscript
+++ b/webkit/build/localized_strings/SConscript
@@ -30,8 +30,9 @@ env_grd = env.Clone()
env_grd.Tool('scons', toolpath=[env_grd.Dir('$CHROME_SRC_DIR/tools/grit/grit')])
# This dummy target (webkit_strings) is used to tell the emitter where
# to put the target files.
-generated = env_grd.GRIT('webkit_strings',
- '$CHROME_SRC_DIR/webkit/glue/webkit_strings.grd')
+generated = env_grd.GRIT(
+ '$TARGET_ROOT/grit_derived_sources/fake_generated_target',
+ '$CHROME_SRC_DIR/webkit/glue/webkit_strings.grd')
if env_res['PLATFORM'] == 'win32':
for g in [g for g in generated if str(g).endswith('.rc')]:
diff --git a/webkit/build/localized_strings/localized_strings.vcproj b/webkit/build/localized_strings/localized_strings.vcproj
index a833027..bef1a48 100644
--- a/webkit/build/localized_strings/localized_strings.vcproj
+++ b/webkit/build/localized_strings/localized_strings.vcproj
@@ -69,7 +69,7 @@
>
</File>
<File
- RelativePath="$(IntDir)\webkit_strings.h"
+ RelativePath="$(OutDir)\grit_derived_sources\webkit_strings.h"
>
</File>
</Files>