From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 28 Jun 2003 13:10:36 +0000 (+0000)
Subject: wxUSE_BASE fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6fd9f0a47401cb921400f5b7ad43da8010ab170f

wxUSE_BASE fixes


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

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 62143724b6..294c92921a 100644
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -13,7 +13,6 @@
 
     <dll id="monodll" template="wx_dll"
          cond="SHARED=='1' and MONOLITHIC=='1'">
-        <define>__WXBASE__</define> 
         <define>wxUSE_BASE=1</define> 
         <define>WXMAKINGDLL</define>
         <sources>$(MONOLIB_SRC)</sources>
@@ -21,7 +20,6 @@
     
     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">
-        <define>__WXBASE__</define> 
         <define>wxUSE_BASE=1</define> 
         <sources>$(MONOLIB_SRC)</sources>
     </lib>
diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 78561c9dda..d661d44421 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -8,7 +8,6 @@
     <dll id="basedll" template="wx_dll"
          cond="SHARED=='1' and MONOLITHIC=='0'">
         <define>WXMAKINGDLL</define>
-        <define>__WXBASE__</define> 
         <define>wxUSE_BASE=1</define>
         <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
@@ -16,7 +15,6 @@
     
     <lib id="baselib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='0'">
-        <define>__WXBASE__</define> 
         <define>wxUSE_BASE=1</define> 
         <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
@@ -29,6 +27,7 @@
     <dll id="coredll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
         <define>WXMAKINGDLL</define>
+        <define>wxUSE_BASE=0</define> 
         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
         
         <wx-lib>base</wx-lib>
@@ -36,6 +35,7 @@
     
     <lib id="corelib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
+        <define>wxUSE_BASE=0</define> 
         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
     </lib>