BASE_AND_GUI_CMN_SRC files that must be compiled both into GUI
and base library (all platforms)
- BASE_$(platform) base files used on platform
+ BASE_$(platform) base files used on platform
BASE_AND_GUI_$(platform)_SRC base & gui files used on platform
$(port)LOWLEVEL low-level GUI classes
XWIN_LOWLEVEL low-level classes for X Window System
ports (wxGTK, wxMotif, wxX11)
+ MSW_DESKTOP files used only on desktop Windows
+ versions and not under Windows CE
+
+ xxx_NATIVE native files not used by wxUniv (used as
+ complement of LOWLEVEL when most of the
+ files are lowlevel and only few are native)
+
HTML wxHTML files
XRC wxXRC files
src/unix/dlunix.cpp
src/unix/mimetype.cpp
src/unix/snglinst.cpp
+ src/unix/stackwalk.cpp
src/unix/stdpaths.cpp
src/unix/threadpsx.cpp
</set>
wx/unix/execute.h
wx/unix/mimetype.h
wx/unix/pipe.h
+ wx/unix/stackwalk.h
wx/unix/stdpaths.h
</set>
<set var="BASE_WIN32_SRC" hints="files">
src/msw/basemsw.cpp
src/msw/crashrpt.cpp
+ src/msw/debughlp.cpp
src/msw/dde.cpp
src/msw/dir.cpp
+ src/msw/dlmsw.cpp
src/msw/mimetype.cpp
src/msw/regconf.cpp
src/msw/registry.cpp
src/msw/snglinst.cpp
+ src/msw/stackwalk.cpp
src/msw/stdpaths.cpp
src/msw/thread.cpp
src/msw/utils.cpp
wx/msw/chkconf.h
wx/msw/crashrpt.h
wx/msw/dde.h
+ wx/msw/debughlp.h
wx/msw/gccpriv.h
wx/msw/mimetype.h
+ wx/msw/stackwalk.h
+ wx/msw/stdpaths.h
wx/msw/winundef.h
wx/msw/wrapcctl.h
+ wx/msw/wrapcdlg.h
wx/msw/wrapwin.h
</set>
<set var="BASE_WINCE_HDR" hints="files">
- <if cond="TOOLKIT=='WINCE'">wx/msw/wince/time.h</if>
+ <if cond="TOOLKIT=='WINCE'">
+ wx/msw/wince/time.h
+ wx/msw/wince/chkconf.h
+ </if>
</set>
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
<!-- 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/hid.cpp
src/mac/corefoundation/stdpaths_cf.cpp
</set>
<set var="BASE_COREFOUNDATION_HDR" hints="files">
wx/mac/corefoundation/cfstring.h
+ wx/mac/corefoundation/hid.h
wx/mac/corefoundation/stdpaths.h
</set>
</set -->
<!-- Base files used only by OS X builds (not CarbonLib or Classic) -->
-<set var="BASE_MAC_OSX_SRC" hints="files">
+<set var="BASE_MACOSX_WXMAC_SRC" hints="files">
+ $(BASE_MAC_SRC)
src/unix/baseunix.cpp
src/unix/dlunix.cpp
src/unix/stdpaths.cpp
</set>
-<set var="BASE_MAC_OSX_HDR" hints="files">
+<set var="BASE_MACOSX_WXMAC_HDR" hints="files">
+ $(BASE_MAC_HDR)
+ wx/unix/apptbase.h
+ wx/unix/apptrait.h
wx/unix/stdpaths.h
</set>
<!-- 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_COREFOUNDATION_SRC)
</set>
-<set var="BASE_DARWIN_HDR" hints="files">
+<set var="BASE_MACOSX_NOTWXMAC_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
wx/os2/stdpaths.h
</set>
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!-- PalmOS -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+
+<set var="BASE_PALMOS_SRC" hints="files">
+ src/palmos/base.cpp
+ src/palmos/dir.cpp
+ src/palmos/prefconf.cpp
+ src/palmos/snglinst.cpp
+ src/palmos/thread.cpp
+ src/palmos/utils.cpp
+ src/palmos/utilsexc.cpp
+</set>
+
+<set var="BASE_AND_GUI_PALMOS_SRC" hints="files">
+ src/palmos/main.cpp
+ src/palmos/volume.cpp
+</set>
+
+<set var="BASE_PALMOS_HDR" hints="files">
+ wx/palmos/apptbase.h
+ wx/palmos/apptrait.h
+ wx/palmos/chkconf.h
+ wx/palmos/mimetype.h
+ wx/palmos/stdpaths.h
+</set>
+
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!-- MSDOS -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+
+<set var="BASE_MSDOS_SRC" hints="files">
+ src/msdos/dir.cpp
+ src/msdos/mimetype.cpp
+ src/msdos/utilsdos.cpp
+</set>
+<set var="BASE_AND_GUI_MSDOS_SRC" hints="files">
+</set>
+<set var="BASE_MSDOS_HDR" hints="files">
+ wx/msdos/mimetype.h
+</set>
+
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
<!-- Common -->
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
wx/config.h
wx/containr.h
wx/datetime.h
- wx/datetime.inl
wx/datstrm.h
wx/dde.h
wx/debug.h
wx/hash.h
wx/hashmap.h
wx/hashset.h
+ wx/html/forcelnk.h
wx/iconloc.h
wx/init.h
wx/intl.h
wx/snglinst.h
wx/sstream.h
wx/stack.h
+ wx/stackwalk.h
wx/stdpaths.h
wx/stockitem.h
wx/stopwatch.h
wx/url.h
</set>
+<!-- ====================================================================== -->
+<!-- wxQA (non GUI library) -->
+<!-- ====================================================================== -->
+
+<set var="QA_SRC" hints="files">
+ src/common/debugrpt.cpp
+ src/generic/dbgrptg.cpp
+</set>
+<set var="QA_HDR" hints="files">
+ wx/debugrpt.h
+</set>
<!-- ====================================================================== -->
<!-- Common GUI files -->
src/gtk/fontdlg.cpp
src/gtk/frame.cpp
src/gtk/gauge.cpp
+ src/gtk/gnome/gprint.cpp
src/gtk/listbox.cpp
src/gtk/mdi.cpp
src/gtk/menu.cpp
wx/gtk/fontdlg.h
wx/gtk/frame.h
wx/gtk/gauge.h
+ wx/gtk/gnome/gprint.h
wx/gtk/listbox.h
wx/gtk/mdi.h
wx/gtk/menu.h
wx/motif/button.h
wx/motif/checkbox.h
wx/motif/checklst.h
+ wx/motif/chkconf.h
wx/motif/choice.h
wx/motif/clipbrd.h
wx/motif/colour.h
src/msw/window.cpp
</set>
<set var="MSW_LOWLEVEL_HDR" hints="files">
+ wx/msw/popupwin.h
+ wx/msw/uxtheme.h
+ wx/msw/uxthemep.h
+ wx/msw/htmlhelp.h
</set>
-<set var="MSW_ONLY_LOWLEVEL_SRC" hints="files">
+<set var="MSW_DESKTOP_LOWLEVEL_SRC" hints="files">
src/msw/helpchm.cpp
src/msw/helpwin.cpp
src/msw/ole/automtn.cpp
src/msw/ole/uuid.cpp
</set>
-<set var="MSW_ONLY_LOWLEVEL_HDR" hints="files">
+<set var="MSW_DESKTOP_LOWLEVEL_HDR" hints="files">
wx/msw/helpchm.h
wx/msw/helpwin.h
</set>
wx/msw/scrolbar.h
wx/msw/setup0.h
wx/msw/slider95.h
- wx/msw/slidrmsw.h
wx/msw/spinbutt.h
wx/msw/spinctrl.h
wx/msw/statbmp.h
wx/msw/window.h
<!-- Resources must be installed together with headers: -->
- wx/msw/gnuwin32/winresrc.h
wx/msw/wx.manifest
wx/msw/wx.rc
<!-- bitmaps -->
<!-- cursors -->
wx/msw/blank.cur
wx/msw/bullseye.cur
- wx/msw/clock.cur
+ wx/msw/cross.cur
wx/msw/hand.cur
- wx/msw/heart.cur
wx/msw/magnif1.cur
- wx/msw/noentry.cur
wx/msw/pbrush.cur
wx/msw/pencil.cur
wx/msw/pntleft.cur
wx/msw/pntright.cur
- wx/msw/query.cur
wx/msw/rightarr.cur
wx/msw/roller.cur
- wx/msw/size.cur
- wx/msw/watch1.cur
<!-- icons -->
wx/msw/cdrom.ico
wx/msw/child.ico
wx/msw/computer.ico
wx/msw/drive.ico
- wx/msw/error.ico
wx/msw/file1.ico
wx/msw/floppy.ico
wx/msw/folder1.ico
wx/msw/folder2.ico
- wx/msw/info.ico
wx/msw/mdi.ico
wx/msw/question.ico
wx/msw/removble.ico
wx/msw/std.ico
- wx/msw/warning.ico
</set>
<!-- Files used only by desktop MSW port, but *not* WindowsCE one: -->
-<set var="MSW_ONLY_SRC" hints="files">
+<set var="MSW_DESKTOP_SRC" hints="files">
src/msw/fdrepdlg.cpp
src/msw/fontdlg.cpp
</set>
-<set var="MSW_ONLY_HDR" hints="files">
+<set var="MSW_DESKTOP_HDR" hints="files">
wx/msw/fdrepdlg.h
wx/msw/fontdlg.h
wx/msw/helpbest.h
src/os2/stattext.cpp
src/os2/tabctrl.cpp
src/os2/textctrl.cpp
+ src/os2/tglbtn.cpp
src/os2/timer.cpp
src/os2/toolbar.cpp
src/os2/tooltip.cpp
wx/os2/stattext.h
wx/os2/tabctrl.h
wx/os2/textctrl.h
+ wx/os2/tglbtn.h
wx/os2/timer.h
wx/os2/toolbar.h
wx/os2/tooltip.h
src/mac/corefoundation/utilsexc_cf.cpp
</set>
+<set var="MAC_OSX_LOWLEVEL_HDR" hints="files">
+</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">
+ <if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_HDR)</if>
</set>
<set var="MAC_OSX_SRC" hints="files">
src/mac/carbon/data.cpp
src/mac/carbon/dataobj.cpp
src/mac/carbon/dc.cpp
+ src/mac/carbon/dccg.cpp
src/mac/carbon/dcclient.cpp
src/mac/carbon/dcmemory.cpp
src/mac/carbon/dcprint.cpp
src/mac/carbon/frame.cpp
src/mac/carbon/gauge.cpp
src/mac/carbon/gdiobj.cpp
- src/mac/carbon/hid.cpp
src/mac/carbon/icon.cpp
+ src/mac/carbon/imaglist.cpp
src/mac/carbon/listbox.cpp
src/mac/carbon/mdi.cpp
src/mac/carbon/menu.cpp
src/generic/caret.cpp
src/generic/fdrepdlg.cpp
src/generic/fontdlgg.cpp
- src/generic/imaglist.cpp
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
wx/generic/caret.h
wx/generic/fdrepdlg.h
wx/generic/fontdlgg.h
- wx/generic/imaglist.h
wx/generic/listctrl.h
wx/generic/statusbr.h
wx/generic/tabg.h
src/cocoa/statline2.mm
src/cocoa/stattext.mm
src/cocoa/textctrl.mm
+ src/cocoa/timer.mm
src/cocoa/toolbar.mm
src/cocoa/tooltip.mm
src/cocoa/toplevel.mm
src/generic/regiong.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
- src/generic/timer.cpp
</set>
<set var="COCOA_HDR" hints="files">
wx/cocoa/NSApplication.h
wx/cocoa/statline.h
wx/cocoa/stattext.h
wx/cocoa/textctrl.h
+ wx/cocoa/timer.h
wx/cocoa/toolbar.h
wx/cocoa/toplevel.h
wx/cocoa/window.h
<set var="ADVANCED_CMN_SRC" hints="files">
src/generic/calctrl.cpp
+ src/generic/datectlg.cpp
src/generic/grid.cpp
src/generic/gridctrl.cpp
src/generic/gridsel.cpp
src/generic/helpext.cpp
src/generic/laywin.cpp
+ src/generic/propdlg.cpp
src/generic/sashwin.cpp
src/generic/splash.cpp
src/generic/tipdlg.cpp
<set var="ADVANCED_CMN_HDR" hints="files">
wx/calctrl.h
wx/dateevt.h
- wx/datectrl.h
wx/dcbuffer.h
wx/generic/calctrl.h
+ wx/generic/datectrl.h
wx/generic/grid.h
wx/generic/gridctrl.h
wx/generic/gridsel.h
wx/generic/helpext.h
wx/generic/laywin.h
+ wx/generic/propdlg.h
wx/generic/sashwin.h
wx/generic/splash.h
wx/generic/wizard.h
wx/grid.h
wx/joystick.h
wx/laywin.h
+ wx/propdlg.h
wx/sashwin.h
wx/sound.h
wx/splash.h
wx/wizard.h
</set>
+<set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
+ wx/datectrl.h
+</set>
+
<set var="ADVANCED_MSW_SRC" hints="files">
src/common/taskbarcmn.cpp
- src/msw/datectrl.cpp
src/msw/sound.cpp
src/msw/taskbar.cpp
</set>
<set var="ADVANCED_MSW_HDR" hints="files">
- wx/msw/datectrl.h
wx/msw/sound.h
wx/msw/taskbar.h
</set>
+
+<!-- not used with wxUniv -->
+<set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
+ src/msw/datectrl.cpp
+</set>
+<set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
+ wx/msw/datectrl.h
+</set>
+
<!-- not built on WindowsCE: -->
-<set var="ADVANCED_MSW_ONLY_SRC" hints="files">
+<set var="ADVANCED_MSW_DESKTOP_SRC" hints="files">
src/msw/joystick.cpp
</set>
-<set var="ADVANCED_MSW_ONLY_HDR" hints="files">
+<set var="ADVANCED_MSW_DESKTOP_HDR" hints="files">
wx/msw/joystick.h
</set>
<set var="ADVANCED_MAC_SRC" hints="files">
src/common/taskbarcmn.cpp
src/mac/carbon/drawer.cpp
- src/mac/carbon/joystick.cpp
src/mac/carbon/sound.cpp
src/mac/carbon/taskbar.cpp
+ src/mac/corefoundation/hidjoystick.cpp
</set>
<set var="ADVANCED_MAC_HDR" hints="files">
wx/mac/carbon/drawer.h
- wx/mac/carbon/joystick.h
wx/mac/carbon/sound.h
wx/mac/carbon/taskbarosx.h
+ wx/mac/corefoundation/joystick.h
</set>
<set var="ADVANCED_COCOA_SRC" hints="files">
src/cocoa/taskbar.mm
src/common/taskbarcmn.cpp
+ src/mac/corefoundation/hidjoystick.cpp
</set>
<set var="ADVANCED_COCOA_HDR" hints="files">
wx/cocoa/taskbar.h
+ wx/mac/corefoundation/joystick.h
</set>
<set var="ADVANCED_OS2_SRC" hints="files">
<set var="MEDIA_MSW_HDR" hints="files">
</set>
<!-- not built on WindowsCE: -->
-<set var="MEDIA_MSW_ONLY_SRC" hints="files">
+<set var="MEDIA_MSW_DESKTOP_SRC" hints="files">
</set>
-<set var="MEDIA_MSW_ONLY_HDR" hints="files">
+<set var="MEDIA_MSW_DESKTOP_HDR" hints="files">
</set>
<set var="MEDIA_MAC_SRC" hints="files">
</set>
<set var="MEDIA_COCOA_SRC" hints="files">
+ src/cocoa/mediactrl.mm
</set>
<set var="MEDIA_COCOA_HDR" hints="files">
</set>
</set>
<set var="MEDIA_UNIX_SRC" hints="files">
+ src/unix/mediactrl.cpp
</set>
<set var="MEDIA_UNIX_HDR" hints="files">
</set>
src/generic/htmllbox.cpp
</set>
<set var="HTML_HDR" hints="files">
- wx/html/forcelnk.h
wx/html/helpctrl.h
wx/html/helpdata.h
wx/html/helpfrm.h
src/xrc/xh_chckb.cpp
src/xrc/xh_chckl.cpp
src/xrc/xh_choic.cpp
+ src/xrc/xh_choicbk.cpp
src/xrc/xh_combo.cpp
+ src/xrc/xh_datectrl.cpp
src/xrc/xh_dlg.cpp
src/xrc/xh_frame.cpp
+ src/xrc/xh_mdi.cpp
src/xrc/xh_gauge.cpp
src/xrc/xh_gdctl.cpp
src/xrc/xh_html.cpp
src/xrc/xh_listb.cpp
+ src/xrc/xh_listbk.cpp
src/xrc/xh_listc.cpp
src/xrc/xh_menu.cpp
src/xrc/xh_notbk.cpp
wx/xrc/xh_chckb.h
wx/xrc/xh_chckl.h
wx/xrc/xh_choic.h
+ wx/xrc/xh_choicbk.h
wx/xrc/xh_combo.h
+ wx/xrc/xh_datectrl.h
wx/xrc/xh_dlg.h
wx/xrc/xh_frame.h
+ wx/xrc/xh_mdi.h
wx/xrc/xh_gauge.h
wx/xrc/xh_gdctl.h
wx/xrc/xh_html.h
wx/xrc/xh_listb.h
+ wx/xrc/xh_listbk.h
wx/xrc/xh_listc.h
wx/xrc/xh_menu.h
wx/xrc/xh_notbk.h
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: -->
<!-- ====================================================================== -->
<!-- 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) $(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>
+ <if cond="TOOLKIT=='MAC'">$(BASE_MACOSX_WXMAC_SRC)</if>
+ <if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
+ <if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
+ <if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
+ <if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_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>
+ <if cond="TOOLKIT==''">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
</set>
<set var="BASE_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_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>
+ <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_SRC)</if>
+ <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
</set>
<set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
<if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
<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>
+ <if cond="PLATFORM_PALMOS=='1'">$(BASE_AND_GUI_PALMOS_SRC)</if>
+ <if cond="PLATFORM_MSDOS=='1'">$(BASE_AND_GUI_MSDOS_SRC)</if>
<!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
<!-- if cond="PLATFORM_MACOS=='1'">$(BASE_AND_GUI_MAC_SRC)</if -->
</set>
+
+ <!-- Nested if would be nicer, but this works -->
+ <!-- These are the files for PLATFORM_MACOSX -->
+ <set var="BASE_MACOSX_HDR" hints="files">
+ <if cond="TOOLKIT=='MAC'">$(BASE_MACOSX_WXMAC_HDR)</if>
+ <if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
+ <if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
+ <if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
+ <if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_HDR)</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_MACOSX_NOTWXMAC_HDR)</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) $(BASE_MAC_OSX_HDR)</if>
- <if cond="TOOLKIT=='COCOA'">$(BASE_UNIX_HDR)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_HDR)</if>
+ <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
+ <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
</set>
<set var="BASE_SRC" hints="files">
<set var="LOWLEVEL_SRC" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
- <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_ONLY_LOWLEVEL_SRC)</if>
+ <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
<set var="LOWLEVEL_HDR" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
- <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
+ <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
<set var="GUI_SRC" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
- <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_ONLY_SRC)</if>
+ <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_SRC) $(MAC_OSX_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
<set var="GUI_HDR" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
- <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_ONLY_HDR)</if>
+ <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_CMN_HDR) $(MAC_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
<!-- wxAdvanced files: -->
<set var="ADVANCED_PLATFORM_SRC" hints="files">
- <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_ONLY_SRC)</if>
+ <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_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=='PM'">$(ADVANCED_OS2_SRC)</if>
</set>
<set var="ADVANCED_PLATFORM_HDR" hints="files">
- <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_ONLY_HDR)</if>
+ <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_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=='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>
+
+ <!-- wxAdv files not used by wxUniv -->
+ <set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
+ <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
+ </set>
+ <set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
+ <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
+ </set>
+
+ <set var="ADVANCED_SRC" hints="files">
+ <if cond="WXUNIV=='0'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_PLATFORM_NATIVE_SRC)</if>
+ <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</if>
+ </set>
+ <set var="ADVANCED_HDR" hints="files">
+ <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_CMN_NATIVE_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
+ <if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</if>
+ </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=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_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=='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=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_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>
$(LOWLEVEL_HDR)
$(GUI_CORE_HEADERS)
$(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
- $(OPENGL_HDR) $(DBGRID_HDR) $(XRC_HDR)
+ $(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR)
</if>
</set>
$(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
$(BASE_MAC_SRC)
$(BASE_OS2_SRC)
+ $(BASE_MSDOS_SRC)
$(BASE_AND_GUI_CMN_SRC)
$(BASE_AND_GUI_UNIX_SRC)
$(BASE_AND_GUI_MAC_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