wx build fix. Make sure we link png/jpeg libraries before wx libraries to get the...
authorkevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Mar 2008 03:59:25 +0000 (03:59 +0000)
committerkevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Mar 2008 03:59:25 +0000 (03:59 +0000)
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@31091 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/wx/ChangeLog
WebKit/wx/wxwebkit.bkl
WebKit/wx/wxwk-settings.bkl

index 973081565fa044aa091e1df8b4de0555630e2a16..88da59a57e4cd403ce839f7751f1102ed5d3fb77 100644 (file)
@@ -1,3 +1,11 @@
+2008-03-16  Kevin Ollivier  <kevino@theolliviers.com>
+
+        wx build fix. Make sure we link png/jpeg libraries before
+        wx libraries to get the right symbols.
+
+        * wxwebkit.bkl:
+        * wxwk-settings.bkl:
+
 2008-03-16  Kevin Ollivier  <kevino@theolliviers.com>
 
         Rubber stamped by Darin.
index ddea831b4ef92e58ffb10dfc12a0e4cbf0d8fa28..e89911cf8185b8c0fb971ad4dae6508a130d95d1 100644 (file)
@@ -59,10 +59,6 @@ This file builds the wxWebKit library.
         <sys-lib>webcore-wx</sys-lib>
         <sys-lib>jscore</sys-lib>
         
-        <if cond="FORMAT=='gnu'">
-            <sys-lib>png</sys-lib>
-            <sys-lib>jpeg</sys-lib>
-        </if>
         <if cond="FORMAT in ['msvc','msvs2005prj']">
             <sys-lib>winmm</sys-lib> <!-- for timeGetTime -->
             <sys-lib>gdiplus</sys-lib>
index e73fbfa5e2515b76b3e8ae84b66eff40059724e8..729487b0ad2b5f7563e02e62161bb4afbe4a584f 100644 (file)
@@ -82,6 +82,14 @@ JavaScriptCore Bakefile project file.
         </if>
     </template>
     <template id="wxwk" template="wxwk_build_settings,wx">
+        <!-- 
+        since wx 2.8's libpng and libjpeg symbols get exported when using gcc/gnu make
+        we need to make sure our versions appear first, so that it will get the symbols
+        from the right place
+        -->
+        <if cond="FORMAT=='gnu'">
+            <ldflags>-ljpeg -lpng</ldflags>
+        </if>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <if cond="PLATFORM_WIN32=='1'">