wx/unix/execute.h
wx/unix/mimetype.h
wx/unix/pipe.h
+ wx/unix/private.h
wx/unix/stackwalk.h
wx/unix/stdpaths.h
</set>
wx/msw/dde.h
wx/msw/debughlp.h
wx/msw/gccpriv.h
+ wx/msw/libraries.h
wx/msw/mimetype.h
+ wx/msw/mslu.h
+ wx/msw/private.h
+ wx/msw/regconf.h
+ wx/msw/registry.h
wx/msw/stackwalk.h
wx/msw/stdpaths.h
wx/msw/winundef.h
wx/os2/apptbase.h
wx/os2/apptrait.h
wx/os2/mimetype.h
+ wx/os2/private.h
wx/os2/stdpaths.h
+ wx/os2/chkconf.h
+ wx/os2/wxrsc.h
</set>
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
src/common/clntdata.cpp
src/common/cmdline.cpp
src/common/config.cpp
+ src/common/convauto.cpp
src/common/datetime.cpp
src/common/datstrm.cpp
src/common/dircmn.cpp
wx/cmdline.h
wx/confbase.h
wx/config.h
+ wx/convauto.h
wx/containr.h
wx/datetime.h
wx/datstrm.h
wx/ipcbase.h
wx/isql.h
wx/isqlext.h
+ wx/link.h
wx/list.h
wx/listimpl.cpp
wx/log.h
src/common/dpycmn.cpp
src/common/dseldlg.cpp
src/common/effects.cpp
+ src/common/evtloopcmn.cpp
src/common/fddlgcmn.cpp
src/common/fldlgcmn.cpp
src/common/fontcmn.cpp
src/generic/splitter.cpp
src/generic/textdlgg.cpp
src/generic/tipwin.cpp
+ src/generic/toolbkg.cpp
src/generic/treectlg.cpp
+ src/generic/treebkg.cpp
src/generic/vlbox.cpp
src/generic/vscroll.cpp
</set>
wx/validate.h
wx/valtext.h
wx/window.h
+ wx/wupdlock.h
wx/accel.h
wx/access.h
wx/bitmap.h
wx/bookctrl.h
wx/busyinfo.h
+ wx/generic/busyinfo.h
wx/caret.h
wx/choicebk.h
wx/clipbrd.h
wx/dialup.h
wx/dirctrl.h
wx/display.h
+ wx/display_impl.h
wx/dnd.h
wx/docmdi.h
wx/docview.h
wx/tbarbase.h
wx/tglbtn.h
wx/tipwin.h
+ wx/toolbook.h
wx/tooltip.h
wx/toplevel.h
wx/treebase.h
+ wx/treebook.h
wx/treectrl.h
wx/valgen.h
wx/vidmode.h
wx/generic/caret.h
wx/unix/fontutil.h
wx/unix/utilsx11.h
- wx/unix/displayx11.h
</set>
src/gtk/frame.cpp
src/gtk/gauge.cpp
src/gtk/gnome/gprint.cpp
+ src/gtk/gnome/gvfs.cpp
src/gtk/listbox.cpp
src/gtk/mdi.cpp
src/gtk/menu.cpp
src/gtk/tbargtk.cpp
src/gtk/textctrl.cpp
src/gtk/tglbtn.cpp
+ src/gtk/treeentry_gtk.c
src/gtk/utilsres.cpp
</set>
<set var="GTK_HDR" hints="files">
wx/gtk/frame.h
wx/gtk/gauge.h
wx/gtk/gnome/gprint.h
+ wx/gtk/gnome/gvfs.h
wx/gtk/listbox.h
wx/gtk/mdi.h
wx/gtk/menu.h
wx/gtk/textctrl.h
wx/gtk/tglbtn.h
wx/gtk/treectrl.h
+ wx/gtk/treeentry_gtk.h
+</set>
+
+
+<!-- ====================================================================== -->
+<!-- wxGTK1 -->
+<!-- ====================================================================== -->
+
+<set var="GTK1_LOWLEVEL_SRC" hints="files">
+ $(XWIN_LOWLEVEL_SRC)
+ src/generic/paletteg.cpp
+ src/gtk1/app.cpp
+ src/gtk1/bitmap.cpp
+ src/gtk1/brush.cpp
+ src/gtk1/clipbrd.cpp
+ src/gtk1/colour.cpp
+ src/gtk1/cursor.cpp
+ src/gtk1/data.cpp
+ src/gtk1/dataobj.cpp
+ src/gtk1/dc.cpp
+ src/gtk1/dcclient.cpp
+ src/gtk1/dcmemory.cpp
+ src/gtk1/dcscreen.cpp
+ src/gtk1/dnd.cpp
+ src/gtk1/evtloop.cpp
+ src/gtk1/font.cpp
+ src/gtk1/gdiobj.cpp
+ src/gtk1/gsockgtk.cpp
+ src/gtk1/icon.cpp
+ src/gtk1/main.cpp
+ src/gtk1/minifram.cpp
+ src/gtk1/pen.cpp
+ src/gtk1/popupwin.cpp
+ src/gtk1/region.cpp
+ src/gtk1/renderer.cpp
+ src/gtk1/settings.cpp
+ src/gtk1/timer.cpp
+ src/gtk1/tooltip.cpp
+ src/gtk1/toplevel.cpp
+ src/gtk1/utilsgtk.cpp
+ src/gtk1/win_gtk.c
+ src/gtk1/window.cpp
+</set>
+<set var="GTK1_LOWLEVEL_HDR" hints="files">
+ $(XWIN_LOWLEVEL_HDR)
+ wx/generic/paletteg.h
+ wx/gtk1/app.h
+ wx/gtk1/bitmap.h
+ wx/gtk1/brush.h
+ wx/gtk1/clipbrd.h
+ wx/gtk1/colour.h
+ wx/gtk1/cursor.h
+ wx/gtk1/dataform.h
+ wx/gtk1/dataobj.h
+ wx/gtk1/dataobj2.h
+ wx/gtk1/dc.h
+ wx/gtk1/dcclient.h
+ wx/gtk1/dcmemory.h
+ wx/gtk1/dcscreen.h
+ wx/gtk1/dnd.h
+ wx/gtk1/font.h
+ wx/gtk1/gdiobj.h
+ wx/gtk1/icon.h
+ wx/gtk1/minifram.h
+ wx/gtk1/pen.h
+ wx/gtk1/popupwin.h
+ wx/gtk1/region.h
+ wx/gtk1/timer.h
+ wx/gtk1/tooltip.h
+ wx/gtk1/toplevel.h
+ wx/gtk1/win_gtk.h
+ wx/gtk1/window.h
+</set>
+<set var="GTK1_SRC" hints="files">
+ <!-- Generic implementations used by wxGTK1: -->
+ src/generic/accel.cpp
+ src/generic/colrdlgg.cpp
+ src/generic/dirdlgg.cpp
+ src/generic/fdrepdlg.cpp
+ src/generic/filedlgg.cpp
+ src/generic/imaglist.cpp
+ src/generic/listctrl.cpp
+ src/generic/msgdlgg.cpp
+ src/generic/prntdlgg.cpp
+ src/generic/statusbr.cpp
+ src/generic/tabg.cpp
+ <!-- Generic implementations used by wxGPE: -->
+ src/generic/fontdlgg.cpp
+ <!-- GTK1 specific files: -->
+ src/gtk1/bmpbuttn.cpp
+ src/gtk1/button.cpp
+ src/gtk1/checkbox.cpp
+ src/gtk1/checklst.cpp
+ src/gtk1/choice.cpp
+ src/gtk1/combobox.cpp
+ src/gtk1/control.cpp
+ src/gtk1/dialog.cpp
+ src/gtk1/filedlg.cpp
+ src/gtk1/fontdlg.cpp
+ src/gtk1/frame.cpp
+ src/gtk1/gauge.cpp
+ src/gtk1/listbox.cpp
+ src/gtk1/mdi.cpp
+ src/gtk1/menu.cpp
+ src/gtk1/notebook.cpp
+ src/gtk1/radiobox.cpp
+ src/gtk1/radiobut.cpp
+ src/gtk1/scrolbar.cpp
+ src/gtk1/scrolwin.cpp
+ src/gtk1/slider.cpp
+ src/gtk1/spinbutt.cpp
+ src/gtk1/spinctrl.cpp
+ src/gtk1/statbmp.cpp
+ src/gtk1/statbox.cpp
+ src/gtk1/statline.cpp
+ src/gtk1/stattext.cpp
+ src/gtk1/tbargtk.cpp
+ src/gtk1/textctrl.cpp
+ src/gtk1/tglbtn.cpp
+ src/gtk1/utilsres.cpp
+</set>
+<set var="GTK1_HDR" hints="files">
+ wx/generic/colrdlgg.h
+ wx/generic/dirdlgg.h
+ wx/generic/fdrepdlg.h
+ wx/generic/listctrl.h
+ wx/generic/statusbr.h
+ wx/generic/tabg.h
+ wx/gtk1/accel.h
+ wx/gtk1/bmpbuttn.h
+ wx/gtk1/button.h
+ wx/gtk1/checkbox.h
+ wx/gtk1/checklst.h
+ wx/gtk1/choice.h
+ wx/gtk1/combobox.h
+ wx/gtk1/control.h
+ wx/gtk1/dialog.h
+ wx/gtk1/filedlg.h
+ wx/gtk1/fontdlg.h
+ wx/gtk1/frame.h
+ wx/gtk1/gauge.h
+ wx/gtk1/listbox.h
+ wx/gtk1/mdi.h
+ wx/gtk1/menu.h
+ wx/gtk1/menuitem.h
+ wx/gtk1/msgdlg.h
+ wx/gtk1/notebook.h
+ wx/gtk1/radiobox.h
+ wx/gtk1/radiobut.h
+ wx/gtk1/scrolbar.h
+ wx/gtk1/scrolwin.h
+ wx/gtk1/slider.h
+ wx/gtk1/spinbutt.h
+ wx/gtk1/spinctrl.h
+ wx/gtk1/statbmp.h
+ wx/gtk1/statbox.h
+ wx/gtk1/statline.h
+ wx/gtk1/stattext.h
+ wx/gtk1/tbargtk.h
+ wx/gtk1/textctrl.h
+ wx/gtk1/tglbtn.h
+ wx/gtk1/treectrl.h
</set>
src/x11/gdiobj.cpp
src/x11/gsockx11.cpp
src/x11/icon.cpp
- src/x11/main.cpp
src/x11/minifram.cpp
src/x11/nanox.c
src/x11/palette.cpp
src/msw/bmpbuttn.cpp
src/msw/button.cpp
src/msw/checkbox.cpp
- src/msw/checklst.cpp
src/msw/choice.cpp
src/msw/colordlg.cpp
src/msw/combobox.cpp
wx/msw/button.h
wx/msw/caret.h
wx/msw/checkbox.h
- wx/msw/checklst.h
wx/msw/choice.h
wx/msw/clipbrd.h
wx/msw/colordlg.h
wx/msw/minifram.h
wx/msw/missing.h
wx/msw/msgdlg.h
- wx/msw/mslu.h
wx/msw/msvcrt.h
wx/msw/notebook.h
wx/msw/ole/access.h
wx/msw/pen.h
wx/msw/printdlg.h
wx/msw/printwin.h
- wx/msw/private.h
wx/msw/radiobox.h
wx/msw/radiobut.h
- wx/msw/regconf.h
wx/msw/region.h
- wx/msw/registry.h
+ wx/msw/rcdefs.h
wx/msw/scrolbar.h
wx/msw/setup0.h
wx/msw/slider95.h
wx/msw/stattext.h
wx/msw/tabctrl.h
wx/msw/tbar95.h
- wx/msw/tbarmsw.h
wx/msw/textctrl.h
wx/msw/tglbtn.h
wx/msw/timer.h
<!-- Resources must be installed together with headers: -->
wx/msw/wx.manifest
+ wx/msw/amd64.manifest
+ wx/msw/ia64.manifest
wx/msw/wx.rc
<!-- bitmaps -->
wx/msw/colours.bmp
<!-- Files used only by desktop MSW port, but *not* WindowsCE one: -->
<set var="MSW_DESKTOP_SRC" hints="files">
+ src/msw/checklst.cpp
src/msw/fdrepdlg.cpp
src/msw/fontdlg.cpp
</set>
<set var="MSW_DESKTOP_HDR" hints="files">
+ wx/msw/checklst.h
wx/msw/fdrepdlg.h
wx/msw/fontdlg.h
wx/msw/helpbest.h
<set var="WINCE_SRC" hints="files">
src/generic/dirdlgg.cpp
src/generic/fdrepdlg.cpp
+ src/generic/filedlgg.cpp
src/generic/fontdlgg.cpp
+ src/msw/wince/checklst.cpp
src/msw/wince/choicece.cpp
src/msw/wince/crt.cpp
src/msw/wince/filedlgwce.cpp
</set>
<set var="WINCE_HDR" hints="files">
wx/generic/fdrepdlg.h
+ wx/generic/filedlgg.h
wx/generic/fontdlgg.h
+ wx/msw/wince/checklst.h
wx/msw/wince/choicece.h
wx/msw/wince/helpwce.h
wx/msw/wince/libraries.h
wx/mgl/app.h
wx/mgl/bitmap.h
wx/mgl/brush.h
+ wx/mgl/chkconf.h
wx/mgl/clipbrd.h
wx/mgl/colour.h
wx/mgl/cursor.h
wx/os2/pnghand.h
wx/os2/pngread.h
wx/os2/print.h
- wx/os2/private.h
wx/os2/radiobox.h
wx/os2/radiobut.h
wx/os2/region.h
src/mac/carbon/dirdlg.cpp
src/mac/carbon/display.cpp
src/mac/carbon/dnd.cpp
+ src/mac/carbon/evtloop.cpp
src/mac/carbon/filedlg.cpp
src/mac/carbon/font.cpp
src/mac/carbon/fontdlg.cpp
wx/mac/dcscreen.h
wx/mac/dialog.h
wx/mac/dirdlg.h
- wx/mac/display.h
wx/mac/dnd.h
+ wx/mac/evtloop.h
wx/mac/filedlg.h
wx/mac/font.h
wx/mac/fontdlg.h
wx/mac/carbon/dcscreen.h
wx/mac/carbon/dialog.h
wx/mac/carbon/dirdlg.h
- wx/mac/carbon/display.h
wx/mac/carbon/dnd.h
+ wx/mac/carbon/evtloop.h
wx/mac/carbon/filedlg.h
wx/mac/carbon/font.h
wx/mac/carbon/fontdlg.h
src/cocoa/dcmemory.mm
src/cocoa/dcscreen.cpp
src/cocoa/dialog.mm
+ src/cocoa/dirdlg.mm
src/cocoa/display.mm
src/cocoa/drawer.mm
src/cocoa/evtloop.mm
src/generic/accel.cpp
src/generic/caret.cpp
src/generic/colrdlgg.cpp
- src/generic/dirdlgg.cpp
src/generic/fdrepdlg.cpp
src/generic/fontdlgg.cpp
src/generic/imaglist.cpp
wx/cocoa/dcmemory.h
wx/cocoa/dcscreen.h
wx/cocoa/dialog.h
- wx/cocoa/display.h
+ wx/cocoa/dirdlg.h
wx/cocoa/drawer.h
wx/cocoa/filedlg.h
wx/cocoa/font.h
wx/cocoa/window.h
<!-- Generic implementations used by wxCocoa: -->
wx/generic/caret.h
- wx/generic/dirdlgg.h
wx/generic/fdrepdlg.h
wx/generic/fontdlgg.h
wx/generic/imaglist.h
<!-- ====================================================================== -->
<set var="ADVANCED_CMN_SRC" hints="files">
+ src/common/datavcmn.cpp
+ src/generic/buttonbar.cpp
src/generic/calctrl.cpp
+ src/generic/datavgen.cpp
src/generic/datectlg.cpp
src/generic/grid.cpp
src/generic/gridctrl.cpp
src/generic/splash.cpp
src/generic/tipdlg.cpp
src/generic/wizard.cpp
+ src/richtext/richtextctrl.cpp
+ src/richtext/richtextbuffer.cpp
+ src/richtext/richtextstyles.cpp
+ src/richtext/richtextxml.cpp
+ src/richtext/richtexthtml.cpp
</set>
<set var="ADVANCED_CMN_HDR" hints="files">
wx/calctrl.h
+ wx/dataview.h
wx/dateevt.h
wx/dcbuffer.h
+ wx/generic/buttonbar.h
wx/generic/calctrl.h
wx/generic/datectrl.h
+ wx/generic/dataview.h
wx/generic/grid.h
wx/generic/gridctrl.h
wx/generic/gridsel.h
wx/tipdlg.h
wx/wave.h
wx/wizard.h
+ wx/richtext/richtextctrl.h
+ wx/richtext/richtextbuffer.h
+ wx/richtext/richtextstyles.h
+ wx/richtext/richtextxml.h
</set>
<set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
wx/datectrl.h
+ wx/dataview.h
</set>
<set var="ADVANCED_MSW_SRC" hints="files">
<set var="ADVANCED_GTK_SRC" hints="files">
src/gtk/taskbar.cpp
+ src/gtk/dataview.cpp
src/gtk/eggtrayicon.c
</set>
+<set var="ADVANCED_GTK1_SRC" hints="files">
+</set>
<!-- ====================================================================== -->
<!-- wxMedia -->
</set>
<set var="MEDIA_MSW_SRC" hints="files">
- src/msw/mediactrl.cpp
+ src/msw/mediactrl_am.cpp
+ src/msw/mediactrl_wmp10.cpp
src/msw/ole/activex.cpp
</set>
<set var="MEDIA_MSW_HDR" hints="files">
<set var="MEDIA_GTK_SRC" hints="files">
</set>
+<set var="MEDIA_GTK1_SRC" hints="files">
+</set>
+
<!-- ====================================================================== -->
<!-- wxHTML -->
<!-- ====================================================================== -->
$(HTML_SRC_PLATFORM)
src/html/helpctrl.cpp
src/html/helpdata.cpp
+ src/html/helpdlg.cpp
src/html/helpfrm.cpp
+ src/html/helpwnd.cpp
src/html/htmlcell.cpp
src/html/htmlfilt.cpp
src/html/htmlpars.cpp
<set var="HTML_HDR" hints="files">
wx/html/helpctrl.h
wx/html/helpdata.h
+ wx/html/helpdlg.h
wx/html/helpfrm.h
+ wx/html/helpwnd.h
wx/html/htmlcell.h
wx/html/htmldefs.h
wx/html/htmlfilt.h
src/xrc/xh_mdi.cpp
src/xrc/xh_gauge.cpp
src/xrc/xh_gdctl.cpp
+ src/xrc/xh_grid.cpp
src/xrc/xh_html.cpp
src/xrc/xh_listb.cpp
src/xrc/xh_listbk.cpp
src/xrc/xh_tglbtn.cpp
src/xrc/xh_toolb.cpp
src/xrc/xh_tree.cpp
+ src/xrc/xh_treebk.cpp
src/xrc/xh_unkwn.cpp
src/xrc/xh_wizrd.cpp
src/xrc/xmlres.cpp
wx/xrc/xh_mdi.h
wx/xrc/xh_gauge.h
wx/xrc/xh_gdctl.h
+ wx/xrc/xh_grid.h
wx/xrc/xh_html.h
wx/xrc/xh_listb.h
wx/xrc/xh_listbk.h
wx/xrc/xh_tglbtn.h
wx/xrc/xh_toolb.h
wx/xrc/xh_tree.h
+ wx/xrc/xh_treebk.h
wx/xrc/xh_unkwn.h
wx/xrc/xh_wizrd.h
wx/xrc/xmlres.h
<set var="OPENGL_SRC" hints="files">
<if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
<if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
- <if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">src/gtk/glcanvas.cpp</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">src/gtk1/glcanvas.cpp</if>
<if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
<if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
<if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
<set var="OPENGL_HDR" hints="files">
<if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
<if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
- <if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">wx/gtk/glcanvas.h</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">wx/gtk1/glcanvas.h</if>
<if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
<if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
<if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</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>
+ <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
</set>
<set var="BASE_SRC" hints="files">
<!-- GUI sources: -->
<set var="LOWLEVEL_SRC" hints="files">
- <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_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=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
</set>
<set var="LOWLEVEL_HDR" hints="files">
- <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_HDR)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_HDR)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
</set>
<set var="GUI_SRC" hints="files">
- <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_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=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_HDR)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_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'">$(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=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
</set>
<!-- wxAdv files not used by wxUniv -->
<set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
+ <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_SRC)</if>
</set>
<set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
+ <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_HDR)</if>
</set>
<set var="ADVANCED_SRC" hints="files">
</set>
<!-- for 'make install', only the headers needed for the installed port -->
- <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)
$(XML_HDR) $(ODBC_HDR)
- $(ALL_GUI_HEADERS)
+ </set>
+ <set var="ALL_HEADERS" make_var="1" hints="files">
+ $(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
</set>
<!-- used by 'make dist', should include wxBase headers for all ports -->
- <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
+ <set var="ALL_PORTS_BASE_HEADERS" make_var="1" hints="files">
$(BASE_CMN_HDR)
$(BASE_UNIX_HDR)
$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
$(BASE_MAC_SRC)
$(BASE_OS2_SRC)
$(BASE_MSDOS_SRC)
+ $(BASE_PALMOS_SRC)
$(BASE_AND_GUI_CMN_SRC)
$(BASE_AND_GUI_UNIX_SRC)
$(BASE_AND_GUI_MAC_SRC)