diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebKitLibraries | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebKitLibraries')
| -rw-r--r-- | WebKitLibraries/ChangeLog | 144 | ||||
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 21 | ||||
| -rwxr-xr-x | WebKitLibraries/win/tools/WinTools.make | 2 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/WinCairo.vsprops | 34 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/cURL.vsprops | 26 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/common.vsprops | 14 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/debug.vsprops | 2 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/debug_internal.vsprops | 25 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops | 68 | ||||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/release.vsprops | 4 |
10 files changed, 243 insertions, 97 deletions
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index bfd54bc..60cb1f6 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,147 @@ +2010-12-01 Adam Roben <aroben@apple.com> + + Don't let harmless errorlevels from the "set" utility leak into + project-specific build scripts + + When using set to unset an environment variable that didn't previously + exist, set raises the errorlevel to 1. This was leaking into + project-specific scripts, causing them to think the build has failed. + We now clear the errorlevel after we finish setting environment + variables. + + Fixes <http://webkit.org/b/50350> Windows builds mysteriously fail in + some configurations + + Reviewed by Steve Falkenburg. + + * win/tools/vsprops/common.vsprops: Call "cmd /c" after setting + environment variables to get rid of any errorlevel that "set" set. + +2010-12-01 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Adam Roben. + + vcproj changes can't be applied cleanly by the Windows EWS bot + https://bugs.webkit.org/show_bug.cgi?id=50328 + + * win/tools/vsprops/WinCairo.vsprops: Added property svn:eol-style. + * win/tools/vsprops/cURL.vsprops: Added property svn:eol-style. + * win/tools/vsprops/debug_wincairo.vsprops: Added property svn:eol-style. + +2010-11-29 Steve Falkenburg <sfalken@apple.com> + + Windows build fix (part 2). + Define Visual Studio internal variables used in pre-build/pre-link/post-build commands in environment for separated cmd files. + + * win/tools/vsprops/common.vsprops: + +2010-11-19 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Adam Roben. + + Add a mechanism for Windows pre-build/pre-link/post-build events to be separated into individual cmd files + https://bugs.webkit.org/show_bug.cgi?id=49858 + + We're migrating our prebuild/prelink/postbuild steps out of vcproj and vsprops files: + - To simplify editing (editing vsprops build steps is confusing). + - For more readable diffs. + + To add a prebuild/prelink/postbuild step for a vcproj, + Add a new file named {ProjectName}PreBuild|PreLink|PostBuild.cmd to the project directory. + For example, a WTF prebuild script would be named WTFPreBuild.cmd and would be located + in the directory JavaScriptCore/JavaScriptCore.vcproj/WTF (alongside WTF.vcproj). + + * win/tools/vsprops/common.vsprops: + * win/tools/vsprops/release.vsprops: + +2010-11-29 Anders Carlsson <andersca@apple.com> + + Reviewed by Sam Weinig and Simon Fraser. + + WebKitSystemInterface.h piece of r72438. + + * WebKitSystemInterface.h: + +2010-11-22 Adam Roben <aroben@apple.com> + + Use paths relative to $WebKitVSPropsRedirectionDir to access shared .vsprops files + + Apple's Windows build allows placing header files and import libraries for WebKit's + dependencies (CoreGraphics, CFNetwork, SQLite, etc.) outside the source tree via the + $WebKitLibrariesDir environment variable. This is both required for production builds and + convenient for Apple-internal developer builds. Apple's production builds also require that + WebKit's shared .vsprops files be accessed relative to $WebKitLibrariesDir. In production + builds, the files are copied into that directory tree by the + WebKitLibraries/win/tools/WinTools.make file. In Apple-internal developer builds, the + copying is done by + JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make. + + This .vsprops copying is problematic in one very important case: when a developer updates + their source tree and then tries to build. Visual Studio only reads .vsprops files when a + project is first loaded. So, when Visual Studio is first opened after the .vsprops files are + updated, it reads in the old files that were already residing in $WebKitLibrariesDir. When a + build is started, JavaScriptCoreGenerated.make copies the new .vsprops files into + $WebKitLibrariesDir, but Visual Studio will not pick up the changes. The rest of the build + will proceed with out-of-date .vsprops files, which will likely result in a build failure. + + To fix this, we now use normal relative paths to access the .vsprops files in the source + tree rather than in $WebKitLibrariesDir, but prefix those paths with a new environment + variable, $WebKitVSPropsRedirectionDir. In developer builds, this environment variable is + unset, so the normal relative paths are used to read the .vsprops files out of the source + tree directly. In production builds, this environment variable is set to a fake directory + that will cause the .vsprops files in $WebKitLibrariesDir to be found when the relative path + is resolved. + + For example, JavaScriptCore.vcproj uses this path for FeatureDefines.vsprops: + + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops + + In developer builds, where $WebKitVSPropsRedirectionDir is unset, this will point to the + files in WebKitLibraries\win\tools\vsprops in the source tree. In production builds, + JavaScriptCore.make sets $WebKitVSPropsRedirectionDir to + "$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\3\", so the full path for + FeatureDefines.vsprops becomes: + + $(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\3\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops + + which resolves to: + + $(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops + + (We rely on the fact that Windows doesn't care whether the directories "1", "2", and "3" + actually exist since they are matched by an equal number of ".." path components.) + + Note that Visual Studio still won't pick up changes made to .vsprops files while Visual + Studio is open, but that problem hasn't seemed to cause developers many headaches so far. + + Fixes <http://webkit.org/b/49181> Windows build fails mysteriously when .vsprops files are + updated + + Reviewed by Dave Hyatt. + + * win/tools/WinTools.make: Copy the shared .vsprops files into a directory tree beneath + AppleInternal\tools\vsprops that matches the source directory tree. This allows production + builds to redirect the relative paths used to find the shared .vsprops files into + AppleInternal by setting $WebKitVSPropsRedirectionDir to the appropriate value. + +2010-11-18 Steve Falkenburg <sfalken@apple.com> + + Rubber-stamped by Adam Roben. + + Remove unused debug_internal vsprops file. + + * win/tools/vsprops/debug_internal.vsprops: Removed. + +2010-11-18 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Adam Roben. + + Debug_Internal Windows configuration is unnecessary, should be removed + https://bugs.webkit.org/show_bug.cgi?id=49753 + + * win/tools/vsprops/debug.vsprops: + * win/tools/vsprops/debug_internal.vsprops: + 2010-11-17 Steve Falkenburg <sfalken@apple.com> Rubber-stamped by Adam Roben. diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 7ec07fb..d135304 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -143,7 +143,7 @@ CGAffineTransform WKGetUserToBaseCTM(CGContextRef); void WKGetGlyphsForCharacters(CGFontRef, const UniChar[], CGGlyph[], size_t); #else typedef void *WKGlyphVectorRef; -OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar *characters, unsigned numCharacters, WKGlyphVectorRef glyphs); +OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar* characters, unsigned numCharacters, WKGlyphVectorRef glyphs); OSStatus WKGetATSStyleGroup(ATSUStyle fontStyle, void **styleGroup); void WKReleaseStyleGroup(void *group); OSStatus WKInitializeGlyphVector(int count, WKGlyphVectorRef glyphs); @@ -336,6 +336,25 @@ void WKSyncSurfaceToView(NSView *view); CFIndex WKGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex index); #endif +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) +typedef enum { + WKSandboxExtensionTypeReadOnly, + WKSandboxExtensionTypeWriteOnly, + WKSandboxExtensionTypeReadWrite, +} WKSandboxExtensionType; +typedef struct __WKSandboxExtension *WKSandboxExtensionRef; + +WKSandboxExtensionRef WKSandboxExtensionCreate(const char* path, WKSandboxExtensionType type); +void WKSandboxExtensionDestroy(WKSandboxExtensionRef sandboxExtension); + +bool WKSandboxExtensionConsume(WKSandboxExtensionRef sandboxExtension); +bool WKSandboxExtensionInvalidate(WKSandboxExtensionRef sandboxExtension); + +const char* WKSandboxExtensionGetSerializedFormat(WKSandboxExtensionRef sandboxExtension, size_t* length); +WKSandboxExtensionRef WKSandboxExtensionCreateFromSerializedFormat(const char* serializationFormat, size_t length); + +#endif + #ifdef __cplusplus } #endif diff --git a/WebKitLibraries/win/tools/WinTools.make b/WebKitLibraries/win/tools/WinTools.make index c487e01..3e99ae5 100755 --- a/WebKitLibraries/win/tools/WinTools.make +++ b/WebKitLibraries/win/tools/WinTools.make @@ -1,3 +1,3 @@ install: - xcopy "$(SRCROOT)\vsprops\*.vsprops" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y + xcopy "$(SRCROOT)\vsprops\*.vsprops" "$(DSTROOT)\AppleInternal\tools\vsprops\OpenSource\WebKitLibraries\win\tools\vsprops" /e/v/i/h/y xcopy "$(SRCROOT)\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops index 9710568..704cd7a 100644 --- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="WinCairo"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo";"$(SolutionDir)\..\..\..\JavaScriptCore\os-win32""
- PreprocessorDefinitions="WIN_CAIRO=1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="cairo.lib libjpeg.lib zlib.lib libpng.lib"
- AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib""
- />
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="WinCairo" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo";"$(SolutionDir)\..\..\..\JavaScriptCore\os-win32"" + PreprocessorDefinitions="WIN_CAIRO=1" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="cairo.lib libjpeg.lib zlib.lib libpng.lib" + AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib"" + /> +</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/cURL.vsprops b/WebKitLibraries/win/tools/vsprops/cURL.vsprops index 3f06aa6..db7680a 100644 --- a/WebKitLibraries/win/tools/vsprops/cURL.vsprops +++ b/WebKitLibraries/win/tools/vsprops/cURL.vsprops @@ -1,13 +1,13 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="cURL"
- >
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib wininet.lib Wldap32.lib libeay32.lib ssleay32.lib libcurl_imp.lib"
- IgnoreAllDefaultLibraries="false"
- IgnoreDefaultLibraryNames=""
- />
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="cURL" + > + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib wininet.lib Wldap32.lib libeay32.lib ssleay32.lib libcurl_imp.lib" + IgnoreAllDefaultLibraries="false" + IgnoreDefaultLibraryNames="" + /> +</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops index b9c710c..b787f6b 100644 --- a/WebKitLibraries/win/tools/vsprops/common.vsprops +++ b/WebKitLibraries/win/tools/vsprops/common.vsprops @@ -25,7 +25,7 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="false" - AdditionalOptions="/SAFESEH /FIXED:NO /dynamicbase /ignore:4221" + AdditionalOptions="/SAFESEH /FIXED:NO /dynamicbase /ignore:4221" OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe" AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib"" GenerateDebugInformation="true" @@ -40,6 +40,18 @@ HeaderFileName="$(OutDir)\$(InputName).h" /> <Tool + Name="VCPostBuildEventTool" + CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PostBuild.cmd file
if not exist "$(ProjectDir)$(ProjectName)PostBuild.cmd" exit /b

