Renamed BASE_DARWIN_(SRC|HDR) to BASE_MACOSX_NOTWXMAC_(SRC|HDR)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott 2005-03-11 21:34:00 +00:00
parent 5b89b4dc32
commit ad07ce2bbd

View File

@ -195,11 +195,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set> </set>
<!-- Base files used by non-wxMac OS X builds --> <!-- Base files used by non-wxMac OS X builds -->
<set var="BASE_DARWIN_SRC" hints="files"> <set var="BASE_MACOSX_NOTWXMAC_SRC" hints="files">
$(BASE_UNIX_SRC) $(BASE_UNIX_SRC)
$(BASE_COREFOUNDATION_SRC) $(BASE_COREFOUNDATION_SRC)
</set> </set>
<set var="BASE_DARWIN_HDR" hints="files"> <set var="BASE_MACOSX_NOTWXMAC_HDR" hints="files">
$(BASE_UNIX_HDR) $(BASE_UNIX_HDR)
$(BASE_COREFOUNDATION_HDR) $(BASE_COREFOUNDATION_HDR)
</set> </set>
@ -2710,15 +2710,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- These are the files for PLATFORM_MACOSX --> <!-- These are the files for PLATFORM_MACOSX -->
<set var="BASE_MACOSX_SRC" hints="files"> <set var="BASE_MACOSX_SRC" hints="files">
<if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC) $(BASE_MAC_OSX_SRC)</if> <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC) $(BASE_MAC_OSX_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if> <if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(BASE_DARWIN_SRC)</if> <if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='X11'">$(BASE_DARWIN_SRC)</if> <if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(BASE_DARWIN_SRC)</if> <if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<!-- FIXME: TOOLKIT!='MAC' is what we really want --> <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
<!-- FIXME: a hack because there are two wxBase versions on <!-- FIXME: a hack because there are two wxBase versions on
Mac; once fixed, this would no longer be needed --> Mac; once fixed, this would no longer be needed -->
<if cond="TOOLKIT==''">$(BASE_DARWIN_SRC)</if> <if cond="TOOLKIT==''">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
</set> </set>
<set var="BASE_PLATFORM_SRC" hints="files"> <set var="BASE_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if> <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>