Correct too-small size when the progress dialog is very simple

[wxWidgets.git] / build / msw / makefile.wat

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 2bc49a470e5c3d349d90092229d3837aa7a99d16..35817a72df57bd815a01ba21486191b47023583a 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -344,6 +344,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_fontcmn.obj &
        $(OBJS)\monodll_fontenumcmn.obj &
        $(OBJS)\monodll_fontmap.obj &
        $(OBJS)\monodll_fontcmn.obj &
        $(OBJS)\monodll_fontenumcmn.obj &
        $(OBJS)\monodll_fontmap.obj &

+       $(OBJS)\monodll_fontutilcmn.obj &

        $(OBJS)\monodll_framecmn.obj &
        $(OBJS)\monodll_gaugecmn.obj &
        $(OBJS)\monodll_gbsizer.obj &
        $(OBJS)\monodll_framecmn.obj &
        $(OBJS)\monodll_gaugecmn.obj &
        $(OBJS)\monodll_gbsizer.obj &


@@ -383,6 +384,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_rgncmn.obj &
        $(OBJS)\monodll_settcmn.obj &
        $(OBJS)\monodll_sizer.obj &
        $(OBJS)\monodll_rgncmn.obj &
        $(OBJS)\monodll_settcmn.obj &
        $(OBJS)\monodll_sizer.obj &

+       $(OBJS)\monodll_srchcmn.obj &

        $(OBJS)\monodll_statbar.obj &
        $(OBJS)\monodll_stockitem.obj &
        $(OBJS)\monodll_tbarbase.obj &
        $(OBJS)\monodll_statbar.obj &
        $(OBJS)\monodll_stockitem.obj &
        $(OBJS)\monodll_tbarbase.obj &


@@ -418,6 +420,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_selstore.obj &
        $(OBJS)\monodll_spinctlg.obj &
        $(OBJS)\monodll_splitter.obj &
        $(OBJS)\monodll_selstore.obj &
        $(OBJS)\monodll_spinctlg.obj &
        $(OBJS)\monodll_splitter.obj &

+       $(OBJS)\monodll_srchctlg.obj &

        $(OBJS)\monodll_textdlgg.obj &
        $(OBJS)\monodll_tipwin.obj &
        $(OBJS)\monodll_toolbkg.obj &
        $(OBJS)\monodll_textdlgg.obj &
        $(OBJS)\monodll_tipwin.obj &
        $(OBJS)\monodll_toolbkg.obj &


@@ -569,6 +572,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_fontcmn.obj &
        $(OBJS)\monodll_fontenumcmn.obj &
        $(OBJS)\monodll_fontmap.obj &
        $(OBJS)\monodll_fontcmn.obj &
        $(OBJS)\monodll_fontenumcmn.obj &
        $(OBJS)\monodll_fontmap.obj &

+       $(OBJS)\monodll_fontutilcmn.obj &

        $(OBJS)\monodll_framecmn.obj &
        $(OBJS)\monodll_gaugecmn.obj &
        $(OBJS)\monodll_gbsizer.obj &
        $(OBJS)\monodll_framecmn.obj &
        $(OBJS)\monodll_gaugecmn.obj &
        $(OBJS)\monodll_gbsizer.obj &


@@ -608,6 +612,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_rgncmn.obj &
        $(OBJS)\monodll_settcmn.obj &
        $(OBJS)\monodll_sizer.obj &
        $(OBJS)\monodll_rgncmn.obj &
        $(OBJS)\monodll_settcmn.obj &
        $(OBJS)\monodll_sizer.obj &

+       $(OBJS)\monodll_srchcmn.obj &

        $(OBJS)\monodll_statbar.obj &
        $(OBJS)\monodll_stockitem.obj &
        $(OBJS)\monodll_tbarbase.obj &
        $(OBJS)\monodll_statbar.obj &
        $(OBJS)\monodll_stockitem.obj &
        $(OBJS)\monodll_tbarbase.obj &


@@ -643,6 +648,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_selstore.obj &
        $(OBJS)\monodll_spinctlg.obj &
        $(OBJS)\monodll_splitter.obj &
        $(OBJS)\monodll_selstore.obj &
        $(OBJS)\monodll_spinctlg.obj &
        $(OBJS)\monodll_splitter.obj &

