<?xml version="1.0" ?>
-<!-- $Id$ -->
<makefile>
<!--
====================================================================== -->
-
+<if cond="FORMAT in ['borland','mingw','msvc','watcom']">
+ <define-rule name="__mm-to-$(OBJEXT[1:])" extends="__any,compilation_rule">
+ </define-rule>
+</if>
<!-- ====================================================================== -->
<!-- wxBase -->
src/unix/timerunx.cpp
src/unix/threadpsx.cpp
src/unix/utilsunx.cpp
+ src/unix/wakeuppipe.cpp
src/unix/fswatcher_kqueue.cpp
</set>
src/common/tarstrm.cpp
src/common/textbuf.cpp
src/common/textfile.cpp
+ src/common/threadinfo.cpp
src/common/time.cpp
src/common/timercmn.cpp
src/common/timerimpl.cpp
wx/clntdata.h
wx/cmdargs.h
wx/cmdline.h
+ wx/compiler.h
wx/confbase.h
wx/config.h
wx/convauto.h
src/common/markupparser.cpp
src/common/matrix.cpp
src/common/menucmn.cpp
+ src/common/modalhook.cpp
src/common/mousemanager.cpp
src/common/nbkbase.cpp
src/common/overlaycmn.cpp
src/common/persist.cpp
src/common/pickerbase.cpp
src/common/popupcmn.cpp
+ src/common/preferencescmn.cpp
src/common/prntbase.cpp
src/common/quantize.cpp
src/common/radiobtncmn.cpp
src/generic/msgdlgg.cpp
src/generic/numdlgg.cpp
src/generic/progdlgg.cpp
+ src/generic/preferencesg.cpp
src/generic/printps.cpp
src/generic/renderg.cpp
src/generic/richmsgdlgg.cpp
src/generic/treebkg.cpp
src/generic/vlbox.cpp
src/generic/vscroll.cpp
+ src/xrc/xmlreshandler.cpp
</set>
<set var="GUI_CMN_HDR" hints="files">
wx/affinematrix2dbase.h
wx/bmpbuttn.h
wx/brush.h
wx/button.h
- wx/cairo.h
wx/checkbox.h
wx/checklst.h
wx/choicdlg.h
wx/listbox.h
wx/mdi.h
wx/menu.h
+ wx/modalhook.h
wx/mousemanager.h
wx/msgdlg.h
wx/nativewin.h
wx/valnum.h
wx/window.h
wx/windowid.h
+ wx/windowptr.h
wx/withimages.h
wx/wrapsizer.h
wx/wupdlock.h
wx/vscroll.h
wx/xpmdecod.h
wx/xpmhand.h
+ wx/xrc/xmlreshandler.h
</set>
<!-- ====================================================================== -->
<!-- wxGTK -->
<!-- ====================================================================== -->
+<set var="GTK_WIN32_SRC" hints="files">
+ src/generic/caret.cpp
+ src/generic/imaglist.cpp
+ src/msw/ole/automtn.cpp
+ src/msw/ole/oleutils.cpp
+ src/msw/ole/safearray.cpp
+ src/msw/ole/uuid.cpp
+ src/msw/dialup.cpp
+ src/msw/dib.cpp
+ src/msw/display.cpp
+ src/msw/utilswin.cpp
+ src/unix/fontenum.cpp
+ src/unix/fontutil.cpp
+</set>
+<set var="GTK_WIN32_HDR" hints="files">
+ wx/generic/caret.h
+ wx/generic/imaglist.h
+ wx/msw/ole/automtn.h
+ wx/msw/ole/oleutils.h
+ wx/msw/ole/safearray.h
+ wx/msw/ole/uuid.h
+ wx/msw/dib.h
+ wx/unix/fontutil.h
+</set>
<set var="GTK_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
+ <if cond="PLATFORM_WIN32=='1'">$(GTK_WIN32_SRC)</if>
</set>
<set var="GTK_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_HDR)</if>
<if cond="PLATFORM_MACOSX=='1'">$(XWIN_LOWLEVEL_HDR)</if>
+ <if cond="PLATFORM_WIN32=='1'">$(GTK_WIN32_HDR)</if>
</set>
<set var="GTK_LOWLEVEL_SRC" hints="files">
$(GTK_PLATFORM_SRC)
wx/gtk/textctrl.h
wx/gtk/textentry.h
wx/gtk/tglbtn.h
- wx/gtk/treeentry_gtk.h
</set>
<set var="GTK2_HDR" hints="files">
$(GTK_HDR)
wx/msw/pencil.cur
wx/msw/pntleft.cur
wx/msw/pntright.cur
- wx/msw/rightarr.cur
wx/msw/roller.cur
<!-- icons -->
wx/msw/cdrom.ico
src/osx/cocoa/nonownedwnd.mm
src/osx/cocoa/notebook.mm
src/osx/cocoa/radiobut.mm
+ src/osx/cocoa/preferences.mm
src/osx/cocoa/printdlg.mm
src/osx/cocoa/scrolbar.mm
src/osx/cocoa/slider.mm
wx/generic/animate.h
</set>
+<set var="ADVANCED_GTK_WIN32_SRC" hints="files">
+ src/common/taskbarcmn.cpp
+ src/msw/joystick.cpp
+ src/msw/sound.cpp
+</set>
+<set var="ADVANCED_GTK_WIN32_HDR" hints="files">
+ wx/msw/joystick.h
+ wx/msw/sound.h
+ wx/msw/taskbar.h
+</set>
<set var="ADVANCED_GTK_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(ADVANCED_UNIX_SRC)</if>
+ <if cond="PLATFORM_WIN32=='1'">$(ADVANCED_GTK_WIN32_SRC)</if>
</set>
<set var="ADVANCED_GTK_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
<if cond="PLATFORM_MACOSX=='1'">$(ADVANCED_UNIX_HDR)</if>
+ <if cond="PLATFORM_WIN32=='1'">$(ADVANCED_GTK_WIN32_HDR)</if>
</set>
<set var="ADVANCED_GTK_SRC" hints="files">
$(ADVANCED_GTK_PLATFORM_SRC)
</set>
<set var="ADVANCED_UNIV_SRC" hints="files">
- src/generic/animateg.cpp
+<!--
+ Including src/generic/animateg.cpp hre unconditionally results in bakefile
+ errors when not fixing the value of TOOLKIT to MSW in msvc format, see #15327.
+-->
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+ src/generic/animateg.cpp
+ </if>
+ <if cond="TOOLKIT=='MSW'">
+ src/generic/animateg.cpp
+ </if>
+ <if cond="TOOLKIT=='WINCE'">
+ src/generic/animateg.cpp
+ </if>
+ <if cond="TOOLKIT=='X11'">
+ src/generic/animateg.cpp
+ </if>
</set>
<set var="ADVANCED_UNIV_HDR" hints="files">
wx/generic/animate.h
src/xrc/xh_propdlg.cpp
src/xrc/xh_radbt.cpp
src/xrc/xh_radbx.cpp
- <!-- disabled until linking problems are fixed -->
- <!-- src/xrc/xh_richtext.cpp -->
src/xrc/xh_scrol.cpp
src/xrc/xh_scwin.cpp
src/xrc/xh_htmllbox.cpp
wx/xrc/xh_propdlg.h
wx/xrc/xh_radbt.h
wx/xrc/xh_radbx.h
- <!-- wx/xrc/xh_richtext.h -->
wx/xrc/xh_scrol.h
wx/xrc/xh_scwin.h
wx/xrc/xh_htmllbox.h
<if cond="TOOLKIT=='OSX_COCOA'">src/osx/cocoa/glcanvas.mm src/osx/glcanvas_osx.cpp</if>
<if cond="TOOLKIT=='OSX_IPHONE'">src/osx/iphone/glcanvas.mm src/osx/glcanvas_osx.cpp</if>
<if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3' and PLATFORM_WIN32=='0'">
src/unix/glx11.cpp
src/gtk/glcanvas.cpp
</if>
src/aui/auibar.cpp
src/aui/tabmdi.cpp
src/aui/tabart.cpp
+ src/xrc/xh_auinotbk.cpp
$(AUI_GTK_SRC)
</set>
<set var="AUI_HDR" hints="files">
wx/aui/tabmdi.h
wx/aui/aui.h
wx/aui/tabart.h
+ wx/xrc/xh_auinotbk.h
$(AUI_GTK_HDR)
</set>
src/ribbon/page.cpp
src/ribbon/panel.cpp
src/ribbon/toolbar.cpp
+ src/xrc/xh_ribbon.cpp
</set>
<set var="RIBBON_HDR" hints="files">
wx/ribbon/art.h
wx/ribbon/page.h
wx/ribbon/panel.h
wx/ribbon/toolbar.h
+ wx/xrc/xh_ribbon.h
</set>
<!-- ====================================================================== -->
src/richtext/richtextstyles.cpp
src/richtext/richtextsymboldlg.cpp
src/richtext/richtextxml.cpp
+ src/xrc/xh_richtext.cpp
</set>
<set var="RICHTEXT_HDR" hints="files">
wx/richtext/richtextbackgroundpage.h
wx/richtext/richtexttabspage.h
wx/richtext/richtextuicustomization.h
wx/richtext/richtextxml.h
+ wx/xrc/xh_richtext.h
</set>
<!-- GUI sources: -->
<set var="LOWLEVEL_SRC" hints="files">
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_LOWLEVEL_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(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>
</set>
<set var="GUI_SRC" hints="files">
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(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=='PM'">$(OS2_SRC)</if>
</set>
<set var="GUI_HDR" hints="files">
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_HDR)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(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=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK2_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(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>
<if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK2_HDR)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
<!-- wxAdv files not used by wxUniv -->
<set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
- <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_SRC)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_SRC)</if>
<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=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_HDR)</if>
+ <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_HDR)</if>
</set>