Linux build fix - ensure that webcore is linked before jscore so that the linker...

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

diff --git a/WebKit/wx/Bakefiles.bkgen b/WebKit/wx/Bakefiles.bkgen
index e7de9a732f493a31eb2cd053a0c574117bb78181..44cc4961efda50dbc30ec8148dfee5ac14375554 100644 (file)
--- a/WebKit/wx/Bakefiles.bkgen
+++ b/WebKit/wx/Bakefiles.bkgen
@@ -95,7 +95,7 @@ Build configuration script for Bakefile.
         -o../../WebKitTools/wx/browser/GNUmakefile
     </add-flags>
     <add-flags files="../../WebKitTools/wx/browser/browser.bkl" formats="msvs2005prj">
-        -o../../WebKitTools/wx/browser/webcore-wx.sln
+        -o../../WebKitTools/wx/browser/browser.sln
     </add-flags>
     <add-flags files="../../WebKitTools/wx/browser/browser.bkl" formats="msvc">
         -o../../WebKitTools/wx/browser/makefile.vc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 45ddbf049a4373a1a333ec77ae0279bb724c2964..55bc46e79bc014a0239492c94871b793e9e51477 100644 (file)
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-06  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Linux build fix - ensure that webcore is linked before jscore
+        so that the linker will know which symbols it needs to link in.
+        Also fix MSVC project file name typo for sample app.
+
+        * Bakefiles.bkgen:
+        * wxwebkit.bkl:
+
 2007-12-04  Darin Adler  <darin@apple.com>
 
         Reviewed by Kevin Decker.

diff --git a/WebKit/wx/wxwebkit.bkl b/WebKit/wx/wxwebkit.bkl
index cef908ddb7c98cce888d1564aefd0ab003bcfded..7e242f072eddf5c9c73d40191bacf6985c9e3279 100644 (file)
--- a/WebKit/wx/wxwebkit.bkl
+++ b/WebKit/wx/wxwebkit.bkl
@@ -49,16 +49,7 @@ This file builds the wxWebKit library.
         <runtime-libs>dynamic</runtime-libs>
         <dllname>wxwebkit</dllname>
         <libname>wxwebkit</libname>
-        
-        <if cond="FORMAT=='gnu'">
-            <ldflags>$(WKOUTPUTDIR)/libjscore.a</ldflags>
-        </if>
-        <if cond="FORMAT in ['msvc','msvs2005prj']">
-            <sys-lib>jscore</sys-lib>
-            <sys-lib>winmm</sys-lib> <!-- for timeGetTime -->
-            <lib-path>$(WKOUTPUTDIR)</lib-path>
-        </if>
-        
+
         <set var="BUILDDIR">obj-$(FORMAT)</set>
         
         <include>$(WK_ROOT)/WebCore/platform/graphics/wx</include>
@@ -68,15 +59,18 @@ This file builds the wxWebKit library.
         <include>$(WK_ROOT)/WebKit/wx</include>
         <include>$(WK_ROOT)/WebKit/wx/WebKitSupport</include>
         
+        <lib-path>$(WKOUTPUTDIR)</lib-path>
+        <sys-lib>webcore-wx</sys-lib>
+        <sys-lib>jscore</sys-lib>
+        
         <if cond="FORMAT=='gnu'">
             <sys-lib>png</sys-lib>
-            <ldflags>$(WKOUTPUTDIR)/libwebcore-wx.a</ldflags>
+            <sys-lib>jpeg</sys-lib>
         </if>
         <if cond="FORMAT in ['msvc','msvs2005prj']">
-            <sys-lib>webcore-wx</sys-lib>
+            <sys-lib>winmm</sys-lib> <!-- for timeGetTime -->
             <sys-lib>libpng</sys-lib>
-            <!-- we use wx's libjpeg so no need to link to an external one. -->
-            <lib-path>$(WKOUTPUTDIR)</lib-path>
+            <sys-lib>libjpeg</sys-lib>
         </if>
         
         <sources>