set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)PostBuild.cmd"
" + /> + <Tool + Name="VCPreBuildEventTool" + CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreBuild.cmd file.
if not exist "$(ProjectDir)$(ProjectName)PreBuild.cmd" exit /b

set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)PreBuild.cmd"
" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreLink.cmd file.
if not exist "$(ProjectDir)$(ProjectName)PreLink.cmd" exit /b

set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)PreLink.cmd"
" + /> + <Tool Name="VCResourceCompilerTool" Culture="1033" AdditionalIncludeDirectories=""$(IntDir)\include"" 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/debug_wincairo.vsprops b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops index 7d424e6..c9f5722 100644 --- a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops @@ -1,34 +1,34 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="debug_wincairo"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo""
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib""
- />
- <UserMacro
- Name="WebKitConfigSuffix"
- Value="_debug"
- PerformEnvironmentSet="true"
- />
- <UserMacro
- Name="LibraryConfigSuffix"
- Value=""
- PerformEnvironmentSet="true"
- />
- <UserMacro
- Name="WebKitDLLConfigSuffix"
- Value="_debug"
- />
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="debug_wincairo" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo"" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib"" + /> + <UserMacro + Name="WebKitConfigSuffix" + Value="_debug" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="LibraryConfigSuffix" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="WebKitDLLConfigSuffix" + Value="_debug" + /> +</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/release.vsprops b/WebKitLibraries/win/tools/vsprops/release.vsprops index 8b38b73..6416e3f 100644 --- a/WebKitLibraries/win/tools/vsprops/release.vsprops +++ b/WebKitLibraries/win/tools/vsprops/release.vsprops @@ -18,10 +18,6 @@ OptimizeForWindows98="1" /> <Tool - Name="VCPreLinkEventTool" - CommandLine="if not exist "$(WebKitOutputDir)\public\sym" mkdir "$(WebKitOutputDir)\public\sym"" - /> - <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" /> |