X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36090ae57eff3e53cd74f504aaaa727b3bdb6ac8..2026acc1e228e2d0e23244796bce9aa16f7a4599:/build/bakefiles/files.bkl?ds=sidebyside
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 8c7ada93a1..385b0df8fd 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -44,7 +44,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
====================================================================== -->
-
+<if cond="FORMAT in ['borland','mingw','msvc','watcom']">
+ <define-rule name="__mm-to-$(OBJEXT[1:])" extends="__any,compilation_rule">
+ </define-rule>
+</if>
<!-- ====================================================================== -->
<!-- wxBase -->
@@ -543,6 +546,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/meta/int2type.h
wx/meta/movable.h
wx/meta/pod.h
+ wx/meta/removeref.h
wx/fswatcher.h
wx/generic/fswatcher.h
</set>
@@ -737,6 +741,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/tbarbase.cpp
src/common/textcmn.cpp
src/common/textentrycmn.cpp
+ src/common/textmeasurecmn.cpp
src/common/toplvcmn.cpp
src/common/treebase.cpp
src/common/uiactioncmn.cpp
@@ -782,6 +787,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -790,7 +796,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/bmpbuttn.h
wx/brush.h
wx/button.h
- wx/cairo.h
wx/checkbox.h
wx/checklst.h
wx/choicdlg.h
@@ -1011,6 +1016,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/vscroll.h
wx/xpmdecod.h
wx/xpmhand.h
+ wx/xrc/xmlreshandler.h
</set>
<!-- ====================================================================== -->
@@ -1047,13 +1053,39 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- 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)
@@ -1082,6 +1114,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/region.cpp
src/gtk/renderer.cpp
src/gtk/settings.cpp
+ src/gtk/textmeasure.cpp
src/gtk/timer.cpp
src/gtk/tooltip.cpp
src/gtk/toplevel.cpp
@@ -1255,6 +1288,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(XWIN_LOWLEVEL_SRC)
src/generic/icon.cpp
src/generic/paletteg.cpp
+ src/generic/textmeasure.cpp
src/gtk1/app.cpp
src/gtk1/bitmap.cpp
src/gtk1/brush.cpp
@@ -1416,6 +1450,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="MOTIF_LOWLEVEL_SRC" hints="files">
$(XWIN_LOWLEVEL_SRC)
+ src/generic/textmeasure.cpp
src/x11/bitmap.cpp
src/x11/brush.cpp
src/x11/palette.cpp
@@ -1581,6 +1616,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="X11_LOWLEVEL_SRC" hints="files">
$(XWIN_LOWLEVEL_SRC)
src/generic/icon.cpp
+ src/generic/textmeasure.cpp
src/generic/timer.cpp
src/x11/app.cpp
src/x11/bitmap.cpp
@@ -1683,6 +1719,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/ole/dropsrc.cpp
src/msw/ole/droptgt.cpp
src/msw/ole/oleutils.cpp
+ src/msw/ole/safearray.cpp
src/msw/palette.cpp
src/msw/pen.cpp
src/msw/popupwin.cpp
@@ -1691,6 +1728,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/region.cpp
src/msw/renderer.cpp
src/msw/settings.cpp
+ src/msw/textmeasure.cpp
src/msw/tooltip.cpp
src/msw/toplevel.cpp
src/msw/uiaction.cpp
@@ -1842,6 +1880,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/ole/dropsrc.h
wx/msw/ole/droptgt.h
wx/msw/ole/oleutils.h
+ wx/msw/ole/safearray.h
wx/msw/ownerdrw.h
wx/msw/palette.h
wx/msw/panel.h
@@ -1963,6 +2002,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/icon.cpp
src/generic/imaglist.cpp
src/generic/mask.cpp
+ src/generic/textmeasure.cpp
src/dfb/app.cpp
src/dfb/bitmap.cpp
src/dfb/brush.cpp
@@ -2039,6 +2079,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/mdig.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
+ src/generic/textmeasure.cpp
<!-- OS/2 specific files: -->
src/os2/accel.cpp
src/os2/app.cpp
@@ -2314,6 +2355,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
+ src/generic/textmeasure.cpp
</if>
</set>
@@ -2656,6 +2698,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/paletteg.cpp
src/generic/regiong.cpp
src/generic/statusbr.cpp
+ src/generic/textmeasure.cpp
</set>
<set var="COCOA_HDR" hints="files">
wx/cocoa/NSApplication.h
@@ -2760,7 +2803,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/univ/themes/win32.cpp
</set>
+<set var="UNIV_PLATFORM_SRC" hints="files">
+ <if cond="TOOLKIT=='MSW'">
+ src/msw/evtloop.cpp
+ </if>
+</set>
+<set var="UNIV_PLATFORM_HDR" hints="files">
+ <if cond="TOOLKIT=='MSW'">
+ wx/msw/evtloop.h
+ </if>
+</set>
+
<set var="UNIV_SRC" hints="files">
+ $(UNIV_PLATFORM_SRC)
src/generic/accel.cpp
src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp
@@ -2812,6 +2867,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/univ/winuniv.cpp
</set>
<set var="UNIV_HDR" hints="files">
+ $(UNIV_PLATFORM_HDR)
wx/generic/accel.h
wx/generic/animate.h
wx/generic/clrpickerg.h
@@ -3121,13 +3177,25 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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)
@@ -3177,7 +3245,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<set var="ADVANCED_UNIV_SRC" hints="files">
- src/generic/animateg.cpp
+<!--
+Don't include src/generic/animateg.cpp many times in ADVANCED_SRC(WXUNIV=='1').
+This file is already included in [OSX_CARBON, OSX_COCOA, OSX_IPHONE, COCOA, PM, MOTIF] TOOLKITs
+and TOOLKIT=='GTK' and TOOLKIT_VERSION==''.
+-->
+ <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>
</set>
<set var="ADVANCED_UNIV_HDR" hints="files">
wx/generic/animate.h
@@ -3332,12 +3413,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(WEBVIEW_SRC_PLATFORM)
src/common/webview.cpp
src/common/webviewarchivehandler.cpp
+ src/common/webviewfshandler.cpp
</set>
<set var="WEBVIEW_HDR_PLATFORM" hints="files">
<if cond="TOOLKIT=='MSW'">
wx/msw/webviewhistoryitem_ie.h
wx/msw/webview_ie.h
+ wx/msw/webview_missing.h
</if>
<if cond="TOOLKIT=='GTK'">
wx/gtk/webviewhistoryitem_webkit.h
@@ -3352,6 +3435,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(WEBVIEW_HDR_PLATFORM)
wx/webview.h
wx/webviewarchivehandler.h
+ wx/webviewfshandler.h
</set>
<!-- ====================================================================== -->
@@ -3399,8 +3483,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -3469,7 +3551,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -3521,7 +3602,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<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>
@@ -3603,6 +3684,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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">
@@ -3614,6 +3696,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/aui/tabmdi.h
wx/aui/aui.h
wx/aui/tabart.h
+ wx/xrc/xh_auinotbk.h
$(AUI_GTK_HDR)
</set>
@@ -3632,6 +3715,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -3643,6 +3727,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/ribbon/page.h
wx/ribbon/panel.h
wx/ribbon/toolbar.h
+ wx/xrc/xh_ribbon.h
</set>
<!-- ====================================================================== -->
@@ -3686,6 +3771,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -3707,8 +3793,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/richtext/richtextstylepage.h
wx/richtext/richtextstyles.h
wx/richtext/richtextsymboldlg.h
+ wx/richtext/richtexttabspage.h
wx/richtext/richtextuicustomization.h
wx/richtext/richtextxml.h
+ wx/xrc/xh_richtext.h
</set>
@@ -3817,8 +3905,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- 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>
@@ -3853,8 +3941,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</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>
@@ -3866,8 +3954,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<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>
@@ -3897,8 +3985,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<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>
@@ -3911,8 +3999,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<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>
@@ -3920,14 +4008,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- 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>