Rename WebKit_debug.dll to WebKit.dll for the Debug configuration
authoraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Oct 2007 21:43:14 +0000 (21:43 +0000)
committeraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Oct 2007 21:43:14 +0000 (21:43 +0000)
 JavaScriptCore:

         Updated testkjs for the rename of WebKit_debug.dll to WebKit.dll for the Debug configuration

         Reviewed by Kevin McCullough.

         * JavaScriptCore.vcproj/debug.vsprops: Added WebKitDLLConfigSuffix.
         * JavaScriptCore.vcproj/debug_internal.vsprops: Ditto.
         * JavaScriptCore.vcproj/release.vsprops: Ditto.
         * JavaScriptCore.vcproj/testkjs/testkjs.vcproj: Use
         WebKitDLLConfigSuffix when referring to WebKit.dll, and fixed a typo
         in the name of icuuc36[_debug].dll.

 WebKitTools:

         Updated for rename of WebKit_debug.dll to WebKit.dll for the Debug configuration

         Reviewed by Kevin McCullough.

         * DumpRenderTree/win/DumpRenderTree.vcproj: Use WebKitDLLConfigSuffix
         when referring to WebKit.dll.
         * DumpRenderTree/win/debug.vsprops: Added WebKitDLLConfigSuffix.
         * DumpRenderTree/win/debug_internal.vsprops: Ditto.
         * DumpRenderTree/win/release.vsprops: Ditto.
         * Scripts/run-safari: Don't pass /debug to Safari anymore because we
         never have a _debug suffix on WebKit.dll.
         * WebKitInitializer/WebKitInitializer.cpp:
         (initializeWebKit): Only use the _debug suffix for WebKit.dll when
         specified.
         * WebKitInitializer/debug_internal.vsprops: Added
         DEBUG_WEBKIT_HAS_SUFFIX preprocessor definition.

 WebKit/win:

         Rename WebKit_debug.dll to WebKit.dll for the Debug configuration

         This is needed so that we can stop having Safari delay-load WebKit,
         which in turn is needed so that Maciej can land a JavaScript speedup
         which breaks delay-loading.

         Reviewed by Kevin McCullough.

         * WebKit.vcproj/WebKit.vcproj: Use WebKitDLLConfigSuffix for the name
         of our DLL and module definition file.
         * WebKit.vcproj/debug.vsprops: Added WebKitDLLConfigSuffix.
         * WebKit.vcproj/debug_internal.vsprops: Ditto.
         * WebKit.vcproj/release.vsprops: Ditto.

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

18 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/debug.vsprops
JavaScriptCore/JavaScriptCore.vcproj/debug_internal.vsprops
JavaScriptCore/JavaScriptCore.vcproj/release.vsprops
JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj
WebKit/win/ChangeLog
WebKit/win/WebKit.vcproj/WebKit.vcproj
WebKit/win/WebKit.vcproj/debug.vsprops
WebKit/win/WebKit.vcproj/debug_internal.vsprops
WebKit/win/WebKit.vcproj/release.vsprops
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
WebKitTools/DumpRenderTree/win/debug.vsprops
WebKitTools/DumpRenderTree/win/debug_internal.vsprops
WebKitTools/DumpRenderTree/win/release.vsprops
WebKitTools/Scripts/run-safari
WebKitTools/WebKitInitializer/WebKitInitializer.cpp
WebKitTools/WebKitInitializer/debug_internal.vsprops

index e114255fd9a9808b8bd6f1184e97bac1d7d4745e..6661db7b9db5d18e7c2a383c9b1486ad4addd4c0 100644 (file)
@@ -1,3 +1,16 @@
+2007-10-16  Adam Roben  <aroben@apple.com>
+
+        Updated testkjs for the rename of WebKit_debug.dll to WebKit.dll for the Debug configuration
+
+        Reviewed by Kevin McCullough.
+
+        * JavaScriptCore.vcproj/debug.vsprops: Added WebKitDLLConfigSuffix.
+        * JavaScriptCore.vcproj/debug_internal.vsprops: Ditto.
+        * JavaScriptCore.vcproj/release.vsprops: Ditto.
+        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj: Use
+        WebKitDLLConfigSuffix when referring to WebKit.dll, and fixed a typo
+        in the name of icuuc36[_debug].dll.
+
 2007-10-16  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Maciej Stachowiak.
