<if cond="TOOLKIT=='WINCE'">wx/msw/wince/time.h</if>
</set>
+<!-- Base files used by Carbon on OS X and CarbonLib (not true Classic) -->
+<!-- FIXME: Maybe this ought to be named BASE_MAC_CARBON_SRC -->
<set var="BASE_MAC_SRC" hints="files">
src/mac/carbon/dirmac.cpp
src/mac/carbon/mimetmac.cpp
- src/unix/baseunix.cpp
src/mac/carbon/utilsexc.cpp
src/mac/carbon/thread.cpp
src/mac/carbon/macnotfy.cpp
+ <!-- One would think MoreFilesX is only for OS X but it seems to
+ apply to CarbonLib as well (FSRefMakeFSSpec) -->
src/mac/carbon/morefilex/MoreFilesX.c
+ <!-- Shared wxMac and wxCocoa files -->
+ src/mac/corefoundation/cfstring.cpp
+ src/mac/corefoundation/stdpaths_cf.cpp
+</set>
+
+<!-- Base files used by Classic (not CarbonLib or OS X builds) -->
+<!-- set var="BASE_MAC_CLASSIC_SRC">
+</set -->
+
+<!-- Base files used only by CarbonLib builds (not Classic or OS X) -->
+<set var="BASE_MAC_CARBONLIB_SRC" hints="files">
+ src/mac/carbon/morefile/DirectoryCopy.c
+ src/mac/carbon/morefile/FSpCompat.c
+ src/mac/carbon/morefile/FileCopy.c
+ src/mac/carbon/morefile/FullPath.c
+ src/mac/carbon/morefile/IterateDirectory.c
+ src/mac/carbon/morefile/MoreDesktopMgr.c
+ src/mac/carbon/morefile/MoreFiles.c
+ src/mac/carbon/morefile/MoreFilesExtras.c
+ src/mac/carbon/morefile/Search.c
+</set>
+
+<!-- Base files used only by OS X builds (not CarbonLib or Classic) -->
+<set var="BASE_MAC_OSX_SRC" hints="files">
+ src/unix/baseunix.cpp
</set>
+<!-- Base and GUI files used by both OS X and CarbonLib -->
<set var="BASE_AND_GUI_MAC_SRC" hints="files">
src/mac/carbon/utils.cpp
src/mac/carbon/uma.cpp
</set>
<set var="BASE_MAC_HDR" hints="files">
+ <!-- Shared wxMac and wxCocoa files -->
+ include/wx/mac/corefoundation/cfstring.h
+ include/wx/mac/corefoundation/stdpaths.h
</set>
<set var="BASE_OS2_SRC" hints="files">
<set var="NET_OS2_HDR" hints="files">
wx/unix/gsockunx.h
</set>
+<!-- Net files used only by CarbonLib (not Classic or OS X) -->
+<set var="NET_MAC_CARBONLIB_SRC" hints="files">
+ src/mac/carbon/gsocket.cpp
+</set>
+<set var="NET_MAC_CARBONLIB_HDR" hints="files">
+ include/wx/mac/carbon/gsockmac.h
+</set>
<set var="NET_CMN_SRC" hints="files">
src/common/fs_inet.cpp
<!-- wxWebKit files -->
src/html/htmlctrl/webkit/webkit.mm
</set>
+<set var="MAC_OSX_SRC" hints="files">
+ <!-- Shared wxMac and wxCocoa files -->
+ src/mac/corefoundation/utilsexc_cf.cpp
+</set>
+
<!-- Header files like wx/mac/foo.h which include wx/mac/carbon/foo.h -->
<set var="MAC_CMN_HDR" hints="files">
wx/mac/accel.h
src/generic/timer.cpp
<!-- wxMac stuff used by wxCocoa: -->
src/mac/carbon/gsockosx.cpp
+ <!-- Shared wxMac and wxCocoa files -->
+ src/mac/corefoundation/cfstring.cpp
+ src/mac/corefoundation/stdpaths_cf.cpp
+ src/mac/corefoundation/utilsexc_cf.cpp
</set>
<set var="COCOA_HDR" hints="files">
wx/cocoa/NSApplication.h
wx/generic/region.h
wx/generic/statusbr.h
wx/generic/tabg.h
+ <!-- Shared wxMac and wxCocoa files -->
+ include/wx/mac/corefoundation/cfstring.h
+ include/wx/mac/corefoundation/stdpaths.h
</set>
src/unix/sound_sdl.cpp
</set>
+<set var="GTK_PRINT_SRC_GNOME" hints="files">
+ src/gtk/gnome/gprint.cpp
+</set>
+
<!-- ====================================================================== -->
<!-- Define sources for specific libraries: -->
<!-- ====================================================================== -->
<!-- wxBase files: -->
<!-- Nested if would be nicer, but this works -->
+ <!-- These are the files for PLATFORM_MACOSX -->
<set var="BASE_MACOSX_SRC" hints="files">
- <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
+ <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC) $(BASE_MAC_OSX_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(BASE_UNIX_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(BASE_UNIX_SRC)</if>
<if cond="TOOLKIT=='X11'">$(BASE_UNIX_SRC)</if>
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
+ <if cond="PLATFORM_MACOS=='1'">$(BASE_MAC_SRC) $(BASE_MAC_CARBONLIB_SRC)</if>
<if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
</set>
<set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
+ <!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
+ <!-- if cond="PLATFORM_MACOS=='1'">$(BASE_AND_GUI_MAC_SRC)</if -->
</set>
<set var="BASE_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
<if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC) $(NET_WINCE_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_SRC)</if>
+ <if cond="PLATFORM_MACOS=='1'">$(NET_MAC_CARBONLIB_SRC)</if>
<if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
</set>
<set var="NET_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
<if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
<if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_HDR)</if>
+ <if cond="PLATFORM_MACOS=='1'">$(NET_MAC_CARBONLIB_HDR)</if>
</set>
<set var="NET_SRC" hints="files">
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_ONLY_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
- <if cond="TOOLKIT=='MAC'">$(MAC_SRC)</if>
+ <if cond="TOOLKIT=='MAC'">$(MAC_SRC) $(MAC_OSX_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
<if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
</set>
<set var="PLUGIN_ADV_SRC">
<if cond="FORMAT=='autoconf' and PLATFORM_UNIX=='1' and USE_PLUGINS=='0'">
$(UNIX_SOUND_SRC_SDL)
+ $(GTK_PRINT_SRC_GNOME)
</if>
</set>