From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Thu, 18 Nov 2004 08:14:18 +0000 (+0000)
Subject: Fixes for USE_GUI=0 to make pure wxBase makefiles possible. Nothing rebaked because... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0bcf9597ab6f3b210a515c3024133e3cd8d0f0d9

Fixes for USE_GUI=0 to make pure wxBase makefiles possible. Nothing rebaked because GUI builds are not influenced (but makefiles minimally changed).


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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 84bcde3f90..4f0eb875d0 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -505,20 +505,28 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         <mac_version>$(WXMACVERSION)</mac_version>
     </template>
 
-    <template id="wx_3rdparty_dependencies">
+    <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>
+    </template>
+
+    <template id="wx_3rdparty_dependencies"
+              template="wx_3rdparty_dependencies_gui">
         <depends>wxexpat</depends>
         <depends>wxzlib</depends>
         <depends cond="FORMAT=='autoconf'">wxodbc</depends>
         <depends>wxregex</depends>
     </template>
 
-    <template id="wx_3rdparty_includes">
+    <template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
         <include>$(INC_TIFF)</include>
         <include>$(INC_JPEG)</include>
         <include>$(INC_PNG)</include>
+    </template>
+
+    <template id="wx_3rdparty_includes"
+              template="wx_3rdparty_includes_gui">
         <include>$(INC_ZLIB)</include>
         <include>$(INC_ODBC)</include>
         <include>$(INC_REGEX)</include>
diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 392254590e..d41d4500b4 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -166,7 +166,7 @@
     <!-- ================================================================ -->
     
     <dll id="htmldll" template="wx_dll"
-         cond="SHARED=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_HTML</define>
         <sources>$(HTML_SRC)</sources>
@@ -177,7 +177,7 @@
     </dll>
     
     <lib id="htmllib" template="wx_lib"
-         cond="SHARED=='0' and USE_HTML=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
         <sources>$(HTML_SRC)</sources>
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </lib>