index d3fbffd39425723a70a816dedc4416f6b7b4124a..f249d8a44b48919c1ac8c5b4982d6d37b34d6304 100644 (file)
@@ -12,4 +12,8 @@
                Name="LibraryConfigSuffix"
                Value=""
        />
+       <UserMacro
+               Name="WebKitDLLConfigSuffix"
+               Value=""
+       />
 </VisualStudioPropertySheet>
index 3120a7c6e3072b23f7f9dea54a5db42f00a457be..ac9d18a37f44ed8c15d61db0f65184f5ab759eab 100644 (file)
@@ -12,4 +12,8 @@
                Name="LibraryConfigSuffix"
                Value=""
        />
+       <UserMacro
+               Name="WebKitDLLConfigSuffix"
+               Value="_debug"
+       />
 </VisualStudioPropertySheet>
index 9d78fc765e6bc93e659dbb946f120c282d2578c6..3916464e2b13782f20414469da2d909560195765 100644 (file)
@@ -12,4 +12,8 @@
                Name="LibraryConfigSuffix"
                Value=""
        />
+       <UserMacro
+               Name="WebKitDLLConfigSuffix"
+               Value=""
+       />
 </VisualStudioPropertySheet>
index dccd31896a451ece2bf2f3ebe74c4427912264ae..08d8777a8311582759ecca7d35edb9714c56be1d 100644 (file)
@@ -71,7 +71,7 @@
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;;..\..\..\icu\lib"\r
-                               DelayLoadDLLs="icuuc$(LibraryConfigSuffix)36.dll;pthreadVC2$(LibraryConfigSuffix).dll;WebKit$(WebKitConfigSuffix).dll"\r
+                               DelayLoadDLLs="icuuc36$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll;WebKit$(WebKitDLLConfigSuffix).dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;;..\..\..\icu\lib"\r
-                               DelayLoadDLLs="icuuc$(LibraryConfigSuffix)36.dll;pthreadVC2$(LibraryConfigSuffix).dll;WebKit$(WebKitConfigSuffix).dll"\r
+                               DelayLoadDLLs="icuuc36$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll;WebKit$(WebKitDLLConfigSuffix).dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;;..\..\..\icu\lib"\r
-                               DelayLoadDLLs="icuuc$(LibraryConfigSuffix)36.dll;pthreadVC2$(LibraryConfigSuffix).dll;WebKit$(WebKitConfigSuffix).dll"\r
+                               DelayLoadDLLs="icuuc36$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll;WebKit$(WebKitDLLConfigSuffix).dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
index d9e0efa165e5aadfc79f9ee2c96b634a30558aaa..e928521492df29b75125a45305d36fc533970f0f 100644 (file)
@@ -1,3 +1,19 @@
+2007-10-16  Adam Roben  <aroben@apple.com>
+
+        Rename WebKit_debug.dll to WebKit.dll for the Debug configuration
+
+        This is needed so that we can stop having Safari delay-load WebKit,
+        which in turn is needed so that Maciej can land a JavaScript speedup
+        which breaks delay-loading.
+
+        Reviewed by Kevin McCullough.
+
+        * WebKit.vcproj/WebKit.vcproj: Use WebKitDLLConfigSuffix for the name
+        of our DLL and module definition file.
+        * WebKit.vcproj/debug.vsprops: Added WebKitDLLConfigSuffix.
+        * WebKit.vcproj/debug_internal.vsprops: Ditto.
+        * WebKit.vcproj/release.vsprops: Ditto.
+
 2007-10-15  Jon Honeycutt  <jhoneycutt@apple.com>
 
         Reviewed by Ollie.
index 8bc0131d85d917a309b8434fb733204b94fe6021..6c9b7cef1285ffce99f1d13366d8d9516d404ac2 100644 (file)
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\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 icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib msimg32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;"\r
-                               ModuleDefinitionFile="WebKit$(WebKitConfigSuffix).def"\r
+                               ModuleDefinitionFile="WebKit$(WebKitDLLConfigSuffix).def"\r
                                DelayLoadDLLs="comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\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 icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib msimg32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;"\r