+       $(OBJS)\monodll_srchctlg.obj &

        $(OBJS)\monodll_textdlgg.obj &
        $(OBJS)\monodll_tipwin.obj &
        $(OBJS)\monodll_toolbkg.obj &
        $(OBJS)\monodll_textdlgg.obj &
        $(OBJS)\monodll_tipwin.obj &
        $(OBJS)\monodll_toolbkg.obj &


@@ -966,6 +972,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_fontcmn.obj &
        $(OBJS)\monolib_fontenumcmn.obj &
        $(OBJS)\monolib_fontmap.obj &
        $(OBJS)\monolib_fontcmn.obj &
        $(OBJS)\monolib_fontenumcmn.obj &
        $(OBJS)\monolib_fontmap.obj &

+       $(OBJS)\monolib_fontutilcmn.obj &

        $(OBJS)\monolib_framecmn.obj &
        $(OBJS)\monolib_gaugecmn.obj &
        $(OBJS)\monolib_gbsizer.obj &
        $(OBJS)\monolib_framecmn.obj &
        $(OBJS)\monolib_gaugecmn.obj &
        $(OBJS)\monolib_gbsizer.obj &


@@ -1005,6 +1012,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_rgncmn.obj &
        $(OBJS)\monolib_settcmn.obj &
        $(OBJS)\monolib_sizer.obj &
        $(OBJS)\monolib_rgncmn.obj &
        $(OBJS)\monolib_settcmn.obj &
        $(OBJS)\monolib_sizer.obj &

+       $(OBJS)\monolib_srchcmn.obj &

        $(OBJS)\monolib_statbar.obj &
        $(OBJS)\monolib_stockitem.obj &
        $(OBJS)\monolib_tbarbase.obj &
        $(OBJS)\monolib_statbar.obj &
        $(OBJS)\monolib_stockitem.obj &
        $(OBJS)\monolib_tbarbase.obj &


@@ -1040,6 +1048,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_selstore.obj &
        $(OBJS)\monolib_spinctlg.obj &
        $(OBJS)\monolib_splitter.obj &
        $(OBJS)\monolib_selstore.obj &
        $(OBJS)\monolib_spinctlg.obj &
        $(OBJS)\monolib_splitter.obj &

+       $(OBJS)\monolib_srchctlg.obj &

        $(OBJS)\monolib_textdlgg.obj &
        $(OBJS)\monolib_tipwin.obj &
        $(OBJS)\monolib_toolbkg.obj &
        $(OBJS)\monolib_textdlgg.obj &
        $(OBJS)\monolib_tipwin.obj &
        $(OBJS)\monolib_toolbkg.obj &


@@ -1191,6 +1200,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_fontcmn.obj &
        $(OBJS)\monolib_fontenumcmn.obj &
        $(OBJS)\monolib_fontmap.obj &
        $(OBJS)\monolib_fontcmn.obj &
        $(OBJS)\monolib_fontenumcmn.obj &
        $(OBJS)\monolib_fontmap.obj &

+       $(OBJS)\monolib_fontutilcmn.obj &

        $(OBJS)\monolib_framecmn.obj &
        $(OBJS)\monolib_gaugecmn.obj &
        $(OBJS)\monolib_gbsizer.obj &
        $(OBJS)\monolib_framecmn.obj &
        $(OBJS)\monolib_gaugecmn.obj &
        $(OBJS)\monolib_gbsizer.obj &


@@ -1230,6 +1240,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_rgncmn.obj &
        $(OBJS)\monolib_settcmn.obj &
        $(OBJS)\monolib_sizer.obj &
        $(OBJS)\monolib_rgncmn.obj &
        $(OBJS)\monolib_settcmn.obj &
        $(OBJS)\monolib_sizer.obj &

+       $(OBJS)\monolib_srchcmn.obj &

        $(OBJS)\monolib_statbar.obj &
        $(OBJS)\monolib_stockitem.obj &
        $(OBJS)\monolib_tbarbase.obj &
        $(OBJS)\monolib_statbar.obj &
        $(OBJS)\monolib_stockitem.obj &
        $(OBJS)\monolib_tbarbase.obj &


@@ -1265,6 +1276,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_selstore.obj &
        $(OBJS)\monolib_spinctlg.obj &
        $(OBJS)\monolib_splitter.obj &
        $(OBJS)\monolib_selstore.obj &
        $(OBJS)\monolib_spinctlg.obj &
        $(OBJS)\monolib_splitter.obj &

