build libjpeg, libpng and libtiff only in GUI mode

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

diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index 5321d58541022cdbc05287bc6eefa32004a160e3..0db85518a0dbed1160e8ab8d1933fc98be363528 100644 (file)
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -8,14 +8,16 @@
         <set var="wxUSE_LIBJPEG">builtin</set>
     </if>
     <set var="LIB_JPEG">
         <set var="wxUSE_LIBJPEG">builtin</set>
     </if>
     <set var="LIB_JPEG">

-        <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
+        <if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
+            wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+        </if>

     </set>
     <set var="INC_JPEG">
         <if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)src/jpeg</if>
     </set>
 
     <lib id="wxjpeg" template="3rdparty_lib"
     </set>
     <set var="INC_JPEG">
         <if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)src/jpeg</if>
     </set>
 
     <lib id="wxjpeg" template="3rdparty_lib"

-         cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
+         cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">

         <dirname>$(LIBDIRNAME)</dirname>
         <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
         <sources>
         <dirname>$(LIBDIRNAME)</dirname>
         <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
         <sources>

diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index bc75ddb688c69ce3f803d43a445c525a8f826402..662d2a28a2ae7fc92cb9860a6bc89b9977595cd9 100644 (file)
--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -8,14 +8,16 @@
         <set var="wxUSE_LIBPNG">builtin</set>
     </if>
     <set var="LIB_PNG">
         <set var="wxUSE_LIBPNG">builtin</set>
     </if>
     <set var="LIB_PNG">

-        <if cond="wxUSE_LIBPNG=='builtin'">wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
+        <if cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1'">
+            wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
+        </if>

     </set>
     <set var="INC_PNG">
         <if cond="wxUSE_LIBPNG=='builtin'">$(TOP_SRCDIR)src/png</if>
     </set>
 
     <lib id="wxpng" template="3rdparty_lib"
     </set>
     <set var="INC_PNG">
         <if cond="wxUSE_LIBPNG=='builtin'">$(TOP_SRCDIR)src/png</if>
     </set>
 
     <lib id="wxpng" template="3rdparty_lib"

-         cond="wxUSE_LIBPNG=='builtin' and BUILDING_LIB=='1'">
+         cond="wxUSE_LIBPNG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">

         <dirname>$(LIBDIRNAME)</dirname>
         <include>$(INC_ZLIB)</include>
         <sources>
         <dirname>$(LIBDIRNAME)</dirname>
         <include>$(INC_ZLIB)</include>
         <sources>

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index e40442dc9a2e1155379ef22a914e71d8d1e71461..379d63d4c033eaee7704bf5ea062de286241462a 100644 (file)
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -8,7 +8,9 @@
         <set var="wxUSE_LIBTIFF">builtin</set>
     </if>
     <set var="LIB_TIFF">
         <set var="wxUSE_LIBTIFF">builtin</set>
     </if>
     <set var="LIB_TIFF">

-        <if cond="wxUSE_LIBTIFF=='builtin'">wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
+        <if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
+            wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+        </if>

     </set>
     <set var="INC_TIFF">
         <if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>
     </set>
     <set var="INC_TIFF">
         <if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>


@@ -21,7 +23,7 @@
     </set>
     
     <lib id="wxtiff" template="3rdparty_lib"
     </set>
     
     <lib id="wxtiff" template="3rdparty_lib"

-         cond="wxUSE_LIBTIFF=='builtin' and BUILDING_LIB=='1'">
+         cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">

         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
             $(TIFF_PLATFORM_SRC)
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
             $(TIFF_PLATFORM_SRC)