-                               ModuleDefinitionFile="WebKit$(WebKitConfigSuffix).def"\r
+                               ModuleDefinitionFile="WebKit$(WebKitDLLConfigSuffix).def"\r
                                DelayLoadDLLs="comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="false"\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 icuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib JavaScriptCore$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib msimg32.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;"\r
-                               ModuleDefinitionFile="WebKit$(WebKitConfigSuffix).def"\r
+                               ModuleDefinitionFile="WebKit$(WebKitDLLConfigSuffix).def"\r
                                DelayLoadDLLs="comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
index 3e586692cd994c2c1d8034961e96a26fc1f8da65..30e46ddfe8cacab0692ccc44684f85d42403ba45 100644 (file)
@@ -14,4 +14,8 @@
                Value=""
                PerformEnvironmentSet="true"
        />
+       <UserMacro
+               Name="WebKitDLLConfigSuffix"
+               Value=""
+       />
 </VisualStudioPropertySheet>
index f7af24e29c331e69bd0672a79f156015bc8d7127..e4611967812949e3f9bda0dc67fadc134cb946c3 100644 (file)
@@ -18,4 +18,8 @@
                Value="_debug"
                PerformEnvironmentSet="true"
        />
+       <UserMacro
+               Name="WebKitDLLConfigSuffix"
+               Value="_debug"
+       />
 </VisualStudioPropertySheet>
index ee9cdba4a8ec9a4a143fe6233e0ad1aa627cc9ac..3156603f19ff085c5735725c854a71b6eba09b1a 100644 (file)
@@ -14,4 +14,8 @@
                Value=""
                PerformEnvironmentSet="true"
        />
+       <UserMacro
+               Name="WebKitDLLConfigSuffix"
+               Value=""
+       />
 </VisualStudioPropertySheet>
index e81a5e97377133af97a8eb7303717d3665944729..bf2711ec0b4480555e68ac6ab593fa18aea636b5 100644 (file)
@@ -1,3 +1,22 @@
+2007-10-16  Adam Roben  <aroben@apple.com>
+
+        Updated for rename of WebKit_debug.dll to WebKit.dll for the Debug configuration
+
+        Reviewed by Kevin McCullough.
+
+        * DumpRenderTree/win/DumpRenderTree.vcproj: Use WebKitDLLConfigSuffix
+        when referring to WebKit.dll.
+        * DumpRenderTree/win/debug.vsprops: Added WebKitDLLConfigSuffix.
+        * DumpRenderTree/win/debug_internal.vsprops: Ditto.
+        * DumpRenderTree/win/release.vsprops: Ditto.
+        * Scripts/run-safari: Don't pass /debug to Safari anymore because we
+        never have a _debug suffix on WebKit.dll.
+        * WebKitInitializer/WebKitInitializer.cpp:
+        (initializeWebKit): Only use the _debug suffix for WebKit.dll when
+        specified.
+        * WebKitInitializer/debug_internal.vsprops: Added
+        DEBUG_WEBKIT_HAS_SUFFIX preprocessor definition.
+
 2007-10-16  Darin Adler  <darin@apple.com>
 
         Reviewed by Adele.
index 2ec6110d85695346444bbd046ecbe816b9a73562..d5416aaf3b32a245029cfc9bf62e4b2f034cb281 100644 (file)
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitInitializer$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib"\r
+                               AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitInitializer$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;;&quot;$(WebKitOutputDir)\bin&quot;"\r
-                               DelayLoadDLLs="WebKit$(WebKitConfigSuffix).dll;CoreGraphics$(LibraryConfigSuffix).dll;CoreFoundation$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"\r
+                               DelayLoadDLLs="WebKit$(WebKitDLLConfigSuffix).dll;CoreGraphics$(LibraryConfigSuffix).dll;CoreFoundation$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitInitializer$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib"\r
+                               AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitInitializer$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;;&quot;$(WebKitOutputDir)\bin&quot;"\r
-                               DelayLoadDLLs="WebKit$(WebKitConfigSuffix).dll;CoreGraphics$(LibraryConfigSuffix).dll;CoreFoundation$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"\r
+                               DelayLoadDLLs="WebKit$(WebKitDLLConfigSuffix).dll;CoreGraphics$(LibraryConfigSuffix).dll;CoreFoundation$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitInitializer$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib"\r
+                               AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib WebKitInitializer$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;;&quot;$(WebKitOutputDir)\bin&quot;"\r
-                               DelayLoadDLLs="WebKit$(WebKitConfigSuffix).dll;CoreGraphics$(LibraryConfigSuffix).dll;CoreFoundation$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"\r
+                               DelayLoadDLLs="WebKit$(WebKitDLLConfigSuffix).dll;CoreGraphics$(LibraryConfigSuffix).dll;CoreFoundation$(LibraryConfigSuffix).dll;pthreadVC2$(LibraryConfigSuffix).dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
index d3fbffd39425723a70a816dedc4416f6b7b4124a..f249d8a44b48919c1ac8c5b4982d6d37b34d6304 100644 (file)
@@ -12,4 +12,8 @@
                Name="LibraryConfigSuffix"
                Value=""
        />
