WebKit/win: https://bugs.webkit.org/show_bug.cgi?id=28048.
authorbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Aug 2009 18:22:13 +0000 (18:22 +0000)
committerbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Aug 2009 18:22:13 +0000 (18:22 +0000)
Move various WinCairo build settings into *.vsprops file.

Reviewed by Adam Roben.

* WebKit.vcproj/WebKit.vcproj: Add new cURL.vsprops property sheet
  (which contains link settings for cURL and its dependencies), and
  remove the corresponding entries from the vcproj file.  Remove
  png, jpeg, cairo library linking flags from vcproj, now that they
  are in the WinCairo.vsprops file.

WebKitLibraries: https://bugs.webkit.org/show_bug.cgi?id=28048.
Move various WinCairo build settings into *.vsprops file.

Reviewed by Adam Roben.

* win/tools/vsprops/cURL.vsprops: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@46990 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/win/ChangeLog
WebKit/win/WebKit.vcproj/WebKit.vcproj
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
WebKitLibraries/win/tools/vsprops/cURL.vsprops [new file with mode: 0644]

index b765e5d..d51728f 100644 (file)
@@ -1,3 +1,16 @@
+2009-08-10  Brent Fulgham  <bfulgham@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28048.
+        Move various WinCairo build settings into *.vsprops file.
+
+        * WebKit.vcproj/WebKit.vcproj: Add new cURL.vsprops property sheet
+          (which contains link settings for cURL and its dependencies), and
+          remove the corresponding entries from the vcproj file.  Remove
+          png, jpeg, cairo library linking flags from vcproj, now that they
+          are in the WinCairo.vsprops file.
+
 2009-08-09  Nikolas Zimmermann  <nikolas.zimmermann@torchmobile.com>
 
         Reviewed by George Staikos.
index 650789e..9a70440 100644 (file)
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\cURL.vsprops"\r
                        CharacterSet="1"\r
                        >\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CFLite_Debug.lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib cairo.lib jpeg.lib libpng.lib libcurl_imp.lib ws2_32.lib wininet.lib Wldap32.lib iphlpapi.lib winmm.lib rpcrt4.lib"\r
+                               AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CFLite_Debug.lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib iphlpapi.lib winmm.lib rpcrt4.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"\r
                                AdditionalLibraryDirectories=""\r
                                ModuleDefinitionFile="WebKit_Cairo$(WebKitDLLConfigSuffix).def"\r
                        OutputDirectory="$(WebKitOutputDir)\bin"\r
                        IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops"\r
+                       InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\cURL.vsprops"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CFLite.lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib cairo.lib jpeg.lib libpng.lib libcurl_imp.lib ws2_32.lib wininet.lib Wldap32.lib iphlpapi.lib winmm.lib rpcrt4.lib"\r
+                               AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib icuin$(LibraryConfigSuffix).lib icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CFLite.lib JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib iphlpapi.lib winmm.lib rpcrt4.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"\r
                                AdditionalLibraryDirectories=""\r
                                ModuleDefinitionFile="WebKit_Cairo$(WebKitDLLConfigSuffix).def"\r
index 3054511..63aba88 100644 (file)
@@ -1,3 +1,12 @@
+2009-08-10  Brent Fulgham  <bfulgham@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28048.
+        Move various WinCairo build settings into *.vsprops file.
+
+        * win/tools/vsprops/cURL.vsprops: Added.
+
 2009-08-06  Peter Kasting  <pkasting@google.com>
 
         Reviewed by Adam Barth.
index 2feb6eb..f42c8ec 100644 (file)
@@ -8,4 +8,8 @@
                Name="VCCLCompilerTool"\r
                PreprocessorDefinitions="WIN_CAIRO=1"\r
        />\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               AdditionalDependencies="cairo.lib jpeg.lib libpng.lib"\r
+       />\r
 </VisualStudioPropertySheet>\r
diff --git a/WebKitLibraries/win/tools/vsprops/cURL.vsprops b/WebKitLibraries/win/tools/vsprops/cURL.vsprops
new file mode 100644 (file)
index 0000000..3f06aa6
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="cURL"\r
+       >\r
+       <Tool\r
+               Name="VCLinkerTool"\r
+               AdditionalDependencies="ws2_32.lib wininet.lib Wldap32.lib libeay32.lib ssleay32.lib libcurl_imp.lib"\r
+               IgnoreAllDefaultLibraries="false"\r
+               IgnoreDefaultLibraryNames=""\r
+       />\r
+</VisualStudioPropertySheet>\r