summaryrefslogtreecommitdiffstats
path: root/webkit/build/WebKit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/build/WebKit')
-rw-r--r--webkit/build/WebKit/SConscript5
-rw-r--r--webkit/build/WebKit/WebKit.vcproj24
-rw-r--r--webkit/build/WebKit/WebKit.vsprops2
3 files changed, 29 insertions, 2 deletions
diff --git a/webkit/build/WebKit/SConscript b/webkit/build/WebKit/SConscript
index db059cc..41ef3ed 100644
--- a/webkit/build/WebKit/SConscript
+++ b/webkit/build/WebKit/SConscript
@@ -9,11 +9,12 @@ env = env.Clone()
env.Append(
CPPDEFINES = [
'WEBKIT_IMPLEMENTATION',
- 'WEBKIT_USING_SKIA'
],
CPPPATH = [
'$WEBKIT_DIR/build/WebCore',
'$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/public',
+ '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/public/gtk',
+ '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src',
]
)
@@ -21,12 +22,14 @@ input_files = [
'$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/ChromiumBridge.cpp',
'$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/ChromiumCurrentTime.cpp',
'$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/ChromiumThreading.cpp',
+ '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/KeyIdentifier.cpp',
'$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebCache.cpp',
'$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebCString.cpp',
'$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebImageSkia.cpp',
'$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebKit.cpp',
'$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebString.cpp',
'$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebURL.cpp',
+ '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/gtk/WebInputEventFactory.cpp',
]
env.ChromeLibrary('WebKit', input_files)
diff --git a/webkit/build/WebKit/WebKit.vcproj b/webkit/build/WebKit/WebKit.vcproj
index b76c8f0..87aee8d 100644
--- a/webkit/build/WebKit/WebKit.vcproj
+++ b/webkit/build/WebKit/WebKit.vcproj
@@ -156,6 +156,10 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\public\WebInputEvent.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\public\WebKit.h"
>
</File>
@@ -187,6 +191,10 @@
Name="win"
>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\public\win\WebInputEventFactory.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\public\win\WebSandboxSupport.h"
>
</File>
@@ -212,6 +220,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\KeyIdentifier.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\KeyIdentifier.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\WebCache.cpp"
>
</File>
@@ -239,6 +255,14 @@
RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\WebURL.cpp"
>
</File>
+ <Filter
+ Name="win"
+ >
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\win\WebInputEventFactory.cpp"
+ >
+ </File>
+ </Filter>
</Filter>
</Filter>
</Files>
diff --git a/webkit/build/WebKit/WebKit.vsprops b/webkit/build/WebKit/WebKit.vsprops
index 905211e..0a16a8c 100644
--- a/webkit/build/WebKit/WebKit.vsprops
+++ b/webkit/build/WebKit/WebKit.vsprops
@@ -7,7 +7,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(SolutionDir)..\third_party\WebKit\WebKit\chromium\public;$(SolutionDir)..\third_party\WebKit\WebKit\chromium\public\win"
+ AdditionalIncludeDirectories="$(SolutionDir)..\third_party\WebKit\WebKit\chromium\public;$(SolutionDir)..\third_party\WebKit\WebKit\chromium\public\win;$(SolutionDir)..\third_party\WebKit\WebKit\chromium\src"
PreprocessorDefinitions="WEBKIT_IMPLEMENTATION;_SCL_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=1"
WarnAsError="true"
/>