+       $(OBJS)\monolib_srchctlg.obj &

        $(OBJS)\monolib_textdlgg.obj &
        $(OBJS)\monolib_tipwin.obj &
        $(OBJS)\monolib_toolbkg.obj &
        $(OBJS)\monolib_textdlgg.obj &
        $(OBJS)\monolib_tipwin.obj &
        $(OBJS)\monolib_toolbkg.obj &


@@ -1509,6 +1521,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_fontcmn.obj &
        $(OBJS)\coredll_fontenumcmn.obj &
        $(OBJS)\coredll_fontmap.obj &
        $(OBJS)\coredll_fontcmn.obj &
        $(OBJS)\coredll_fontenumcmn.obj &
        $(OBJS)\coredll_fontmap.obj &

+       $(OBJS)\coredll_fontutilcmn.obj &

        $(OBJS)\coredll_framecmn.obj &
        $(OBJS)\coredll_gaugecmn.obj &
        $(OBJS)\coredll_gbsizer.obj &
        $(OBJS)\coredll_framecmn.obj &
        $(OBJS)\coredll_gaugecmn.obj &
        $(OBJS)\coredll_gbsizer.obj &


@@ -1548,6 +1561,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_rgncmn.obj &
        $(OBJS)\coredll_settcmn.obj &
        $(OBJS)\coredll_sizer.obj &
        $(OBJS)\coredll_rgncmn.obj &
        $(OBJS)\coredll_settcmn.obj &
        $(OBJS)\coredll_sizer.obj &

+       $(OBJS)\coredll_srchcmn.obj &

        $(OBJS)\coredll_statbar.obj &
        $(OBJS)\coredll_stockitem.obj &
        $(OBJS)\coredll_tbarbase.obj &
        $(OBJS)\coredll_statbar.obj &
        $(OBJS)\coredll_stockitem.obj &
        $(OBJS)\coredll_tbarbase.obj &


@@ -1583,6 +1597,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_selstore.obj &
        $(OBJS)\coredll_spinctlg.obj &
        $(OBJS)\coredll_splitter.obj &
        $(OBJS)\coredll_selstore.obj &
        $(OBJS)\coredll_spinctlg.obj &
        $(OBJS)\coredll_splitter.obj &

+       $(OBJS)\coredll_srchctlg.obj &

        $(OBJS)\coredll_textdlgg.obj &
        $(OBJS)\coredll_tipwin.obj &
        $(OBJS)\coredll_toolbkg.obj &
        $(OBJS)\coredll_textdlgg.obj &
        $(OBJS)\coredll_tipwin.obj &
        $(OBJS)\coredll_toolbkg.obj &


@@ -1734,6 +1749,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_fontcmn.obj &
        $(OBJS)\coredll_fontenumcmn.obj &
        $(OBJS)\coredll_fontmap.obj &
        $(OBJS)\coredll_fontcmn.obj &
        $(OBJS)\coredll_fontenumcmn.obj &
        $(OBJS)\coredll_fontmap.obj &

+       $(OBJS)\coredll_fontutilcmn.obj &

        $(OBJS)\coredll_framecmn.obj &
        $(OBJS)\coredll_gaugecmn.obj &
        $(OBJS)\coredll_gbsizer.obj &
        $(OBJS)\coredll_framecmn.obj &
        $(OBJS)\coredll_gaugecmn.obj &
        $(OBJS)\coredll_gbsizer.obj &


@@ -1773,6 +1789,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_rgncmn.obj &
        $(OBJS)\coredll_settcmn.obj &
        $(OBJS)\coredll_sizer.obj &
        $(OBJS)\coredll_rgncmn.obj &
        $(OBJS)\coredll_settcmn.obj &
        $(OBJS)\coredll_sizer.obj &

+       $(OBJS)\coredll_srchcmn.obj &

        $(OBJS)\coredll_statbar.obj &
        $(OBJS)\coredll_stockitem.obj &
        $(OBJS)\coredll_tbarbase.obj &
        $(OBJS)\coredll_statbar.obj &
        $(OBJS)\coredll_stockitem.obj &
        $(OBJS)\coredll_tbarbase.obj &


