diff options
Diffstat (limited to 'WebKitLibraries/win/tools/vsprops')
7 files changed, 135 insertions, 36 deletions
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops index e3893f2..eaa660b 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops @@ -9,7 +9,7 @@ > <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_RUBY);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)" + PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_IMAGE_RESIZER);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PROGRESS_TAG);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)" /> <UserMacro Name="ENABLE_3D_CANVAS" @@ -18,6 +18,16 @@ /> <UserMacro Name="ENABLE_3D_RENDERING" + Value="ENABLE_3D_RENDERING" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="ENABLE_ACCELERATED_2D_CANVAS" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="ENABLE_BLOB" Value="" PerformEnvironmentSet="true" /> @@ -47,6 +57,16 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_DEVICE_ORIENTATION" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="ENABLE_DIRECTORY_UPLOAD" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_DOM_STORAGE" Value="ENABLE_DOM_STORAGE" PerformEnvironmentSet="true" @@ -62,6 +82,16 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_FILE_SYSTEM" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="ENABLE_FULLSCREEN_API" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_GEOLOCATION" Value="ENABLE_GEOLOCATION" PerformEnvironmentSet="true" @@ -72,21 +102,41 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_IMAGE_RESIZER" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_INDEXED_DATABASE" Value="" PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_INPUT_SPEECH" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_JAVASCRIPT_DEBUGGER" Value="ENABLE_JAVASCRIPT_DEBUGGER" PerformEnvironmentSet="true" /> <UserMacro - Name="ENABLE_MATHML" + Name="ENABLE_LINK_PREFETCH" Value="" PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_MATHML" + Value="ENABLE_MATHML" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="ENABLE_METER_TAG" + Value="ENABLE_METER_TAG" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_NOTIFICATIONS" Value="" PerformEnvironmentSet="true" @@ -97,8 +147,8 @@ PerformEnvironmentSet="true" /> <UserMacro - Name="ENABLE_RUBY" - Value="ENABLE_RUBY" + Name="ENABLE_PROGRESS_TAG" + Value="" PerformEnvironmentSet="true" /> <UserMacro @@ -147,11 +197,21 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_WEB_AUDIO" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_WEB_SOCKETS" Value="ENABLE_WEB_SOCKETS" PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_WEB_TIMING" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_WML" Value="" PerformEnvironmentSet="true" diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops index 1c16a9b..1dd6532 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops @@ -5,11 +5,11 @@ <VisualStudioPropertySheet ProjectType="Visual C++" Version="8.00" - Name="FeatureDefines" + Name="FeatureDefinesCairo" > <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)" + PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_IMAGE_RESIZER);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PROGRESS_TAG);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)" /> <UserMacro Name="ENABLE_3D_CANVAS" @@ -22,6 +22,16 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_ACCELERATED_2D_CANVAS" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="ENABLE_BLOB" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_CHANNEL_MESSAGING" Value="ENABLE_CHANNEL_MESSAGING" PerformEnvironmentSet="true" @@ -47,6 +57,16 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_DEVICE_ORIENTATION" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="ENABLE_DIRECTORY_UPLOAD" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_DOM_STORAGE" Value="ENABLE_DOM_STORAGE" PerformEnvironmentSet="true" @@ -62,6 +82,16 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_FILE_SYSTEM" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="ENABLE_FULLSCREEN_API" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_GEOLOCATION" Value="" PerformEnvironmentSet="true" @@ -72,21 +102,41 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_IMAGE_RESIZER" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_INDEXED_DATABASE" Value="" PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_INPUT_SPEECH" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_JAVASCRIPT_DEBUGGER" Value="ENABLE_JAVASCRIPT_DEBUGGER" PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_LINK_PREFETCH" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_MATHML" Value="" PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_METER_TAG" + Value="ENABLE_METER_TAG" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_NOTIFICATIONS" Value="" PerformEnvironmentSet="true" @@ -97,6 +147,11 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_PROGRESS_TAG" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_SHARED_WORKERS" Value="ENABLE_SHARED_WORKERS" PerformEnvironmentSet="true" @@ -142,11 +197,21 @@ PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_WEB_AUDIO" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_WEB_SOCKETS" Value="ENABLE_WEB_SOCKETS" PerformEnvironmentSet="true" /> <UserMacro + Name="ENABLE_WEB_TIMING" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro Name="ENABLE_WML" Value="" PerformEnvironmentSet="true" diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops index 60873a3..9710568 100644 --- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops @@ -4,10 +4,10 @@ Version="8.00"
Name="WinCairo"
>
- <Tool
+ <Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo";"$(SolutionDir)\..\..\..\JavaScriptCore\os-win32""
PreprocessorDefinitions="WIN_CAIRO=1"
- AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo""
/>
<Tool
Name="VCLinkerTool"
diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops index 8976ceb..b9c710c 100644 --- a/WebKitLibraries/win/tools/vsprops/common.vsprops +++ b/WebKitLibraries/win/tools/vsprops/common.vsprops @@ -15,7 +15,7 @@ WarningLevel="4" WarnAsError="true" DebugInformationFormat="3" - DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4180;4189;4244;4251;4275;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387" + DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4180;4189;4201;4244;4251;4275;4288;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387" /> <Tool Name="VCLibrarianTool" diff --git a/WebKitLibraries/win/tools/vsprops/debug.vsprops b/WebKitLibraries/win/tools/vsprops/debug.vsprops index 9ab8f20..6845d8a 100644 --- a/WebKitLibraries/win/tools/vsprops/debug.vsprops +++ b/WebKitLibraries/win/tools/vsprops/debug.vsprops @@ -20,7 +20,7 @@ /> <UserMacro Name="WebKitConfigSuffix" - Value="_debug" + Value="" PerformEnvironmentSet="true" /> <UserMacro diff --git a/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops b/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops deleted file mode 100644 index d0c61c1..0000000 --- a/WebKitLibraries/win/tools/vsprops/debug_internal.vsprops +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="debug_internal" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="DEBUG_INTERNAL" - /> - <UserMacro - Name="WebKitConfigSuffix" - Value="" - PerformEnvironmentSet="true" - /> - <UserMacro - Name="LibraryConfigSuffix" - Value="" - PerformEnvironmentSet="true" - /> - <UserMacro - Name="WebKitDLLConfigSuffix" - Value="" - /> -</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/release.vsprops b/WebKitLibraries/win/tools/vsprops/release.vsprops index 109176d..8b38b73 100644 --- a/WebKitLibraries/win/tools/vsprops/release.vsprops +++ b/WebKitLibraries/win/tools/vsprops/release.vsprops @@ -13,7 +13,6 @@ <Tool Name="VCLinkerTool" LinkIncremental="1" - StripPrivateSymbols="$(WebKitOutputDir)\public\sym\$(TargetName).pdb" OptimizeReferences="2" EnableCOMDATFolding="2" OptimizeForWindows98="1" |