some compilers (Watcom) don't like it if wxBase library PCH file contains

symbols from GUI components and won't link a DLL

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 832470de2985a6dcf07bf665998204053ad0f921..f769c3f40f5d4fefcb48094c4f24e8a113a3abae 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -390,19 +390,21 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
     </template>
     
     <template id="wx_lib" template="wx_lib_b,wx_3rdparty_dependencies"/>
-    <template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_dependencies"/>
+    <template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_dependencies">
+        <define>wxUSE_GUI=0</define> 
+    </template>
+
     <template id="wx_dll" template="wx_dll_b,wx_3rdparty_dependencies"
                           template_append="wx_append_nomono"/>
     <template id="wx_base_dll" template="wx_dll_b,wx_3rdparty_dependencies"
-                               template_append="wx_append_base_nomono"/>
+                               template_append="wx_append_base_nomono">
+        <define>wxUSE_GUI=0</define> 
+    </template>
                            
     <!-- =============================================================== -->
     <!--             Templates for building wxWindows plugins:           -->
     <!-- =============================================================== -->
 
-    <set var="">
-    </set>
-
     <if cond="WX_STABLE_BRANCH=='1'">
         <set var="PLUGIN_VERSION">
             <if cond="PLATFORM_UNIX=='1'">
@@ -430,6 +432,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
                 $(id)$(addPrefixIfNotEmpty('_',WXNAMESUFFIX))$(PLUGIN_VERSION)
             </dllname>
             <define>WXUSINGDLL</define>
+            <define>wxUSE_GUI=0</define>
         </template>
     </define-rule>
     

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index befb3203847a3d20aefccf00ad789f21ced45273..144bf65ba69fb234bb59f7af9608fb4e8fb330b7 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -11,7 +11,6 @@
          cond="SHARED=='1' and MONOLITHIC=='0'">
         <define>WXMAKINGDLL_BASE</define>
         <define>wxUSE_BASE=1</define>
-        <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
         <msvc-copy-setup-h/>
@@ -20,7 +19,6 @@
     <lib id="baselib" template="wx_base_lib"
          cond="SHARED=='0' and MONOLITHIC=='0'">
         <define>wxUSE_BASE=1</define> 
-        <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
         <msvc-copy-setup-h/>