src/unix/dir.cpp
src/unix/mimetype.cpp
src/unix/snglinst.cpp
+ src/unix/stdpaths.cpp
src/unix/threadpsx.cpp
</set>
<set var="BASE_AND_GUI_UNIX_SRC" hints="files">
wx/unix/execute.h
wx/unix/mimetype.h
wx/unix/pipe.h
+ wx/unix/stdpaths.h
</set>
<set var="BASE_WIN32_SRC" hints="files">
<if cond="TOOLKIT=='WINCE'">wx/msw/wince/time.h</if>
</set>
-<set var="BASE_DARWIN_SRC" hints="files">
- src/unix/baseunix.cpp
- src/unix/dir.cpp
- src/unix/mimetype.cpp
- src/unix/snglinst.cpp
- src/unix/threadpsx.cpp
-</set>
-<set var="BASE_AND_GUI_DARWIN_SRC" hints="files">
- src/unix/utilsunx.cpp
-</set>
-<set var="BASE_DARWIN_HDR" hints="files">
-</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">
src/common/object.cpp
src/common/process.cpp
src/common/regex.cpp
+ src/common/stdpbase.cpp
src/common/sstream.cpp
src/common/stopwatch.cpp
src/common/strconv.cpp
src/common/tokenzr.cpp
src/common/txtstrm.cpp
src/common/unzip.c
+ src/common/uri.cpp
src/common/variant.cpp
src/common/wfstream.cpp
src/common/wxchar.cpp
wx/snglinst.h
wx/sstream.h
wx/stack.h
+ wx/stdpaths.h
wx/stockitem.h
wx/stopwatch.h
wx/strconv.h
wx/tokenzr.h
wx/txtstrm.h
wx/types.h
+ wx/uri.h
wx/utils.h
wx/variant.h
wx/vector.h
<if cond="TOOLKIT=='WINCE'">wx/msw/wince/net.h</if>
</set>
-<set var="NET_DARWIN_SRC" hints="files">
- src/unix/gsocket.cpp
-</set>
-<set var="NET_DARWIN_HDR" hints="files">
- wx/unix/gsockunx.h
-</set>
-
<set var="NET_OS2_SRC" hints="files">
src/unix/gsocket.cpp
</set>
<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
src/msw/region.cpp
src/msw/renderer.cpp
src/msw/settings.cpp
+ src/msw/stdpaths.cpp
src/msw/timer.cpp
src/msw/tooltip.cpp
src/msw/toplevel.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/cocoa/checklst.mm
src/cocoa/choice.mm
src/cocoa/clipbrd.mm
+ src/cocoa/colordlg.mm
src/cocoa/colour.mm
src/cocoa/combobox.mm
src/cocoa/control.mm
src/cocoa/dcmemory.mm
src/cocoa/dcscreen.cpp
src/cocoa/dialog.mm
+ src/cocoa/display.mm
+ src/cocoa/drawer.mm
src/cocoa/evtloop.mm
+ src/cocoa/filedlg.mm
src/cocoa/font.cpp
+ src/cocoa/fontdlg.mm
src/cocoa/fontenum.mm
src/cocoa/fontutil.cpp
src/cocoa/frame.mm
src/cocoa/mdi.mm
src/cocoa/menu.mm
src/cocoa/menuitem.mm
+ src/cocoa/msgdlg.mm
src/cocoa/notebook.mm
src/cocoa/pen.mm
src/cocoa/radiobox.mm
src/cocoa/scrolbar.mm
src/cocoa/settings.cpp
src/cocoa/slider.mm
+ src/cocoa/sound.mm
src/cocoa/spinbutt.mm
src/cocoa/statbmp.mm
src/cocoa/statbox.mm
src/cocoa/stattext.mm
src/cocoa/textctrl.mm
src/cocoa/toolbar.mm
+ src/cocoa/tooltip.mm
src/cocoa/toplevel.mm
src/cocoa/utils.cpp
- src/cocoa/utilsexc.cpp
+ src/cocoa/utilsexc.mm
src/cocoa/window.mm
<!-- Generic implementations used by wxCocoa: -->
src/generic/accel.cpp
src/generic/colrdlgg.cpp
src/generic/dirdlgg.cpp
src/generic/fdrepdlg.cpp
- src/generic/filedlgg.cpp
src/generic/fontdlgg.cpp
src/generic/imaglist.cpp
src/generic/listctrl.cpp
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/cocoa/checklst.h
wx/cocoa/choice.h
wx/cocoa/clipbrd.h
+ wx/cocoa/colordlg.h
wx/cocoa/colour.h
wx/cocoa/combobox.h
wx/cocoa/control.h
wx/cocoa/dcmemory.h
wx/cocoa/dcscreen.h
wx/cocoa/dialog.h
+ wx/cocoa/display.h
+ wx/cocoa/drawer.h
+ wx/cocoa/filedlg.h
wx/cocoa/font.h
+ wx/cocoa/fontdlg.h
wx/cocoa/frame.h
wx/cocoa/gauge.h
wx/cocoa/gdiobj.h
wx/cocoa/mdi.h
wx/cocoa/menu.h
wx/cocoa/menuitem.h
+ wx/cocoa/msgdlg.h
wx/cocoa/notebook.h
wx/cocoa/pen.h
wx/cocoa/radiobox.h
wx/cocoa/region.h
wx/cocoa/scrolbar.h
wx/cocoa/slider.h
+ wx/cocoa/sound.h
wx/cocoa/spinbutt.h
wx/cocoa/statbmp.h
wx/cocoa/statbox.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>
wx/mac/carbon/taskbarosx.h
</set>
+<set var="ADVANCED_COCOA_SRC" hints="files">
+ src/cocoa/taskbar.mm
+ src/common/taskbarcmn.cpp
+</set>
+<set var="ADVANCED_COCOA_HDR" hints="files">
+ include/wx/cocoa/taskbar.h
+</set>
+
<set var="ADVANCED_OS2_SRC" hints="files">
src/os2/joystick.cpp
src/os2/sound.cpp
src/gtk/eggtrayicon.c
</set>
-
<!-- ====================================================================== -->
<!-- wxHTML -->
<!-- ====================================================================== -->
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=='COCOA'">$(BASE_DARWIN_SRC)</if>
- <if cond="TOOLKIT=='GTK'">$(BASE_DARWIN_SRC)</if>
- <if cond="TOOLKIT=='X11'">$(BASE_DARWIN_SRC)</if>
- <if cond="TOOLKIT=='MOTIF'">$(BASE_DARWIN_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="TOOLKIT=='MOTIF'">$(BASE_UNIX_SRC)</if>
<!-- FIXME: TOOLKIT!='MAC' is what we really want -->
+
+ <!-- FIXME: a hack because there are two wxBase versions on
+ Mac; once fixed, this would no longer be needed -->
+ <if cond="TOOLKIT==''">$(BASE_UNIX_SRC)</if>
</set>
<set var="BASE_PLATFORM_SRC" hints="files">
<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">
<set var="BASE_AND_GUI_PLATFORM_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_DARWIN_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_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR)</if>
- <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_HDR)</if>
+ <if cond="TOOLKIT=='COCOA'">$(BASE_UNIX_HDR)</if>
</set>
<set var="BASE_SRC" hints="files">
<set var="NET_PLATFORM_SRC" hints="files">
<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_DARWIN_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_UNIX=='1'">$(NET_UNIX_HDR)</if>
<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_DARWIN_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>
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_ONLY_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
+ <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_ONLY_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
+ <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
<set var="ALL_BASE_SOURCES" make_var="1" hints="files">
$(BASE_CMN_SRC)
$(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
- $(BASE_MAC_SRC) $(BASE_DARWIN_SRC)
+ $(BASE_MAC_SRC)
$(BASE_OS2_SRC)
$(BASE_AND_GUI_CMN_SRC)
$(BASE_AND_GUI_UNIX_SRC)
$(BASE_AND_GUI_MAC_SRC)
- $(BASE_AND_GUI_DARWIN_SRC)
$(BASE_AND_GUI_WIN32_SRC)
$(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
$(XML_SRC) $(ODBC_SRC)
<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>
projects / wxWidgets.git / blobdiff