IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-->
-
-
+
+
<!-- ======================================================================
FILES
src/unix/utilsunx.cpp
</set>
<set var="BASE_UNIX_HDR" hints="files">
+ wx/unix/apptbase.h
+ wx/unix/apptrait.h
+ wx/unix/execute.h
wx/unix/mimetype.h
+ wx/unix/pipe.h
</set>
<set var="BASE_WIN32_SRC" hints="files">
src/msw/volume.cpp
</set>
<set var="BASE_WIN32_HDR" hints="files">
+ wx/msw/apptrait.h
+ wx/msw/apptbase.h
wx/msw/chkconf.h
wx/msw/crashrpt.h
wx/msw/dde.h
src/mac/dirmac.cpp
src/mac/mimetmac.cpp
src/unix/baseunix.cpp
+ src/mac/utilsexc.cpp
+ src/mac/thread.cpp
+ src/mac/macnotfy.cpp
+ src/mac/morefilex/MoreFilesX.c
</set>
<set var="BASE_AND_GUI_MAC_SRC" hints="files">
src/mac/utils.cpp
- src/mac/utilsexc.cpp
+ src/mac/uma.cpp
</set>
<set var="BASE_MAC_HDR" hints="files">
<set var="BASE_OS2_SRC" hints="files">
src/os2/dir.cpp
+ src/os2/mimetype.cpp
+ src/os2/thread.cpp
src/os2/utils.cpp
src/os2/utilsexc.cpp
</set>
src/common/filesys.cpp
src/common/fmapbase.cpp
src/common/fs_zip.cpp
+ src/common/gzstream.cpp
src/common/hash.cpp
src/common/hashmap.cpp
src/common/init.cpp
src/common/variant.cpp
src/common/wfstream.cpp
src/common/wxchar.cpp
+ src/common/xti.cpp
+ src/common/xtistrm.cpp
src/common/zipstrm.cpp
src/common/zstream.cpp
</set>
src/common/utilscmn.cpp
</set>
<set var="BASE_CMN_HDR" hints="files">
+ wx/afterstd.h
wx/app.h
wx/apptrait.h
wx/arrimpl.cpp
wx/debug.h
wx/defs.h
wx/dir.h
+ wx/dlimpexp.h
wx/dynarray.h
wx/dynlib.h
wx/dynload.h
wx/encconv.h
wx/event.h
+ wx/except.h
wx/features.h
wx/ffile.h
wx/file.h
wx/fontmap.h
wx/fs_mem.h
wx/fs_zip.h
+ wx/gzstream.h
wx/hash.h
wx/hashmap.h
+ wx/hashset.h
wx/iconloc.h
wx/init.h
wx/intl.h
wx/object.h
wx/platform.h
wx/process.h
+ wx/ptr_scpd.h
wx/regex.h
+ wx/scopeguard.h
wx/snglinst.h
+ wx/stack.h
wx/stopwatch.h
wx/strconv.h
wx/stream.h
wx/textfile.h
wx/thread.h
wx/thrimpl.cpp
+ wx/timer.h
wx/tokenzr.h
wx/txtstrm.h
wx/types.h
wx/wx.h
wx/wxchar.h
wx/wxprec.h
+ wx/xti.h
+ wx/xtistrm.h
wx/zipstrm.h
wx/zstream.h
</set>
wx/unix/gsockunx.h
</set>
-<set var="NET_MAC_SRC" hints="files">
- src/mac/gsocket.c
-</set>
-<set var="NET_MAC_HDR" hints="files">
- wx/mac/gsockmac.h
-</set>
-
<set var="NET_OS2_SRC" hints="files">
+ src/os2/gsocket.c
</set>
<set var="NET_OS2_HDR" hints="files">
+ wx/unix/gsockunx.h
</set>
<set var="NET_CMN_SRC" hints="files">
src/common/artprov.cpp
src/common/artstd.cpp
src/common/bmpbase.cpp
+ src/common/bookctrl.cpp
src/common/choiccmn.cpp
src/common/clipcmn.cpp
src/common/cmdproc.cpp
src/common/fontmap.cpp
src/common/framecmn.cpp
src/common/gaugecmn.cpp
+ src/common/gbsizer.cpp
src/common/gdicmn.cpp
src/common/geometry.cpp
src/common/gifdecod.cpp
src/generic/dcpsg.cpp
src/generic/dirctrlg.cpp
src/generic/dragimgg.cpp
+ src/generic/listbkg.cpp
src/generic/logg.cpp
src/generic/numdlgg.cpp
src/generic/panelg.cpp
src/generic/progdlgg.cpp
+ src/generic/printps.cpp
src/generic/renderg.cpp
src/generic/scrlwing.cpp
src/generic/selstore.cpp
src/generic/spinctlg.cpp
src/generic/splitter.cpp
- src/generic/tbarsmpl.cpp
src/generic/textdlgg.cpp
src/generic/tipwin.cpp
src/generic/treectlg.cpp
wx/dialog.h
wx/dirdlg.h
wx/dragimag.h
+ wx/encinfo.h
wx/filedlg.h
wx/frame.h
wx/gauge.h
+ wx/gbsizer.h
wx/gdicmn.h
wx/generic/accel.h
wx/generic/choicdgg.h
wx/generic/notebook.h
wx/generic/panelg.h
wx/generic/prntdlgg.h
+ wx/generic/printps.h
wx/generic/progdlgg.h
wx/generic/scrolwin.h
wx/generic/spinctlg.h
wx/statusbr.h
wx/textctrl.h
wx/textdlg.h
- wx/timer.h
wx/toolbar.h
wx/validate.h
wx/valtext.h
wx/accel.h
wx/access.h
- wx/afterstd.h
wx/artprov.h
wx/bitmap.h
+ wx/bookctrl.h
wx/busyinfo.h
wx/caret.h
wx/clipbrd.h
wx/imagtiff.h
wx/imagxpm.h
wx/listbase.h
+ wx/listbook.h
wx/listctrl.h
wx/matrix.h
wx/menuitem.h
wx/spinbutt.h
wx/spinctrl.h
wx/splitter.h
- wx/stack.h
wx/statline.h
wx/tab.h
wx/tabctrl.h
wx/tbarbase.h
- wx/tbarsmpl.h
wx/tglbtn.h
wx/tipwin.h
wx/tooltip.h
wx/treebase.h
wx/treectrl.h
wx/valgen.h
+ wx/vidmode.h
wx/vlbox.h
wx/vms_x_fix.h
wx/vscroll.h
<set var="XWIN_LOWLEVEL_SRC" hints="files">
src/generic/caret.cpp
- src/generic/printps.cpp
src/unix/dialup.cpp
src/unix/fontenum.cpp
src/unix/fontutil.cpp
src/unix/utilsx11.cpp
+ src/unix/displayx11.cpp
</set>
<set var="XWIN_LOWLEVEL_HDR" hints="files">
wx/generic/caret.h
- wx/generic/printps.h
wx/unix/fontutil.h
wx/unix/utilsx11.h
+ wx/unix/displayx11.h
</set>
src/gtk/gsockgtk.c
src/gtk/icon.cpp
src/gtk/main.cpp
+ src/gtk/minifram.cpp
src/gtk/pen.cpp
src/gtk/popupwin.cpp
src/gtk/region.cpp
src/gtk/listbox.cpp
src/gtk/mdi.cpp
src/gtk/menu.cpp
- src/gtk/minifram.cpp
src/gtk/msgdlg.cpp
src/gtk/notebook.cpp
src/gtk/radiobox.cpp
</set>
<set var="MOTIF_LOWLEVEL_HDR" hints="files">
$(XWIN_LOWLEVEL_HDR)
+ wx/x11/bitmap.h
+ wx/x11/brush.h
+ wx/x11/pen.h
+ wx/x11/region.h
</set>
<set var="MOTIF_SRC" hints="files">
src/motif/accel.cpp
src/motif/minifram.cpp
src/motif/msgdlg.cpp
src/motif/palette.cpp
+ src/motif/popupwin.cpp
src/motif/radiobox.cpp
src/motif/radiobut.cpp
src/motif/scrolbar.cpp
src/motif/toplevel.cpp
src/motif/utils.cpp
src/motif/window.cpp
+ src/motif/xmcombo/xmcombo.c
<!-- Generic files used by wxMotif: -->
src/generic/colrdlgg.cpp
src/generic/dirdlgg.cpp
wx/motif/minifram.h
wx/motif/msgdlg.h
wx/motif/palette.h
+ wx/motif/popupwin.h
wx/motif/print.h
wx/motif/private.h
wx/motif/radiobox.h
wx/motif/radiobut.h
wx/motif/region.h
wx/motif/scrolbar.h
- wx/motif/settings.h
wx/motif/slider.h
wx/motif/spinbutt.h
wx/motif/statbmp.h
</set>
<set var="X11_LOWLEVEL_HDR" hints="files">
$(XWIN_LOWLEVEL_HDR)
- src/generic/timer.h
wx/x11/app.h
wx/x11/bitmap.h
wx/x11/brush.h
wx/x11/minifram.h
wx/x11/palette.h
wx/x11/pen.h
+ wx/x11/popupwin.h
wx/x11/print.h
wx/x11/private.h
wx/x11/privx.h
src/msw/palette.cpp
src/msw/pen.cpp
src/msw/popupwin.cpp
+ src/msw/printdlg.cpp
+ src/msw/printwin.cpp
src/msw/region.cpp
src/msw/renderer.cpp
src/msw/settings.cpp
</set>
<set var="MSW_SRC" hints="files">
src/generic/statusbr.cpp
+ src/generic/prntdlgg.cpp
src/msw/accel.cpp
src/msw/bmpbuttn.cpp
src/msw/button.cpp
src/msw/notebook.cpp
src/msw/ole/access.cpp
src/msw/ownerdrw.cpp
- src/msw/penwin.cpp
- src/msw/printdlg.cpp
- src/msw/printwin.cpp
src/msw/radiobox.cpp
src/msw/radiobut.cpp
src/msw/scrolbar.cpp
<set var="OS2_LOWLEVEL_HDR" hints="files">
</set>
<set var="OS2_SRC" hints="files">
+ <!-- Generic implementations used by wxOS2: -->
src/generic/caret.cpp
+ src/generic/colrdlgg.cpp
+ src/generic/dirdlgg.cpp
+ src/generic/fdrepdlg.cpp
+ src/generic/imaglist.cpp
+ src/generic/listctrl.cpp
+ src/generic/mdig.cpp
+ src/generic/msgdlgg.cpp
+ src/generic/prntdlgg.cpp
+ src/generic/statusbr.cpp
+ <!-- OS/2 specific files: -->
src/os2/accel.cpp
src/os2/app.cpp
src/os2/bitmap.cpp
src/os2/dcscreen.cpp
src/os2/dialog.cpp
src/os2/dnd.cpp
+ src/os2/evtloop.cpp
src/os2/filedlg.cpp
src/os2/font.cpp
src/os2/fontdlg.cpp
src/os2/gauge.cpp
src/os2/gdiimage.cpp
src/os2/gdiobj.cpp
- src/os2/gsocket.c
src/os2/gsockpm.c
src/os2/helpwin.cpp
src/os2/icon.cpp
src/os2/menu.cpp
src/os2/menuitem.cpp
src/os2/metafile.cpp
- src/os2/mimetype.cpp
src/os2/msgdlg.cpp
src/os2/nativdlg.cpp
src/os2/notebook.cpp
src/os2/stattext.cpp
src/os2/tabctrl.cpp
src/os2/textctrl.cpp
- src/os2/thread.cpp
src/os2/timer.cpp
src/os2/toolbar.cpp
src/os2/tooltip.cpp
src/os2/toplevel.cpp
+ src/os2/utilsgui.cpp
src/os2/window.cpp
</set>
<set var="OS2_HDR" hints="files">
wx/generic/caret.h
+ wx/generic/colrdlgg.h
+ wx/generic/dirdlgg.h
+ wx/generic/fdrepdlg.h
+ wx/generic/listctrl.h
+ wx/generic/mdig.h
+ wx/generic/statusbr.h
wx/os2/accel.h
wx/os2/app.h
wx/os2/bitmap.h
wx/os2/gauge.h
wx/os2/gdiimage.h
wx/os2/gdiobj.h
- wx/os2/gsockos2.h
wx/os2/helpwin.h
wx/os2/icon.h
wx/os2/iniconf.h
src/mac/frame.cpp
src/mac/gauge.cpp
src/mac/gdiobj.cpp
+ src/mac/gsockosx.c
src/mac/icon.cpp
src/mac/listbox.cpp
- src/mac/macnotfy.cpp
src/mac/mdi.cpp
src/mac/menu.cpp
src/mac/menuitem.cpp
src/mac/metafile.cpp
src/mac/minifram.cpp
- src/mac/morefilex/MoreFilesX.c
src/mac/msgdlg.cpp
src/mac/notebmac.cpp
src/mac/palette.cpp
src/mac/stattext.cpp
src/mac/tabctrl.cpp
src/mac/textctrl.cpp
- src/mac/thread.cpp
src/mac/timer.cpp
src/mac/toolbar.cpp
src/mac/tooltip.cpp
src/mac/toplevel.cpp
- src/mac/uma.cpp
src/mac/window.cpp
<!-- Generic implementations used by wxMac: -->
src/generic/caret.cpp
src/generic/fontdlgg.cpp
src/generic/imaglist.cpp
src/generic/listctrl.cpp
+ src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
<!-- Unix files used by wxMac: -->
src/cocoa/NSControl.mm
src/cocoa/NSMenu.mm
src/cocoa/NSPanel.mm
+ src/cocoa/NSTableView.mm
src/cocoa/NSTextField.mm
src/cocoa/NSView.mm
src/cocoa/NSWindow.mm
src/cocoa/dcmemory.mm
src/cocoa/dcscreen.cpp
src/cocoa/dialog.mm
+ src/cocoa/evtloop.mm
src/cocoa/font.cpp
src/cocoa/fontenum.mm
src/cocoa/fontutil.cpp
src/cocoa/icon.cpp
src/cocoa/listbox.mm
src/cocoa/main.cpp
+ src/cocoa/mbarman.mm
+ src/cocoa/mdi.mm
src/cocoa/menu.mm
src/cocoa/menuitem.mm
src/cocoa/pen.mm
src/cocoa/statline2.mm
src/cocoa/stattext.mm
src/cocoa/textctrl.mm
+ src/cocoa/toolbar.mm
src/cocoa/toplevel.mm
src/cocoa/utils.cpp
src/cocoa/utilsexc.cpp
src/generic/fontdlgg.cpp
src/generic/imaglist.cpp
src/generic/listctrl.cpp
- src/generic/mdig.cpp
src/generic/msgdlgg.cpp
src/generic/notebook.cpp
src/generic/paletteg.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
src/generic/timer.cpp
+ <!-- wxMac stuff used by wxCocoa: -->
+ src/mac/gsockosx.c
</set>
<set var="COCOA_HDR" hints="files">
wx/cocoa/NSBox.h
wx/cocoa/NSControl.h
wx/cocoa/NSMenu.h
wx/cocoa/NSPanel.h
+ wx/cocoa/NSTableView.h
wx/cocoa/NSTextField.h
wx/cocoa/NSView.h
wx/cocoa/NSWindow.h
wx/cocoa/gdiobj.h
wx/cocoa/icon.h
wx/cocoa/listbox.h
+ wx/cocoa/mbarman.h
+ wx/cocoa/mdi.h
wx/cocoa/menu.h
wx/cocoa/menuitem.h
wx/cocoa/pen.h
wx/cocoa/statline.h
wx/cocoa/stattext.h
wx/cocoa/textctrl.h
+ wx/cocoa/toolbar.h
wx/cocoa/toplevel.h
wx/cocoa/window.h
<!-- Generic implementations used by wxCocoa: -->
wx/generic/fontdlgg.h
wx/generic/imaglist.h
wx/generic/listctrl.h
- wx/generic/mdig.h
wx/generic/paletteg.h
wx/generic/statusbr.h
wx/generic/tabg.h
<if cond="TOOLKIT=='MSW'">
src/msw/helpbest.cpp
</if>
+ <if cond="PLATFORM_UNIX=='1'">
+ src/html/chm.cpp
+ </if>
+ <if cond="PLATFORM_MACOSX=='1'">
+ src/html/chm.cpp
+ </if>
</set>
<set var="HTML_SRC" hints="files">
$(HTML_SRC_PLATFORM)
<set var="XML_SRC" hints="files">
src/xml/xml.cpp
+ src/common/xtixml.cpp <!-- FIXME - temporary solution -->
</set>
<set var="XML_HDR" hints="files">
wx/xml/xml.h
+ wx/xtixml.h <!-- FIXME - temporary solution -->
</set>
<if cond="TOOLKIT=='MAC'">src/mac/glcanvas.cpp</if>
<if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
<if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
- <if cond="TOOLKIT=='MOTIF'">src/motif/glcanvas.cpp</if>
+ <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
<if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
+ <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
</set>
<set var="OPENGL_HDR" hints="files">
<if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h</if>
<if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
<if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
- <if cond="TOOLKIT=='MOTIF'">wx/motif/glcanvas.h</if>
+ <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>
<if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
+ <if cond="TOOLKIT=='PM'">wx/os2/glcanvas.h</if>
</set>
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
+ <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
</set>
<set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
<if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
$(BASE_AND_GUI_CMN_SRC)
$(BASE_AND_GUI_PLATFORM_SRC) $(BASE_AND_GUI_TOOLKIT_SRC)
</set>
-
-
+
+
<!-- wxNet files: -->
- <set var="NET_MACOSX_SRC" hints="files">
- <if cond="TOOLKIT=='MAC'">$(NET_MAC_SRC)</if>
- <if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_SRC)</if>
- <if cond="TOOLKIT=='GTK'">$(NET_DARWIN_SRC)</if>
- <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
- </set>
<set var="NET_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC)</if>
- <if cond="PLATFORM_MACOSX=='1'">$(NET_MACOSX_SRC)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_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)</if>
- <if cond="TOOLKIT=='MAC'">$(NET_MAC_HDR)</if>
- <if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_HDR)</if>
+ <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_HDR)</if>
</set>
<set var="NET_SRC" hints="files">
<!-- GUI sources: -->
-
+
<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)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
- <if cond="TOOLKIT=='OS2'">$(OS2_LOWLEVEL_SRC)</if>
+ <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
</set>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
- <if cond="TOOLKIT=='OS2'">$(OS2_LOWLEVEL_HDR)</if>
+ <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
</set>
-
+
<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)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
- <if cond="TOOLKIT=='OS2'">$(OS2_SRC)</if>
+ <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
</set>
<set var="GUI_HDR" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_HDR)</if>
<if cond="TOOLKIT=='MAC'">$(MAC_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
- <if cond="TOOLKIT=='OS2'">$(OS2_HDR)</if>
+ <if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
</set>
<set var="CORE_SRC" hints="files">
$(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
</if>
</set>
-
+
<!-- wxAdvanced files: -->
<set var="ADVANCED_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
- <if cond="TOOLKIT=='OS2'">$(ADVANCED_OS2_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)</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>
- <if cond="TOOLKIT=='OS2'">$(ADVANCED_OS2_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>
+ <set var="GUI_CORE_HEADERS" hints="files">
+ <if cond="USE_GUI=='1' and WXUNIV=='0'">$(GUI_HDR)</if>
+ <if cond="USE_GUI=='1' and WXUNIV=='1'">$(UNIV_HDR)</if>
+ </set>
+
<set var="ALL_GUI_HEADERS" hints="files">
- <if cond="USE_GUI=='1' and WXUNIV=='0'">
- $(GUI_CMN_HDR) $(LOWLEVEL_HDR) $(GUI_HDR)
- </if>
- <if cond="USE_GUI=='1' and WXUNIV=='1'">
- $(GUI_CMN_HDR) $(LOWLEVEL_HDR) $(UNIV_HDR)
+ <if cond="USE_GUI=='1'">
+ $(GUI_CMN_HDR)
+ $(LOWLEVEL_HDR)
+ $(GUI_CORE_HEADERS)
+ $(ADVANCED_HDR) $(HTML_HDR)
+ $(OPENGL_HDR) $(DBGRID_HDR)
</if>
</set>
- <set var="ALL_HEADERS" make_var="1" hints="files">
+
+ <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
$(NET_CMN_HDR) $(NET_PLATFORM_HDR)
- $(ALL_GUI_HEADERS) $(ADVANCED_HDR)
- $(HTML_HDR) $(XML_HDR)
- $(OPENGL_HDR) $(ODBC_HDR) $(DBGRID_HDR)
+ $(XML_HDR) $(ODBC_HDR)
+ </set>
+
+ <set var="ALL_HEADERS" make_var="1" hints="files">
+ $(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
+ </set>
+
+ <set var="ALL_BASE_SOURCES" make_var="1" hints="files">
+ $(BASE_CMN_SRC)
+ $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_MAC_SRC) $(BASE_DARWIN_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)
+ $(XML_SRC) $(ODBC_SRC)
</set>
</makefile>
projects / wxWidgets.git / blobdiff