<!-- wxBase -->
<!-- ====================================================================== -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!-- UNIX -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
<set var="BASE_UNIX_SRC" hints="files">
src/unix/baseunix.cpp
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>
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!-- Windows -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
<set var="BASE_WIN32_SRC" hints="files">
src/msw/basemsw.cpp
src/msw/crashrpt.cpp
src/msw/regconf.cpp
src/msw/registry.cpp
src/msw/snglinst.cpp
+ src/msw/stdpaths.cpp
src/msw/thread.cpp
src/msw/utils.cpp
src/msw/utilsexc.cpp
<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
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!-- Mac -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+
+<!-- Used on Mac OS CarbonLib, Mac OS X wxMac base, and Mac OS X darwin base -->
+<set var="BASE_COREFOUNDATION_SRC" hints="files">
+ src/mac/corefoundation/cfstring.cpp
+ src/mac/corefoundation/stdpaths_cf.cpp
</set>
-<set var="BASE_DARWIN_HDR" hints="files">
+<set var="BASE_COREFOUNDATION_HDR" hints="files">
+ wx/mac/corefoundation/cfstring.h
+ wx/mac/corefoundation/stdpaths.h
</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
+ $(BASE_COREFOUNDATION_SRC)
</set>
-
+<set var="BASE_MAC_HDR" hints="files">
+ $(BASE_COREFOUNDATION_HDR)
+</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">
+<!-- Base files used by Classic (not CarbonLib or OS X builds) -->
+<!-- set var="BASE_MAC_CLASSIC_SRC">
+</set -->
+<!-- set var="BASE_MAC_CLASSIC_HDR">
+</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>
+<!-- set var="BASE_MAC_CARBONLIB_HDR" hints="files">
+</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
+ src/unix/stdpaths.cpp
+</set>
+<set var="BASE_MAC_OSX_HDR" hints="files">
+ wx/unix/stdpaths.h
</set>
+<!-- Base files used by non-wxMac OS X builds -->
+<set var="BASE_DARWIN_SRC" hints="files">
+ $(BASE_UNIX_SRC)
+ $(BASE_COREFOUNDATION_SRC)
+</set>
+<set var="BASE_DARWIN_HDR" hints="files">
+ $(BASE_UNIX_HDR)
+ $(BASE_COREFOUNDATION_HDR)
+</set>
+
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!-- OS/2 -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
<set var="BASE_OS2_SRC" hints="files">
src/os2/dir.cpp
src/os2/mimetype.cpp
+ src/os2/stdpaths.cpp
src/os2/thread.cpp
src/os2/utils.cpp
src/os2/utilsexc.cpp
<set var="BASE_AND_GUI_OS2_SRC" hints="files">
</set>
<set var="BASE_OS2_HDR" hints="files">
+ wx/os2/apptbase.h
+ wx/os2/apptrait.h
+ wx/os2/mimetype.h
+ wx/os2/stdpaths.h
</set>
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!-- Common -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
<set var="BASE_CMN_SRC" hints="files">
src/common/appbase.cpp
+ src/common/archive.cpp
src/common/clntdata.cpp
src/common/cmdline.cpp
src/common/config.cpp
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/textfile.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/afterstd.h
wx/app.h
wx/apptrait.h
+ wx/archive.h
wx/arrimpl.cpp
wx/arrstr.h
wx/beforestd.h
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">
+ wx/mac/carbon/gsockmac.h
+</set>
<set var="NET_CMN_SRC" hints="files">
src/common/fs_inet.cpp
src/gtk/combobox.cpp
src/gtk/control.cpp
src/gtk/dialog.cpp
+ src/gtk/filedlg.cpp
src/gtk/fontdlg.cpp
src/gtk/frame.cpp
src/gtk/gauge.cpp
<!-- wxMac -->
<!-- ====================================================================== -->
+<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
+ <!-- Shared wxMac and wxCocoa files -->
+ src/mac/corefoundation/gsockosx.cpp
+ src/mac/corefoundation/utilsexc_cf.cpp
+</set>
+
<set var="MAC_LOWLEVEL_SRC" hints="files">
+ <if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_SRC)</if>
</set>
<set var="MAC_LOWLEVEL_HDR" hints="files">
</set>
+
+<set var="MAC_OSX_SRC" hints="files">
+<if cond="PLATFORM_MACOSX=='1'">
+ <!-- Unix files used by wxMac: -->
+ src/unix/snglinst.cpp
+ <!-- wxWebKit files -->
+ src/html/htmlctrl/webkit/webkit.mm
+ <!-- Native color/font dialogs -->
+ src/mac/carbon/fontdlgosx.mm
+ src/mac/carbon/colordlgosx.mm
+</if>
+</set>
+
<set var="MAC_SRC" hints="files">
src/mac/carbon/accel.cpp
src/mac/carbon/aga.cpp
src/mac/carbon/frame.cpp
src/mac/carbon/gauge.cpp
src/mac/carbon/gdiobj.cpp
- src/mac/carbon/gsockosx.cpp
src/mac/carbon/hid.cpp
src/mac/carbon/icon.cpp
src/mac/carbon/listbox.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
- <!-- Unix files used by wxMac: -->
- src/unix/snglinst.cpp
- <!-- wxWebKit files -->
- src/html/htmlctrl/webkit/webkit.mm
</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
<!-- ====================================================================== -->
<set var="COCOA_LOWLEVEL_SRC" hints="files">
+ <!-- Shared wxMac and wxCocoa files -->
+ src/mac/corefoundation/gsockosx.cpp
+ src/mac/corefoundation/utilsexc_cf.cpp
</set>
<set var="COCOA_LOWLEVEL_HDR" hints="files">
</set>
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/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/statusbr.cpp
src/generic/tabg.cpp
src/generic/timer.cpp
- <!-- wxMac stuff used by wxCocoa: -->
- src/mac/carbon/gsockosx.cpp
</set>
<set var="COCOA_HDR" hints="files">
wx/cocoa/NSApplication.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/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">
+ 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>
-<set var="ADVANCED_GTK_HDR" hints="files">
- src/gtk/eggtrayicon.h
+<!-- ====================================================================== -->
+<!-- wxMedia -->
+<!-- ====================================================================== -->
+
+<set var="MEDIA_CMN_SRC" hints="files">
+ src/common/mediactrlcmn.cpp
+</set>
+
+<set var="MEDIA_CMN_HDR" hints="files">
+ wx/mediactrl.h
+</set>
+
+<set var="MEDIA_MSW_SRC" hints="files">
+ src/msw/mediactrl.cpp
+</set>
+<set var="MEDIA_MSW_HDR" hints="files">
+</set>
+<!-- not built on WindowsCE: -->
+<set var="MEDIA_MSW_ONLY_SRC" hints="files">
+</set>
+<set var="MEDIA_MSW_ONLY_HDR" hints="files">
+</set>
+
+<set var="MEDIA_MAC_SRC" hints="files">
+ src/mac/carbon/mediactrl.cpp
+</set>
+<set var="MEDIA_MAC_HDR" hints="files">
+</set>
+
+<set var="MEDIA_COCOA_SRC" hints="files">
+</set>
+<set var="MEDIA_COCOA_HDR" hints="files">
+</set>
+
+<set var="MEDIA_OS2_SRC" hints="files">
+</set>
+<set var="MEDIA_OS2_HDR" hints="files">
+</set>
+
+<set var="MEDIA_UNIX_SRC" hints="files">
+</set>
+<set var="MEDIA_UNIX_HDR" hints="files">
+</set>
+
+<set var="MEDIA_GTK_SRC" hints="files">
</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_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>
<!-- 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_DARWIN_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=='MAC'">$(BASE_MAC_HDR) $(BASE_MAC_OSX_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_GTK_HDR) $(ADVANCED_UNIX_HDR)</if>
+ <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
</set>
<set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
<set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
+ <!-- wxMedia files: -->
+ <set var="MEDIA_PLATFORM_SRC" hints="files">
+ <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_ONLY_SRC)</if>
+ <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
+ <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_SRC)</if>
+ <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if>
+ <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
+ <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
+ <if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_SRC)</if>
+ <if cond="TOOLKIT=='PM'">$(MEDIA_OS2_SRC)</if>
+ </set>
+ <set var="MEDIA_PLATFORM_HDR" hints="files">
+ <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_ONLY_HDR)</if>
+ <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
+ <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_HDR)</if>
+ <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if>
+ <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
+ <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>
+ <if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_HDR)</if>
+ <if cond="TOOLKIT=='PM'">$(MEDIA_OS2_HDR)</if>
+ </set>
+ <set var="MEDIA_SRC">$(MEDIA_CMN_SRC) $(MEDIA_PLATFORM_SRC)</set>
+ <set var="MEDIA_HDR">$(MEDIA_CMN_HDR) $(MEDIA_PLATFORM_HDR)</set>
<set var="GUI_CORE_HEADERS" hints="files">
$(GUI_CMN_HDR)
$(LOWLEVEL_HDR)
$(GUI_CORE_HEADERS)
- $(ADVANCED_HDR) $(HTML_HDR)
+ $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
$(OPENGL_HDR) $(DBGRID_HDR) $(XRC_HDR)
</if>
</set>
<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