@@ -1808,6 +1825,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_selstore.obj &
        $(OBJS)\coredll_spinctlg.obj &
        $(OBJS)\coredll_splitter.obj &
        $(OBJS)\coredll_selstore.obj &
        $(OBJS)\coredll_spinctlg.obj &
        $(OBJS)\coredll_splitter.obj &

+       $(OBJS)\coredll_srchctlg.obj &

        $(OBJS)\coredll_textdlgg.obj &
        $(OBJS)\coredll_tipwin.obj &
        $(OBJS)\coredll_toolbkg.obj &
        $(OBJS)\coredll_textdlgg.obj &
        $(OBJS)\coredll_tipwin.obj &
        $(OBJS)\coredll_toolbkg.obj &


@@ -1966,6 +1984,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_fontcmn.obj &
        $(OBJS)\corelib_fontenumcmn.obj &
        $(OBJS)\corelib_fontmap.obj &
        $(OBJS)\corelib_fontcmn.obj &
        $(OBJS)\corelib_fontenumcmn.obj &
        $(OBJS)\corelib_fontmap.obj &

+       $(OBJS)\corelib_fontutilcmn.obj &

        $(OBJS)\corelib_framecmn.obj &
        $(OBJS)\corelib_gaugecmn.obj &
        $(OBJS)\corelib_gbsizer.obj &
        $(OBJS)\corelib_framecmn.obj &
        $(OBJS)\corelib_gaugecmn.obj &
        $(OBJS)\corelib_gbsizer.obj &


@@ -2005,6 +2024,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_rgncmn.obj &
        $(OBJS)\corelib_settcmn.obj &
        $(OBJS)\corelib_sizer.obj &
        $(OBJS)\corelib_rgncmn.obj &
        $(OBJS)\corelib_settcmn.obj &
        $(OBJS)\corelib_sizer.obj &

+       $(OBJS)\corelib_srchcmn.obj &

        $(OBJS)\corelib_statbar.obj &
        $(OBJS)\corelib_stockitem.obj &
        $(OBJS)\corelib_tbarbase.obj &
        $(OBJS)\corelib_statbar.obj &
        $(OBJS)\corelib_stockitem.obj &
        $(OBJS)\corelib_tbarbase.obj &


@@ -2040,6 +2060,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_selstore.obj &
        $(OBJS)\corelib_spinctlg.obj &
        $(OBJS)\corelib_splitter.obj &
        $(OBJS)\corelib_selstore.obj &
        $(OBJS)\corelib_spinctlg.obj &
        $(OBJS)\corelib_splitter.obj &

+       $(OBJS)\corelib_srchctlg.obj &

        $(OBJS)\corelib_textdlgg.obj &
        $(OBJS)\corelib_tipwin.obj &
        $(OBJS)\corelib_toolbkg.obj &
        $(OBJS)\corelib_textdlgg.obj &
        $(OBJS)\corelib_tipwin.obj &
        $(OBJS)\corelib_toolbkg.obj &


@@ -2191,6 +2212,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_fontcmn.obj &
        $(OBJS)\corelib_fontenumcmn.obj &
        $(OBJS)\corelib_fontmap.obj &
        $(OBJS)\corelib_fontcmn.obj &
        $(OBJS)\corelib_fontenumcmn.obj &
        $(OBJS)\corelib_fontmap.obj &

+       $(OBJS)\corelib_fontutilcmn.obj &

        $(OBJS)\corelib_framecmn.obj &
        $(OBJS)\corelib_gaugecmn.obj &
        $(OBJS)\corelib_gbsizer.obj &
        $(OBJS)\corelib_framecmn.obj &
        $(OBJS)\corelib_gaugecmn.obj &
        $(OBJS)\corelib_gbsizer.obj &


@@ -2230,6 +2252,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_rgncmn.obj &
        $(OBJS)\corelib_settcmn.obj &
        $(OBJS)\corelib_sizer.obj &
        $(OBJS)\corelib_rgncmn.obj &
        $(OBJS)\corelib_settcmn.obj &
        $(OBJS)\corelib_sizer.obj &

+       $(OBJS)\corelib_srchcmn.obj &

        $(OBJS)\corelib_statbar.obj &
        $(OBJS)\corelib_stockitem.obj &
        $(OBJS)\corelib_tbarbase.obj &
        $(OBJS)\corelib_statbar.obj &
        $(OBJS)\corelib_stockitem.obj &
        $(OBJS)\corelib_tbarbase.obj &


