1) Added INC_FOO variable with include directory for 3rd party libraries

2) Don't compile ODBC on Windows

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index dbd52bd39effa1002e1ed83de0f13493a26ac52f..e166c5390627b169fed0947d0f656781240cf277 100644 (file)
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -10,8 +10,12 @@
     <set var="LIB_JPEG">
         <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg</if>
     </set>
+    <set var="INC_JPEG">
+        <if cond="wxUSE_LIBJPEG=='builtin'">$(SRCDIR)/src/jpeg</if>
+    </set>
 
-    <lib id="wxjpeg" cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxjpeg" template="anylib"
+         cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
             src/jpeg/jcomapi.c

diff --git a/build/bakefiles/odbc.bkl b/build/bakefiles/odbc.bkl
index eec210764d1fcef5fe751a2821f3778d23b005fb..f76a8d2f1ea68635f7b4549e664b12b0c30f7986 100644 (file)
--- a/build/bakefiles/odbc.bkl
+++ b/build/bakefiles/odbc.bkl
@@ -5,13 +5,20 @@
         <option name="wxUSE_ODBC"/>
     </if>
     <if cond="FORMAT!='autoconf'">
-        <set var="wxUSE_ODBC">builtin</set>
+        <set var="wxUSE_ODBC">
+            <if cond="PLATFORM_UNIX=='1'">builtin</if>
+            <if cond="PLATFORM_UNIX=='0'">0</if>
+        </set>
     </if>
     <set var="LIB_ODBC">
         <if cond="wxUSE_ODBC=='builtin'">wxodbc</if>
     </set>
+    <set var="INC_ODBC">
+        <if cond="wxUSE_ODBC=='builtin'">$(SRCDIR)/src/odbc</if>
+    </set>
 
-    <lib id="wxodbc" cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxodbc" template="anylib"
+         cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
                    src/iodbc/catalog.c

diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index 8d80297d2c9f5dba4965fbdc081feb96b413d1bc..2f6b6d74de5ee29f8c85740bbf7ae571e973716c 100644 (file)
--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -10,9 +10,14 @@
     <set var="LIB_PNG">
         <if cond="wxUSE_LIBPNG=='builtin'">wxpng</if>
     </set>
+    <set var="INC_PNG">
+        <if cond="wxUSE_LIBPNG=='builtin'">$(SRCDIR)/src/png</if>
+    </set>
 
-    <lib id="wxpng" cond="wxUSE_LIBPNG=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxpng" template="anylib"
+         cond="wxUSE_LIBPNG=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
+        <include>$(INC_ZLIB)</include>
         <sources>
                    src/png/png.c
                    src/png/pngerror.c

diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index fa07162d7ca2d0b5aad182b0473274799126b67b..4a0753868891236f466e858dbf94e936c7d694e0 100644 (file)
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -10,8 +10,12 @@
     <set var="LIB_REGEX">
         <if cond="wxUSE_REGEX=='builtin'">wxregex</if>
     </set>
+    <set var="INC_REGEX">
+        <if cond="wxUSE_REGEX=='builtin'">$(SRCDIR)/src/regex</if>
+    </set>
 
-    <lib id="wxregex" cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxregex" template="anylib"
+         cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
             src/regex/regcomp.c

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 815b2b8edc4430599a2f5cced7662c4a2e38a31c..453d8570bc277e3acb6111bf8f82290010f8fbc5 100644 (file)
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -10,10 +10,20 @@
     <set var="LIB_TIFF">
         <if cond="wxUSE_LIBTIFF=='builtin'">wxtiff</if>
     </set>
+    <set var="INC_TIFF">
+        <if cond="wxUSE_LIBTIFF=='builtin'">$(SRCDIR)/src/tiff</if>
+    </set>
 
-    <lib id="wxtiff" cond="wxUSE_LIBTIFF=='builtin' and BUILDING_LIB=='1'">
+    <set var="TIFF_PLATFORM_SRC">
+        <if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
+        <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
+    </set>
+    
+    <lib id="wxtiff" template="anylib"
+         cond="wxUSE_LIBTIFF=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
+            $(TIFF_PLATFORM_SRC)
                    src/tiff/tif_aux.c
                    src/tiff/tif_close.c
                    src/tiff/tif_codec.c
@@ -42,7 +52,6 @@
                    src/tiff/tif_strip.c
                    src/tiff/tif_thunder.c
                    src/tiff/tif_tile.c
-                   src/tiff/tif_unix.c
                    src/tiff/tif_version.c
                    src/tiff/tif_warning.c
                    src/tiff/tif_write.c

diff --git a/build/bakefiles/zlib.bkl b/build/bakefiles/zlib.bkl
index c32306acd3c81473ac8a488b92da6664b4182b7e..18020fa730112ef4545387b64e634b07abc98b42 100644 (file)
--- a/build/bakefiles/zlib.bkl
+++ b/build/bakefiles/zlib.bkl
@@ -10,8 +10,12 @@
     <set var="LIB_ZLIB">
         <if cond="wxUSE_ZLIB=='builtin'">wxzlib</if>
     </set>
+    <set var="INC_ZLIB">
+        <if cond="wxUSE_ZLIB=='builtin'">$(SRCDIR)/src/zlib</if>
+    </set>
 
-    <lib id="wxzlib" cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
+    <lib id="wxzlib" teplate="anylib"
+         cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
             src/zlib/adler32.c