+       <UserMacro
+               Name="WebKitDLLConfigSuffix"
+               Value=""
+       />
 </VisualStudioPropertySheet>
index 5fdf415720ba802a41b57b2ef35183b594427d45..bc9e387eb81128f563929188b5f46eee9750f0ee 100644 (file)
@@ -12,4 +12,8 @@
                Name="LibraryConfigSuffix"
                Value="_debug"
        />
+       <UserMacro
+               Name="WebKitDLLConfigSuffix"
+               Value="_debug"
+       />
 </VisualStudioPropertySheet>
index 9d78fc765e6bc93e659dbb946f120c282d2578c6..3916464e2b13782f20414469da2d909560195765 100644 (file)
@@ -12,4 +12,8 @@
                Name="LibraryConfigSuffix"
                Value=""
        />
+       <UserMacro
+               Name="WebKitDLLConfigSuffix"
+               Value=""
+       />
 </VisualStudioPropertySheet>
index ef3e72e70073e8ecf449376e1f5948a347ddeb3b..ca57ed8a240f78b1757aec058d707c629d234283 100755 (executable)
@@ -52,13 +52,11 @@ if (isOSX()) {
 } elsif (isCygwin()) {
     chomp(my $winSafariPath = `cygpath -wa "$safariPath"`);
     chomp(my $winProductDir = `cygpath -wa "$productDir"`);
-    my $extraArgs = "";
-    $extraArgs .= "/debug" if configuration() eq "Debug";
 
     my ($fh, $path) = tempfile(UNLINK => 0, SUFFIX => '.cmd') or die;
     print $fh <<EOF;
 \@echo off
-"$winSafariPath" /frameworkPath:"$winProductDir" $extraArgs
+"$winSafariPath" /frameworkPath:"$winProductDir"
 EOF
     chomp($path = `cygpath -ws "$path"`);
     $safariPath = "cmd";
index 934860865e349f2324cfe9673bf02490b8122d42..c833639f603508c88b4f6cfae394b8da4f808718 100644 (file)
 #define DLL(name) RELEASEDLL(name)
 #endif
 
+#ifdef DEBUG_WEBKIT_HAS_SUFFIX
+#define WEBKITDLL DEBUGDLL(WebKit)
+#else
+#define WEBKITDLL RELEASEDLL(WebKit)
+#endif
+
 static TCHAR* getStringValue(HKEY key, LPCTSTR valueName)
 {
     DWORD type = 0;
@@ -175,7 +181,7 @@ bool initializeWebKit()
             return false;
         }
 
-    HMODULE webKitModule = LoadLibrary(DLL(WebKit));
+    HMODULE webKitModule = LoadLibrary(WEBKITDLL);
     if (!webKitModule) {
         LOG_ERROR(TEXT("LoadLibrary(%s) failed\n"), DLL(WebKit));
         return false;
index 279d40fb84513a0234d83dc0ea4cb45074868902..00d1b64e5514a029e02aca0178ebd158f4066a0a 100644 (file)
@@ -6,7 +6,7 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="USE_DEBUG_SUPPORT_LIBS"
+               PreprocessorDefinitions="USE_DEBUG_SUPPORT_LIBS;DEBUG_WEBKIT_HAS_SUFFIX"
        />
        <UserMacro
                Name="WebKitConfigSuffix"