@@ -2265,6 +2288,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_selstore.obj &
        $(OBJS)\corelib_spinctlg.obj &
        $(OBJS)\corelib_splitter.obj &
        $(OBJS)\corelib_selstore.obj &
        $(OBJS)\corelib_spinctlg.obj &
        $(OBJS)\corelib_splitter.obj &

+       $(OBJS)\corelib_srchctlg.obj &

        $(OBJS)\corelib_textdlgg.obj &
        $(OBJS)\corelib_tipwin.obj &
        $(OBJS)\corelib_toolbkg.obj &
        $(OBJS)\corelib_textdlgg.obj &
        $(OBJS)\corelib_tipwin.obj &
        $(OBJS)\corelib_toolbkg.obj &


@@ -2615,6 +2639,27 @@ __gllib___depname = &
 !endif
 !endif
 !endif
 !endif
 !endif
 !endif

+__htmldll_library_link_DEP =
+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+!ifeq USE_GUI 1
+!ifeq USE_HTML 1
+__htmldll_library_link_DEP = $(__htmldll___depname)
+!endif
+!endif
+!endif
+!endif
+__htmldll_library_link_LIBR =
+!ifeq MONOLITHIC 0
+!ifeq SHARED 1
+!ifeq USE_GUI 1
+!ifeq USE_HTML 1
+__htmldll_library_link_LIBR = &
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!endif
+!endif
+!endif
+!endif

 __DEBUGINFO_3 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
 __DEBUGINFO_3 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default


@@ -2757,8 +2802,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
        RUNTIME_LIBS="$(RUNTIME_LIBS)"
        WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
        RUNTIME_LIBS="$(RUNTIME_LIBS)"

-WX_RELEASE_NODOT = 27
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
+WX_RELEASE_NODOT = 29
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0

 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = ..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = ..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)


@@ -4325,14 +4370,14 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 !ifeq USE_XRC 1
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 !ifeq USE_XRC 1

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_wat$(VENDORTAG).dll :  $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_wat$(VENDORTAG).dll :  $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)

        @%create $(OBJS)\xrcdll.lbc
        @%append $(OBJS)\xrcdll.lbc option quiet
        @%append $(OBJS)\xrcdll.lbc name $^@
        @%append $(OBJS)\xrcdll.lbc option caseexact
        @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i
        @%create $(OBJS)\xrcdll.lbc
        @%append $(OBJS)\xrcdll.lbc option quiet
        @%append $(OBJS)\xrcdll.lbc name $^@
        @%append $(OBJS)\xrcdll.lbc option caseexact
        @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i

-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\xrcdll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\xrcdll.lbc library %i

        @%append $(OBJS)\xrcdll.lbc option resource=$(OBJS)\xrcdll_version.res
        @%append $(OBJS)\xrcdll.lbc system nt_dll
        wlink @$(OBJS)\xrcdll.lbc
        @%append $(OBJS)\xrcdll.lbc option resource=$(OBJS)\xrcdll_version.res
        @%append $(OBJS)\xrcdll.lbc system nt_dll
        wlink @$(OBJS)\xrcdll.lbc


@@ -4385,14 +4430,14 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 !ifeq USE_RICHTEXT 1
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 !ifeq USE_RICHTEXT 1

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_wat$(VENDORTAG).dll :  $(RICHTEXTDLL_OBJECTS) $(OBJS)\richtextdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__htmldll___depname) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_wat$(VENDORTAG).dll :  $(RICHTEXTDLL_OBJECTS) $(OBJS)\richtextdll_version.res $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)

        @%create $(OBJS)\richtextdll.lbc
        @%append $(OBJS)\richtextdll.lbc option quiet
        @%append $(OBJS)\richtextdll.lbc name $^@
        @%append $(OBJS)\richtextdll.lbc option caseexact
        @%append $(OBJS)\richtextdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(RICHTEXTDLL_OBJECTS)) do @%append $(OBJS)\richtextdll.lbc file %i
        @%create $(OBJS)\richtextdll.lbc
        @%append $(OBJS)\richtextdll.lbc option quiet
        @%append $(OBJS)\richtextdll.lbc name $^@
        @%append $(OBJS)\richtextdll.lbc option caseexact
        @%append $(OBJS)\richtextdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(RICHTEXTDLL_OBJECTS)) do @%append $(OBJS)\richtextdll.lbc file %i

-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\richtextdll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\richtextdll.lbc library %i

        @%append $(OBJS)\richtextdll.lbc option resource=$(OBJS)\richtextdll_version.res
        @%append $(OBJS)\richtextdll.lbc system nt_dll
        wlink @$(OBJS)\richtextdll.lbc
        @%append $(OBJS)\richtextdll.lbc option resource=$(OBJS)\richtextdll_version.res
        @%append $(OBJS)\richtextdll.lbc system nt_dll
        wlink @$(OBJS)\richtextdll.lbc


@@ -4470,8 +4515,8 @@ $(SETUPHDIR)\wx\msw\rcdefs.h :  $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde
 
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
 
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)

-       @echo WXVER_MINOR=7 >>$(BUILD_CFG_FILE)
-       @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
+       @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)
+       @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)

        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)


@@ -6412,6 +6457,11 @@ $(OBJS)\monodll_fontmap.obj :  .AUTODEPEND ..\..\src\common\fontmap.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monodll_fontutilcmn.obj :  .AUTODEPEND ..\..\src\common\fontutilcmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monodll_framecmn.obj :  .AUTODEPEND ..\..\src\common\framecmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monodll_framecmn.obj :  .AUTODEPEND ..\..\src\common\framecmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -6607,6 +6657,11 @@ $(OBJS)\monodll_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monodll_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monodll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monodll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -6782,6 +6837,11 @@ $(OBJS)\monodll_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monodll_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monodll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monodll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<


@@ -8499,6 +8559,11 @@ $(OBJS)\monolib_fontmap.obj :  .AUTODEPEND ..\..\src\common\fontmap.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monolib_fontutilcmn.obj :  .AUTODEPEND ..\..\src\common\fontutilcmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monolib_framecmn.obj :  .AUTODEPEND ..\..\src\common\framecmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monolib_framecmn.obj :  .AUTODEPEND ..\..\src\common\framecmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -8694,6 +8759,11 @@ $(OBJS)\monolib_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monolib_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monolib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monolib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -8869,6 +8939,11 @@ $(OBJS)\monolib_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\monolib_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\monolib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\monolib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<


@@ -10610,6 +10685,11 @@ $(OBJS)\coredll_fontmap.obj :  .AUTODEPEND ..\..\src\common\fontmap.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\coredll_fontutilcmn.obj :  .AUTODEPEND ..\..\src\common\fontutilcmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\coredll_framecmn.obj :  .AUTODEPEND ..\..\src\common\framecmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_framecmn.obj :  .AUTODEPEND ..\..\src\common\framecmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -10805,6 +10885,11 @@ $(OBJS)\coredll_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\coredll_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\coredll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -10980,6 +11065,11 @@ $(OBJS)\coredll_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\coredll_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\coredll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\coredll_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<


@@ -11975,6 +12065,11 @@ $(OBJS)\corelib_fontmap.obj :  .AUTODEPEND ..\..\src\common\fontmap.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\corelib_fontutilcmn.obj :  .AUTODEPEND ..\..\src\common\fontutilcmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\corelib_framecmn.obj :  .AUTODEPEND ..\..\src\common\framecmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_framecmn.obj :  .AUTODEPEND ..\..\src\common\framecmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -12170,6 +12265,11 @@ $(OBJS)\corelib_sizer.obj :  .AUTODEPEND ..\..\src\common\sizer.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\corelib_srchcmn.obj :  .AUTODEPEND ..\..\src\common\srchcmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\corelib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_statbar.obj :  .AUTODEPEND ..\..\src\common\statbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<


@@ -12345,6 +12445,11 @@ $(OBJS)\corelib_splitter.obj :  .AUTODEPEND ..\..\src\generic\splitter.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 

+!ifeq USE_GUI 1
+$(OBJS)\corelib_srchctlg.obj :  .AUTODEPEND ..\..\src\generic\srchctlg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+

 !ifeq USE_GUI 1
 $(OBJS)\corelib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !ifeq USE_GUI 1
 $(OBJS)\corelib_textdlgg.obj :  .AUTODEPEND ..\..\src\generic\textdlgg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<