added DEBUG_FLAG, DEBUG_INFO and DEBUG_RUNTIME_LIBS options

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index cb0205b47659ea1f3f0988ba7a744abf739475e5..900c2261b7c4bacefcf66f4806da508f7fbd5957 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -232,26 +232,26 @@ HTMLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -DWXUSINGDLL -DWXMAKINGDLL_HTML $(CXXFLAGS) $(PIC_FLAG)
 HTMLDLL_OBJECTS =  \
        $(__HTML_SRC_PLATFORM_OBJECTS_2) \
        -DWXUSINGDLL -DWXMAKINGDLL_HTML $(CXXFLAGS) $(PIC_FLAG)
 HTMLDLL_OBJECTS =  \
        $(__HTML_SRC_PLATFORM_OBJECTS_2) \

+       htmldll_helpctrl.o \

        htmldll_helpdata.o \
        htmldll_helpfrm.o \
        htmldll_helpdata.o \
        htmldll_helpfrm.o \

-       htmldll_helpctrl.o \

        htmldll_htmlcell.o \
        htmldll_htmlfilt.o \
        htmldll_htmlpars.o \
        htmldll_htmltag.o \
        htmldll_htmlwin.o \
        htmldll_htmlcell.o \
        htmldll_htmlfilt.o \
        htmldll_htmlpars.o \
        htmldll_htmltag.o \
        htmldll_htmlwin.o \

-       htmldll_winpars.o \
+       htmldll_htmprint.o \
+       htmldll_m_dflist.o \

        htmldll_m_fonts.o \
        htmldll_m_hline.o \
        htmldll_m_image.o \
        htmldll_m_layout.o \
        htmldll_m_links.o \
        htmldll_m_list.o \
        htmldll_m_fonts.o \
        htmldll_m_hline.o \
        htmldll_m_image.o \
        htmldll_m_layout.o \
        htmldll_m_links.o \
        htmldll_m_list.o \

-       htmldll_m_dflist.o \

        htmldll_m_pre.o \
        htmldll_m_pre.o \

-       htmldll_m_tables.o \

        htmldll_m_style.o \
        htmldll_m_style.o \

-       htmldll_htmprint.o \
+       htmldll_m_tables.o \
+       htmldll_winpars.o \

        htmldll_htmllbox.o
 HTMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
        htmldll_htmllbox.o
 HTMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \


@@ -259,26 +259,26 @@ HTMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(CXXFLAGS)
 HTMLLIB_OBJECTS =  \
        $(__HTML_SRC_PLATFORM_OBJECTS_3) \
        $(CXXFLAGS)
 HTMLLIB_OBJECTS =  \
        $(__HTML_SRC_PLATFORM_OBJECTS_3) \

+       htmllib_helpctrl.o \

        htmllib_helpdata.o \
        htmllib_helpfrm.o \
        htmllib_helpdata.o \
        htmllib_helpfrm.o \

-       htmllib_helpctrl.o \

        htmllib_htmlcell.o \
        htmllib_htmlfilt.o \
        htmllib_htmlpars.o \
        htmllib_htmltag.o \
        htmllib_htmlwin.o \
        htmllib_htmlcell.o \
        htmllib_htmlfilt.o \
        htmllib_htmlpars.o \
        htmllib_htmltag.o \
        htmllib_htmlwin.o \

-       htmllib_winpars.o \
+       htmllib_htmprint.o \
+       htmllib_m_dflist.o \

        htmllib_m_fonts.o \
        htmllib_m_hline.o \
        htmllib_m_image.o \
        htmllib_m_layout.o \
        htmllib_m_links.o \
        htmllib_m_list.o \
        htmllib_m_fonts.o \
        htmllib_m_hline.o \
        htmllib_m_image.o \
        htmllib_m_layout.o \
        htmllib_m_links.o \
        htmllib_m_list.o \

-       htmllib_m_dflist.o \

        htmllib_m_pre.o \
        htmllib_m_pre.o \

-       htmllib_m_tables.o \

        htmllib_m_style.o \
        htmllib_m_style.o \

-       htmllib_htmprint.o \
+       htmllib_m_tables.o \
+       htmllib_winpars.o \

        htmllib_htmllbox.o
 LIBDIRNAME = $(top_builddir)lib
 MONODLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        htmllib_htmllbox.o
 LIBDIRNAME = $(top_builddir)lib
 MONODLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \


@@ -352,12 +352,12 @@ MONODLL_OBJECTS =  \
        monodll_ftp.o \
        monodll_http.o \
        monodll_protocol.o \
        monodll_ftp.o \
        monodll_http.o \
        monodll_protocol.o \

-       monodll_url.o \
-       monodll_sckfile.o \

        monodll_sckaddr.o \
        monodll_sckaddr.o \

+       monodll_sckfile.o \

        monodll_sckipc.o \
        monodll_sckstrm.o \
        monodll_socket.o \
        monodll_sckipc.o \
        monodll_sckstrm.o \
        monodll_socket.o \

+       monodll_url.o \

        $(__NET_PLATFORM_SRC_OBJECTS) \
        $(__MONOLIB_GUI_SRC_OBJECTS) \
        monodll_xml.o
        $(__NET_PLATFORM_SRC_OBJECTS) \
        $(__MONOLIB_GUI_SRC_OBJECTS) \
        monodll_xml.o


@@ -432,12 +432,12 @@ MONOLIB_OBJECTS =  \
        monolib_ftp.o \
        monolib_http.o \
        monolib_protocol.o \
        monolib_ftp.o \
        monolib_http.o \
        monolib_protocol.o \

-       monolib_url.o \
-       monolib_sckfile.o \

        monolib_sckaddr.o \
        monolib_sckaddr.o \

+       monolib_sckfile.o \

        monolib_sckipc.o \
        monolib_sckstrm.o \
        monolib_socket.o \
        monolib_sckipc.o \
        monolib_sckstrm.o \
        monolib_socket.o \

+       monolib_url.o \

        $(__NET_PLATFORM_SRC_OBJECTS_1) \
        $(__MONOLIB_GUI_SRC_OBJECTS_1) \
        monolib_xml.o
        $(__NET_PLATFORM_SRC_OBJECTS_1) \
        $(__MONOLIB_GUI_SRC_OBJECTS_1) \
        monolib_xml.o


@@ -454,12 +454,12 @@ NETDLL_OBJECTS =  \
        netdll_ftp.o \
        netdll_http.o \
        netdll_protocol.o \
        netdll_ftp.o \
        netdll_http.o \
        netdll_protocol.o \

-       netdll_url.o \
-       netdll_sckfile.o \

        netdll_sckaddr.o \
        netdll_sckaddr.o \

+       netdll_sckfile.o \

        netdll_sckipc.o \
        netdll_sckstrm.o \
        netdll_socket.o \
        netdll_sckipc.o \
        netdll_sckstrm.o \
        netdll_socket.o \

+       netdll_url.o \

        $(__NET_PLATFORM_SRC_OBJECTS_2)
 NETLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
        $(__NET_PLATFORM_SRC_OBJECTS_2)
 NETLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \


@@ -474,12 +474,12 @@ NETLIB_OBJECTS =  \
        netlib_ftp.o \
        netlib_http.o \
        netlib_protocol.o \
        netlib_ftp.o \
        netlib_http.o \
        netlib_protocol.o \

-       netlib_url.o \
-       netlib_sckfile.o \

        netlib_sckaddr.o \
        netlib_sckaddr.o \

+       netlib_sckfile.o \

        netlib_sckipc.o \
        netlib_sckstrm.o \
        netlib_socket.o \
        netlib_sckipc.o \
        netlib_sckstrm.o \
        netlib_socket.o \

+       netlib_url.o \

        $(__NET_PLATFORM_SRC_OBJECTS_3)
 WXEXPAT_CFLAGS = $(CPPFLAGS)   -I./src/expat $(CFLAGS)
 WXEXPAT_OBJECTS =  \
        $(__NET_PLATFORM_SRC_OBJECTS_3)
 WXEXPAT_CFLAGS = $(CPPFLAGS)   -I./src/expat $(CFLAGS)
 WXEXPAT_OBJECTS =  \


@@ -643,75 +643,44 @@ XMLLIB_OBJECTS =  \
 ### Conditionally set variables: ###
 
 COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS =  \
 ### Conditionally set variables: ###
 
 COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS =  \

-       wx/gdicmn.h \
+       wx/bmpbuttn.h \
+       wx/brush.h \
+       wx/button.h \
+       wx/checkbox.h \
+       wx/checklst.h \
+       wx/choicdlg.h \
+       wx/choice.h \
+       wx/cmndata.h \
+       wx/combobox.h \
+       wx/control.h \
+       wx/ctrlsub.h \

        wx/cursor.h \
        wx/cursor.h \

-       wx/window.h \
-       wx/panel.h \
-       wx/frame.h \

        wx/dc.h \
        wx/dcclient.h \
        wx/dcmemory.h \
        wx/dcprint.h \
        wx/dcscreen.h \
        wx/dc.h \
        wx/dcclient.h \
        wx/dcmemory.h \
        wx/dcprint.h \
        wx/dcscreen.h \

-       wx/button.h \
-       wx/menu.h \
-       wx/pen.h \
-       wx/brush.h \
-       wx/palette.h \
-       wx/icon.h \

        wx/dialog.h \
        wx/dialog.h \

-       wx/timer.h \
-       wx/settings.h \
-       wx/msgdlg.h \
-       wx/cmndata.h \
-       wx/control.h \
-       wx/ctrlsub.h \
-       wx/bmpbuttn.h \
-       wx/checkbox.h \
-       wx/checklst.h \
-       wx/choice.h \
-       wx/scrolbar.h \
-       wx/stattext.h \
-       wx/statbmp.h \
-       wx/statbox.h \
-       wx/listbox.h \
-       wx/radiobox.h \
-       wx/radiobut.h \
-       wx/renderer.h \
-       wx/textctrl.h \
-       wx/slider.h \
-       wx/gauge.h \
-       wx/scrolwin.h \

        wx/dirdlg.h \
        wx/dirdlg.h \

-       wx/toolbar.h \
-       wx/combobox.h \
-       wx/layout.h \
-       wx/sizer.h \
-       wx/mdi.h \
-       wx/statusbr.h \
-       wx/scrolbar.h \
-       wx/choicdlg.h \
-       wx/textdlg.h \

        wx/filedlg.h \
        wx/filedlg.h \

-       wx/validate.h \
-       wx/valtext.h \
-       wx/selstore.h \
+       wx/frame.h \
+       wx/gauge.h \
+       wx/gdicmn.h \

        wx/generic/accel.h \
        wx/generic/calctrl.h \
        wx/generic/choicdgg.h \
        wx/generic/colrdlgg.h \
        wx/generic/dcpsg.h \
        wx/generic/dirctrlg.h \
        wx/generic/accel.h \
        wx/generic/calctrl.h \
        wx/generic/choicdgg.h \
        wx/generic/colrdlgg.h \
        wx/generic/dcpsg.h \
        wx/generic/dirctrlg.h \

-       wx/generic/fontdlgg.h \

        wx/generic/filedlgg.h \
        wx/generic/filedlgg.h \

+       wx/generic/fontdlgg.h \

        wx/generic/grid.h \
        wx/generic/grid.h \

-       wx/generic/gridctrl.h \

        wx/generic/grid.h \
        wx/generic/grid.h \

+       wx/generic/gridctrl.h \

        wx/generic/helpext.h \
        wx/generic/helpext.h \

-       wx/generic/logg.h \
-       wx/helphtml.h \

        wx/generic/imaglist.h \
        wx/generic/laywin.h \
        wx/generic/imaglist.h \
        wx/generic/laywin.h \

+       wx/generic/logg.h \

        wx/generic/msgdlgg.h \
        wx/generic/notebook.h \
        wx/generic/panelg.h \
        wx/generic/msgdlgg.h \
        wx/generic/notebook.h \
        wx/generic/panelg.h \


@@ -724,8 +693,39 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS =  \
        wx/generic/splitter.h \
        wx/generic/textdlgg.h \
        wx/generic/timer.h \
        wx/generic/splitter.h \
        wx/generic/textdlgg.h \
        wx/generic/timer.h \

-       wx/generic/wizard.h \

        wx/generic/treectlg.h \
        wx/generic/treectlg.h \

+       wx/generic/wizard.h \
+       wx/helphtml.h \
+       wx/icon.h \
+       wx/layout.h \
+       wx/listbox.h \
+       wx/mdi.h \
+       wx/menu.h \
+       wx/msgdlg.h \
+       wx/palette.h \
+       wx/panel.h \
+       wx/pen.h \
+       wx/radiobox.h \
+       wx/radiobut.h \
+       wx/renderer.h \
+       wx/scrolbar.h \
+       wx/scrolbar.h \
+       wx/scrolwin.h \
+       wx/selstore.h \
+       wx/settings.h \
+       wx/sizer.h \
+       wx/slider.h \
+       wx/statbmp.h \
+       wx/statbox.h \
+       wx/stattext.h \
+       wx/statusbr.h \
+       wx/textctrl.h \
+       wx/textdlg.h \
+       wx/timer.h \
+       wx/toolbar.h \
+       wx/validate.h \
+       wx/valtext.h \
+       wx/window.h \

        wx/accel.h \
        wx/access.h \
        wx/afterstd.h \
        wx/accel.h \
        wx/access.h \
        wx/afterstd.h \


@@ -833,75 +833,44 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS =  \
        $(GUI_HDR)
 @COND_USE_GUI_1_WXUNIV_0@ALL_GUI_HEADERS = $(COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS)
 COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS =  \
        $(GUI_HDR)
 @COND_USE_GUI_1_WXUNIV_0@ALL_GUI_HEADERS = $(COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS)
 COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS =  \

-       wx/gdicmn.h \
+       wx/bmpbuttn.h \
+       wx/brush.h \
+       wx/button.h \
+       wx/checkbox.h \
+       wx/checklst.h \
+       wx/choicdlg.h \
+       wx/choice.h \
+       wx/cmndata.h \
+       wx/combobox.h \
+       wx/control.h \
+       wx/ctrlsub.h \

        wx/cursor.h \
        wx/cursor.h \

-       wx/window.h \
-       wx/panel.h \
-       wx/frame.h \

        wx/dc.h \
        wx/dcclient.h \
        wx/dcmemory.h \
        wx/dcprint.h \
        wx/dcscreen.h \
        wx/dc.h \
        wx/dcclient.h \
        wx/dcmemory.h \
        wx/dcprint.h \
        wx/dcscreen.h \

-       wx/button.h \
-       wx/menu.h \
-       wx/pen.h \
-       wx/brush.h \
-       wx/palette.h \
-       wx/icon.h \

        wx/dialog.h \
        wx/dialog.h \

-       wx/timer.h \
-       wx/settings.h \
-       wx/msgdlg.h \
-       wx/cmndata.h \
-       wx/control.h \
-       wx/ctrlsub.h \
-       wx/bmpbuttn.h \
-       wx/checkbox.h \
-       wx/checklst.h \
-       wx/choice.h \
-       wx/scrolbar.h \
-       wx/stattext.h \
-       wx/statbmp.h \
-       wx/statbox.h \
-       wx/listbox.h \
-       wx/radiobox.h \
-       wx/radiobut.h \
-       wx/renderer.h \
-       wx/textctrl.h \
-       wx/slider.h \
-       wx/gauge.h \
-       wx/scrolwin.h \

        wx/dirdlg.h \
        wx/dirdlg.h \

-       wx/toolbar.h \
-       wx/combobox.h \
-       wx/layout.h \
-       wx/sizer.h \
-       wx/mdi.h \
-       wx/statusbr.h \
-       wx/scrolbar.h \
-       wx/choicdlg.h \
-       wx/textdlg.h \

        wx/filedlg.h \
        wx/filedlg.h \

-       wx/validate.h \
-       wx/valtext.h \
-       wx/selstore.h \
+       wx/frame.h \
+       wx/gauge.h \
+       wx/gdicmn.h \

        wx/generic/accel.h \
        wx/generic/calctrl.h \
        wx/generic/choicdgg.h \
        wx/generic/colrdlgg.h \
        wx/generic/dcpsg.h \
        wx/generic/dirctrlg.h \
        wx/generic/accel.h \
        wx/generic/calctrl.h \
        wx/generic/choicdgg.h \
        wx/generic/colrdlgg.h \
        wx/generic/dcpsg.h \
        wx/generic/dirctrlg.h \

-       wx/generic/fontdlgg.h \

        wx/generic/filedlgg.h \
        wx/generic/filedlgg.h \

+       wx/generic/fontdlgg.h \

        wx/generic/grid.h \
        wx/generic/grid.h \

-       wx/generic/gridctrl.h \

        wx/generic/grid.h \
        wx/generic/grid.h \

+       wx/generic/gridctrl.h \

        wx/generic/helpext.h \
        wx/generic/helpext.h \

-       wx/generic/logg.h \
-       wx/helphtml.h \

        wx/generic/imaglist.h \
        wx/generic/laywin.h \
        wx/generic/imaglist.h \
        wx/generic/laywin.h \

+       wx/generic/logg.h \

        wx/generic/msgdlgg.h \
        wx/generic/notebook.h \
        wx/generic/panelg.h \
        wx/generic/msgdlgg.h \
        wx/generic/notebook.h \
        wx/generic/panelg.h \


@@ -914,8 +883,39 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS =  \
        wx/generic/splitter.h \
        wx/generic/textdlgg.h \
        wx/generic/timer.h \
        wx/generic/splitter.h \
        wx/generic/textdlgg.h \
        wx/generic/timer.h \

-       wx/generic/wizard.h \

        wx/generic/treectlg.h \
        wx/generic/treectlg.h \

+       wx/generic/wizard.h \
+       wx/helphtml.h \
+       wx/icon.h \
+       wx/layout.h \
+       wx/listbox.h \
+       wx/mdi.h \
+       wx/menu.h \
+       wx/msgdlg.h \
+       wx/palette.h \
+       wx/panel.h \
+       wx/pen.h \
+       wx/radiobox.h \
+       wx/radiobut.h \
+       wx/renderer.h \
+       wx/scrolbar.h \
+       wx/scrolbar.h \
+       wx/scrolwin.h \
+       wx/selstore.h \
+       wx/settings.h \
+       wx/sizer.h \
+       wx/slider.h \
+       wx/statbmp.h \
+       wx/statbox.h \
+       wx/stattext.h \
+       wx/statusbr.h \
+       wx/textctrl.h \
+       wx/textdlg.h \
+       wx/timer.h \
+       wx/toolbar.h \
+       wx/validate.h \
+       wx/valtext.h \
+       wx/window.h \

        wx/accel.h \
        wx/access.h \
        wx/afterstd.h \
        wx/accel.h \
        wx/access.h \
        wx/afterstd.h \


@@ -1020,6 +1020,14 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS =  \
        wx/generic/dragimgg.h \
        wx/generic/gridsel.h \
        $(LOWLEVEL_HDR) \
        wx/generic/dragimgg.h \
        wx/generic/gridsel.h \
        $(LOWLEVEL_HDR) \

+       wx/generic/accel.h \
+       wx/generic/dirdlgg.h \
+       wx/generic/fdrepdlg.h \
+       wx/generic/fontdlgg.h \
+       wx/generic/listctrl.h \
+       wx/generic/mdig.h \
+       wx/generic/statusbr.h \
+       wx/generic/tabg.h \

        wx/univ/app.h \
        wx/univ/bmpbuttn.h \
        wx/univ/button.h \
        wx/univ/app.h \
        wx/univ/bmpbuttn.h \
        wx/univ/button.h \


@@ -1031,7 +1039,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS =  \
        wx/univ/control.h \
        wx/univ/dialog.h \
        wx/univ/frame.h \
        wx/univ/control.h \
        wx/univ/dialog.h \
        wx/univ/frame.h \

-       wx/univ/toplevel.h \

        wx/univ/gauge.h \
        wx/univ/inpcons.h \
        wx/univ/inphand.h \
        wx/univ/gauge.h \
        wx/univ/inpcons.h \
        wx/univ/inphand.h \


@@ -1046,7 +1053,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS =  \
        wx/univ/scrolbar.h \
        wx/univ/scrthumb.h \
        wx/univ/scrtimer.h \
        wx/univ/scrolbar.h \
        wx/univ/scrthumb.h \
        wx/univ/scrtimer.h \

-       wx/univ/setup.h \

        wx/univ/slider.h \
        wx/univ/spinbutt.h \
        wx/univ/statbmp.h \
        wx/univ/slider.h \
        wx/univ/spinbutt.h \
        wx/univ/statbmp.h \


@@ -1057,25 +1063,18 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS =  \
        wx/univ/textctrl.h \
        wx/univ/theme.h \
        wx/univ/toolbar.h \
        wx/univ/textctrl.h \
        wx/univ/theme.h \
        wx/univ/toolbar.h \

-       wx/univ/window.h \
-       wx/generic/mdig.h \
-       wx/generic/fdrepdlg.h \
-       wx/generic/fontdlgg.h \
-       wx/generic/tabg.h \
-       wx/generic/dirdlgg.h \
-       wx/generic/statusbr.h \
-       wx/generic/accel.h \
-       wx/generic/listctrl.h
+       wx/univ/toplevel.h \
+       wx/univ/window.h

 @COND_USE_GUI_1_WXUNIV_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS)
 @COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = wx/unix/mimetype.h
 COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR =  \
 @COND_USE_GUI_1_WXUNIV_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS)
 @COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = wx/unix/mimetype.h
 COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR =  \

+       wx/msw/chkconf.h \
+       wx/msw/crashrpt.h \

        wx/msw/dde.h \
        wx/msw/gccpriv.h \
        wx/msw/mimetype.h \
        wx/msw/winundef.h \
        wx/msw/dde.h \
        wx/msw/gccpriv.h \
        wx/msw/mimetype.h \
        wx/msw/winundef.h \

-       wx/msw/wrapwin.h \
-       wx/msw/chkconf.h \
-       wx/msw/crashrpt.h
+       wx/msw/wrapwin.h

 @COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR)
 @COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = 
 @COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = 
 @COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR)
 @COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = 
 @COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = 


@@ -1137,17 +1136,22 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
        wx/cocoa/textctrl.h \
        wx/cocoa/toplevel.h \
        wx/cocoa/window.h \
        wx/cocoa/textctrl.h \
        wx/cocoa/toplevel.h \
        wx/cocoa/window.h \

-       wx/generic/statusbr.h \
+       wx/generic/caret.h \
+       wx/generic/fdrepdlg.h \

        wx/generic/fontdlgg.h \
        wx/generic/imaglist.h \
        wx/generic/listctrl.h \
        wx/generic/fontdlgg.h \
        wx/generic/imaglist.h \
        wx/generic/listctrl.h \

-       wx/generic/fdrepdlg.h \
-       wx/generic/tabg.h \
-       wx/generic/caret.h \

        wx/generic/mdig.h \
        wx/generic/mdig.h \

-       wx/generic/paletteg.h
+       wx/generic/paletteg.h \
+       wx/generic/statusbr.h \
+       wx/generic/tabg.h

 @COND_TOOLKIT_COCOA@GUI_HDR = $(COND_TOOLKIT_COCOA_GUI_HDR)
 COND_TOOLKIT_GTK_GUI_HDR =  \
 @COND_TOOLKIT_COCOA@GUI_HDR = $(COND_TOOLKIT_COCOA_GUI_HDR)
 COND_TOOLKIT_GTK_GUI_HDR =  \

+       wx/generic/dirdlgg.h \
+       wx/generic/fdrepdlg.h \
+       wx/generic/listctrl.h \
+       wx/generic/statusbr.h \
+       wx/generic/tabg.h \

        wx/gtk/accel.h \
        wx/gtk/app.h \
        wx/gtk/bitmap.h \
        wx/gtk/accel.h \
        wx/gtk/app.h \
        wx/gtk/bitmap.h \


@@ -1175,7 +1179,6 @@ COND_TOOLKIT_GTK_GUI_HDR =  \
        wx/gtk/font.h \
        wx/gtk/fontdlg.h \
        wx/gtk/frame.h \
        wx/gtk/font.h \
        wx/gtk/fontdlg.h \
        wx/gtk/frame.h \

-       wx/gtk/toplevel.h \

        wx/gtk/gauge.h \
        wx/gtk/gdiobj.h \
        wx/gtk/icon.h \
        wx/gtk/gauge.h \
        wx/gtk/gdiobj.h \
        wx/gtk/icon.h \


@@ -1206,18 +1209,13 @@ COND_TOOLKIT_GTK_GUI_HDR =  \
        wx/gtk/tglbtn.h \
        wx/gtk/timer.h \
        wx/gtk/tooltip.h \
        wx/gtk/tglbtn.h \
        wx/gtk/timer.h \
        wx/gtk/tooltip.h \

+       wx/gtk/toplevel.h \

        wx/gtk/treectrl.h \
        wx/gtk/wave.h \
        wx/gtk/win_gtk.h \
        wx/gtk/treectrl.h \
        wx/gtk/wave.h \
        wx/gtk/win_gtk.h \

-       wx/gtk/window.h \
-       wx/generic/fdrepdlg.h \
-       wx/generic/tabg.h \
-       wx/generic/dirdlgg.h \
-       wx/generic/statusbr.h \
-       wx/generic/listctrl.h
+       wx/gtk/window.h

 @COND_TOOLKIT_GTK@GUI_HDR = $(COND_TOOLKIT_GTK_GUI_HDR)
 COND_TOOLKIT_MAC_GUI_HDR =  \
 @COND_TOOLKIT_GTK@GUI_HDR = $(COND_TOOLKIT_GTK_GUI_HDR)
 COND_TOOLKIT_MAC_GUI_HDR =  \

-       wx/mac/chkconf.h \

        wx/mac/accel.h \
        wx/mac/aga.h \
        wx/mac/app.h \
        wx/mac/accel.h \
        wx/mac/aga.h \
        wx/mac/app.h \


@@ -1227,6 +1225,7 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
        wx/mac/button.h \
        wx/mac/checkbox.h \
        wx/mac/checklst.h \
        wx/mac/button.h \
        wx/mac/checkbox.h \
        wx/mac/checklst.h \

+       wx/mac/chkconf.h \

        wx/mac/choice.h \
        wx/mac/clipbrd.h \
        wx/mac/colordlg.h \
        wx/mac/choice.h \
        wx/mac/clipbrd.h \
        wx/mac/colordlg.h \


@@ -1297,15 +1296,26 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
        wx/mac/uma.h \
        wx/mac/wave.h \
        wx/mac/window.h \
        wx/mac/uma.h \
        wx/mac/wave.h \
        wx/mac/window.h \

-       wx/generic/statusbr.h \
+       wx/generic/caret.h \
+       wx/generic/fdrepdlg.h \

        wx/generic/fontdlgg.h \
        wx/generic/imaglist.h \
        wx/generic/listctrl.h \
        wx/generic/fontdlgg.h \
        wx/generic/imaglist.h \
        wx/generic/listctrl.h \

-       wx/generic/fdrepdlg.h \
-       wx/generic/tabg.h \
-       wx/generic/caret.h
+       wx/generic/statusbr.h \
+       wx/generic/tabg.h

 @COND_TOOLKIT_MAC@GUI_HDR = $(COND_TOOLKIT_MAC_GUI_HDR)
 COND_TOOLKIT_MOTIF_GUI_HDR =  \
 @COND_TOOLKIT_MAC@GUI_HDR = $(COND_TOOLKIT_MAC_GUI_HDR)
 COND_TOOLKIT_MOTIF_GUI_HDR =  \

+       wx/generic/colrdlgg.h \
+       wx/generic/dirdlgg.h \
+       wx/generic/fdrepdlg.h \
+       wx/generic/fontdlgg.h \
+       wx/generic/imaglist.h \
+       wx/generic/listctrl.h \
+       wx/generic/notebook.h \
+       wx/generic/prntdlgg.h \
+       wx/generic/statline.h \
+       wx/generic/statusbr.h \
+       wx/generic/tabg.h \

        wx/motif/accel.h \
        wx/motif/app.h \
        wx/motif/bmpbuttn.h \
        wx/motif/accel.h \
        wx/motif/app.h \
        wx/motif/bmpbuttn.h \


@@ -1358,18 +1368,7 @@ COND_TOOLKIT_MOTIF_GUI_HDR =  \
        wx/motif/timer.h \
        wx/motif/toolbar.h \
        wx/motif/toplevel.h \
        wx/motif/timer.h \
        wx/motif/toolbar.h \
        wx/motif/toplevel.h \

-       wx/motif/window.h \
-       wx/generic/fdrepdlg.h \
-       wx/generic/listctrl.h \
-       wx/generic/imaglist.h \
-       wx/generic/notebook.h \
-       wx/generic/fontdlgg.h \
-       wx/generic/colrdlgg.h \
-       wx/generic/statline.h \
-       wx/generic/tabg.h \
-       wx/generic/dirdlgg.h \
-       wx/generic/prntdlgg.h \
-       wx/generic/statusbr.h
+       wx/motif/window.h

 @COND_TOOLKIT_MOTIF@GUI_HDR = $(COND_TOOLKIT_MOTIF_GUI_HDR)
 COND_TOOLKIT_MSW_GUI_HDR =  \
        wx/msw/accel.h \
 @COND_TOOLKIT_MOTIF@GUI_HDR = $(COND_TOOLKIT_MOTIF_GUI_HDR)
 COND_TOOLKIT_MSW_GUI_HDR =  \
        wx/msw/accel.h \


@@ -1406,6 +1405,7 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
        wx/msw/gauge95.h \
        wx/msw/gdiimage.h \
        wx/msw/gdiobj.h \
        wx/msw/gauge95.h \
        wx/msw/gdiimage.h \
        wx/msw/gdiobj.h \

+       wx/msw/helpbest.h \

        wx/msw/helpchm.h \
        wx/msw/helpwin.h \
        wx/msw/icon.h \
        wx/msw/helpchm.h \
        wx/msw/helpwin.h \
        wx/msw/icon.h \


@@ -1424,6 +1424,15 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
        wx/msw/mslu.h \
        wx/msw/msvcrt.h \
        wx/msw/notebook.h \
        wx/msw/mslu.h \
        wx/msw/msvcrt.h \
        wx/msw/notebook.h \

+       wx/msw/ole/access.h \
+       wx/msw/ole/automtn.h \
+       wx/msw/ole/dataform.h \
+       wx/msw/ole/dataobj.h \
+       wx/msw/ole/dataobj2.h \
+       wx/msw/ole/dropsrc.h \
+       wx/msw/ole/droptgt.h \
+       wx/msw/ole/oleutils.h \
+       wx/msw/ole/uuid.h \

        wx/msw/palette.h \
        wx/msw/pen.h \
        wx/msw/printdlg.h \
        wx/msw/palette.h \
        wx/msw/pen.h \
        wx/msw/printdlg.h \


@@ -1438,8 +1447,8 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
        wx/msw/setup0.h \
        wx/msw/slider95.h \
        wx/msw/slidrmsw.h \
        wx/msw/setup0.h \
        wx/msw/slider95.h \
        wx/msw/slidrmsw.h \

-       wx/msw/spinctrl.h \

        wx/msw/spinbutt.h \
        wx/msw/spinbutt.h \

+       wx/msw/spinctrl.h \

        wx/msw/statbmp.h \
        wx/msw/statbox.h \
        wx/msw/statbr95.h \
        wx/msw/statbmp.h \
        wx/msw/statbox.h \
        wx/msw/statbr95.h \


@@ -1457,19 +1466,9 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
        wx/msw/treectrl.h \
        wx/msw/wave.h \
        wx/msw/window.h \
        wx/msw/treectrl.h \
        wx/msw/wave.h \
        wx/msw/window.h \

-       wx/msw/ole/access.h \
-       wx/msw/ole/automtn.h \
-       wx/msw/ole/dataform.h \
-       wx/msw/ole/dataobj.h \
-       wx/msw/ole/dataobj2.h \
-       wx/msw/ole/dropsrc.h \
-       wx/msw/ole/droptgt.h \
-       wx/msw/ole/oleutils.h \
-       wx/msw/ole/uuid.h \
-       wx/msw/helpbest.h \
-       wx/msw/wx.rc \
-       wx/msw/wx.manifest \

        wx/msw/gnuwin32/winresrc.h \
        wx/msw/gnuwin32/winresrc.h \

+       wx/msw/wx.manifest \
+       wx/msw/wx.rc \

        wx/msw/colours.bmp \
        wx/msw/csquery.bmp \
        wx/msw/disable.bmp \
        wx/msw/colours.bmp \
        wx/msw/csquery.bmp \
        wx/msw/disable.bmp \


@@ -1506,89 +1505,91 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
        wx/msw/warning.ico
 @COND_TOOLKIT_MSW@GUI_HDR = $(COND_TOOLKIT_MSW_GUI_HDR)
 COND_TOOLKIT_OS2_GUI_HDR =  \
        wx/msw/warning.ico
 @COND_TOOLKIT_MSW@GUI_HDR = $(COND_TOOLKIT_MSW_GUI_HDR)
 COND_TOOLKIT_OS2_GUI_HDR =  \

+       wx/generic/caret.h \

        wx/os2/accel.h \
        wx/os2/accel.h \

-       wx/os2/dataobj.h \
-       wx/os2/helpwin.h \
-       wx/os2/pngread.h \
-       wx/os2/statline.h \

        wx/os2/app.h \
        wx/os2/app.h \

-       wx/os2/dataobj2.h \
-       wx/os2/icon.h \
-       wx/os2/stattext.h \

        wx/os2/bitmap.h \
        wx/os2/bitmap.h \

+       wx/os2/bmpbuttn.h \
+       wx/os2/brush.h \
+       wx/os2/button.h \
+       wx/os2/checkbox.h \
+       wx/os2/checklst.h \
+       wx/os2/choice.h \
+       wx/os2/clipbrd.h \
+       wx/os2/colour.h \
+       wx/os2/combobox.h \
+       wx/os2/control.h \
+       wx/os2/cursor.h \
+       wx/os2/dataform.h \
+       wx/os2/dataobj.h \
+       wx/os2/dataobj2.h \

        wx/os2/dc.h \
        wx/os2/dc.h \

-       wx/os2/tabctrl.h \

        wx/os2/dcclient.h \
        wx/os2/dcclient.h \

-       wx/os2/print.h \
-       wx/os2/bmpbuttn.h \

        wx/os2/dcmemory.h \
        wx/os2/dcmemory.h \

-       wx/os2/iniconf.h \
-       wx/os2/private.h \
-       wx/os2/textctrl.h \
-       wx/os2/brush.h \

        wx/os2/dcprint.h \
        wx/os2/dcprint.h \

-       wx/os2/joystick.h \
-       wx/os2/timer.h \

        wx/os2/dcscreen.h \
        wx/os2/dcscreen.h \

-       wx/os2/listbox.h \
-       wx/os2/button.h \

        wx/os2/dialog.h \
        wx/os2/dialog.h \

-       wx/os2/radiobox.h \
-       wx/os2/toolbar.h \
-       wx/os2/checkbox.h \
-       wx/os2/radiobut.h \
-       wx/os2/tooltip.h \
-       wx/os2/checklst.h \

        wx/os2/dnd.h \
        wx/os2/dnd.h \

-       wx/os2/menu.h \
-       wx/os2/region.h \
-       wx/os2/menuitem.h \
-       wx/os2/choice.h \

        wx/os2/filedlg.h \
        wx/os2/filedlg.h \

-       wx/os2/metafile.h \
-       wx/os2/scrolbar.h \
-       wx/os2/wave.h \
-       wx/os2/clipbrd.h \

        wx/os2/font.h \
        wx/os2/font.h \

-       wx/os2/minifram.h \
-       wx/os2/settings.h \
-       wx/os2/window.h \

        wx/os2/fontdlg.h \
        wx/os2/fontdlg.h \

-       wx/os2/msgdlg.h \
-       wx/os2/colour.h \

        wx/os2/frame.h \
        wx/os2/frame.h \

-       wx/os2/setup0.h \
-       wx/os2/combobox.h \

        wx/os2/gauge.h \
        wx/os2/gauge.h \

-       wx/os2/notebook.h \
-       wx/os2/control.h \

        wx/os2/gdiimage.h \
        wx/os2/gdiimage.h \

-       wx/os2/palette.h \
-       wx/os2/slider.h \
-       wx/os2/cursor.h \

        wx/os2/gdiobj.h \
        wx/os2/gdiobj.h \

-       wx/os2/spinbutt.h \

        wx/os2/gsockos2.h \
        wx/os2/gsockos2.h \

+       wx/os2/helpwin.h \
+       wx/os2/icon.h \
+       wx/os2/iniconf.h \
+       wx/os2/joystick.h \
+       wx/os2/listbox.h \
+       wx/os2/menu.h \
+       wx/os2/menuitem.h \
+       wx/os2/metafile.h \
+       wx/os2/minifram.h \
+       wx/os2/msgdlg.h \
+       wx/os2/notebook.h \
+       wx/os2/palette.h \

        wx/os2/pen.h \
        wx/os2/pen.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 \
+       wx/os2/scrolbar.h \
+       wx/os2/settings.h \
+       wx/os2/setup0.h \
+       wx/os2/slider.h \
+       wx/os2/spinbutt.h \

        wx/os2/spinctrl.h \
        wx/os2/statbmp.h \
        wx/os2/spinctrl.h \
        wx/os2/statbmp.h \

-       wx/os2/dataform.h \
-       wx/os2/pnghand.h \

        wx/os2/statbox.h \
        wx/os2/statbox.h \

+       wx/os2/statline.h \
+       wx/os2/stattext.h \
+       wx/os2/tabctrl.h \
+       wx/os2/textctrl.h \
+       wx/os2/timer.h \
+       wx/os2/toolbar.h \
+       wx/os2/tooltip.h \

        wx/os2/toplevel.h \
        wx/os2/toplevel.h \

-       wx/generic/caret.h
+       wx/os2/wave.h \
+       wx/os2/window.h

 @COND_TOOLKIT_OS2@GUI_HDR = $(COND_TOOLKIT_OS2_GUI_HDR)
 @COND_TOOLKIT_COCOA@LOWLEVEL_HDR = 
 COND_TOOLKIT_GTK_LOWLEVEL_HDR =  \
 @COND_TOOLKIT_OS2@GUI_HDR = $(COND_TOOLKIT_OS2_GUI_HDR)
 @COND_TOOLKIT_COCOA@LOWLEVEL_HDR = 
 COND_TOOLKIT_GTK_LOWLEVEL_HDR =  \

+       wx/generic/caret.h \
+       wx/generic/printps.h \

        wx/unix/fontutil.h \
        wx/unix/fontutil.h \

-       wx/unix/utilsx11.h \

        wx/unix/taskbarx11.h \
        wx/unix/taskbarx11.h \

-       wx/generic/printps.h \
-       wx/generic/caret.h \
+       wx/unix/utilsx11.h \

        wx/generic/paletteg.h
 @COND_TOOLKIT_GTK@LOWLEVEL_HDR = $(COND_TOOLKIT_GTK_LOWLEVEL_HDR)
 @COND_TOOLKIT_MAC@LOWLEVEL_HDR = 
 COND_TOOLKIT_MGL_LOWLEVEL_HDR =  \
        wx/generic/paletteg.h
 @COND_TOOLKIT_GTK@LOWLEVEL_HDR = $(COND_TOOLKIT_GTK_LOWLEVEL_HDR)
 @COND_TOOLKIT_MAC@LOWLEVEL_HDR = 
 COND_TOOLKIT_MGL_LOWLEVEL_HDR =  \

+       wx/generic/caret.h \
+       wx/generic/timer.h \

        wx/mgl/app.h \
        wx/mgl/bitmap.h \
        wx/mgl/brush.h \
        wx/mgl/app.h \
        wx/mgl/bitmap.h \
        wx/mgl/brush.h \


@@ -1609,25 +1610,24 @@ COND_TOOLKIT_MGL_LOWLEVEL_HDR =  \
        wx/mgl/private.h \
        wx/mgl/region.h \
        wx/mgl/toplevel.h \
        wx/mgl/private.h \
        wx/mgl/region.h \
        wx/mgl/toplevel.h \

-       wx/mgl/window.h \
-       wx/generic/timer.h \
-       wx/generic/caret.h
+       wx/mgl/window.h

 @COND_TOOLKIT_MGL@LOWLEVEL_HDR = $(COND_TOOLKIT_MGL_LOWLEVEL_HDR)
 COND_TOOLKIT_MOTIF_LOWLEVEL_HDR =  \
 @COND_TOOLKIT_MGL@LOWLEVEL_HDR = $(COND_TOOLKIT_MGL_LOWLEVEL_HDR)
 COND_TOOLKIT_MOTIF_LOWLEVEL_HDR =  \

+       wx/generic/caret.h \
+       wx/generic/printps.h \

        wx/unix/fontutil.h \
        wx/unix/fontutil.h \

-       wx/unix/utilsx11.h \

        wx/unix/taskbarx11.h \
        wx/unix/taskbarx11.h \

-       wx/generic/printps.h \
-       wx/generic/caret.h
+       wx/unix/utilsx11.h

 @COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = $(COND_TOOLKIT_MOTIF_LOWLEVEL_HDR)
 @COND_TOOLKIT_MSW@LOWLEVEL_HDR = 
 @COND_TOOLKIT_OS2@LOWLEVEL_HDR = 
 COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
 @COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = $(COND_TOOLKIT_MOTIF_LOWLEVEL_HDR)
 @COND_TOOLKIT_MSW@LOWLEVEL_HDR = 
 @COND_TOOLKIT_OS2@LOWLEVEL_HDR = 
 COND_TOOLKIT_X11_LOWLEVEL_HDR =  \

+       wx/generic/caret.h \
+       wx/generic/printps.h \

        wx/unix/fontutil.h \
        wx/unix/fontutil.h \

-       wx/unix/utilsx11.h \

        wx/unix/taskbarx11.h \
        wx/unix/taskbarx11.h \

-       wx/generic/printps.h \
-       wx/generic/caret.h \
+       wx/unix/utilsx11.h \
+       src/generic/timer.h \

        wx/x11/app.h \
        wx/x11/bitmap.h \
        wx/x11/brush.h \
        wx/x11/app.h \
        wx/x11/bitmap.h \
        wx/x11/brush.h \


@@ -1657,8 +1657,7 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
        wx/x11/reparent.h \
        wx/x11/textctrl.h \
        wx/x11/toplevel.h \
        wx/x11/reparent.h \
        wx/x11/textctrl.h \
        wx/x11/toplevel.h \

-       wx/x11/window.h \
-       src/generic/timer.h
+       wx/x11/window.h

 @COND_TOOLKIT_X11@LOWLEVEL_HDR = $(COND_TOOLKIT_X11_LOWLEVEL_HDR)
 @COND_PLATFORM_UNIX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_PLATFORM_WIN32_1@NET_PLATFORM_HDR = wx/msw/gsockmsw.h
 @COND_TOOLKIT_X11@LOWLEVEL_HDR = $(COND_TOOLKIT_X11_LOWLEVEL_HDR)
 @COND_PLATFORM_UNIX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_PLATFORM_WIN32_1@NET_PLATFORM_HDR = wx/msw/gsockmsw.h


@@ -1675,7 +1674,8 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
 @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc

-@COND_BUILD_DEBUG@WXDEBUGFLAG = d
+@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d

 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx_base$(WXBASEPORT)
 @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wxbase$(WXBASEPORT)250
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx_base$(WXBASEPORT)
 @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wxbase$(WXBASEPORT)250
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)


@@ -1735,11 +1735,11 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS =  \

-       monodll_baseunix.o \

        monodll_dirmac.o \
        monodll_mimetmac.o \
        monodll_utils.o \
        monodll_dirmac.o \
        monodll_mimetmac.o \
        monodll_utils.o \

-       monodll_utilsexc.o
+       monodll_utilsexc.o \
+       monodll_baseunix.o

 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \


@@ -1756,11 +1756,11 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 =  \

-       monolib_baseunix.o \

        monolib_dirmac.o \
        monolib_mimetmac.o \
        monolib_utils.o \
        monolib_dirmac.o \
        monolib_mimetmac.o \
        monolib_utils.o \

-       monolib_utilsexc.o
+       monolib_utilsexc.o \
+       monolib_baseunix.o

 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \


@@ -1777,11 +1777,11 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 =  \

-       basedll_baseunix.o \

        basedll_dirmac.o \
        basedll_mimetmac.o \
        basedll_utils.o \
        basedll_dirmac.o \
        basedll_mimetmac.o \
        basedll_utils.o \

-       basedll_utilsexc.o
+       basedll_utilsexc.o \
+       basedll_baseunix.o

 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \


@@ -1798,11 +1798,11 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 =  \

-       baselib_baseunix.o \

        baselib_dirmac.o \
        baselib_mimetmac.o \
        baselib_utils.o \
        baselib_dirmac.o \
        baselib_mimetmac.o \
        baselib_utils.o \

-       baselib_utilsexc.o
+       baselib_utilsexc.o \
+       baselib_baseunix.o

 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS)
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS)


@@ -1815,6 +1815,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS =  \
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS)
 COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
        monodll_basemsw.o \
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS)
 COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
        monodll_basemsw.o \

+       monodll_crashrpt.o \

        monodll_dde.o \
        monodll_dir.o \
        monodll_mimetype.o \
        monodll_dde.o \
        monodll_dir.o \
        monodll_mimetype.o \


@@ -1823,8 +1824,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
        monodll_snglinst.o \
        monodll_thread.o \
        monodll_utils.o \
        monodll_snglinst.o \
        monodll_thread.o \
        monodll_utils.o \

-       monodll_utilsexc.o \
-       monodll_crashrpt.o
+       monodll_utilsexc.o

 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_1)
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_1)


@@ -1837,6 +1837,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1)
 COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
        monolib_basemsw.o \
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1)
 COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
        monolib_basemsw.o \

+       monolib_crashrpt.o \

        monolib_dde.o \
        monolib_dir.o \
        monolib_mimetype.o \
        monolib_dde.o \
        monolib_dir.o \
        monolib_mimetype.o \


@@ -1845,8 +1846,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
        monolib_snglinst.o \
        monolib_thread.o \
        monolib_utils.o \
        monolib_snglinst.o \
        monolib_thread.o \
        monolib_utils.o \

-       monolib_utilsexc.o \
-       monolib_crashrpt.o
+       monolib_utilsexc.o

 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_2)
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_2)


@@ -1859,6 +1859,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2)
 COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
        basedll_basemsw.o \
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2)
 COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
        basedll_basemsw.o \

+       basedll_crashrpt.o \

        basedll_dde.o \
        basedll_dir.o \
        basedll_mimetype.o \
        basedll_dde.o \
        basedll_dir.o \
        basedll_mimetype.o \


@@ -1867,8 +1868,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
        basedll_snglinst.o \
        basedll_thread.o \
        basedll_utils.o \
        basedll_snglinst.o \
        basedll_thread.o \
        basedll_utils.o \

-       basedll_utilsexc.o \
-       basedll_crashrpt.o
+       basedll_utilsexc.o

 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_3)
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_3)


@@ -1881,6 +1881,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3)
 COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
        baselib_basemsw.o \
 @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3)
 COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
        baselib_basemsw.o \

+       baselib_crashrpt.o \

        baselib_dde.o \
        baselib_dir.o \
        baselib_mimetype.o \
        baselib_dde.o \
        baselib_dir.o \
        baselib_mimetype.o \


@@ -1889,46 +1890,13 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
        baselib_snglinst.o \
        baselib_thread.o \
        baselib_utils.o \
        baselib_snglinst.o \
        baselib_thread.o \
        baselib_utils.o \

-       baselib_utilsexc.o \
-       baselib_crashrpt.o
+       baselib_utilsexc.o

 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
        $(__LOWLEVEL_SRC_OBJECTS) \
        $(__GUI_SRC_OBJECTS) \
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
        $(__LOWLEVEL_SRC_OBJECTS) \
        $(__GUI_SRC_OBJECTS) \

-       monodll_busyinfo.o \
-       monodll_calctrl.o \
-       monodll_choicdgg.o \
-       monodll_dcbuffer.o \
-       monodll_dcpsg.o \
-       monodll_dirctrlg.o \
-       monodll_dragimgg.o \
-       monodll_grid.o \
-       monodll_gridctrl.o \
-       monodll_gridsel.o \
-       monodll_helpext.o \
-       monodll_laywin.o \
-       monodll_logg.o \
-       monodll_numdlgg.o \
-       monodll_panelg.o \
-       monodll_progdlgg.o \
-       monodll_renderg.o \
-       monodll_sashwin.o \
-       monodll_scrlwing.o \
-       monodll_selstore.o \
-       monodll_spinctlg.o \
-       monodll_splash.o \
-       monodll_splitter.o \
-       monodll_tbarsmpl.o \
-       monodll_textdlgg.o \
-       monodll_tipdlg.o \
-       monodll_tipwin.o \
-       monodll_treectlg.o \
-       monodll_vlbox.o \
-       monodll_vscroll.o \
-       monodll_wizard.o \
-       monodll_appcmn.o \
-       monodll_fontmap.o \

        monodll_accesscmn.o \
        monodll_accesscmn.o \

+       monodll_appcmn.o \

        monodll_artprov.o \
        monodll_artstd.o \
        monodll_bmpbase.o \
        monodll_artprov.o \
        monodll_artstd.o \
        monodll_bmpbase.o \


@@ -1954,9 +1922,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
        monodll_fddlgcmn.o \
        monodll_fldlgcmn.o \
        monodll_fontcmn.o \
        monodll_fddlgcmn.o \
        monodll_fldlgcmn.o \
        monodll_fontcmn.o \

+       monodll_fontmap.o \

        monodll_framecmn.o \
        monodll_framecmn.o \

-       monodll_timercmn.o \
-       monodll_toplvcmn.o \

        monodll_gaugecmn.o \
        monodll_gdicmn.o \
        monodll_geometry.o \
        monodll_gaugecmn.o \
        monodll_gdicmn.o \
        monodll_geometry.o \


@@ -1966,6 +1933,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
        monodll_imagall.o \
        monodll_imagbmp.o \
        monodll_image.o \
        monodll_imagall.o \
        monodll_imagbmp.o \
        monodll_image.o \

+       monodll_imagfill.o \

        monodll_imaggif.o \
        monodll_imagiff.o \
        monodll_imagjpeg.o \
        monodll_imaggif.o \
        monodll_imagiff.o \
        monodll_imagjpeg.o \


@@ -1974,7 +1942,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
        monodll_imagpnm.o \
        monodll_imagtiff.o \
        monodll_imagxpm.o \
        monodll_imagpnm.o \
        monodll_imagtiff.o \
        monodll_imagxpm.o \

-       monodll_imagfill.o \

        monodll_layout.o \
        monodll_lboxcmn.o \
        monodll_matrix.o \
        monodll_layout.o \
        monodll_lboxcmn.o \
        monodll_matrix.o \


@@ -1992,64 +1959,14 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
        monodll_statbar.o \
        monodll_tbarbase.o \
        monodll_textcmn.o \
        monodll_statbar.o \
        monodll_tbarbase.o \
        monodll_textcmn.o \

+       monodll_timercmn.o \
+       monodll_toplvcmn.o \

        monodll_treebase.o \
        monodll_valgen.o \
        monodll_validate.o \
        monodll_valtext.o \
        monodll_wincmn.o \
        monodll_treebase.o \
        monodll_valgen.o \
        monodll_validate.o \
        monodll_valtext.o \
        monodll_wincmn.o \

-       monodll_xpmdecod.o
-@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS)
-COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
-       $(__LOWLEVEL_SRC_OBJECTS) \
-       $(__UNIV_TEXTCTRL_OBJECTS) \
-       monodll_bmpbuttn.o \
-       monodll_button.o \
-       monodll_checkbox.o \
-       monodll_checklst.o \
-       monodll_choice.o \
-       monodll_colschem.o \
-       monodll_combobox.o \
-       monodll_control.o \
-       monodll_dialog.o \
-       monodll_framuniv.o \
-       monodll_topluniv.o \
-       monodll_gauge.o \
-       monodll_inpcons.o \
-       monodll_inphand.o \
-       monodll_listbox.o \
-       monodll_menu.o \
-       monodll_notebook.o \
-       monodll_radiobox.o \
-       monodll_radiobut.o \
-       monodll_renderer.o \
-       monodll_scrarrow.o \
-       monodll_scrolbar.o \
-       monodll_scrthumb.o \
-       monodll_slider.o \
-       monodll_spinbutt.o \
-       monodll_statbmp.o \
-       monodll_statbox.o \
-       monodll_statline.o \
-       monodll_stattext.o \
-       monodll_statusbr.o \
-       monodll_toolbar.o \
-       monodll_theme.o \
-       monodll_winuniv.o \
-       monodll_mdig.o \
-       monodll_imaglist.o \
-       monodll_colrdlgg.o \
-       monodll_listctrl.o \
-       monodll_filedlgg.o \
-       monodll_dirdlgg.o \
-       monodll_prntdlgg.o \
-       monodll_accel.o \
-       monodll_msgdlgg.o \
-       monodll_fdrepdlg.o \
-       monodll_fontdlgg.o \
-       monodll_tabg.o \
-       monodll_gtk.o \
-       monodll_win32.o \
-       monodll_metal.o \
+       monodll_xpmdecod.o \

        monodll_busyinfo.o \
        monodll_calctrl.o \
        monodll_choicdgg.o \
        monodll_busyinfo.o \
        monodll_calctrl.o \
        monodll_choicdgg.o \


@@ -2080,10 +1997,61 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
        monodll_treectlg.o \
        monodll_vlbox.o \
        monodll_vscroll.o \
        monodll_treectlg.o \
        monodll_vlbox.o \
        monodll_vscroll.o \

-       monodll_wizard.o \
-       monodll_appcmn.o \
-       monodll_fontmap.o \
+       monodll_wizard.o
+@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS)
+COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
+       $(__LOWLEVEL_SRC_OBJECTS) \
+       $(__UNIV_TEXTCTRL_OBJECTS) \
+       monodll_accel.o \
+       monodll_colrdlgg.o \
+       monodll_dirdlgg.o \
+       monodll_fdrepdlg.o \
+       monodll_filedlgg.o \
+       monodll_fontdlgg.o \
+       monodll_imaglist.o \
+       monodll_listctrl.o \
+       monodll_mdig.o \
+       monodll_msgdlgg.o \
+       monodll_prntdlgg.o \
+       monodll_tabg.o \
+       monodll_bmpbuttn.o \
+       monodll_button.o \
+       monodll_checkbox.o \
+       monodll_checklst.o \
+       monodll_choice.o \
+       monodll_colschem.o \
+       monodll_combobox.o \
+       monodll_control.o \
+       monodll_dialog.o \
+       monodll_framuniv.o \
+       monodll_gauge.o \
+       monodll_inpcons.o \
+       monodll_inphand.o \
+       monodll_listbox.o \
+       monodll_menu.o \
+       monodll_notebook.o \
+       monodll_radiobox.o \
+       monodll_radiobut.o \
+       monodll_renderer.o \
+       monodll_scrarrow.o \
+       monodll_scrolbar.o \
+       monodll_scrthumb.o \
+       monodll_slider.o \
+       monodll_spinbutt.o \
+       monodll_statbmp.o \
+       monodll_statbox.o \
+       monodll_statline.o \
+       monodll_stattext.o \
+       monodll_statusbr.o \
+       monodll_theme.o \
+       monodll_toolbar.o \
+       monodll_topluniv.o \
+       monodll_winuniv.o \
+       monodll_gtk.o \
+       monodll_metal.o \
+       monodll_win32.o \

        monodll_accesscmn.o \
        monodll_accesscmn.o \

+       monodll_appcmn.o \

        monodll_artprov.o \
        monodll_artstd.o \
        monodll_bmpbase.o \
        monodll_artprov.o \
        monodll_artstd.o \
        monodll_bmpbase.o \


@@ -2109,9 +2077,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
        monodll_fddlgcmn.o \
        monodll_fldlgcmn.o \
        monodll_fontcmn.o \
        monodll_fddlgcmn.o \
        monodll_fldlgcmn.o \
        monodll_fontcmn.o \

+       monodll_fontmap.o \

        monodll_framecmn.o \
        monodll_framecmn.o \

-       monodll_timercmn.o \
-       monodll_toplvcmn.o \

        monodll_gaugecmn.o \
        monodll_gdicmn.o \
        monodll_geometry.o \
        monodll_gaugecmn.o \
        monodll_gdicmn.o \
        monodll_geometry.o \


@@ -2121,6 +2088,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
        monodll_imagall.o \
        monodll_imagbmp.o \
        monodll_image.o \
        monodll_imagall.o \
        monodll_imagbmp.o \
        monodll_image.o \

+       monodll_imagfill.o \

        monodll_imaggif.o \
        monodll_imagiff.o \
        monodll_imagjpeg.o \
        monodll_imaggif.o \
        monodll_imagiff.o \
        monodll_imagjpeg.o \


@@ -2129,7 +2097,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
        monodll_imagpnm.o \
        monodll_imagtiff.o \
        monodll_imagxpm.o \
        monodll_imagpnm.o \
        monodll_imagtiff.o \
        monodll_imagxpm.o \

-       monodll_imagfill.o \

        monodll_layout.o \
        monodll_lboxcmn.o \
        monodll_matrix.o \
        monodll_layout.o \
        monodll_lboxcmn.o \
        monodll_matrix.o \


@@ -2147,50 +2114,51 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
        monodll_statbar.o \
        monodll_tbarbase.o \
        monodll_textcmn.o \
        monodll_statbar.o \
        monodll_tbarbase.o \
        monodll_textcmn.o \

+       monodll_timercmn.o \
+       monodll_toplvcmn.o \

        monodll_treebase.o \
        monodll_valgen.o \
        monodll_validate.o \
        monodll_valtext.o \
        monodll_wincmn.o \
        monodll_treebase.o \
        monodll_valgen.o \
        monodll_validate.o \
        monodll_valtext.o \
        monodll_wincmn.o \

-       monodll_xpmdecod.o
+       monodll_xpmdecod.o \
+       monodll_busyinfo.o \
+       monodll_calctrl.o \
+       monodll_choicdgg.o \
+       monodll_dcbuffer.o \
+       monodll_dcpsg.o \
+       monodll_dirctrlg.o \
+       monodll_dragimgg.o \
+       monodll_grid.o \
+       monodll_gridctrl.o \
+       monodll_gridsel.o \
+       monodll_helpext.o \
+       monodll_laywin.o \
+       monodll_logg.o \
+       monodll_numdlgg.o \
+       monodll_panelg.o \
+       monodll_progdlgg.o \
+       monodll_renderg.o \
+       monodll_sashwin.o \
+       monodll_scrlwing.o \
+       monodll_selstore.o \
+       monodll_spinctlg.o \
+       monodll_splash.o \
+       monodll_splitter.o \
+       monodll_tbarsmpl.o \
+       monodll_textdlgg.o \
+       monodll_tipdlg.o \
+       monodll_tipwin.o \
+       monodll_treectlg.o \
+       monodll_vlbox.o \
+       monodll_vscroll.o \
+       monodll_wizard.o

 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
        $(__LOWLEVEL_SRC_OBJECTS_9) \
        $(__GUI_SRC_OBJECTS_1) \
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
        $(__LOWLEVEL_SRC_OBJECTS_9) \
        $(__GUI_SRC_OBJECTS_1) \

-       monolib_busyinfo.o \
-       monolib_calctrl.o \
-       monolib_choicdgg.o \
-       monolib_dcbuffer.o \
-       monolib_dcpsg.o \
-       monolib_dirctrlg.o \
-       monolib_dragimgg.o \
-       monolib_grid.o \
-       monolib_gridctrl.o \
-       monolib_gridsel.o \
-       monolib_helpext.o \
-       monolib_laywin.o \
-       monolib_logg.o \
-       monolib_numdlgg.o \
-       monolib_panelg.o \
-       monolib_progdlgg.o \
-       monolib_renderg.o \
-       monolib_sashwin.o \
-       monolib_scrlwing.o \
-       monolib_selstore.o \
-       monolib_spinctlg.o \
-       monolib_splash.o \
-       monolib_splitter.o \
-       monolib_tbarsmpl.o \
-       monolib_textdlgg.o \
-       monolib_tipdlg.o \
-       monolib_tipwin.o \
-       monolib_treectlg.o \
-       monolib_vlbox.o \
-       monolib_vscroll.o \
-       monolib_wizard.o \
-       monolib_appcmn.o \
-       monolib_fontmap.o \

        monolib_accesscmn.o \
        monolib_accesscmn.o \

+       monolib_appcmn.o \

        monolib_artprov.o \
        monolib_artstd.o \
        monolib_bmpbase.o \
        monolib_artprov.o \
        monolib_artstd.o \
        monolib_bmpbase.o \


@@ -2216,9 +2184,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
        monolib_fddlgcmn.o \
        monolib_fldlgcmn.o \
        monolib_fontcmn.o \
        monolib_fddlgcmn.o \
        monolib_fldlgcmn.o \
        monolib_fontcmn.o \

+       monolib_fontmap.o \

        monolib_framecmn.o \
        monolib_framecmn.o \

-       monolib_timercmn.o \
-       monolib_toplvcmn.o \

        monolib_gaugecmn.o \
        monolib_gdicmn.o \
        monolib_geometry.o \
        monolib_gaugecmn.o \
        monolib_gdicmn.o \
        monolib_geometry.o \


@@ -2228,6 +2195,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
        monolib_imagall.o \
        monolib_imagbmp.o \
        monolib_image.o \
        monolib_imagall.o \
        monolib_imagbmp.o \
        monolib_image.o \

+       monolib_imagfill.o \

        monolib_imaggif.o \
        monolib_imagiff.o \
        monolib_imagjpeg.o \
        monolib_imaggif.o \
        monolib_imagiff.o \
        monolib_imagjpeg.o \


@@ -2236,7 +2204,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
        monolib_imagpnm.o \
        monolib_imagtiff.o \
        monolib_imagxpm.o \
        monolib_imagpnm.o \
        monolib_imagtiff.o \
        monolib_imagxpm.o \

-       monolib_imagfill.o \

        monolib_layout.o \
        monolib_lboxcmn.o \
        monolib_matrix.o \
        monolib_layout.o \
        monolib_lboxcmn.o \
        monolib_matrix.o \


@@ -2254,16 +2221,61 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
        monolib_statbar.o \
        monolib_tbarbase.o \
        monolib_textcmn.o \
        monolib_statbar.o \
        monolib_tbarbase.o \
        monolib_textcmn.o \

+       monolib_timercmn.o \
+       monolib_toplvcmn.o \

        monolib_treebase.o \
        monolib_valgen.o \
        monolib_validate.o \
        monolib_valtext.o \
        monolib_wincmn.o \
        monolib_treebase.o \
        monolib_valgen.o \
        monolib_validate.o \
        monolib_valtext.o \
        monolib_wincmn.o \

-       monolib_xpmdecod.o
+       monolib_xpmdecod.o \
+       monolib_busyinfo.o \
+       monolib_calctrl.o \
+       monolib_choicdgg.o \
+       monolib_dcbuffer.o \
+       monolib_dcpsg.o \
+       monolib_dirctrlg.o \
+       monolib_dragimgg.o \
+       monolib_grid.o \
+       monolib_gridctrl.o \
+       monolib_gridsel.o \
+       monolib_helpext.o \
+       monolib_laywin.o \
+       monolib_logg.o \
+       monolib_numdlgg.o \
+       monolib_panelg.o \
+       monolib_progdlgg.o \
+       monolib_renderg.o \
+       monolib_sashwin.o \
+       monolib_scrlwing.o \
+       monolib_selstore.o \
+       monolib_spinctlg.o \
+       monolib_splash.o \
+       monolib_splitter.o \
+       monolib_tbarsmpl.o \
+       monolib_textdlgg.o \
+       monolib_tipdlg.o \
+       monolib_tipwin.o \
+       monolib_treectlg.o \
+       monolib_vlbox.o \
+       monolib_vscroll.o \
+       monolib_wizard.o

 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        $(__LOWLEVEL_SRC_OBJECTS_9) \
        $(__UNIV_TEXTCTRL_OBJECTS_1) \
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        $(__LOWLEVEL_SRC_OBJECTS_9) \
        $(__UNIV_TEXTCTRL_OBJECTS_1) \

+       monolib_accel.o \
+       monolib_colrdlgg.o \
+       monolib_dirdlgg.o \
+       monolib_fdrepdlg.o \
+       monolib_filedlgg.o \
+       monolib_fontdlgg.o \
+       monolib_imaglist.o \
+       monolib_listctrl.o \
+       monolib_mdig.o \
+       monolib_msgdlgg.o \
+       monolib_prntdlgg.o \
+       monolib_tabg.o \

        monolib_bmpbuttn.o \
        monolib_button.o \
        monolib_checkbox.o \
        monolib_bmpbuttn.o \
        monolib_button.o \
        monolib_checkbox.o \


@@ -2274,7 +2286,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        monolib_control.o \
        monolib_dialog.o \
        monolib_framuniv.o \
        monolib_control.o \
        monolib_dialog.o \
        monolib_framuniv.o \

-       monolib_topluniv.o \

        monolib_gauge.o \
        monolib_inpcons.o \
        monolib_inphand.o \
        monolib_gauge.o \
        monolib_inpcons.o \
        monolib_inphand.o \


@@ -2294,58 +2305,15 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        monolib_statline.o \
        monolib_stattext.o \
        monolib_statusbr.o \
        monolib_statline.o \
        monolib_stattext.o \
        monolib_statusbr.o \

-       monolib_toolbar.o \

        monolib_theme.o \
        monolib_theme.o \

+       monolib_toolbar.o \
+       monolib_topluniv.o \

        monolib_winuniv.o \
        monolib_winuniv.o \

-       monolib_mdig.o \
-       monolib_imaglist.o \
-       monolib_colrdlgg.o \
-       monolib_listctrl.o \
-       monolib_filedlgg.o \
-       monolib_dirdlgg.o \
-       monolib_prntdlgg.o \
-       monolib_accel.o \
-       monolib_msgdlgg.o \
-       monolib_fdrepdlg.o \
-       monolib_fontdlgg.o \
-       monolib_tabg.o \

        monolib_gtk.o \
        monolib_gtk.o \

-       monolib_win32.o \

        monolib_metal.o \
        monolib_metal.o \

-       monolib_busyinfo.o \
-       monolib_calctrl.o \
-       monolib_choicdgg.o \
-       monolib_dcbuffer.o \
-       monolib_dcpsg.o \
-       monolib_dirctrlg.o \
-       monolib_dragimgg.o \
-       monolib_grid.o \
-       monolib_gridctrl.o \
-       monolib_gridsel.o \
-       monolib_helpext.o \
-       monolib_laywin.o \
-       monolib_logg.o \
-       monolib_numdlgg.o \
-       monolib_panelg.o \
-       monolib_progdlgg.o \
-       monolib_renderg.o \
-       monolib_sashwin.o \
-       monolib_scrlwing.o \
-       monolib_selstore.o \
-       monolib_spinctlg.o \
-       monolib_splash.o \
-       monolib_splitter.o \
-       monolib_tbarsmpl.o \
-       monolib_textdlgg.o \
-       monolib_tipdlg.o \
-       monolib_tipwin.o \
-       monolib_treectlg.o \
-       monolib_vlbox.o \
-       monolib_vscroll.o \
-       monolib_wizard.o \
-       monolib_appcmn.o \
-       monolib_fontmap.o \
+       monolib_win32.o \

        monolib_accesscmn.o \
        monolib_accesscmn.o \

+       monolib_appcmn.o \

        monolib_artprov.o \
        monolib_artstd.o \
        monolib_bmpbase.o \
        monolib_artprov.o \
        monolib_artstd.o \
        monolib_bmpbase.o \


@@ -2371,9 +2339,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        monolib_fddlgcmn.o \
        monolib_fldlgcmn.o \
        monolib_fontcmn.o \
        monolib_fddlgcmn.o \
        monolib_fldlgcmn.o \
        monolib_fontcmn.o \

+       monolib_fontmap.o \

        monolib_framecmn.o \
        monolib_framecmn.o \

-       monolib_timercmn.o \
-       monolib_toplvcmn.o \

        monolib_gaugecmn.o \
        monolib_gdicmn.o \
        monolib_geometry.o \
        monolib_gaugecmn.o \
        monolib_gdicmn.o \
        monolib_geometry.o \


@@ -2383,6 +2350,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        monolib_imagall.o \
        monolib_imagbmp.o \
        monolib_image.o \
        monolib_imagall.o \
        monolib_imagbmp.o \
        monolib_image.o \

+       monolib_imagfill.o \

        monolib_imaggif.o \
        monolib_imagiff.o \
        monolib_imagjpeg.o \
        monolib_imaggif.o \
        monolib_imagiff.o \
        monolib_imagjpeg.o \


@@ -2391,7 +2359,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        monolib_imagpnm.o \
        monolib_imagtiff.o \
        monolib_imagxpm.o \
        monolib_imagpnm.o \
        monolib_imagtiff.o \
        monolib_imagxpm.o \

-       monolib_imagfill.o \

        monolib_layout.o \
        monolib_lboxcmn.o \
        monolib_matrix.o \
        monolib_layout.o \
        monolib_lboxcmn.o \
        monolib_matrix.o \


@@ -2409,50 +2376,51 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        monolib_statbar.o \
        monolib_tbarbase.o \
        monolib_textcmn.o \
        monolib_statbar.o \
        monolib_tbarbase.o \
        monolib_textcmn.o \

+       monolib_timercmn.o \
+       monolib_toplvcmn.o \

        monolib_treebase.o \
        monolib_valgen.o \
        monolib_validate.o \
        monolib_valtext.o \
        monolib_wincmn.o \
        monolib_treebase.o \
        monolib_valgen.o \
        monolib_validate.o \
        monolib_valtext.o \
        monolib_wincmn.o \

-       monolib_xpmdecod.o
+       monolib_xpmdecod.o \
+       monolib_busyinfo.o \
+       monolib_calctrl.o \
+       monolib_choicdgg.o \
+       monolib_dcbuffer.o \
+       monolib_dcpsg.o \
+       monolib_dirctrlg.o \
+       monolib_dragimgg.o \
+       monolib_grid.o \
+       monolib_gridctrl.o \
+       monolib_gridsel.o \
+       monolib_helpext.o \
+       monolib_laywin.o \
+       monolib_logg.o \
+       monolib_numdlgg.o \
+       monolib_panelg.o \
+       monolib_progdlgg.o \
+       monolib_renderg.o \
+       monolib_sashwin.o \
+       monolib_scrlwing.o \
+       monolib_selstore.o \
+       monolib_spinctlg.o \
+       monolib_splash.o \
+       monolib_splitter.o \
+       monolib_tbarsmpl.o \
+       monolib_textdlgg.o \
+       monolib_tipdlg.o \
+       monolib_tipwin.o \
+       monolib_treectlg.o \
+       monolib_vlbox.o \
+       monolib_vscroll.o \
+       monolib_wizard.o

 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
        $(__LOWLEVEL_SRC_OBJECTS_0) \
        $(__GUI_SRC_OBJECTS_2) \
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
        $(__LOWLEVEL_SRC_OBJECTS_0) \
        $(__GUI_SRC_OBJECTS_2) \

-       coredll_busyinfo.o \
-       coredll_calctrl.o \
-       coredll_choicdgg.o \
-       coredll_dcbuffer.o \
-       coredll_dcpsg.o \
-       coredll_dirctrlg.o \
-       coredll_dragimgg.o \
-       coredll_grid.o \
-       coredll_gridctrl.o \
-       coredll_gridsel.o \
-       coredll_helpext.o \
-       coredll_laywin.o \
-       coredll_logg.o \
-       coredll_numdlgg.o \
-       coredll_panelg.o \
-       coredll_progdlgg.o \
-       coredll_renderg.o \
-       coredll_sashwin.o \
-       coredll_scrlwing.o \
-       coredll_selstore.o \
-       coredll_spinctlg.o \
-       coredll_splash.o \
-       coredll_splitter.o \
-       coredll_tbarsmpl.o \
-       coredll_textdlgg.o \
-       coredll_tipdlg.o \
-       coredll_tipwin.o \
-       coredll_treectlg.o \
-       coredll_vlbox.o \
-       coredll_vscroll.o \
-       coredll_wizard.o \
-       coredll_appcmn.o \
-       coredll_fontmap.o \

        coredll_accesscmn.o \
        coredll_accesscmn.o \

+       coredll_appcmn.o \

        coredll_artprov.o \
        coredll_artstd.o \
        coredll_bmpbase.o \
        coredll_artprov.o \
        coredll_artstd.o \
        coredll_bmpbase.o \


@@ -2478,9 +2446,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
        coredll_fddlgcmn.o \
        coredll_fldlgcmn.o \
        coredll_fontcmn.o \
        coredll_fddlgcmn.o \
        coredll_fldlgcmn.o \
        coredll_fontcmn.o \

+       coredll_fontmap.o \

        coredll_framecmn.o \
        coredll_framecmn.o \

-       coredll_timercmn.o \
-       coredll_toplvcmn.o \

        coredll_gaugecmn.o \
        coredll_gdicmn.o \
        coredll_geometry.o \
        coredll_gaugecmn.o \
        coredll_gdicmn.o \
        coredll_geometry.o \


@@ -2490,6 +2457,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
        coredll_imagall.o \
        coredll_imagbmp.o \
        coredll_image.o \
        coredll_imagall.o \
        coredll_imagbmp.o \
        coredll_image.o \

+       coredll_imagfill.o \

        coredll_imaggif.o \
        coredll_imagiff.o \
        coredll_imagjpeg.o \
        coredll_imaggif.o \
        coredll_imagiff.o \
        coredll_imagjpeg.o \


@@ -2498,7 +2466,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
        coredll_imagpnm.o \
        coredll_imagtiff.o \
        coredll_imagxpm.o \
        coredll_imagpnm.o \
        coredll_imagtiff.o \
        coredll_imagxpm.o \

-       coredll_imagfill.o \

        coredll_layout.o \
        coredll_lboxcmn.o \
        coredll_matrix.o \
        coredll_layout.o \
        coredll_lboxcmn.o \
        coredll_matrix.o \


@@ -2516,16 +2483,61 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
        coredll_statbar.o \
        coredll_tbarbase.o \
        coredll_textcmn.o \
        coredll_statbar.o \
        coredll_tbarbase.o \
        coredll_textcmn.o \

+       coredll_timercmn.o \
+       coredll_toplvcmn.o \

        coredll_treebase.o \
        coredll_valgen.o \
        coredll_validate.o \
        coredll_valtext.o \
        coredll_wincmn.o \
        coredll_treebase.o \
        coredll_valgen.o \
        coredll_validate.o \
        coredll_valtext.o \
        coredll_wincmn.o \

-       coredll_xpmdecod.o
+       coredll_xpmdecod.o \
+       coredll_busyinfo.o \
+       coredll_calctrl.o \
+       coredll_choicdgg.o \
+       coredll_dcbuffer.o \
+       coredll_dcpsg.o \
+       coredll_dirctrlg.o \
+       coredll_dragimgg.o \
+       coredll_grid.o \
+       coredll_gridctrl.o \
+       coredll_gridsel.o \
+       coredll_helpext.o \
+       coredll_laywin.o \
+       coredll_logg.o \
+       coredll_numdlgg.o \
+       coredll_panelg.o \
+       coredll_progdlgg.o \
+       coredll_renderg.o \
+       coredll_sashwin.o \
+       coredll_scrlwing.o \
+       coredll_selstore.o \
+       coredll_spinctlg.o \
+       coredll_splash.o \
+       coredll_splitter.o \
+       coredll_tbarsmpl.o \
+       coredll_textdlgg.o \
+       coredll_tipdlg.o \
+       coredll_tipwin.o \
+       coredll_treectlg.o \
+       coredll_vlbox.o \
+       coredll_vscroll.o \
+       coredll_wizard.o

 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        $(__LOWLEVEL_SRC_OBJECTS_0) \
        $(__UNIV_TEXTCTRL_OBJECTS_2) \
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        $(__LOWLEVEL_SRC_OBJECTS_0) \
        $(__UNIV_TEXTCTRL_OBJECTS_2) \

+       coredll_accel.o \
+       coredll_colrdlgg.o \
+       coredll_dirdlgg.o \
+       coredll_fdrepdlg.o \
+       coredll_filedlgg.o \
+       coredll_fontdlgg.o \
+       coredll_imaglist.o \
+       coredll_listctrl.o \
+       coredll_mdig.o \
+       coredll_msgdlgg.o \
+       coredll_prntdlgg.o \
+       coredll_tabg.o \

        coredll_bmpbuttn.o \
        coredll_button.o \
        coredll_checkbox.o \
        coredll_bmpbuttn.o \
        coredll_button.o \
        coredll_checkbox.o \


@@ -2536,7 +2548,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        coredll_control.o \
        coredll_dialog.o \
        coredll_framuniv.o \
        coredll_control.o \
        coredll_dialog.o \
        coredll_framuniv.o \

-       coredll_topluniv.o \

        coredll_gauge.o \
        coredll_inpcons.o \
        coredll_inphand.o \
        coredll_gauge.o \
        coredll_inpcons.o \
        coredll_inphand.o \


@@ -2556,58 +2567,15 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        coredll_statline.o \
        coredll_stattext.o \
        coredll_statusbr.o \
        coredll_statline.o \
        coredll_stattext.o \
        coredll_statusbr.o \

-       coredll_toolbar.o \

        coredll_theme.o \
        coredll_theme.o \

+       coredll_toolbar.o \
+       coredll_topluniv.o \

        coredll_winuniv.o \
        coredll_winuniv.o \

-       coredll_mdig.o \
-       coredll_imaglist.o \
-       coredll_colrdlgg.o \
-       coredll_listctrl.o \
-       coredll_filedlgg.o \
-       coredll_dirdlgg.o \
-       coredll_prntdlgg.o \
-       coredll_accel.o \
-       coredll_msgdlgg.o \
-       coredll_fdrepdlg.o \
-       coredll_fontdlgg.o \
-       coredll_tabg.o \

        coredll_gtk.o \
        coredll_gtk.o \

-       coredll_win32.o \

        coredll_metal.o \
        coredll_metal.o \

-       coredll_busyinfo.o \
-       coredll_calctrl.o \
-       coredll_choicdgg.o \
-       coredll_dcbuffer.o \
-       coredll_dcpsg.o \
-       coredll_dirctrlg.o \
-       coredll_dragimgg.o \
-       coredll_grid.o \
-       coredll_gridctrl.o \
-       coredll_gridsel.o \
-       coredll_helpext.o \
-       coredll_laywin.o \
-       coredll_logg.o \
-       coredll_numdlgg.o \
-       coredll_panelg.o \
-       coredll_progdlgg.o \
-       coredll_renderg.o \
-       coredll_sashwin.o \
-       coredll_scrlwing.o \
-       coredll_selstore.o \
-       coredll_spinctlg.o \
-       coredll_splash.o \
-       coredll_splitter.o \
-       coredll_tbarsmpl.o \
-       coredll_textdlgg.o \
-       coredll_tipdlg.o \
-       coredll_tipwin.o \
-       coredll_treectlg.o \
-       coredll_vlbox.o \
-       coredll_vscroll.o \
-       coredll_wizard.o \
-       coredll_appcmn.o \
-       coredll_fontmap.o \
+       coredll_win32.o \

        coredll_accesscmn.o \
        coredll_accesscmn.o \

+       coredll_appcmn.o \

        coredll_artprov.o \
        coredll_artstd.o \
        coredll_bmpbase.o \
        coredll_artprov.o \
        coredll_artstd.o \
        coredll_bmpbase.o \


@@ -2633,9 +2601,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        coredll_fddlgcmn.o \
        coredll_fldlgcmn.o \
        coredll_fontcmn.o \
        coredll_fddlgcmn.o \
        coredll_fldlgcmn.o \
        coredll_fontcmn.o \

+       coredll_fontmap.o \

        coredll_framecmn.o \
        coredll_framecmn.o \

-       coredll_timercmn.o \
-       coredll_toplvcmn.o \

        coredll_gaugecmn.o \
        coredll_gdicmn.o \
        coredll_geometry.o \
        coredll_gaugecmn.o \
        coredll_gdicmn.o \
        coredll_geometry.o \


@@ -2645,6 +2612,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        coredll_imagall.o \
        coredll_imagbmp.o \
        coredll_image.o \
        coredll_imagall.o \
        coredll_imagbmp.o \
        coredll_image.o \

+       coredll_imagfill.o \

        coredll_imaggif.o \
        coredll_imagiff.o \
        coredll_imagjpeg.o \
        coredll_imaggif.o \
        coredll_imagiff.o \
        coredll_imagjpeg.o \


@@ -2653,7 +2621,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        coredll_imagpnm.o \
        coredll_imagtiff.o \
        coredll_imagxpm.o \
        coredll_imagpnm.o \
        coredll_imagtiff.o \
        coredll_imagxpm.o \

-       coredll_imagfill.o \

        coredll_layout.o \
        coredll_lboxcmn.o \
        coredll_matrix.o \
        coredll_layout.o \
        coredll_lboxcmn.o \
        coredll_matrix.o \


@@ -2671,50 +2638,51 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        coredll_statbar.o \
        coredll_tbarbase.o \
        coredll_textcmn.o \
        coredll_statbar.o \
        coredll_tbarbase.o \
        coredll_textcmn.o \

+       coredll_timercmn.o \
+       coredll_toplvcmn.o \

        coredll_treebase.o \
        coredll_valgen.o \
        coredll_validate.o \
        coredll_valtext.o \
        coredll_wincmn.o \
        coredll_treebase.o \
        coredll_valgen.o \
        coredll_validate.o \
        coredll_valtext.o \
        coredll_wincmn.o \

-       coredll_xpmdecod.o
+       coredll_xpmdecod.o \
+       coredll_busyinfo.o \
+       coredll_calctrl.o \
+       coredll_choicdgg.o \
+       coredll_dcbuffer.o \
+       coredll_dcpsg.o \
+       coredll_dirctrlg.o \
+       coredll_dragimgg.o \
+       coredll_grid.o \
+       coredll_gridctrl.o \
+       coredll_gridsel.o \
+       coredll_helpext.o \
+       coredll_laywin.o \
+       coredll_logg.o \
+       coredll_numdlgg.o \
+       coredll_panelg.o \
+       coredll_progdlgg.o \
+       coredll_renderg.o \
+       coredll_sashwin.o \
+       coredll_scrlwing.o \
+       coredll_selstore.o \
+       coredll_spinctlg.o \
+       coredll_splash.o \
+       coredll_splitter.o \
+       coredll_tbarsmpl.o \
+       coredll_textdlgg.o \
+       coredll_tipdlg.o \
+       coredll_tipwin.o \
+       coredll_treectlg.o \
+       coredll_vlbox.o \
+       coredll_vscroll.o \
+       coredll_wizard.o

 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
        $(__LOWLEVEL_SRC_OBJECTS_8) \
        $(__GUI_SRC_OBJECTS_3) \
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
        $(__LOWLEVEL_SRC_OBJECTS_8) \
        $(__GUI_SRC_OBJECTS_3) \

-       corelib_busyinfo.o \
-       corelib_calctrl.o \
-       corelib_choicdgg.o \
-       corelib_dcbuffer.o \
-       corelib_dcpsg.o \
-       corelib_dirctrlg.o \
-       corelib_dragimgg.o \
-       corelib_grid.o \
-       corelib_gridctrl.o \
-       corelib_gridsel.o \
-       corelib_helpext.o \
-       corelib_laywin.o \
-       corelib_logg.o \
-       corelib_numdlgg.o \
-       corelib_panelg.o \
-       corelib_progdlgg.o \
-       corelib_renderg.o \
-       corelib_sashwin.o \
-       corelib_scrlwing.o \
-       corelib_selstore.o \
-       corelib_spinctlg.o \
-       corelib_splash.o \
-       corelib_splitter.o \
-       corelib_tbarsmpl.o \
-       corelib_textdlgg.o \
-       corelib_tipdlg.o \
-       corelib_tipwin.o \
-       corelib_treectlg.o \
-       corelib_vlbox.o \
-       corelib_vscroll.o \
-       corelib_wizard.o \
-       corelib_appcmn.o \
-       corelib_fontmap.o \

        corelib_accesscmn.o \
        corelib_accesscmn.o \

+       corelib_appcmn.o \

        corelib_artprov.o \
        corelib_artstd.o \
        corelib_bmpbase.o \
        corelib_artprov.o \
        corelib_artstd.o \
        corelib_bmpbase.o \


@@ -2740,9 +2708,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
        corelib_fddlgcmn.o \
        corelib_fldlgcmn.o \
        corelib_fontcmn.o \
        corelib_fddlgcmn.o \
        corelib_fldlgcmn.o \
        corelib_fontcmn.o \

+       corelib_fontmap.o \

        corelib_framecmn.o \
        corelib_framecmn.o \

-       corelib_timercmn.o \
-       corelib_toplvcmn.o \

        corelib_gaugecmn.o \
        corelib_gdicmn.o \
        corelib_geometry.o \
        corelib_gaugecmn.o \
        corelib_gdicmn.o \
        corelib_geometry.o \


@@ -2752,6 +2719,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
        corelib_imagall.o \
        corelib_imagbmp.o \
        corelib_image.o \
        corelib_imagall.o \
        corelib_imagbmp.o \
        corelib_image.o \

+       corelib_imagfill.o \

        corelib_imaggif.o \
        corelib_imagiff.o \
        corelib_imagjpeg.o \
        corelib_imaggif.o \
        corelib_imagiff.o \
        corelib_imagjpeg.o \


@@ -2760,7 +2728,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
        corelib_imagpnm.o \
        corelib_imagtiff.o \
        corelib_imagxpm.o \
        corelib_imagpnm.o \
        corelib_imagtiff.o \
        corelib_imagxpm.o \

-       corelib_imagfill.o \

        corelib_layout.o \
        corelib_lboxcmn.o \
        corelib_matrix.o \
        corelib_layout.o \
        corelib_lboxcmn.o \
        corelib_matrix.o \


@@ -2778,64 +2745,14 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
        corelib_statbar.o \
        corelib_tbarbase.o \
        corelib_textcmn.o \
        corelib_statbar.o \
        corelib_tbarbase.o \
        corelib_textcmn.o \

+       corelib_timercmn.o \
+       corelib_toplvcmn.o \

        corelib_treebase.o \
        corelib_valgen.o \
        corelib_validate.o \
        corelib_valtext.o \
        corelib_wincmn.o \
        corelib_treebase.o \
        corelib_valgen.o \
        corelib_validate.o \
        corelib_valtext.o \
        corelib_wincmn.o \

-       corelib_xpmdecod.o
-@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3)
-COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
-       $(__LOWLEVEL_SRC_OBJECTS_8) \
-       $(__UNIV_TEXTCTRL_OBJECTS_3) \
-       corelib_bmpbuttn.o \
-       corelib_button.o \
-       corelib_checkbox.o \
-       corelib_checklst.o \
-       corelib_choice.o \
-       corelib_colschem.o \
-       corelib_combobox.o \
-       corelib_control.o \
-       corelib_dialog.o \
-       corelib_framuniv.o \
-       corelib_topluniv.o \
-       corelib_gauge.o \
-       corelib_inpcons.o \
-       corelib_inphand.o \
-       corelib_listbox.o \
-       corelib_menu.o \
-       corelib_notebook.o \
-       corelib_radiobox.o \
-       corelib_radiobut.o \
-       corelib_renderer.o \
-       corelib_scrarrow.o \
-       corelib_scrolbar.o \
-       corelib_scrthumb.o \
-       corelib_slider.o \
-       corelib_spinbutt.o \
-       corelib_statbmp.o \
-       corelib_statbox.o \
-       corelib_statline.o \
-       corelib_stattext.o \
-       corelib_statusbr.o \
-       corelib_toolbar.o \
-       corelib_theme.o \
-       corelib_winuniv.o \
-       corelib_mdig.o \
-       corelib_imaglist.o \
-       corelib_colrdlgg.o \
-       corelib_listctrl.o \
-       corelib_filedlgg.o \
-       corelib_dirdlgg.o \
-       corelib_prntdlgg.o \
-       corelib_accel.o \
-       corelib_msgdlgg.o \
-       corelib_fdrepdlg.o \
-       corelib_fontdlgg.o \
-       corelib_tabg.o \
-       corelib_gtk.o \
-       corelib_win32.o \
-       corelib_metal.o \
+       corelib_xpmdecod.o \

        corelib_busyinfo.o \
        corelib_calctrl.o \
        corelib_choicdgg.o \
        corelib_busyinfo.o \
        corelib_calctrl.o \
        corelib_choicdgg.o \


@@ -2866,10 +2783,61 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
        corelib_treectlg.o \
        corelib_vlbox.o \
        corelib_vscroll.o \
        corelib_treectlg.o \
        corelib_vlbox.o \
        corelib_vscroll.o \

-       corelib_wizard.o \
-       corelib_appcmn.o \
-       corelib_fontmap.o \
+       corelib_wizard.o
+@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3)
+COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
+       $(__LOWLEVEL_SRC_OBJECTS_8) \
+       $(__UNIV_TEXTCTRL_OBJECTS_3) \
+       corelib_accel.o \
+       corelib_colrdlgg.o \
+       corelib_dirdlgg.o \
+       corelib_fdrepdlg.o \
+       corelib_filedlgg.o \
+       corelib_fontdlgg.o \
+       corelib_imaglist.o \
+       corelib_listctrl.o \
+       corelib_mdig.o \
+       corelib_msgdlgg.o \
+       corelib_prntdlgg.o \
+       corelib_tabg.o \
+       corelib_bmpbuttn.o \
+       corelib_button.o \
+       corelib_checkbox.o \
+       corelib_checklst.o \
+       corelib_choice.o \
+       corelib_colschem.o \
+       corelib_combobox.o \
+       corelib_control.o \
+       corelib_dialog.o \
+       corelib_framuniv.o \
+       corelib_gauge.o \
+       corelib_inpcons.o \
+       corelib_inphand.o \
+       corelib_listbox.o \
+       corelib_menu.o \
+       corelib_notebook.o \
+       corelib_radiobox.o \
+       corelib_radiobut.o \
+       corelib_renderer.o \
+       corelib_scrarrow.o \
+       corelib_scrolbar.o \
+       corelib_scrthumb.o \
+       corelib_slider.o \
+       corelib_spinbutt.o \
+       corelib_statbmp.o \
+       corelib_statbox.o \
+       corelib_statline.o \
+       corelib_stattext.o \
+       corelib_statusbr.o \
+       corelib_theme.o \
+       corelib_toolbar.o \
+       corelib_topluniv.o \
+       corelib_winuniv.o \
+       corelib_gtk.o \
+       corelib_metal.o \
+       corelib_win32.o \

        corelib_accesscmn.o \
        corelib_accesscmn.o \

+       corelib_appcmn.o \

        corelib_artprov.o \
        corelib_artstd.o \
        corelib_bmpbase.o \
        corelib_artprov.o \
        corelib_artstd.o \
        corelib_bmpbase.o \


@@ -2895,9 +2863,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
        corelib_fddlgcmn.o \
        corelib_fldlgcmn.o \
        corelib_fontcmn.o \
        corelib_fddlgcmn.o \
        corelib_fldlgcmn.o \
        corelib_fontcmn.o \

+       corelib_fontmap.o \

        corelib_framecmn.o \
        corelib_framecmn.o \

-       corelib_timercmn.o \
-       corelib_toplvcmn.o \

        corelib_gaugecmn.o \
        corelib_gdicmn.o \
        corelib_geometry.o \
        corelib_gaugecmn.o \
        corelib_gdicmn.o \
        corelib_geometry.o \


@@ -2907,6 +2874,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
        corelib_imagall.o \
        corelib_imagbmp.o \
        corelib_image.o \
        corelib_imagall.o \
        corelib_imagbmp.o \
        corelib_image.o \

+       corelib_imagfill.o \

        corelib_imaggif.o \
        corelib_imagiff.o \
        corelib_imagjpeg.o \
        corelib_imaggif.o \
        corelib_imagiff.o \
        corelib_imagjpeg.o \


@@ -2915,7 +2883,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
        corelib_imagpnm.o \
        corelib_imagtiff.o \
        corelib_imagxpm.o \
        corelib_imagpnm.o \
        corelib_imagtiff.o \
        corelib_imagxpm.o \

-       corelib_imagfill.o \

        corelib_layout.o \
        corelib_lboxcmn.o \
        corelib_matrix.o \
        corelib_layout.o \
        corelib_lboxcmn.o \
        corelib_matrix.o \


@@ -2933,12 +2900,45 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
        corelib_statbar.o \
        corelib_tbarbase.o \
        corelib_textcmn.o \
        corelib_statbar.o \
        corelib_tbarbase.o \
        corelib_textcmn.o \

+       corelib_timercmn.o \
+       corelib_toplvcmn.o \

        corelib_treebase.o \
        corelib_valgen.o \
        corelib_validate.o \
        corelib_valtext.o \
        corelib_wincmn.o \
        corelib_treebase.o \
        corelib_valgen.o \
        corelib_validate.o \
        corelib_valtext.o \
        corelib_wincmn.o \

-       corelib_xpmdecod.o
+       corelib_xpmdecod.o \
+       corelib_busyinfo.o \
+       corelib_calctrl.o \
+       corelib_choicdgg.o \
+       corelib_dcbuffer.o \
+       corelib_dcpsg.o \
+       corelib_dirctrlg.o \
+       corelib_dragimgg.o \
+       corelib_grid.o \
+       corelib_gridctrl.o \
+       corelib_gridsel.o \
+       corelib_helpext.o \
+       corelib_laywin.o \
+       corelib_logg.o \
+       corelib_numdlgg.o \
+       corelib_panelg.o \
+       corelib_progdlgg.o \
+       corelib_renderg.o \
+       corelib_sashwin.o \
+       corelib_scrlwing.o \
+       corelib_selstore.o \
+       corelib_spinctlg.o \
+       corelib_splash.o \
+       corelib_splitter.o \
+       corelib_tbarsmpl.o \
+       corelib_textdlgg.o \
+       corelib_tipdlg.o \
+       corelib_tipwin.o \
+       corelib_treectlg.o \
+       corelib_vlbox.o \
+       corelib_vscroll.o \
+       corelib_wizard.o

 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
        monodll_NSBox.o \
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
        monodll_NSBox.o \


@@ -2950,8 +2950,8 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
        monodll_NSView.o \
        monodll_NSWindow.o \
        monodll_app.o \
        monodll_NSView.o \
        monodll_NSWindow.o \
        monodll_app.o \

-       monodll_bmpbuttn.o \

        monodll_bitmap.o \
        monodll_bitmap.o \

+       monodll_bmpbuttn.o \

        monodll_brush.o \
        monodll_button.o \
        monodll_checkbox.o \
        monodll_brush.o \
        monodll_button.o \
        monodll_checkbox.o \


@@ -2996,35 +2996,35 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
        monodll_utils.o \
        monodll_utilsexc.o \
        monodll_window.o \
        monodll_utils.o \
        monodll_utilsexc.o \
        monodll_window.o \

-       monodll_statusbr.o \
-       monodll_imaglist.o \
-       monodll_listctrl.o \
-       monodll_fdrepdlg.o \
-       monodll_tabg.o \
-       monodll_fontdlgg.o \
+       monodll_accel.o \
+       monodll_caret.o \

        monodll_colrdlgg.o \
        monodll_colrdlgg.o \

-       monodll_msgdlgg.o \

        monodll_dirdlgg.o \
        monodll_dirdlgg.o \

+       monodll_fdrepdlg.o \

        monodll_filedlgg.o \
        monodll_filedlgg.o \

+       monodll_fontdlgg.o \
+       monodll_imaglist.o \
+       monodll_listctrl.o \
+       monodll_mdig.o \
+       monodll_msgdlgg.o \

        monodll_notebook.o \
        monodll_notebook.o \

-       monodll_accel.o \

        monodll_paletteg.o \
        monodll_paletteg.o \

-       monodll_timer.o \
-       monodll_caret.o \
-       monodll_mdig.o
+       monodll_statusbr.o \
+       monodll_tabg.o \
+       monodll_timer.o

 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS =  \
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS =  \

-       monodll_imaglist.o \
+       monodll_accel.o \

        monodll_colrdlgg.o \
        monodll_colrdlgg.o \

-       monodll_listctrl.o \
-       monodll_filedlgg.o \

        monodll_dirdlgg.o \
        monodll_dirdlgg.o \

-       monodll_prntdlgg.o \
-       monodll_accel.o \
-       monodll_msgdlgg.o \

        monodll_fdrepdlg.o \
        monodll_fdrepdlg.o \

-       monodll_tabg.o \
+       monodll_filedlgg.o \
+       monodll_imaglist.o \
+       monodll_listctrl.o \
+       monodll_msgdlgg.o \
+       monodll_prntdlgg.o \

        monodll_statusbr.o \
        monodll_statusbr.o \

+       monodll_tabg.o \

        monodll_bmpbuttn.o \
        monodll_button.o \
        monodll_checkbox.o \
        monodll_bmpbuttn.o \
        monodll_button.o \
        monodll_checkbox.o \


@@ -3105,6 +3105,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
        monodll_menuitem.o \
        monodll_metafile.o \
        monodll_minifram.o \
        monodll_menuitem.o \
        monodll_metafile.o \
        monodll_minifram.o \

+       monodll_MoreFilesX.o \

        monodll_msgdlg.o \
        monodll_notebmac.o \
        monodll_palette.o \
        monodll_msgdlg.o \
        monodll_notebmac.o \
        monodll_palette.o \


@@ -3129,24 +3130,22 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
        monodll_textctrl.o \
        monodll_thread.o \
        monodll_timer.o \
        monodll_textctrl.o \
        monodll_thread.o \
        monodll_timer.o \

-       monodll_toplevel.o \

        monodll_toolbar.o \
        monodll_tooltip.o \
        monodll_toolbar.o \
        monodll_tooltip.o \

+       monodll_toplevel.o \

        monodll_uma.o \
        monodll_wave.o \
        monodll_window.o \
        monodll_uma.o \
        monodll_wave.o \
        monodll_window.o \

-       monodll_MoreFilesX.o \
-       monodll_statusbr.o \
+       monodll_caret.o \
+       monodll_fdrepdlg.o \
+       monodll_fontdlgg.o \

        monodll_imaglist.o \
        monodll_listctrl.o \
        monodll_imaglist.o \
        monodll_listctrl.o \

-       monodll_fdrepdlg.o \
+       monodll_statusbr.o \

        monodll_tabg.o \
        monodll_tabg.o \

-       monodll_fontdlgg.o \
-       monodll_caret.o \

        monodll_snglinst.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
        monodll_snglinst.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \

-       monodll_gsockmot.o \

        monodll_accel.o \
        monodll_app.o \
        monodll_bmpbuttn.o \
        monodll_accel.o \
        monodll_app.o \
        monodll_bmpbuttn.o \


@@ -3174,6 +3173,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
        monodll_frame.o \
        monodll_gauge.o \
        monodll_gdiobj.o \
        monodll_frame.o \
        monodll_gauge.o \
        monodll_gdiobj.o \

+       monodll_gsockmot.o \

        monodll_icon.o \
        monodll_listbox.o \
        monodll_main.o \
        monodll_icon.o \
        monodll_listbox.o \
        monodll_main.o \


@@ -3192,28 +3192,26 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
        monodll_statbmp.o \
        monodll_statbox.o \
        monodll_stattext.o \
        monodll_statbmp.o \
        monodll_statbox.o \
        monodll_stattext.o \

-       monodll_toolbar.o \

        monodll_textctrl.o \
        monodll_timer.o \
        monodll_textctrl.o \
        monodll_timer.o \

+       monodll_toolbar.o \

        monodll_toplevel.o \
        monodll_utils.o \
        monodll_window.o \
        monodll_toplevel.o \
        monodll_utils.o \
        monodll_window.o \

+       monodll_colrdlgg.o \
+       monodll_dirdlgg.o \

        monodll_fdrepdlg.o \
        monodll_fdrepdlg.o \

-       monodll_listctrl.o \
+       monodll_fontdlgg.o \

        monodll_imaglist.o \
        monodll_imaglist.o \

+       monodll_listctrl.o \

        monodll_notebook.o \
        monodll_notebook.o \

-       monodll_fontdlgg.o \
-       monodll_colrdlgg.o \
-       monodll_statline.o \
-       monodll_tabg.o \
-       monodll_dirdlgg.o \

        monodll_prntdlgg.o \
        monodll_prntdlgg.o \

-       monodll_statusbr.o
+       monodll_statline.o \
+       monodll_statusbr.o \
+       monodll_tabg.o

 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
        monodll_statusbr.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
        monodll_statusbr.o \

-       monodll_uxtheme.o \
-       monodll_access.o \

        monodll_accel.o \
        monodll_bmpbuttn.o \
        monodll_button.o \
        monodll_accel.o \
        monodll_bmpbuttn.o \
        monodll_button.o \


@@ -3241,6 +3239,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
        monodll_msgdlg.o \
        monodll_nativdlg.o \
        monodll_notebook.o \
        monodll_msgdlg.o \
        monodll_nativdlg.o \
        monodll_notebook.o \

+       monodll_access.o \

        monodll_ownerdrw.o \
        monodll_penwin.o \
        monodll_printdlg.o \
        monodll_ownerdrw.o \
        monodll_penwin.o \
        monodll_printdlg.o \


@@ -3261,9 +3260,11 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
        monodll_tbar95.o \
        monodll_textctrl.o \
        monodll_tglbtn.o \
        monodll_tbar95.o \
        monodll_textctrl.o \
        monodll_tglbtn.o \

-       monodll_treectrl.o
+       monodll_treectrl.o \
+       monodll_uxtheme.o

 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS)
 COND_TOOLKIT_OS2___GUI_SRC_OBJECTS =  \
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS)
 COND_TOOLKIT_OS2___GUI_SRC_OBJECTS =  \

+       monodll_caret.o \

        monodll_accel.o \
        monodll_app.o \
        monodll_bitmap.o \
        monodll_accel.o \
        monodll_app.o \
        monodll_bitmap.o \


@@ -3296,6 +3297,8 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS =  \
        monodll_gauge.o \
        monodll_gdiimage.o \
        monodll_gdiobj.o \
        monodll_gauge.o \
        monodll_gdiimage.o \
        monodll_gdiobj.o \

+       monodll_gsocket.o \
+       monodll_gsockpm.o \

        monodll_helpwin.o \
        monodll_icon.o \
        monodll_iniconf.o \
        monodll_helpwin.o \
        monodll_icon.o \
        monodll_iniconf.o \


@@ -3327,16 +3330,13 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS =  \
        monodll_stattext.o \
        monodll_tabctrl.o \
        monodll_textctrl.o \
        monodll_stattext.o \
        monodll_tabctrl.o \
        monodll_textctrl.o \

-       monodll_timer.o \

        monodll_thread.o \
        monodll_thread.o \

+       monodll_timer.o \

        monodll_toolbar.o \
        monodll_tooltip.o \
        monodll_toplevel.o \
        monodll_wave.o \
        monodll_toolbar.o \
        monodll_tooltip.o \
        monodll_toplevel.o \
        monodll_wave.o \

-       monodll_window.o \
-       monodll_gsocket.o \
-       monodll_gsockpm.o \
-       monodll_caret.o
+       monodll_window.o

 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
        monolib_NSBox.o \
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
        monolib_NSBox.o \


@@ -3348,8 +3348,8 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
        monolib_NSView.o \
        monolib_NSWindow.o \
        monolib_app.o \
        monolib_NSView.o \
        monolib_NSWindow.o \
        monolib_app.o \

-       monolib_bmpbuttn.o \

        monolib_bitmap.o \
        monolib_bitmap.o \

+       monolib_bmpbuttn.o \

        monolib_brush.o \
        monolib_button.o \
        monolib_checkbox.o \
        monolib_brush.o \
        monolib_button.o \
        monolib_checkbox.o \


@@ -3394,35 +3394,35 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
        monolib_utils.o \
        monolib_utilsexc.o \
        monolib_window.o \
        monolib_utils.o \
        monolib_utilsexc.o \
        monolib_window.o \

-       monolib_statusbr.o \
-       monolib_imaglist.o \
-       monolib_listctrl.o \
-       monolib_fdrepdlg.o \
-       monolib_tabg.o \
-       monolib_fontdlgg.o \
+       monolib_accel.o \
+       monolib_caret.o \

        monolib_colrdlgg.o \
        monolib_colrdlgg.o \

-       monolib_msgdlgg.o \

        monolib_dirdlgg.o \
        monolib_dirdlgg.o \

+       monolib_fdrepdlg.o \

        monolib_filedlgg.o \
        monolib_filedlgg.o \

+       monolib_fontdlgg.o \
+       monolib_imaglist.o \
+       monolib_listctrl.o \
+       monolib_mdig.o \
+       monolib_msgdlgg.o \

        monolib_notebook.o \
        monolib_notebook.o \

-       monolib_accel.o \

        monolib_paletteg.o \
        monolib_paletteg.o \

-       monolib_timer.o \
-       monolib_caret.o \
-       monolib_mdig.o
+       monolib_statusbr.o \
+       monolib_tabg.o \
+       monolib_timer.o

 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 =  \

-       monolib_imaglist.o \
+       monolib_accel.o \

        monolib_colrdlgg.o \
        monolib_colrdlgg.o \

-       monolib_listctrl.o \
-       monolib_filedlgg.o \

        monolib_dirdlgg.o \
        monolib_dirdlgg.o \

-       monolib_prntdlgg.o \
-       monolib_accel.o \
-       monolib_msgdlgg.o \

        monolib_fdrepdlg.o \
        monolib_fdrepdlg.o \

-       monolib_tabg.o \
+       monolib_filedlgg.o \
+       monolib_imaglist.o \
+       monolib_listctrl.o \
+       monolib_msgdlgg.o \
+       monolib_prntdlgg.o \

        monolib_statusbr.o \
        monolib_statusbr.o \

+       monolib_tabg.o \

        monolib_bmpbuttn.o \
        monolib_button.o \
        monolib_checkbox.o \
        monolib_bmpbuttn.o \
        monolib_button.o \
        monolib_checkbox.o \


@@ -3503,6 +3503,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
        monolib_menuitem.o \
        monolib_metafile.o \
        monolib_minifram.o \
        monolib_menuitem.o \
        monolib_metafile.o \
        monolib_minifram.o \

+       monolib_MoreFilesX.o \

        monolib_msgdlg.o \
        monolib_notebmac.o \
        monolib_palette.o \
        monolib_msgdlg.o \
        monolib_notebmac.o \
        monolib_palette.o \


@@ -3527,24 +3528,22 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
        monolib_textctrl.o \
        monolib_thread.o \
        monolib_timer.o \
        monolib_textctrl.o \
        monolib_thread.o \
        monolib_timer.o \

-       monolib_toplevel.o \

        monolib_toolbar.o \
        monolib_tooltip.o \
        monolib_toolbar.o \
        monolib_tooltip.o \

+       monolib_toplevel.o \

        monolib_uma.o \
        monolib_wave.o \
        monolib_window.o \
        monolib_uma.o \
        monolib_wave.o \
        monolib_window.o \

-       monolib_MoreFilesX.o \
-       monolib_statusbr.o \
+       monolib_caret.o \
+       monolib_fdrepdlg.o \
+       monolib_fontdlgg.o \

        monolib_imaglist.o \
        monolib_listctrl.o \
        monolib_imaglist.o \
        monolib_listctrl.o \

-       monolib_fdrepdlg.o \
+       monolib_statusbr.o \

        monolib_tabg.o \
        monolib_tabg.o \

-       monolib_fontdlgg.o \
-       monolib_caret.o \

        monolib_snglinst.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
        monolib_snglinst.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \

-       monolib_gsockmot.o \

        monolib_accel.o \
        monolib_app.o \
        monolib_bmpbuttn.o \
        monolib_accel.o \
        monolib_app.o \
        monolib_bmpbuttn.o \


@@ -3572,6 +3571,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
        monolib_frame.o \
        monolib_gauge.o \
        monolib_gdiobj.o \
        monolib_frame.o \
        monolib_gauge.o \
        monolib_gdiobj.o \

+       monolib_gsockmot.o \

        monolib_icon.o \
        monolib_listbox.o \
        monolib_main.o \
        monolib_icon.o \
        monolib_listbox.o \
        monolib_main.o \


@@ -3590,28 +3590,26 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
        monolib_statbmp.o \
        monolib_statbox.o \
        monolib_stattext.o \
        monolib_statbmp.o \
        monolib_statbox.o \
        monolib_stattext.o \

-       monolib_toolbar.o \

        monolib_textctrl.o \
        monolib_timer.o \
        monolib_textctrl.o \
        monolib_timer.o \

+       monolib_toolbar.o \

        monolib_toplevel.o \
        monolib_utils.o \
        monolib_window.o \
        monolib_toplevel.o \
        monolib_utils.o \
        monolib_window.o \

+       monolib_colrdlgg.o \
+       monolib_dirdlgg.o \

        monolib_fdrepdlg.o \
        monolib_fdrepdlg.o \

-       monolib_listctrl.o \
+       monolib_fontdlgg.o \

        monolib_imaglist.o \
        monolib_imaglist.o \

+       monolib_listctrl.o \

        monolib_notebook.o \
        monolib_notebook.o \

-       monolib_fontdlgg.o \
-       monolib_colrdlgg.o \
-       monolib_statline.o \
-       monolib_tabg.o \
-       monolib_dirdlgg.o \

        monolib_prntdlgg.o \
        monolib_prntdlgg.o \

-       monolib_statusbr.o
+       monolib_statline.o \
+       monolib_statusbr.o \
+       monolib_tabg.o

 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
        monolib_statusbr.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
        monolib_statusbr.o \

-       monolib_uxtheme.o \
-       monolib_access.o \

        monolib_accel.o \
        monolib_bmpbuttn.o \
        monolib_button.o \
        monolib_accel.o \
        monolib_bmpbuttn.o \
        monolib_button.o \


@@ -3639,6 +3637,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
        monolib_msgdlg.o \
        monolib_nativdlg.o \
        monolib_notebook.o \
        monolib_msgdlg.o \
        monolib_nativdlg.o \
        monolib_notebook.o \

+       monolib_access.o \

        monolib_ownerdrw.o \
        monolib_penwin.o \
        monolib_printdlg.o \
        monolib_ownerdrw.o \
        monolib_penwin.o \
        monolib_printdlg.o \


@@ -3659,9 +3658,11 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
        monolib_tbar95.o \
        monolib_textctrl.o \
        monolib_tglbtn.o \
        monolib_tbar95.o \
        monolib_textctrl.o \
        monolib_tglbtn.o \

-       monolib_treectrl.o
+       monolib_treectrl.o \
+       monolib_uxtheme.o

 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 =  \

+       monolib_caret.o \

        monolib_accel.o \
        monolib_app.o \
        monolib_bitmap.o \
        monolib_accel.o \
        monolib_app.o \
        monolib_bitmap.o \


@@ -3694,6 +3695,8 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 =  \
        monolib_gauge.o \
        monolib_gdiimage.o \
        monolib_gdiobj.o \
        monolib_gauge.o \
        monolib_gdiimage.o \
        monolib_gdiobj.o \

+       monolib_gsocket.o \
+       monolib_gsockpm.o \

        monolib_helpwin.o \
        monolib_icon.o \
        monolib_iniconf.o \
        monolib_helpwin.o \
        monolib_icon.o \
        monolib_iniconf.o \


@@ -3725,16 +3728,13 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 =  \
        monolib_stattext.o \
        monolib_tabctrl.o \
        monolib_textctrl.o \
        monolib_stattext.o \
        monolib_tabctrl.o \
        monolib_textctrl.o \

-       monolib_timer.o \

        monolib_thread.o \
        monolib_thread.o \

+       monolib_timer.o \

        monolib_toolbar.o \
        monolib_tooltip.o \
        monolib_toplevel.o \
        monolib_wave.o \
        monolib_toolbar.o \
        monolib_tooltip.o \
        monolib_toplevel.o \
        monolib_wave.o \

-       monolib_window.o \
-       monolib_gsocket.o \
-       monolib_gsockpm.o \
-       monolib_caret.o
+       monolib_window.o

 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
        coredll_NSBox.o \
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
        coredll_NSBox.o \


@@ -3746,8 +3746,8 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
        coredll_NSView.o \
        coredll_NSWindow.o \
        coredll_app.o \
        coredll_NSView.o \
        coredll_NSWindow.o \
        coredll_app.o \

-       coredll_bmpbuttn.o \

        coredll_bitmap.o \
        coredll_bitmap.o \

+       coredll_bmpbuttn.o \

        coredll_brush.o \
        coredll_button.o \
        coredll_checkbox.o \
        coredll_brush.o \
        coredll_button.o \
        coredll_checkbox.o \


@@ -3792,35 +3792,35 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
        coredll_utils.o \
        coredll_utilsexc.o \
        coredll_window.o \
        coredll_utils.o \
        coredll_utilsexc.o \
        coredll_window.o \

-       coredll_statusbr.o \
-       coredll_imaglist.o \
-       coredll_listctrl.o \
-       coredll_fdrepdlg.o \
-       coredll_tabg.o \
-       coredll_fontdlgg.o \
+       coredll_accel.o \
+       coredll_caret.o \

        coredll_colrdlgg.o \
        coredll_colrdlgg.o \

-       coredll_msgdlgg.o \

        coredll_dirdlgg.o \
        coredll_dirdlgg.o \

+       coredll_fdrepdlg.o \

        coredll_filedlgg.o \
        coredll_filedlgg.o \

+       coredll_fontdlgg.o \
+       coredll_imaglist.o \
+       coredll_listctrl.o \
+       coredll_mdig.o \
+       coredll_msgdlgg.o \

        coredll_notebook.o \
        coredll_notebook.o \

-       coredll_accel.o \

        coredll_paletteg.o \
        coredll_paletteg.o \

-       coredll_timer.o \
-       coredll_caret.o \
-       coredll_mdig.o
+       coredll_statusbr.o \
+       coredll_tabg.o \
+       coredll_timer.o

 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 =  \

-       coredll_imaglist.o \
+       coredll_accel.o \

        coredll_colrdlgg.o \
        coredll_colrdlgg.o \

-       coredll_listctrl.o \
-       coredll_filedlgg.o \

        coredll_dirdlgg.o \
        coredll_dirdlgg.o \

-       coredll_prntdlgg.o \
-       coredll_accel.o \
-       coredll_msgdlgg.o \

        coredll_fdrepdlg.o \
        coredll_fdrepdlg.o \

-       coredll_tabg.o \
+       coredll_filedlgg.o \
+       coredll_imaglist.o \
+       coredll_listctrl.o \
+       coredll_msgdlgg.o \
+       coredll_prntdlgg.o \

        coredll_statusbr.o \
        coredll_statusbr.o \

+       coredll_tabg.o \

        coredll_bmpbuttn.o \
        coredll_button.o \
        coredll_checkbox.o \
        coredll_bmpbuttn.o \
        coredll_button.o \
        coredll_checkbox.o \


@@ -3901,6 +3901,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
        coredll_menuitem.o \
        coredll_metafile.o \
        coredll_minifram.o \
        coredll_menuitem.o \
        coredll_metafile.o \
        coredll_minifram.o \

+       coredll_MoreFilesX.o \

        coredll_msgdlg.o \
        coredll_notebmac.o \
        coredll_palette.o \
        coredll_msgdlg.o \
        coredll_notebmac.o \
        coredll_palette.o \


@@ -3925,24 +3926,22 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
        coredll_textctrl.o \
        coredll_thread.o \
        coredll_timer.o \
        coredll_textctrl.o \
        coredll_thread.o \
        coredll_timer.o \

-       coredll_toplevel.o \

        coredll_toolbar.o \
        coredll_tooltip.o \
        coredll_toolbar.o \
        coredll_tooltip.o \

+       coredll_toplevel.o \

        coredll_uma.o \
        coredll_wave.o \
        coredll_window.o \
        coredll_uma.o \
        coredll_wave.o \
        coredll_window.o \

-       coredll_MoreFilesX.o \
-       coredll_statusbr.o \
+       coredll_caret.o \
+       coredll_fdrepdlg.o \
+       coredll_fontdlgg.o \

        coredll_imaglist.o \
        coredll_listctrl.o \
        coredll_imaglist.o \
        coredll_listctrl.o \

-       coredll_fdrepdlg.o \
+       coredll_statusbr.o \

        coredll_tabg.o \
        coredll_tabg.o \

-       coredll_fontdlgg.o \
-       coredll_caret.o \

        coredll_snglinst.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
        coredll_snglinst.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \

-       coredll_gsockmot.o \

        coredll_accel.o \
        coredll_app.o \
        coredll_bmpbuttn.o \
        coredll_accel.o \
        coredll_app.o \
        coredll_bmpbuttn.o \


@@ -3970,6 +3969,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
        coredll_frame.o \
        coredll_gauge.o \
        coredll_gdiobj.o \
        coredll_frame.o \
        coredll_gauge.o \
        coredll_gdiobj.o \

+       coredll_gsockmot.o \

        coredll_icon.o \
        coredll_listbox.o \
        coredll_main.o \
        coredll_icon.o \
        coredll_listbox.o \
        coredll_main.o \


@@ -3988,28 +3988,26 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
        coredll_statbmp.o \
        coredll_statbox.o \
        coredll_stattext.o \
        coredll_statbmp.o \
        coredll_statbox.o \
        coredll_stattext.o \

-       coredll_toolbar.o \

        coredll_textctrl.o \
        coredll_timer.o \
        coredll_textctrl.o \
        coredll_timer.o \

+       coredll_toolbar.o \

        coredll_toplevel.o \
        coredll_utils.o \
        coredll_window.o \
        coredll_toplevel.o \
        coredll_utils.o \
        coredll_window.o \

+       coredll_colrdlgg.o \
+       coredll_dirdlgg.o \

        coredll_fdrepdlg.o \
        coredll_fdrepdlg.o \

-       coredll_listctrl.o \
+       coredll_fontdlgg.o \

        coredll_imaglist.o \
        coredll_imaglist.o \

+       coredll_listctrl.o \

        coredll_notebook.o \
        coredll_notebook.o \

-       coredll_fontdlgg.o \
-       coredll_colrdlgg.o \
-       coredll_statline.o \
-       coredll_tabg.o \
-       coredll_dirdlgg.o \

        coredll_prntdlgg.o \
        coredll_prntdlgg.o \

-       coredll_statusbr.o
+       coredll_statline.o \
+       coredll_statusbr.o \
+       coredll_tabg.o

 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
        coredll_statusbr.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
        coredll_statusbr.o \

-       coredll_uxtheme.o \
-       coredll_access.o \

        coredll_accel.o \
        coredll_bmpbuttn.o \
        coredll_button.o \
        coredll_accel.o \
        coredll_bmpbuttn.o \
        coredll_button.o \


@@ -4037,6 +4035,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
        coredll_msgdlg.o \
        coredll_nativdlg.o \
        coredll_notebook.o \
        coredll_msgdlg.o \
        coredll_nativdlg.o \
        coredll_notebook.o \

+       coredll_access.o \

        coredll_ownerdrw.o \
        coredll_penwin.o \
        coredll_printdlg.o \
        coredll_ownerdrw.o \
        coredll_penwin.o \
        coredll_printdlg.o \


@@ -4057,9 +4056,11 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
        coredll_tbar95.o \
        coredll_textctrl.o \
        coredll_tglbtn.o \
        coredll_tbar95.o \
        coredll_textctrl.o \
        coredll_tglbtn.o \

-       coredll_treectrl.o
+       coredll_treectrl.o \
+       coredll_uxtheme.o

 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 =  \

+       coredll_caret.o \

        coredll_accel.o \
        coredll_app.o \
        coredll_bitmap.o \
        coredll_accel.o \
        coredll_app.o \
        coredll_bitmap.o \


@@ -4092,6 +4093,8 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 =  \
        coredll_gauge.o \
        coredll_gdiimage.o \
        coredll_gdiobj.o \
        coredll_gauge.o \
        coredll_gdiimage.o \
        coredll_gdiobj.o \

+       coredll_gsocket.o \
+       coredll_gsockpm.o \

        coredll_helpwin.o \
        coredll_icon.o \
        coredll_iniconf.o \
        coredll_helpwin.o \
        coredll_icon.o \
        coredll_iniconf.o \


@@ -4123,16 +4126,13 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 =  \
        coredll_stattext.o \
        coredll_tabctrl.o \
        coredll_textctrl.o \
        coredll_stattext.o \
        coredll_tabctrl.o \
        coredll_textctrl.o \

-       coredll_timer.o \

        coredll_thread.o \
        coredll_thread.o \

+       coredll_timer.o \

        coredll_toolbar.o \
        coredll_tooltip.o \
        coredll_toplevel.o \
        coredll_wave.o \
        coredll_toolbar.o \
        coredll_tooltip.o \
        coredll_toplevel.o \
        coredll_wave.o \

-       coredll_window.o \
-       coredll_gsocket.o \
-       coredll_gsockpm.o \
-       coredll_caret.o
+       coredll_window.o

 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
        corelib_NSBox.o \
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
        corelib_NSBox.o \


@@ -4144,8 +4144,8 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
        corelib_NSView.o \
        corelib_NSWindow.o \
        corelib_app.o \
        corelib_NSView.o \
        corelib_NSWindow.o \
        corelib_app.o \

-       corelib_bmpbuttn.o \

        corelib_bitmap.o \
        corelib_bitmap.o \

+       corelib_bmpbuttn.o \

        corelib_brush.o \
        corelib_button.o \
        corelib_checkbox.o \
        corelib_brush.o \
        corelib_button.o \
        corelib_checkbox.o \


@@ -4190,35 +4190,35 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
        corelib_utils.o \
        corelib_utilsexc.o \
        corelib_window.o \
        corelib_utils.o \
        corelib_utilsexc.o \
        corelib_window.o \

-       corelib_statusbr.o \
-       corelib_imaglist.o \
-       corelib_listctrl.o \
-       corelib_fdrepdlg.o \
-       corelib_tabg.o \
-       corelib_fontdlgg.o \
+       corelib_accel.o \
+       corelib_caret.o \

        corelib_colrdlgg.o \
        corelib_colrdlgg.o \

-       corelib_msgdlgg.o \

        corelib_dirdlgg.o \
        corelib_dirdlgg.o \

+       corelib_fdrepdlg.o \

        corelib_filedlgg.o \
        corelib_filedlgg.o \

+       corelib_fontdlgg.o \
+       corelib_imaglist.o \
+       corelib_listctrl.o \
+       corelib_mdig.o \
+       corelib_msgdlgg.o \

        corelib_notebook.o \
        corelib_notebook.o \

-       corelib_accel.o \

        corelib_paletteg.o \
        corelib_paletteg.o \

-       corelib_timer.o \
-       corelib_caret.o \
-       corelib_mdig.o
+       corelib_statusbr.o \
+       corelib_tabg.o \
+       corelib_timer.o

 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 =  \

-       corelib_imaglist.o \
+       corelib_accel.o \

        corelib_colrdlgg.o \
        corelib_colrdlgg.o \

-       corelib_listctrl.o \
-       corelib_filedlgg.o \

        corelib_dirdlgg.o \
        corelib_dirdlgg.o \

-       corelib_prntdlgg.o \
-       corelib_accel.o \
-       corelib_msgdlgg.o \

        corelib_fdrepdlg.o \
        corelib_fdrepdlg.o \

-       corelib_tabg.o \
+       corelib_filedlgg.o \
+       corelib_imaglist.o \
+       corelib_listctrl.o \
+       corelib_msgdlgg.o \
+       corelib_prntdlgg.o \

        corelib_statusbr.o \
        corelib_statusbr.o \

+       corelib_tabg.o \

        corelib_bmpbuttn.o \
        corelib_button.o \
        corelib_checkbox.o \
        corelib_bmpbuttn.o \
        corelib_button.o \
        corelib_checkbox.o \


@@ -4299,6 +4299,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
        corelib_menuitem.o \
        corelib_metafile.o \
        corelib_minifram.o \
        corelib_menuitem.o \
        corelib_metafile.o \
        corelib_minifram.o \

+       corelib_MoreFilesX.o \

        corelib_msgdlg.o \
        corelib_notebmac.o \
        corelib_palette.o \
        corelib_msgdlg.o \
        corelib_notebmac.o \
        corelib_palette.o \


@@ -4323,24 +4324,22 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
        corelib_textctrl.o \
        corelib_thread.o \
        corelib_timer.o \
        corelib_textctrl.o \
        corelib_thread.o \
        corelib_timer.o \

-       corelib_toplevel.o \

        corelib_toolbar.o \
        corelib_tooltip.o \
        corelib_toolbar.o \
        corelib_tooltip.o \

+       corelib_toplevel.o \

        corelib_uma.o \
        corelib_wave.o \
        corelib_window.o \
        corelib_uma.o \
        corelib_wave.o \
        corelib_window.o \

-       corelib_MoreFilesX.o \
-       corelib_statusbr.o \
+       corelib_caret.o \
+       corelib_fdrepdlg.o \
+       corelib_fontdlgg.o \

        corelib_imaglist.o \
        corelib_listctrl.o \
        corelib_imaglist.o \
        corelib_listctrl.o \

-       corelib_fdrepdlg.o \
+       corelib_statusbr.o \

        corelib_tabg.o \
        corelib_tabg.o \

-       corelib_fontdlgg.o \
-       corelib_caret.o \

        corelib_snglinst.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
        corelib_snglinst.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \

-       corelib_gsockmot.o \

        corelib_accel.o \
        corelib_app.o \
        corelib_bmpbuttn.o \
        corelib_accel.o \
        corelib_app.o \
        corelib_bmpbuttn.o \


@@ -4368,6 +4367,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
        corelib_frame.o \
        corelib_gauge.o \
        corelib_gdiobj.o \
        corelib_frame.o \
        corelib_gauge.o \
        corelib_gdiobj.o \

+       corelib_gsockmot.o \

        corelib_icon.o \
        corelib_listbox.o \
        corelib_main.o \
        corelib_icon.o \
        corelib_listbox.o \
        corelib_main.o \


@@ -4386,28 +4386,26 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
        corelib_statbmp.o \
        corelib_statbox.o \
        corelib_stattext.o \
        corelib_statbmp.o \
        corelib_statbox.o \
        corelib_stattext.o \

-       corelib_toolbar.o \

        corelib_textctrl.o \
        corelib_timer.o \
        corelib_textctrl.o \
        corelib_timer.o \

+       corelib_toolbar.o \

        corelib_toplevel.o \
        corelib_utils.o \
        corelib_window.o \
        corelib_toplevel.o \
        corelib_utils.o \
        corelib_window.o \

+       corelib_colrdlgg.o \
+       corelib_dirdlgg.o \

        corelib_fdrepdlg.o \
        corelib_fdrepdlg.o \

-       corelib_listctrl.o \
+       corelib_fontdlgg.o \

        corelib_imaglist.o \
        corelib_imaglist.o \

+       corelib_listctrl.o \

        corelib_notebook.o \
        corelib_notebook.o \

-       corelib_fontdlgg.o \
-       corelib_colrdlgg.o \
-       corelib_statline.o \
-       corelib_tabg.o \
-       corelib_dirdlgg.o \

        corelib_prntdlgg.o \
        corelib_prntdlgg.o \

-       corelib_statusbr.o
+       corelib_statline.o \
+       corelib_statusbr.o \
+       corelib_tabg.o

 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
        corelib_statusbr.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
        corelib_statusbr.o \

-       corelib_uxtheme.o \
-       corelib_access.o \

        corelib_accel.o \
        corelib_bmpbuttn.o \
        corelib_button.o \
        corelib_accel.o \
        corelib_bmpbuttn.o \
        corelib_button.o \


@@ -4435,6 +4433,7 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
        corelib_msgdlg.o \
        corelib_nativdlg.o \
        corelib_notebook.o \
        corelib_msgdlg.o \
        corelib_nativdlg.o \
        corelib_notebook.o \

+       corelib_access.o \

        corelib_ownerdrw.o \
        corelib_penwin.o \
        corelib_printdlg.o \
        corelib_ownerdrw.o \
        corelib_penwin.o \
        corelib_printdlg.o \


@@ -4455,9 +4454,11 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
        corelib_tbar95.o \
        corelib_textctrl.o \
        corelib_tglbtn.o \
        corelib_tbar95.o \
        corelib_textctrl.o \
        corelib_tglbtn.o \

-       corelib_treectrl.o
+       corelib_treectrl.o \
+       corelib_uxtheme.o

 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 =  \

+       corelib_caret.o \

        corelib_accel.o \
        corelib_app.o \
        corelib_bitmap.o \
        corelib_accel.o \
        corelib_app.o \
        corelib_bitmap.o \


@@ -4490,6 +4491,8 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 =  \
        corelib_gauge.o \
        corelib_gdiimage.o \
        corelib_gdiobj.o \
        corelib_gauge.o \
        corelib_gdiimage.o \
        corelib_gdiobj.o \

+       corelib_gsocket.o \
+       corelib_gsockpm.o \

        corelib_helpwin.o \
        corelib_icon.o \
        corelib_iniconf.o \
        corelib_helpwin.o \
        corelib_icon.o \
        corelib_iniconf.o \


@@ -4521,16 +4524,13 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 =  \
        corelib_stattext.o \
        corelib_tabctrl.o \
        corelib_textctrl.o \
        corelib_stattext.o \
        corelib_tabctrl.o \
        corelib_textctrl.o \

-       corelib_timer.o \

        corelib_thread.o \
        corelib_thread.o \

+       corelib_timer.o \

        corelib_toolbar.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
        corelib_wave.o \
        corelib_toolbar.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
        corelib_wave.o \

-       corelib_window.o \
-       corelib_gsocket.o \
-       corelib_gsockpm.o \
-       corelib_caret.o
+       corelib_window.o

 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3)
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3)
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o


@@ -4562,16 +4562,15 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 =  \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS =  \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS =  \

-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \

        monodll_taskbarcmn.o \
        monodll_taskbarcmn.o \

-       monodll_taskbarx11.o \
-       monodll_printps.o \

        monodll_caret.o \
        monodll_caret.o \

+       monodll_printps.o \

        monodll_dialup.o \
        monodll_dialup.o \

-       monodll_gsockgtk.o \
-       monodll_win_gtk.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_taskbarx11.o \
+       monodll_utilsx11.o \
+       monodll_paletteg.o \

        monodll_app.o \
        monodll_bitmap.o \
        monodll_brush.o \
        monodll_app.o \
        monodll_bitmap.o \
        monodll_brush.o \


@@ -4587,8 +4586,8 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS =  \
        monodll_dnd.o \
        monodll_evtloop.o \
        monodll_font.o \
        monodll_dnd.o \
        monodll_evtloop.o \
        monodll_font.o \

-       monodll_toplevel.o \

        monodll_gdiobj.o \
        monodll_gdiobj.o \

+       monodll_gsockgtk.o \

        monodll_icon.o \
        monodll_main.o \
        monodll_pen.o \
        monodll_icon.o \
        monodll_main.o \
        monodll_pen.o \


@@ -4597,56 +4596,58 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS =  \
        monodll_settings.o \
        monodll_timer.o \
        monodll_tooltip.o \
        monodll_settings.o \
        monodll_timer.o \
        monodll_tooltip.o \

+       monodll_toplevel.o \

        monodll_utilsgtk.o \
        monodll_utilsgtk.o \

-       monodll_window.o \
-       monodll_paletteg.o
+       monodll_win_gtk.o \
+       monodll_window.o

 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS)
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = 
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS)
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = 
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \

-       monodll_colour.o \
-       monodll_dc.o \
-       monodll_gdiobj.o \
-       monodll_palette.o \
-       monodll_region.o \
-       monodll_brush.o \
-       monodll_pen.o \
-       monodll_font.o \
-       monodll_data.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_evtloop.o \
+       monodll_caret.o \
+       monodll_timer.o \

        monodll_app.o \
        monodll_bitmap.o \
        monodll_app.o \
        monodll_bitmap.o \

-       monodll_dirmgl.o \
+       monodll_brush.o \

        monodll_clipbrd.o \
        monodll_clipbrd.o \

+       monodll_colour.o \

        monodll_cursor.o \
        monodll_cursor.o \

+       monodll_data.o \
+       monodll_dc.o \

        monodll_dcclient.o \
        monodll_dcmemory.o \
        monodll_dcscreen.o \
        monodll_dcclient.o \
        monodll_dcmemory.o \
        monodll_dcscreen.o \

-       monodll_toplevel.o \
+       monodll_dirmgl.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiobj.o \

        monodll_icon.o \
        monodll_icon.o \

+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_region.o \

        monodll_settings.o \
        monodll_settings.o \

-       monodll_window.o \
+       monodll_toplevel.o \

        monodll_utils.o \
        monodll_utils.o \

-       monodll_timer.o \
-       monodll_caret.o
+       monodll_window.o

 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \

-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \

        monodll_taskbarcmn.o \
        monodll_taskbarcmn.o \

-       monodll_taskbarx11.o \
-       monodll_printps.o \

        monodll_caret.o \
        monodll_caret.o \

+       monodll_printps.o \

        monodll_dialup.o \
        monodll_dialup.o \

-       monodll_region.o \
-       monodll_pen.o \
-       monodll_brush.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_taskbarx11.o \
+       monodll_utilsx11.o \

        monodll_bitmap.o \
        monodll_bitmap.o \

+       monodll_brush.o \
+       monodll_pen.o \
+       monodll_region.o \

        monodll_utilsx.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
        monodll_utilsx.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \

+       monodll_taskbarcmn.o \

        monodll_app.o \
        monodll_bitmap.o \
        monodll_brush.o \
        monodll_app.o \
        monodll_bitmap.o \
        monodll_brush.o \


@@ -4676,38 +4677,36 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
        monodll_icon.o \
        monodll_joystick.o \
        monodll_minifram.o \
        monodll_icon.o \
        monodll_joystick.o \
        monodll_minifram.o \

+       monodll_automtn.o \
+       monodll_dataobj.o \
+       monodll_dropsrc.o \
+       monodll_droptgt.o \
+       monodll_oleutils.o \
+       monodll_uuid.o \

        monodll_palette.o \
        monodll_pen.o \
        monodll_popupwin.o \
        monodll_region.o \
        monodll_settings.o \
        monodll_palette.o \
        monodll_pen.o \
        monodll_popupwin.o \
        monodll_region.o \
        monodll_settings.o \

-       monodll_taskbarcmn.o \

        monodll_taskbar.o \
        monodll_timer.o \
        monodll_tooltip.o \
        monodll_toplevel.o \
        monodll_utilsgui.o \
        monodll_wave.o \
        monodll_taskbar.o \
        monodll_timer.o \
        monodll_tooltip.o \
        monodll_toplevel.o \
        monodll_utilsgui.o \
        monodll_wave.o \

-       monodll_window.o \
-       monodll_automtn.o \
-       monodll_dataobj.o \
-       monodll_dropsrc.o \
-       monodll_droptgt.o \
-       monodll_oleutils.o \
-       monodll_uuid.o
+       monodll_window.o

 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS = 
 COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS = 
 COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \

-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \

        monodll_taskbarcmn.o \
        monodll_taskbarcmn.o \

-       monodll_taskbarx11.o \
-       monodll_printps.o \

        monodll_caret.o \
        monodll_caret.o \

+       monodll_printps.o \

        monodll_dialup.o \
        monodll_dialup.o \

-       monodll_gsockx11.o \
-       monodll_nanox.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_taskbarx11.o \
+       monodll_utilsx11.o \
+       monodll_timer.o \

        monodll_app.o \
        monodll_bitmap.o \
        monodll_brush.o \
        monodll_app.o \
        monodll_bitmap.o \
        monodll_brush.o \


@@ -4723,10 +4722,12 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
        monodll_evtloop.o \
        monodll_font.o \
        monodll_gdiobj.o \
        monodll_evtloop.o \
        monodll_font.o \
        monodll_gdiobj.o \

+       monodll_gsockx11.o \

        monodll_icon.o \
        monodll_joystick.o \
        monodll_main.o \
        monodll_minifram.o \
        monodll_icon.o \
        monodll_joystick.o \
        monodll_main.o \
        monodll_minifram.o \

+       monodll_nanox.o \

        monodll_palette.o \
        monodll_pen.o \
        monodll_popupwin.o \
        monodll_palette.o \
        monodll_pen.o \
        monodll_popupwin.o \


@@ -4736,21 +4737,19 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
        monodll_toplevel.o \
        monodll_utils.o \
        monodll_utilsx.o \
        monodll_toplevel.o \
        monodll_utils.o \
        monodll_utilsx.o \

-       monodll_window.o \
-       monodll_timer.o
+       monodll_window.o

 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_0 = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 =  \
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_0 = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 =  \

-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \

        coredll_taskbarcmn.o \
        coredll_taskbarcmn.o \

-       coredll_taskbarx11.o \
-       coredll_printps.o \

        coredll_caret.o \
        coredll_caret.o \

+       coredll_printps.o \

        coredll_dialup.o \
        coredll_dialup.o \

-       coredll_gsockgtk.o \
-       coredll_win_gtk.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_taskbarx11.o \
+       coredll_utilsx11.o \
+       coredll_paletteg.o \

        coredll_app.o \
        coredll_bitmap.o \
        coredll_brush.o \
        coredll_app.o \
        coredll_bitmap.o \
        coredll_brush.o \


@@ -4766,8 +4765,8 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 =  \
        coredll_dnd.o \
        coredll_evtloop.o \
        coredll_font.o \
        coredll_dnd.o \
        coredll_evtloop.o \
        coredll_font.o \

-       coredll_toplevel.o \

        coredll_gdiobj.o \
        coredll_gdiobj.o \

+       coredll_gsockgtk.o \

        coredll_icon.o \
        coredll_main.o \
        coredll_pen.o \
        coredll_icon.o \
        coredll_main.o \
        coredll_pen.o \


@@ -4776,56 +4775,58 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 =  \
        coredll_settings.o \
        coredll_timer.o \
        coredll_tooltip.o \
        coredll_settings.o \
        coredll_timer.o \
        coredll_tooltip.o \

+       coredll_toplevel.o \

        coredll_utilsgtk.o \
        coredll_utilsgtk.o \

-       coredll_window.o \
-       coredll_paletteg.o
+       coredll_win_gtk.o \
+       coredll_window.o

 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0)
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_0 = 
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0 =  \
 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0)
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_0 = 
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0 =  \

-       coredll_colour.o \
-       coredll_dc.o \
-       coredll_gdiobj.o \
-       coredll_palette.o \
-       coredll_region.o \
-       coredll_brush.o \
-       coredll_pen.o \
-       coredll_font.o \
-       coredll_data.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_evtloop.o \
+       coredll_caret.o \
+       coredll_timer.o \

        coredll_app.o \
        coredll_bitmap.o \
        coredll_app.o \
        coredll_bitmap.o \

-       coredll_dirmgl.o \
+       coredll_brush.o \

        coredll_clipbrd.o \
        coredll_clipbrd.o \

+       coredll_colour.o \

        coredll_cursor.o \
        coredll_cursor.o \

+       coredll_data.o \
+       coredll_dc.o \

        coredll_dcclient.o \
        coredll_dcmemory.o \
        coredll_dcscreen.o \
        coredll_dcclient.o \
        coredll_dcmemory.o \
        coredll_dcscreen.o \

-       coredll_toplevel.o \
+       coredll_dirmgl.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiobj.o \

        coredll_icon.o \
        coredll_icon.o \

+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_region.o \

        coredll_settings.o \
        coredll_settings.o \

-       coredll_window.o \
+       coredll_toplevel.o \

        coredll_utils.o \
        coredll_utils.o \

-       coredll_timer.o \
-       coredll_caret.o
+       coredll_window.o

 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0)
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0)

-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 =  \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 =  \

        coredll_taskbarcmn.o \
        coredll_taskbarcmn.o \

-       coredll_taskbarx11.o \
-       coredll_printps.o \

        coredll_caret.o \
        coredll_caret.o \

+       coredll_printps.o \

        coredll_dialup.o \
        coredll_dialup.o \

-       coredll_region.o \
-       coredll_pen.o \
-       coredll_brush.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_taskbarx11.o \
+       coredll_utilsx11.o \

        coredll_bitmap.o \
        coredll_bitmap.o \

+       coredll_brush.o \
+       coredll_pen.o \
+       coredll_region.o \

        coredll_utilsx.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 =  \
        coredll_utilsx.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 =  \

+       coredll_taskbarcmn.o \

        coredll_app.o \
        coredll_bitmap.o \
        coredll_brush.o \
        coredll_app.o \
        coredll_bitmap.o \
        coredll_brush.o \


@@ -4855,38 +4856,36 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 =  \
        coredll_icon.o \
        coredll_joystick.o \
        coredll_minifram.o \
        coredll_icon.o \
        coredll_joystick.o \
        coredll_minifram.o \

+       coredll_automtn.o \
+       coredll_dataobj.o \
+       coredll_dropsrc.o \
+       coredll_droptgt.o \
+       coredll_oleutils.o \
+       coredll_uuid.o \

        coredll_palette.o \
        coredll_pen.o \
        coredll_popupwin.o \
        coredll_region.o \
        coredll_settings.o \
        coredll_palette.o \
        coredll_pen.o \
        coredll_popupwin.o \
        coredll_region.o \
        coredll_settings.o \

-       coredll_taskbarcmn.o \

        coredll_taskbar.o \
        coredll_timer.o \
        coredll_tooltip.o \
        coredll_toplevel.o \
        coredll_utilsgui.o \
        coredll_wave.o \
        coredll_taskbar.o \
        coredll_timer.o \
        coredll_tooltip.o \
        coredll_toplevel.o \
        coredll_utilsgui.o \
        coredll_wave.o \

-       coredll_window.o \
-       coredll_automtn.o \
-       coredll_dataobj.o \
-       coredll_dropsrc.o \
-       coredll_droptgt.o \
-       coredll_oleutils.o \
-       coredll_uuid.o
+       coredll_window.o

 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0)
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_0 = 
 COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0)
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_0 = 
 COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \

-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \

        coredll_taskbarcmn.o \
        coredll_taskbarcmn.o \

-       coredll_taskbarx11.o \
-       coredll_printps.o \

        coredll_caret.o \
        coredll_caret.o \

+       coredll_printps.o \

        coredll_dialup.o \
        coredll_dialup.o \

-       coredll_gsockx11.o \
-       coredll_nanox.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_taskbarx11.o \
+       coredll_utilsx11.o \
+       coredll_timer.o \

        coredll_app.o \
        coredll_bitmap.o \
        coredll_brush.o \
        coredll_app.o \
        coredll_bitmap.o \
        coredll_brush.o \


@@ -4902,10 +4901,12 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \
        coredll_evtloop.o \
        coredll_font.o \
        coredll_gdiobj.o \
        coredll_evtloop.o \
        coredll_font.o \
        coredll_gdiobj.o \

+       coredll_gsockx11.o \

        coredll_icon.o \
        coredll_joystick.o \
        coredll_main.o \
        coredll_minifram.o \
        coredll_icon.o \
        coredll_joystick.o \
        coredll_main.o \
        coredll_minifram.o \

+       coredll_nanox.o \

        coredll_palette.o \
        coredll_pen.o \
        coredll_popupwin.o \
        coredll_palette.o \
        coredll_pen.o \
        coredll_popupwin.o \


@@ -4915,21 +4916,19 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \
        coredll_toplevel.o \
        coredll_utils.o \
        coredll_utilsx.o \
        coredll_toplevel.o \
        coredll_utils.o \
        coredll_utilsx.o \

-       coredll_window.o \
-       coredll_timer.o
+       coredll_window.o

 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_8 = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_8 = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \

-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \

        corelib_taskbarcmn.o \
        corelib_taskbarcmn.o \

-       corelib_taskbarx11.o \
-       corelib_printps.o \

        corelib_caret.o \
        corelib_caret.o \

+       corelib_printps.o \

        corelib_dialup.o \
        corelib_dialup.o \

-       corelib_gsockgtk.o \
-       corelib_win_gtk.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_taskbarx11.o \
+       corelib_utilsx11.o \
+       corelib_paletteg.o \

        corelib_app.o \
        corelib_bitmap.o \
        corelib_brush.o \
        corelib_app.o \
        corelib_bitmap.o \
        corelib_brush.o \


@@ -4945,8 +4944,8 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \
        corelib_dnd.o \
        corelib_evtloop.o \
        corelib_font.o \
        corelib_dnd.o \
        corelib_evtloop.o \
        corelib_font.o \

-       corelib_toplevel.o \

        corelib_gdiobj.o \
        corelib_gdiobj.o \

+       corelib_gsockgtk.o \

        corelib_icon.o \
        corelib_main.o \
        corelib_pen.o \
        corelib_icon.o \
        corelib_main.o \
        corelib_pen.o \


@@ -4955,56 +4954,58 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \
        corelib_settings.o \
        corelib_timer.o \
        corelib_tooltip.o \
        corelib_settings.o \
        corelib_timer.o \
        corelib_tooltip.o \

+       corelib_toplevel.o \

        corelib_utilsgtk.o \
        corelib_utilsgtk.o \

-       corelib_window.o \
-       corelib_paletteg.o
+       corelib_win_gtk.o \
+       corelib_window.o

 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8)
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_8 = 
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 =  \
 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8)
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_8 = 
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 =  \

-       corelib_colour.o \
-       corelib_dc.o \
-       corelib_gdiobj.o \
-       corelib_palette.o \
-       corelib_region.o \
-       corelib_brush.o \
-       corelib_pen.o \
-       corelib_font.o \
-       corelib_data.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_evtloop.o \
+       corelib_caret.o \
+       corelib_timer.o \

        corelib_app.o \
        corelib_bitmap.o \
        corelib_app.o \
        corelib_bitmap.o \

-       corelib_dirmgl.o \
+       corelib_brush.o \

        corelib_clipbrd.o \
        corelib_clipbrd.o \

+       corelib_colour.o \

        corelib_cursor.o \
        corelib_cursor.o \

+       corelib_data.o \
+       corelib_dc.o \

        corelib_dcclient.o \
        corelib_dcmemory.o \
        corelib_dcscreen.o \
        corelib_dcclient.o \
        corelib_dcmemory.o \
        corelib_dcscreen.o \

-       corelib_toplevel.o \
+       corelib_dirmgl.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_gdiobj.o \

        corelib_icon.o \
        corelib_icon.o \

+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_region.o \

        corelib_settings.o \
        corelib_settings.o \

-       corelib_window.o \
+       corelib_toplevel.o \

        corelib_utils.o \
        corelib_utils.o \

-       corelib_timer.o \
-       corelib_caret.o
+       corelib_window.o

 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 =  \
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 =  \

-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \

        corelib_taskbarcmn.o \
        corelib_taskbarcmn.o \

-       corelib_taskbarx11.o \
-       corelib_printps.o \

        corelib_caret.o \
        corelib_caret.o \

+       corelib_printps.o \

        corelib_dialup.o \
        corelib_dialup.o \

-       corelib_region.o \
-       corelib_pen.o \
-       corelib_brush.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_taskbarx11.o \
+       corelib_utilsx11.o \

        corelib_bitmap.o \
        corelib_bitmap.o \

+       corelib_brush.o \
+       corelib_pen.o \
+       corelib_region.o \

        corelib_utilsx.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 =  \
        corelib_utilsx.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 =  \

+       corelib_taskbarcmn.o \

        corelib_app.o \
        corelib_bitmap.o \
        corelib_brush.o \
        corelib_app.o \
        corelib_bitmap.o \
        corelib_brush.o \


@@ -5034,38 +5035,36 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 =  \
        corelib_icon.o \
        corelib_joystick.o \
        corelib_minifram.o \
        corelib_icon.o \
        corelib_joystick.o \
        corelib_minifram.o \

+       corelib_automtn.o \
+       corelib_dataobj.o \
+       corelib_dropsrc.o \
+       corelib_droptgt.o \
+       corelib_oleutils.o \
+       corelib_uuid.o \

        corelib_palette.o \
        corelib_pen.o \
        corelib_popupwin.o \
        corelib_region.o \
        corelib_settings.o \
        corelib_palette.o \
        corelib_pen.o \
        corelib_popupwin.o \
        corelib_region.o \
        corelib_settings.o \

-       corelib_taskbarcmn.o \

        corelib_taskbar.o \
        corelib_timer.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
        corelib_utilsgui.o \
        corelib_wave.o \
        corelib_taskbar.o \
        corelib_timer.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
        corelib_utilsgui.o \
        corelib_wave.o \

-       corelib_window.o \
-       corelib_automtn.o \
-       corelib_dataobj.o \
-       corelib_dropsrc.o \
-       corelib_droptgt.o \
-       corelib_oleutils.o \
-       corelib_uuid.o
+       corelib_window.o

 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8)
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_8 = 
 COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8)
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_8 = 
 COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \

-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \

        corelib_taskbarcmn.o \
        corelib_taskbarcmn.o \

-       corelib_taskbarx11.o \
-       corelib_printps.o \

        corelib_caret.o \
        corelib_caret.o \

+       corelib_printps.o \

        corelib_dialup.o \
        corelib_dialup.o \

-       corelib_gsockx11.o \
-       corelib_nanox.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_taskbarx11.o \
+       corelib_utilsx11.o \
+       corelib_timer.o \

        corelib_app.o \
        corelib_bitmap.o \
        corelib_brush.o \
        corelib_app.o \
        corelib_bitmap.o \
        corelib_brush.o \


@@ -5081,10 +5080,12 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
        corelib_evtloop.o \
        corelib_font.o \
        corelib_gdiobj.o \
        corelib_evtloop.o \
        corelib_font.o \
        corelib_gdiobj.o \

+       corelib_gsockx11.o \

        corelib_icon.o \
        corelib_joystick.o \
        corelib_main.o \
        corelib_minifram.o \
        corelib_icon.o \
        corelib_joystick.o \
        corelib_main.o \
        corelib_minifram.o \

+       corelib_nanox.o \

        corelib_palette.o \
        corelib_pen.o \
        corelib_popupwin.o \
        corelib_palette.o \
        corelib_pen.o \
        corelib_popupwin.o \


@@ -5094,21 +5095,19 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
        corelib_toplevel.o \
        corelib_utils.o \
        corelib_utilsx.o \
        corelib_toplevel.o \
        corelib_utils.o \
        corelib_utilsx.o \

-       corelib_window.o \
-       corelib_timer.o
+       corelib_window.o

 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_9 = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 =  \
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_9 = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 =  \

-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \

        monolib_taskbarcmn.o \
        monolib_taskbarcmn.o \

-       monolib_taskbarx11.o \
-       monolib_printps.o \

        monolib_caret.o \
        monolib_caret.o \

+       monolib_printps.o \

        monolib_dialup.o \
        monolib_dialup.o \

-       monolib_gsockgtk.o \
-       monolib_win_gtk.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_taskbarx11.o \
+       monolib_utilsx11.o \
+       monolib_paletteg.o \

        monolib_app.o \
        monolib_bitmap.o \
        monolib_brush.o \
        monolib_app.o \
        monolib_bitmap.o \
        monolib_brush.o \


@@ -5124,8 +5123,8 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 =  \
        monolib_dnd.o \
        monolib_evtloop.o \
        monolib_font.o \
        monolib_dnd.o \
        monolib_evtloop.o \
        monolib_font.o \

-       monolib_toplevel.o \

        monolib_gdiobj.o \
        monolib_gdiobj.o \

+       monolib_gsockgtk.o \

        monolib_icon.o \
        monolib_main.o \
        monolib_pen.o \
        monolib_icon.o \
        monolib_main.o \
        monolib_pen.o \


@@ -5134,56 +5133,58 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 =  \
        monolib_settings.o \
        monolib_timer.o \
        monolib_tooltip.o \
        monolib_settings.o \
        monolib_timer.o \
        monolib_tooltip.o \

+       monolib_toplevel.o \

        monolib_utilsgtk.o \
        monolib_utilsgtk.o \

-       monolib_window.o \
-       monolib_paletteg.o
+       monolib_win_gtk.o \
+       monolib_window.o

 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9)
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_9 = 
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9 =  \
 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9)
 @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_9 = 
 COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9 =  \

-       monolib_colour.o \
-       monolib_dc.o \
-       monolib_gdiobj.o \
-       monolib_palette.o \
-       monolib_region.o \
-       monolib_brush.o \
-       monolib_pen.o \
-       monolib_font.o \
-       monolib_data.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_evtloop.o \
+       monolib_caret.o \
+       monolib_timer.o \

        monolib_app.o \
        monolib_bitmap.o \
        monolib_app.o \
        monolib_bitmap.o \

-       monolib_dirmgl.o \
+       monolib_brush.o \

        monolib_clipbrd.o \
        monolib_clipbrd.o \

+       monolib_colour.o \

        monolib_cursor.o \
        monolib_cursor.o \

+       monolib_data.o \
+       monolib_dc.o \

        monolib_dcclient.o \
        monolib_dcmemory.o \
        monolib_dcscreen.o \
        monolib_dcclient.o \
        monolib_dcmemory.o \
        monolib_dcscreen.o \

-       monolib_toplevel.o \
+       monolib_dirmgl.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiobj.o \

        monolib_icon.o \
        monolib_icon.o \

+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_region.o \

        monolib_settings.o \
        monolib_settings.o \

-       monolib_window.o \
+       monolib_toplevel.o \

        monolib_utils.o \
        monolib_utils.o \

-       monolib_timer.o \
-       monolib_caret.o
+       monolib_window.o

 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 =  \
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 =  \

-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \

        monolib_taskbarcmn.o \
        monolib_taskbarcmn.o \

-       monolib_taskbarx11.o \
-       monolib_printps.o \

        monolib_caret.o \
        monolib_caret.o \

+       monolib_printps.o \

        monolib_dialup.o \
        monolib_dialup.o \

-       monolib_region.o \
-       monolib_pen.o \
-       monolib_brush.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_taskbarx11.o \
+       monolib_utilsx11.o \

        monolib_bitmap.o \
        monolib_bitmap.o \

+       monolib_brush.o \
+       monolib_pen.o \
+       monolib_region.o \

        monolib_utilsx.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 =  \
        monolib_utilsx.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 =  \

+       monolib_taskbarcmn.o \

        monolib_app.o \
        monolib_bitmap.o \
        monolib_brush.o \
        monolib_app.o \
        monolib_bitmap.o \
        monolib_brush.o \


@@ -5213,38 +5214,36 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 =  \
        monolib_icon.o \
        monolib_joystick.o \
        monolib_minifram.o \
        monolib_icon.o \
        monolib_joystick.o \
        monolib_minifram.o \

+       monolib_automtn.o \
+       monolib_dataobj.o \
+       monolib_dropsrc.o \
+       monolib_droptgt.o \
+       monolib_oleutils.o \
+       monolib_uuid.o \

        monolib_palette.o \
        monolib_pen.o \
        monolib_popupwin.o \
        monolib_region.o \
        monolib_settings.o \
        monolib_palette.o \
        monolib_pen.o \
        monolib_popupwin.o \
        monolib_region.o \
        monolib_settings.o \

-       monolib_taskbarcmn.o \

        monolib_taskbar.o \
        monolib_timer.o \
        monolib_tooltip.o \
        monolib_toplevel.o \
        monolib_utilsgui.o \
        monolib_wave.o \
        monolib_taskbar.o \
        monolib_timer.o \
        monolib_tooltip.o \
        monolib_toplevel.o \
        monolib_utilsgui.o \
        monolib_wave.o \

-       monolib_window.o \
-       monolib_automtn.o \
-       monolib_dataobj.o \
-       monolib_dropsrc.o \
-       monolib_droptgt.o \
-       monolib_oleutils.o \
-       monolib_uuid.o
+       monolib_window.o

 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9)
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_9 = 
 COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 =  \
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9)
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_9 = 
 COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 =  \

-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \

        monolib_taskbarcmn.o \
        monolib_taskbarcmn.o \

-       monolib_taskbarx11.o \
-       monolib_printps.o \

        monolib_caret.o \
        monolib_caret.o \

+       monolib_printps.o \

        monolib_dialup.o \
        monolib_dialup.o \

-       monolib_gsockx11.o \
-       monolib_nanox.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_taskbarx11.o \
+       monolib_utilsx11.o \
+       monolib_timer.o \

        monolib_app.o \
        monolib_bitmap.o \
        monolib_brush.o \
        monolib_app.o \
        monolib_bitmap.o \
        monolib_brush.o \


@@ -5260,10 +5259,12 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 =  \
        monolib_evtloop.o \
        monolib_font.o \
        monolib_gdiobj.o \
        monolib_evtloop.o \
        monolib_font.o \
        monolib_gdiobj.o \

+       monolib_gsockx11.o \

        monolib_icon.o \
        monolib_joystick.o \
        monolib_main.o \
        monolib_minifram.o \
        monolib_icon.o \
        monolib_joystick.o \
        monolib_main.o \
        monolib_minifram.o \

+       monolib_nanox.o \

        monolib_palette.o \
        monolib_pen.o \
        monolib_popupwin.o \
        monolib_palette.o \
        monolib_pen.o \
        monolib_popupwin.o \


@@ -5273,57 +5274,56 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 =  \
        monolib_toplevel.o \
        monolib_utils.o \
        monolib_utilsx.o \
        monolib_toplevel.o \
        monolib_utils.o \
        monolib_utilsx.o \

-       monolib_window.o \
-       monolib_timer.o
+       monolib_window.o

 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9)
 COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
        $(__CORE_SRC_OBJECTS) \
        $(__HTML_SRC_PLATFORM_OBJECTS) \
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9)
 COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
        $(__CORE_SRC_OBJECTS) \
        $(__HTML_SRC_PLATFORM_OBJECTS) \

+       monodll_helpctrl.o \

        monodll_helpdata.o \
        monodll_helpfrm.o \
        monodll_helpdata.o \
        monodll_helpfrm.o \

-       monodll_helpctrl.o \

        monodll_htmlcell.o \
        monodll_htmlfilt.o \
        monodll_htmlpars.o \
        monodll_htmltag.o \
        monodll_htmlwin.o \
        monodll_htmlcell.o \
        monodll_htmlfilt.o \
        monodll_htmlpars.o \
        monodll_htmltag.o \
        monodll_htmlwin.o \

-       monodll_winpars.o \
+       monodll_htmprint.o \
+       monodll_m_dflist.o \

        monodll_m_fonts.o \
        monodll_m_hline.o \
        monodll_m_image.o \
        monodll_m_layout.o \
        monodll_m_links.o \
        monodll_m_list.o \
        monodll_m_fonts.o \
        monodll_m_hline.o \
        monodll_m_image.o \
        monodll_m_layout.o \
        monodll_m_links.o \
        monodll_m_list.o \

-       monodll_m_dflist.o \

        monodll_m_pre.o \
        monodll_m_pre.o \

-       monodll_m_tables.o \

        monodll_m_style.o \
        monodll_m_style.o \

-       monodll_htmprint.o \
+       monodll_m_tables.o \
+       monodll_winpars.o \

        monodll_htmllbox.o
 @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS)
 COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
        $(__CORE_SRC_OBJECTS_1) \
        $(__HTML_SRC_PLATFORM_OBJECTS_1) \
        monodll_htmllbox.o
 @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS)
 COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
        $(__CORE_SRC_OBJECTS_1) \
        $(__HTML_SRC_PLATFORM_OBJECTS_1) \

+       monolib_helpctrl.o \

        monolib_helpdata.o \
        monolib_helpfrm.o \
        monolib_helpdata.o \
        monolib_helpfrm.o \

-       monolib_helpctrl.o \

        monolib_htmlcell.o \
        monolib_htmlfilt.o \
        monolib_htmlpars.o \
        monolib_htmltag.o \
        monolib_htmlwin.o \
        monolib_htmlcell.o \
        monolib_htmlfilt.o \
        monolib_htmlpars.o \
        monolib_htmltag.o \
        monolib_htmlwin.o \

-       monolib_winpars.o \
+       monolib_htmprint.o \
+       monolib_m_dflist.o \

        monolib_m_fonts.o \
        monolib_m_hline.o \
        monolib_m_image.o \
        monolib_m_layout.o \
        monolib_m_links.o \
        monolib_m_list.o \
        monolib_m_fonts.o \
        monolib_m_hline.o \
        monolib_m_image.o \
        monolib_m_layout.o \
        monolib_m_links.o \
        monolib_m_list.o \

-       monolib_m_dflist.o \

        monolib_m_pre.o \
        monolib_m_pre.o \

-       monolib_m_tables.o \

        monolib_m_style.o \
        monolib_m_style.o \

-       monolib_htmprint.o \
+       monolib_m_tables.o \
+       monolib_winpars.o \

        monolib_htmllbox.o
 @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1)
 @COND_TOOLKIT_COCOA@__NET_MACOSX_SRC_OBJECTS = monodll_gsocket.o
        monolib_htmllbox.o
 @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1)
 @COND_TOOLKIT_COCOA@__NET_MACOSX_SRC_OBJECTS = monodll_gsocket.o


@@ -10824,7 +10824,7 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in
        $(INSTALL_DIR) $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
        (cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
        $(INSTALL_DIR) $(includedir)
        $(INSTALL_DIR) $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
        (cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
        $(INSTALL_DIR) $(includedir)

-       for f in wx/apptrait.h wx/beforestd.h wx/containr.h wx/msgout.h wx/types.h wx/init.h wx/arrimpl.cpp wx/listimpl.cpp wx/app.h wx/buffer.h wx/build.h wx/chkconf.h wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h wx/datetime.h wx/datetime.inl wx/datstrm.h wx/db.h wx/dbkeyg.h wx/dbtable.h wx/dde.h wx/debug.h wx/defs.h wx/dir.h wx/dynarray.h wx/arrstr.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h wx/features.h wx/ffile.h wx/file.h wx/fileconf.h wx/filefn.h wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h wx/fs_zip.h wx/fs_mem.h wx/hash.h wx/hashmap.h wx/iconloc.h wx/intl.h wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h wx/list.h wx/log.h wx/longlong.h wx/math.h wx/memory.h wx/memconf.h wx/memtext.h wx/mimetype.h wx/module.h wx/msgout.h wx/mstream.h wx/object.h wx/platform.h wx/process.h wx/regex.h wx/snglinst.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/tokenzr.h wx/txtstrm.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h wx/wfstream.h wx/wx.h wx/wxchar.h wx/wxprec.h wx/zipstrm.h wx/zstream.h $(BASE_PLATFORM_HDR) wx/fs_inet.h wx/url.h wx/protocol/protocol.h wx/protocol/http.h wx/protocol/ftp.h wx/protocol/file.h wx/gsocket.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h $(NET_PLATFORM_HDR) $(ALL_GUI_HEADERS) wx/wxhtml.h wx/html/forcelnk.h wx/html/helpctrl.h wx/html/helpdata.h wx/html/helpfrm.h wx/html/htmlcell.h wx/html/htmldefs.h wx/html/htmlfilt.h wx/html/htmlpars.h wx/html/htmlproc.h wx/html/htmltag.h wx/html/htmlwin.h wx/html/htmprint.h wx/html/m_templ.h wx/html/winpars.h wx/htmllbox.h wx/xml/xml.h $(OPENGL_HDR); do \
+       for f in wx/app.h wx/apptrait.h wx/arrimpl.cpp wx/arrstr.h wx/beforestd.h wx/buffer.h wx/build.h wx/chkconf.h wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h wx/containr.h wx/datetime.h wx/datetime.inl wx/datstrm.h wx/db.h wx/dbkeyg.h wx/dbtable.h wx/dde.h wx/debug.h wx/defs.h wx/dir.h wx/dynarray.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h wx/features.h wx/ffile.h wx/file.h wx/fileconf.h wx/filefn.h wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h wx/fs_mem.h wx/fs_zip.h wx/hash.h wx/hashmap.h wx/iconloc.h wx/init.h wx/intl.h wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h wx/list.h wx/listimpl.cpp wx/log.h wx/longlong.h wx/math.h wx/memconf.h wx/memory.h wx/memtext.h wx/mimetype.h wx/module.h wx/msgout.h wx/msgout.h wx/mstream.h wx/object.h wx/platform.h wx/process.h wx/regex.h wx/snglinst.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/tokenzr.h wx/txtstrm.h wx/types.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h wx/wfstream.h wx/wx.h wx/wxchar.h wx/wxprec.h wx/zipstrm.h wx/zstream.h $(BASE_PLATFORM_HDR) wx/fs_inet.h wx/gsocket.h wx/protocol/file.h wx/protocol/ftp.h wx/protocol/http.h wx/protocol/protocol.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h wx/url.h $(NET_PLATFORM_HDR) $(ALL_GUI_HEADERS) wx/html/forcelnk.h wx/html/helpctrl.h wx/html/helpdata.h wx/html/helpfrm.h wx/html/htmlcell.h wx/html/htmldefs.h wx/html/htmlfilt.h wx/html/htmlpars.h wx/html/htmlproc.h wx/html/htmltag.h wx/html/htmlwin.h wx/html/htmprint.h wx/html/m_templ.h wx/html/winpars.h wx/wxhtml.h wx/htmllbox.h wx/xml/xml.h $(OPENGL_HDR); do \

        if test ! -d $(includedir)/`dirname $$f` ; then \
        $(INSTALL_DIR) $(includedir)/`dirname $$f`; \
        fi; \
        if test ! -d $(includedir)/`dirname $$f` ; then \
        $(INSTALL_DIR) $(includedir)/`dirname $$f`; \
        fi; \

diff --git a/build/config.bcc b/build/config.bcc
index 22c077da26c6a3520899ae809a3f80b1ea88b27b..eea0dddb9a529ef7a3703164ab54d106156448ec 100644 (file)
--- a/build/config.bcc
+++ b/build/config.bcc
@@ -13,75 +13,106 @@
 !ifndef BUILD
 BUILD = release
 !endif
 !ifndef BUILD
 BUILD = release
 !endif

+

 # C compiler 
 !ifndef CC
 CC = bcc32
 !endif
 # C compiler 
 !ifndef CC
 CC = bcc32
 !endif

+

 # Name of your custom configuration. This affects directory
 # Name of your custom configuration. This affects directory

-#            where object files are stored as well as the location of
-#            compiled .lib files and setup.h under the lib/ toplevel directory. 
+# where object files are stored as well as the location of
+# compiled .lib files and setup.h under the lib/ toplevel directory. 

 !ifndef CFG
 CFG = 
 !endif
 !ifndef CFG
 CFG = 
 !endif

+

 # Standard flags for CC 
 !ifndef CFLAGS
 CFLAGS = 
 !endif
 # Standard flags for CC 
 !ifndef CFLAGS
 CFLAGS = 
 !endif

+

 # Standard preprocessor flags (common for CC and CXX) 
 !ifndef CPPFLAGS
 CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include
 !endif
 # Standard preprocessor flags (common for CC and CXX) 
 !ifndef CPPFLAGS
 CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include
 !endif

+

 # C++ compiler 
 !ifndef CXX
 CXX = bcc32
 !endif
 # C++ compiler 
 !ifndef CXX
 CXX = bcc32
 !endif

+

 # Standard flags for C++ 
 !ifndef CXXFLAGS
 CXXFLAGS = 
 !endif
 # Standard flags for C++ 
 !ifndef CXXFLAGS
 CXXFLAGS = 
 !endif

+
+# Should __WXDEBUG__ be defined? The default value "default" means that it will
+# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
+!ifndef DEBUG_FLAG
+DEBUG_FLAG = default
+!endif
+
+# Should debugging info be included in the executables? The default value
+# "default" means that debug info will be included if BUILD=debug
+# and not included if BUILD=release. [0,1,default]
+!ifndef DEBUG_INFO
+DEBUG_INFO = default
+!endif
+

 # Standard linker flags 
 !ifndef LDFLAGS
 LDFLAGS = -L$(BCCDIR)\lib
 !endif
 # Standard linker flags 
 !ifndef LDFLAGS
 LDFLAGS = -L$(BCCDIR)\lib
 !endif

+

 # Multiple libraries or single huge monolithic one? [0,1]
 !ifndef MONOLITHIC
 MONOLITHIC = 1
 !endif
 # Multiple libraries or single huge monolithic one? [0,1]
 !ifndef MONOLITHIC
 MONOLITHIC = 1
 !endif

+

 # Is this official build by wxWindows developers? [0,1]
 !ifndef OFFICIAL_BUILD
 OFFICIAL_BUILD = 0
 !endif
 # Is this official build by wxWindows developers? [0,1]
 !ifndef OFFICIAL_BUILD
 OFFICIAL_BUILD = 0
 !endif

+

 # Version of C runtime library to use. You can change this to
 # Version of C runtime library to use. You can change this to

-#                static if SHARED=0, but it is highly recommended to not do
-#                it if SHARED=1 unless you know what you are doing. [dynamic,static]
+# static if SHARED=0, but it is highly recommended to not do
+# it if SHARED=1 unless you know what you are doing. [dynamic,static]

 !ifndef RUNTIME_LIBS
 RUNTIME_LIBS = dynamic
 !endif
 !ifndef RUNTIME_LIBS
 RUNTIME_LIBS = dynamic
 !endif

+

 # What type of library to build? [0,1]
 !ifndef SHARED
 SHARED = 1
 !endif
 # What type of library to build? [0,1]
 !ifndef SHARED
 SHARED = 1
 !endif

+

 # Compile Unicode build of wxWindows? [0,1]
 !ifndef UNICODE
 UNICODE = 0
 !endif
 # Compile Unicode build of wxWindows? [0,1]
 !ifndef UNICODE
 UNICODE = 0
 !endif

+

 # Build GUI libraries? [0,1]
 !ifndef USE_GUI
 USE_GUI = 1
 !endif
 # Build GUI libraries? [0,1]
 !ifndef USE_GUI
 USE_GUI = 1
 !endif

+

 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 !ifndef USE_HTML
 USE_HTML = 1
 !endif
 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 !ifndef USE_HTML
 USE_HTML = 1
 !endif

+

 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 !ifndef USE_OPENGL
 USE_OPENGL = 0
 !endif
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 !ifndef USE_OPENGL
 USE_OPENGL = 0
 !endif

+

 # Use this to name your customized DLLs differently 
 !ifndef VENDOR
 VENDOR = custom
 !endif
 # Use this to name your customized DLLs differently 
 !ifndef VENDOR
 VENDOR = custom
 !endif

+

 # Build wxUniversal instead of native port? [0,1]
 !ifndef WXUNIV
 WXUNIV = 0
 !endif
 # Build wxUniversal instead of native port? [0,1]
 !ifndef WXUNIV
 WXUNIV = 0
 !endif

+

diff --git a/build/config.gcc b/build/config.gcc
index 03d6ae3e323bf14ea067019049158fb3c9eadf2a..47ded375d007cc7dc185506efaddde8902b3081e 100644 (file)
--- a/build/config.gcc
+++ b/build/config.gcc
@@ -11,41 +11,68 @@
 
 # Type of compiled binaries [debug,release]
 BUILD = release
 
 # Type of compiled binaries [debug,release]
 BUILD = release

+

 # C compiler 
 CC = gcc
 # C compiler 
 CC = gcc

+

 # Name of your custom configuration. This affects directory
 # Name of your custom configuration. This affects directory

-#            where object files are stored as well as the location of
-#            compiled .lib files and setup.h under the lib/ toplevel directory. 
+# where object files are stored as well as the location of
+# compiled .lib files and setup.h under the lib/ toplevel directory. 

 CFG = 
 CFG = 

+

 # Standard flags for CC 
 CFLAGS = 
 # Standard flags for CC 
 CFLAGS = 

+

 # Standard preprocessor flags (common for CC and CXX) 
 CPPFLAGS = 
 # Standard preprocessor flags (common for CC and CXX) 
 CPPFLAGS = 

+

 # C++ compiler 
 CXX = g++
 # C++ compiler 
 CXX = g++

+

 # Standard flags for C++ 
 CXXFLAGS = 
 # Standard flags for C++ 
 CXXFLAGS = 

+
+# Should __WXDEBUG__ be defined? The default value "default" means that it will
+# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
+DEBUG_FLAG = default
+
+# Should debugging info be included in the executables? The default value
+# "default" means that debug info will be included if BUILD=debug
+# and not included if BUILD=release. [0,1,default]
+DEBUG_INFO = default
+

 # Set the version of your Mingw installation here.
 # Set the version of your Mingw installation here.

-#                "3" ...... this is for Mingw 2.0 or newer that cames with gcc3
-#                "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95]
+#     "3" ...... this is for Mingw 2.0 or newer (comes with gcc3)
+#     "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95]

 GCC_VERSION = 3
 GCC_VERSION = 3

+

 # Standard linker flags 
 LDFLAGS = 
 # Standard linker flags 
 LDFLAGS = 

+

 # Multiple libraries or single huge monolithic one? [0,1]
 MONOLITHIC = 1
 # Multiple libraries or single huge monolithic one? [0,1]
 MONOLITHIC = 1

+

 # Is this official build by wxWindows developers? [0,1]
 OFFICIAL_BUILD = 0
 # Is this official build by wxWindows developers? [0,1]
 OFFICIAL_BUILD = 0

+

 # What type of library to build? [0,1]
 SHARED = 1
 # What type of library to build? [0,1]
 SHARED = 1

+

 # Compile Unicode build of wxWindows? [0,1]
 UNICODE = 0
 # Compile Unicode build of wxWindows? [0,1]
 UNICODE = 0

+

 # Build GUI libraries? [0,1]
 USE_GUI = 1
 # Build GUI libraries? [0,1]
 USE_GUI = 1

+

 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 USE_HTML = 1
 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 USE_HTML = 1

+

 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0

+

 # Use this to name your customized DLLs differently 
 VENDOR = custom
 # Use this to name your customized DLLs differently 
 VENDOR = custom

+

 # Build wxUniversal instead of native port? [0,1]
 WXUNIV = 0
 # Build wxUniversal instead of native port? [0,1]
 WXUNIV = 0

+

diff --git a/build/config.vc b/build/config.vc
index d0a9d8825fe7d3e9c20e62d390fa9e6d2611b3b6..39434664406ffaf62f637dccee8040ba037d1f3d 100644 (file)
--- a/build/config.vc
+++ b/build/config.vc
@@ -11,41 +11,72 @@
 
 # Type of compiled binaries [debug,release]
 BUILD = release
 
 # Type of compiled binaries [debug,release]
 BUILD = release

+

 # C compiler 
 CC = cl
 # C compiler 
 CC = cl

+

 # Name of your custom configuration. This affects directory
 # Name of your custom configuration. This affects directory

-#            where object files are stored as well as the location of
-#            compiled .lib files and setup.h under the lib/ toplevel directory. 
+# where object files are stored as well as the location of
+# compiled .lib files and setup.h under the lib/ toplevel directory. 

 CFG = 
 CFG = 

+

 # Standard flags for CC 
 CFLAGS = 
 # Standard flags for CC 
 CFLAGS = 

+

 # Standard preprocessor flags (common for CC and CXX) 
 CPPFLAGS = 
 # Standard preprocessor flags (common for CC and CXX) 
 CPPFLAGS = 

+

 # C++ compiler 
 CXX = cl
 # C++ compiler 
 CXX = cl

+

 # Standard flags for C++ 
 CXXFLAGS = 
 # Standard flags for C++ 
 CXXFLAGS = 

+
+# Should __WXDEBUG__ be defined? The default value "default" means that it will
+# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
+DEBUG_FLAG = default
+
+# Should debugging info be included in the executables? The default value
+# "default" means that debug info will be included if BUILD=debug
+# and not included if BUILD=release. [0,1,default]
+DEBUG_INFO = default
+
+# Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
+# Acts according to DEBUG_INFO by default. [0,1,default]
+DEBUG_RUNTIME_LIBS = default
+

 # Standard linker flags 
 LDFLAGS = 
 # Standard linker flags 
 LDFLAGS = 

+

 # Multiple libraries or single huge monolithic one? [0,1]
 MONOLITHIC = 1
 # Multiple libraries or single huge monolithic one? [0,1]
 MONOLITHIC = 1

+

 # Is this official build by wxWindows developers? [0,1]
 OFFICIAL_BUILD = 0
 # Is this official build by wxWindows developers? [0,1]
 OFFICIAL_BUILD = 0

+

 # Version of C runtime library to use. You can change this to
 # Version of C runtime library to use. You can change this to

-#                static if SHARED=0, but it is highly recommended to not do
-#                it if SHARED=1 unless you know what you are doing. [dynamic,static]
+# static if SHARED=0, but it is highly recommended to not do
+# it if SHARED=1 unless you know what you are doing. [dynamic,static]

 RUNTIME_LIBS = dynamic
 RUNTIME_LIBS = dynamic

+

 # What type of library to build? [0,1]
 SHARED = 1
 # What type of library to build? [0,1]
 SHARED = 1

+

 # Compile Unicode build of wxWindows? [0,1]
 UNICODE = 0
 # Compile Unicode build of wxWindows? [0,1]
 UNICODE = 0

+

 # Build GUI libraries? [0,1]
 USE_GUI = 1
 # Build GUI libraries? [0,1]
 USE_GUI = 1

+

 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 USE_HTML = 1
 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 USE_HTML = 1

+

 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0

+

 # Use this to name your customized DLLs differently 
 VENDOR = custom
 # Use this to name your customized DLLs differently 
 VENDOR = custom

+

 # Build wxUniversal instead of native port? [0,1]
 WXUNIV = 0
 # Build wxUniversal instead of native port? [0,1]
 WXUNIV = 0

+

diff --git a/build/config.wat b/build/config.wat
index 516eee0de51f9ba37737e0bf6d0b7bac368c82ab..be9f82a77f7301ca22fbf9c69417456e274b46d2 100644 (file)
--- a/build/config.wat
+++ b/build/config.wat
@@ -11,41 +11,68 @@
 
 # Type of compiled binaries [debug,release]
 BUILD = release
 
 # Type of compiled binaries [debug,release]
 BUILD = release

+

 # C compiler 
 CC = wcc386
 # C compiler 
 CC = wcc386

+

 # Name of your custom configuration. This affects directory
 # Name of your custom configuration. This affects directory

-#            where object files are stored as well as the location of
-#            compiled .lib files and setup.h under the lib/ toplevel directory. 
+# where object files are stored as well as the location of
+# compiled .lib files and setup.h under the lib/ toplevel directory. 

 CFG = 
 CFG = 

+

 # Standard flags for CC 
 CFLAGS = 
 # Standard flags for CC 
 CFLAGS = 

+

 # Standard preprocessor flags (common for CC and CXX) 
 CPPFLAGS = 
 # Standard preprocessor flags (common for CC and CXX) 
 CPPFLAGS = 

+

 # C++ compiler 
 CXX = wpp386
 # C++ compiler 
 CXX = wpp386

+

 # Standard flags for C++ 
 CXXFLAGS = 
 # Standard flags for C++ 
 CXXFLAGS = 

+
+# Should __WXDEBUG__ be defined? The default value "default" means that it will
+# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
+DEBUG_FLAG = default
+
+# Should debugging info be included in the executables? The default value
+# "default" means that debug info will be included if BUILD=debug
+# and not included if BUILD=release. [0,1,default]
+DEBUG_INFO = default
+

 # Standard linker flags 
 LDFLAGS = 
 # Standard linker flags 
 LDFLAGS = 

+

 # Multiple libraries or single huge monolithic one? [0,1]
 MONOLITHIC = 1
 # Multiple libraries or single huge monolithic one? [0,1]
 MONOLITHIC = 1

+

 # Is this official build by wxWindows developers? [0,1]
 OFFICIAL_BUILD = 0
 # Is this official build by wxWindows developers? [0,1]
 OFFICIAL_BUILD = 0

+

 # Version of C runtime library to use. You can change this to
 # Version of C runtime library to use. You can change this to

-#                static if SHARED=0, but it is highly recommended to not do
-#                it if SHARED=1 unless you know what you are doing. [dynamic,static]
+# static if SHARED=0, but it is highly recommended to not do
+# it if SHARED=1 unless you know what you are doing. [dynamic,static]

 RUNTIME_LIBS = dynamic
 RUNTIME_LIBS = dynamic

+

 # What type of library to build? [0,1]
 SHARED = 1
 # What type of library to build? [0,1]
 SHARED = 1

+

 # Compile Unicode build of wxWindows? [0,1]
 UNICODE = 0
 # Compile Unicode build of wxWindows? [0,1]
 UNICODE = 0

+

 # Build GUI libraries? [0,1]
 USE_GUI = 1
 # Build GUI libraries? [0,1]
 USE_GUI = 1

+

 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 USE_HTML = 1
 # Build wxHTML library (USE_GUI must be 1)? [0,1]
 USE_HTML = 1

+

 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0

+

 # Use this to name your customized DLLs differently 
 VENDOR = custom
 # Use this to name your customized DLLs differently 
 VENDOR = custom

+

 # Build wxUniversal instead of native port? [0,1]
 WXUNIV = 0
 # Build wxUniversal instead of native port? [0,1]
 WXUNIV = 0

+

diff --git a/build/makefile.bcc b/build/makefile.bcc
index 67d3db2a893e4b69468ea8cf1b8a0ad40d6afa8a..2ba3439071d6035a9dd149fd663d1c5492ea5a5c 100644 (file)
--- a/build/makefile.bcc
+++ b/build/makefile.bcc
@@ -20,12 +20,12 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-BASEDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+BASEDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)

-BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -86,6 +86,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_zipstrm.obj \
        $(OBJS)\basedll_zstream.obj \
        $(OBJS)\basedll_basemsw.obj \
        $(OBJS)\basedll_zipstrm.obj \
        $(OBJS)\basedll_zstream.obj \
        $(OBJS)\basedll_basemsw.obj \

+       $(OBJS)\basedll_crashrpt.obj \

        $(OBJS)\basedll_dde.obj \
        $(OBJS)\basedll_dir.obj \
        $(OBJS)\basedll_mimetype.obj \
        $(OBJS)\basedll_dde.obj \
        $(OBJS)\basedll_dir.obj \
        $(OBJS)\basedll_mimetype.obj \


@@ -95,7 +96,6 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_thread.obj \
        $(OBJS)\basedll_utils.obj \
        $(OBJS)\basedll_utilsexc.obj \
        $(OBJS)\basedll_thread.obj \
        $(OBJS)\basedll_utils.obj \
        $(OBJS)\basedll_utilsexc.obj \

-       $(OBJS)\basedll_crashrpt.obj \

        $(OBJS)\basedll_event.obj \
        $(OBJS)\basedll_fs_mem.obj \
        $(OBJS)\basedll_msgout.obj \
        $(OBJS)\basedll_event.obj \
        $(OBJS)\basedll_fs_mem.obj \
        $(OBJS)\basedll_msgout.obj \


@@ -103,12 +103,12 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_main.obj \
        $(OBJS)\basedll_mslu.obj \
        $(OBJS)\basedll_volume.obj
        $(OBJS)\basedll_main.obj \
        $(OBJS)\basedll_mslu.obj \
        $(OBJS)\basedll_volume.obj

-BASELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+BASELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)

-BASELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+BASELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -168,6 +168,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_zipstrm.obj \
        $(OBJS)\baselib_zstream.obj \
        $(OBJS)\baselib_basemsw.obj \
        $(OBJS)\baselib_zipstrm.obj \
        $(OBJS)\baselib_zstream.obj \
        $(OBJS)\baselib_basemsw.obj \

+       $(OBJS)\baselib_crashrpt.obj \

        $(OBJS)\baselib_dde.obj \
        $(OBJS)\baselib_dir.obj \
        $(OBJS)\baselib_mimetype.obj \
        $(OBJS)\baselib_dde.obj \
        $(OBJS)\baselib_dir.obj \
        $(OBJS)\baselib_mimetype.obj \


@@ -177,7 +178,6 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_thread.obj \
        $(OBJS)\baselib_utils.obj \
        $(OBJS)\baselib_utilsexc.obj \
        $(OBJS)\baselib_thread.obj \
        $(OBJS)\baselib_utils.obj \
        $(OBJS)\baselib_utilsexc.obj \

-       $(OBJS)\baselib_crashrpt.obj \

        $(OBJS)\baselib_event.obj \
        $(OBJS)\baselib_fs_mem.obj \
        $(OBJS)\baselib_msgout.obj \
        $(OBJS)\baselib_event.obj \
        $(OBJS)\baselib_fs_mem.obj \
        $(OBJS)\baselib_msgout.obj \


@@ -185,7 +185,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_main.obj \
        $(OBJS)\baselib_mslu.obj \
        $(OBJS)\baselib_volume.obj
        $(OBJS)\baselib_main.obj \
        $(OBJS)\baselib_mslu.obj \
        $(OBJS)\baselib_volume.obj

-COREDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+COREDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -201,7 +201,7 @@ COREDLL_OBJECTS =  \
        $(OBJS)\coredll_mslu.obj \
        $(OBJS)\coredll_volume.obj \
        $(____CORE_SRC_FILENAMES_2_OBJECTS)
        $(OBJS)\coredll_mslu.obj \
        $(OBJS)\coredll_volume.obj \
        $(____CORE_SRC_FILENAMES_2_OBJECTS)

-CORELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+CORELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -216,7 +216,7 @@ CORELIB_OBJECTS =  \
        $(OBJS)\corelib_mslu.obj \
        $(OBJS)\corelib_volume.obj \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)
        $(OBJS)\corelib_mslu.obj \
        $(OBJS)\corelib_volume.obj \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)

-GLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+GLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -224,7 +224,7 @@ GLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG)
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \
        $(OBJS)\gldll_glcanvas.obj
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \
        $(OBJS)\gldll_glcanvas.obj

-GLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+GLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -232,7 +232,7 @@ GLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG)
 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.obj \
        $(OBJS)\gllib_glcanvas.obj
 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.obj \
        $(OBJS)\gllib_glcanvas.obj

-HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -241,28 +241,28 @@ HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.obj \
        $(OBJS)\htmldll_helpbest.obj \
 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.obj \
        $(OBJS)\htmldll_helpbest.obj \

+       $(OBJS)\htmldll_helpctrl.obj \

        $(OBJS)\htmldll_helpdata.obj \
        $(OBJS)\htmldll_helpfrm.obj \
        $(OBJS)\htmldll_helpdata.obj \
        $(OBJS)\htmldll_helpfrm.obj \

-       $(OBJS)\htmldll_helpctrl.obj \

        $(OBJS)\htmldll_htmlcell.obj \
        $(OBJS)\htmldll_htmlfilt.obj \
        $(OBJS)\htmldll_htmlpars.obj \
        $(OBJS)\htmldll_htmltag.obj \
        $(OBJS)\htmldll_htmlwin.obj \
        $(OBJS)\htmldll_htmlcell.obj \
        $(OBJS)\htmldll_htmlfilt.obj \
        $(OBJS)\htmldll_htmlpars.obj \
        $(OBJS)\htmldll_htmltag.obj \
        $(OBJS)\htmldll_htmlwin.obj \

-       $(OBJS)\htmldll_winpars.obj \
+       $(OBJS)\htmldll_htmprint.obj \
+       $(OBJS)\htmldll_m_dflist.obj \

        $(OBJS)\htmldll_m_fonts.obj \
        $(OBJS)\htmldll_m_hline.obj \
        $(OBJS)\htmldll_m_image.obj \
        $(OBJS)\htmldll_m_layout.obj \
        $(OBJS)\htmldll_m_links.obj \
        $(OBJS)\htmldll_m_list.obj \
        $(OBJS)\htmldll_m_fonts.obj \
        $(OBJS)\htmldll_m_hline.obj \
        $(OBJS)\htmldll_m_image.obj \
        $(OBJS)\htmldll_m_layout.obj \
        $(OBJS)\htmldll_m_links.obj \
        $(OBJS)\htmldll_m_list.obj \

-       $(OBJS)\htmldll_m_dflist.obj \

        $(OBJS)\htmldll_m_pre.obj \
        $(OBJS)\htmldll_m_pre.obj \

-       $(OBJS)\htmldll_m_tables.obj \

        $(OBJS)\htmldll_m_style.obj \
        $(OBJS)\htmldll_m_style.obj \

-       $(OBJS)\htmldll_htmprint.obj \
+       $(OBJS)\htmldll_m_tables.obj \
+       $(OBJS)\htmldll_winpars.obj \

        $(OBJS)\htmldll_htmllbox.obj
        $(OBJS)\htmldll_htmllbox.obj

-HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -270,35 +270,35 @@ HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
 HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_dummy.obj \
        $(OBJS)\htmllib_helpbest.obj \
 HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_dummy.obj \
        $(OBJS)\htmllib_helpbest.obj \

+       $(OBJS)\htmllib_helpctrl.obj \

        $(OBJS)\htmllib_helpdata.obj \
        $(OBJS)\htmllib_helpfrm.obj \
        $(OBJS)\htmllib_helpdata.obj \
        $(OBJS)\htmllib_helpfrm.obj \

-       $(OBJS)\htmllib_helpctrl.obj \

        $(OBJS)\htmllib_htmlcell.obj \
        $(OBJS)\htmllib_htmlfilt.obj \
        $(OBJS)\htmllib_htmlpars.obj \
        $(OBJS)\htmllib_htmltag.obj \
        $(OBJS)\htmllib_htmlwin.obj \
        $(OBJS)\htmllib_htmlcell.obj \
        $(OBJS)\htmllib_htmlfilt.obj \
        $(OBJS)\htmllib_htmlpars.obj \
        $(OBJS)\htmllib_htmltag.obj \
        $(OBJS)\htmllib_htmlwin.obj \

-       $(OBJS)\htmllib_winpars.obj \
+       $(OBJS)\htmllib_htmprint.obj \
+       $(OBJS)\htmllib_m_dflist.obj \

        $(OBJS)\htmllib_m_fonts.obj \
        $(OBJS)\htmllib_m_hline.obj \
        $(OBJS)\htmllib_m_image.obj \
        $(OBJS)\htmllib_m_layout.obj \
        $(OBJS)\htmllib_m_links.obj \
        $(OBJS)\htmllib_m_list.obj \
        $(OBJS)\htmllib_m_fonts.obj \
        $(OBJS)\htmllib_m_hline.obj \
        $(OBJS)\htmllib_m_image.obj \
        $(OBJS)\htmllib_m_layout.obj \
        $(OBJS)\htmllib_m_links.obj \
        $(OBJS)\htmllib_m_list.obj \

-       $(OBJS)\htmllib_m_dflist.obj \

        $(OBJS)\htmllib_m_pre.obj \
        $(OBJS)\htmllib_m_pre.obj \

-       $(OBJS)\htmllib_m_tables.obj \

        $(OBJS)\htmllib_m_style.obj \
        $(OBJS)\htmllib_m_style.obj \

-       $(OBJS)\htmllib_htmprint.obj \
+       $(OBJS)\htmllib_m_tables.obj \
+       $(OBJS)\htmllib_winpars.obj \

        $(OBJS)\htmllib_htmllbox.obj
 LIBDIRNAME = \
        ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
        $(OBJS)\htmllib_htmllbox.obj
 LIBDIRNAME = \
        ..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-MONODLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+MONODLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS)
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS)

-MONODLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+MONODLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -358,6 +358,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_zipstrm.obj \
        $(OBJS)\monodll_zstream.obj \
        $(OBJS)\monodll_basemsw.obj \
        $(OBJS)\monodll_zipstrm.obj \
        $(OBJS)\monodll_zstream.obj \
        $(OBJS)\monodll_basemsw.obj \

+       $(OBJS)\monodll_crashrpt.obj \

        $(OBJS)\monodll_dde.obj \
        $(OBJS)\monodll_dir.obj \
        $(OBJS)\monodll_mimetype.obj \
        $(OBJS)\monodll_dde.obj \
        $(OBJS)\monodll_dir.obj \
        $(OBJS)\monodll_mimetype.obj \


@@ -367,7 +368,6 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_thread.obj \
        $(OBJS)\monodll_utils.obj \
        $(OBJS)\monodll_utilsexc.obj \
        $(OBJS)\monodll_thread.obj \
        $(OBJS)\monodll_utils.obj \
        $(OBJS)\monodll_utilsexc.obj \

-       $(OBJS)\monodll_crashrpt.obj \

        $(OBJS)\monodll_event.obj \
        $(OBJS)\monodll_fs_mem.obj \
        $(OBJS)\monodll_msgout.obj \
        $(OBJS)\monodll_event.obj \
        $(OBJS)\monodll_fs_mem.obj \
        $(OBJS)\monodll_msgout.obj \


@@ -379,22 +379,22 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_ftp.obj \
        $(OBJS)\monodll_http.obj \
        $(OBJS)\monodll_protocol.obj \
        $(OBJS)\monodll_ftp.obj \
        $(OBJS)\monodll_http.obj \
        $(OBJS)\monodll_protocol.obj \

-       $(OBJS)\monodll_url.obj \
-       $(OBJS)\monodll_sckfile.obj \

        $(OBJS)\monodll_sckaddr.obj \
        $(OBJS)\monodll_sckaddr.obj \

+       $(OBJS)\monodll_sckfile.obj \

        $(OBJS)\monodll_sckipc.obj \
        $(OBJS)\monodll_sckstrm.obj \
        $(OBJS)\monodll_socket.obj \
        $(OBJS)\monodll_sckipc.obj \
        $(OBJS)\monodll_sckstrm.obj \
        $(OBJS)\monodll_socket.obj \

+       $(OBJS)\monodll_url.obj \

        $(OBJS)\monodll_gsocket.obj \
        $(OBJS)\monodll_gsockmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.obj
        $(OBJS)\monodll_gsocket.obj \
        $(OBJS)\monodll_gsockmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.obj

-MONOLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+MONOLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 $(CFLAGS)
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 $(CFLAGS)

-MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -454,6 +454,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_zipstrm.obj \
        $(OBJS)\monolib_zstream.obj \
        $(OBJS)\monolib_basemsw.obj \
        $(OBJS)\monolib_zipstrm.obj \
        $(OBJS)\monolib_zstream.obj \
        $(OBJS)\monolib_basemsw.obj \

+       $(OBJS)\monolib_crashrpt.obj \

        $(OBJS)\monolib_dde.obj \
        $(OBJS)\monolib_dir.obj \
        $(OBJS)\monolib_mimetype.obj \
        $(OBJS)\monolib_dde.obj \
        $(OBJS)\monolib_dir.obj \
        $(OBJS)\monolib_mimetype.obj \


@@ -463,7 +464,6 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_thread.obj \
        $(OBJS)\monolib_utils.obj \
        $(OBJS)\monolib_utilsexc.obj \
        $(OBJS)\monolib_thread.obj \
        $(OBJS)\monolib_utils.obj \
        $(OBJS)\monolib_utilsexc.obj \

-       $(OBJS)\monolib_crashrpt.obj \

        $(OBJS)\monolib_event.obj \
        $(OBJS)\monolib_fs_mem.obj \
        $(OBJS)\monolib_msgout.obj \
        $(OBJS)\monolib_event.obj \
        $(OBJS)\monolib_fs_mem.obj \
        $(OBJS)\monolib_msgout.obj \


@@ -475,22 +475,22 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_ftp.obj \
        $(OBJS)\monolib_http.obj \
        $(OBJS)\monolib_protocol.obj \
        $(OBJS)\monolib_ftp.obj \
        $(OBJS)\monolib_http.obj \
        $(OBJS)\monolib_protocol.obj \

-       $(OBJS)\monolib_url.obj \
-       $(OBJS)\monolib_sckfile.obj \

        $(OBJS)\monolib_sckaddr.obj \
        $(OBJS)\monolib_sckaddr.obj \

+       $(OBJS)\monolib_sckfile.obj \

        $(OBJS)\monolib_sckipc.obj \
        $(OBJS)\monolib_sckstrm.obj \
        $(OBJS)\monolib_socket.obj \
        $(OBJS)\monolib_sckipc.obj \
        $(OBJS)\monolib_sckstrm.obj \
        $(OBJS)\monolib_socket.obj \

+       $(OBJS)\monolib_url.obj \

        $(OBJS)\monolib_gsocket.obj \
        $(OBJS)\monolib_gsockmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.obj
        $(OBJS)\monolib_gsocket.obj \
        $(OBJS)\monolib_gsockmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.obj

-NETDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+NETDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)

-NETDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+NETDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -501,20 +501,20 @@ NETDLL_OBJECTS =  \
        $(OBJS)\netdll_ftp.obj \
        $(OBJS)\netdll_http.obj \
        $(OBJS)\netdll_protocol.obj \
        $(OBJS)\netdll_ftp.obj \
        $(OBJS)\netdll_http.obj \
        $(OBJS)\netdll_protocol.obj \

-       $(OBJS)\netdll_url.obj \
-       $(OBJS)\netdll_sckfile.obj \

        $(OBJS)\netdll_sckaddr.obj \
        $(OBJS)\netdll_sckaddr.obj \

+       $(OBJS)\netdll_sckfile.obj \

        $(OBJS)\netdll_sckipc.obj \
        $(OBJS)\netdll_sckstrm.obj \
        $(OBJS)\netdll_socket.obj \
        $(OBJS)\netdll_sckipc.obj \
        $(OBJS)\netdll_sckstrm.obj \
        $(OBJS)\netdll_socket.obj \

+       $(OBJS)\netdll_url.obj \

        $(OBJS)\netdll_gsocket.obj \
        $(OBJS)\netdll_gsockmsw.obj
        $(OBJS)\netdll_gsocket.obj \
        $(OBJS)\netdll_gsockmsw.obj

-NETLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+NETLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)

-NETLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+NETLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -525,23 +525,23 @@ NETLIB_OBJECTS =  \
        $(OBJS)\netlib_ftp.obj \
        $(OBJS)\netlib_http.obj \
        $(OBJS)\netlib_protocol.obj \
        $(OBJS)\netlib_ftp.obj \
        $(OBJS)\netlib_http.obj \
        $(OBJS)\netlib_protocol.obj \

-       $(OBJS)\netlib_url.obj \
-       $(OBJS)\netlib_sckfile.obj \

        $(OBJS)\netlib_sckaddr.obj \
        $(OBJS)\netlib_sckaddr.obj \

+       $(OBJS)\netlib_sckfile.obj \

        $(OBJS)\netlib_sckipc.obj \
        $(OBJS)\netlib_sckstrm.obj \
        $(OBJS)\netlib_socket.obj \
        $(OBJS)\netlib_sckipc.obj \
        $(OBJS)\netlib_sckstrm.obj \
        $(OBJS)\netlib_socket.obj \

+       $(OBJS)\netlib_url.obj \

        $(OBJS)\netlib_gsocket.obj \
        $(OBJS)\netlib_gsockmsw.obj
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
        $(OBJS)\netlib_gsocket.obj \
        $(OBJS)\netlib_gsockmsw.obj
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-WXEXPAT_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXEXPAT_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CFLAGS)
 WXEXPAT_OBJECTS =  \
        $(OBJS)\wxexpat_xmlparse.obj \
        $(OBJS)\wxexpat_xmlrole.obj \
        $(OBJS)\wxexpat_xmltok.obj
        -tWM -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CFLAGS)
 WXEXPAT_OBJECTS =  \
        $(OBJS)\wxexpat_xmlparse.obj \
        $(OBJS)\wxexpat_xmlrole.obj \
        $(OBJS)\wxexpat_xmltok.obj

-WXJPEG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXJPEG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM -I$(LIBDIRNAME) $(CFLAGS)
 WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jcomapi.obj \
        -tWM -I$(LIBDIRNAME) $(CFLAGS)
 WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jcomapi.obj \


@@ -590,7 +590,7 @@ WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jquant1.obj \
        $(OBJS)\wxjpeg_jquant2.obj \
        $(OBJS)\wxjpeg_jdmerge.obj
        $(OBJS)\wxjpeg_jquant1.obj \
        $(OBJS)\wxjpeg_jquant2.obj \
        $(OBJS)\wxjpeg_jdmerge.obj

-WXPNG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXPNG_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM -I..\src\zlib $(CFLAGS)
 WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_png.obj \
        -tWM -I..\src\zlib $(CFLAGS)
 WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_png.obj \


@@ -610,14 +610,14 @@ WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_pngwrite.obj \
        $(OBJS)\wxpng_pngwtran.obj \
        $(OBJS)\wxpng_pngwutil.obj
        $(OBJS)\wxpng_pngwrite.obj \
        $(OBJS)\wxpng_pngwtran.obj \
        $(OBJS)\wxpng_pngwutil.obj

-WXREGEX_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXREGEX_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM $(CFLAGS)
 WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regcomp.obj \
        $(OBJS)\wxregex_regexec.obj \
        $(OBJS)\wxregex_regerror.obj \
        $(OBJS)\wxregex_regfree.obj
        -tWM $(CFLAGS)
 WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regcomp.obj \
        $(OBJS)\wxregex_regexec.obj \
        $(OBJS)\wxregex_regerror.obj \
        $(OBJS)\wxregex_regfree.obj

-WXTIFF_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXTIFF_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM $(CFLAGS)
 WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_win32.obj \
        -tWM $(CFLAGS)
 WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_win32.obj \


@@ -653,7 +653,7 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_warning.obj \
        $(OBJS)\wxtiff_tif_write.obj \
        $(OBJS)\wxtiff_tif_zip.obj
        $(OBJS)\wxtiff_tif_warning.obj \
        $(OBJS)\wxtiff_tif_write.obj \
        $(OBJS)\wxtiff_tif_zip.obj

-WXZLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) \
+WXZLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \

        -tWM $(CFLAGS)
 WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_adler32.obj \
        -tWM $(CFLAGS)
 WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_adler32.obj \


@@ -670,7 +670,7 @@ WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_infcodes.obj \
        $(OBJS)\wxzlib_infutil.obj \
        $(OBJS)\wxzlib_inffast.obj
        $(OBJS)\wxzlib_infcodes.obj \
        $(OBJS)\wxzlib_infutil.obj \
        $(OBJS)\wxzlib_inffast.obj

-XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -678,7 +678,7 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \
        $(OBJS)\xmldll_xml.obj
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \
        $(OBJS)\xmldll_xml.obj

-XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
+XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \


@@ -701,7 +701,10 @@ VENDORTAG = _$(VENDOR)
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif

-!if "$(BUILD)" == "debug"
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_FLAG)" == "1"

 WXDEBUGFLAG = d
 !endif
 !if "$(SHARED)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(SHARED)" == "1"


@@ -713,13 +716,22 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG = -v
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG = -v-
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-

 !endif
 !endif

-!if "$(BUILD)" == "debug"
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"

 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif
 !if "$(USE_GUI)" == "1"
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif
 !if "$(USE_GUI)" == "1"


@@ -768,6 +780,7 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \

+       $(OBJS)\monolib_taskbarcmn.obj \

        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \
        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \


@@ -797,12 +810,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_joystick.obj \
        $(OBJS)\monolib_minifram.obj \
        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_joystick.obj \
        $(OBJS)\monolib_minifram.obj \

+       $(OBJS)\monolib_automtn.obj \
+       $(OBJS)\monolib_dataobj.obj \
+       $(OBJS)\monolib_dropsrc.obj \
+       $(OBJS)\monolib_droptgt.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_uuid.obj \

        $(OBJS)\monolib_palette.obj \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_settings.obj \
        $(OBJS)\monolib_palette.obj \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_settings.obj \

-       $(OBJS)\monolib_taskbarcmn.obj \

        $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_tooltip.obj \
        $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_tooltip.obj \


@@ -810,15 +828,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_utilsgui.obj \
        $(OBJS)\monolib_wave.obj \
        $(OBJS)\monolib_window.obj \
        $(OBJS)\monolib_utilsgui.obj \
        $(OBJS)\monolib_wave.obj \
        $(OBJS)\monolib_window.obj \

-       $(OBJS)\monolib_automtn.obj \
-       $(OBJS)\monolib_dataobj.obj \
-       $(OBJS)\monolib_dropsrc.obj \
-       $(OBJS)\monolib_droptgt.obj \
-       $(OBJS)\monolib_oleutils.obj \
-       $(OBJS)\monolib_uuid.obj \

        $(OBJS)\monolib_statusbr.obj \
        $(OBJS)\monolib_statusbr.obj \

-       $(OBJS)\monolib_uxtheme.obj \
-       $(OBJS)\monolib_access.obj \

        $(OBJS)\monolib_accel.obj \
        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \
        $(OBJS)\monolib_accel.obj \
        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \


@@ -846,6 +856,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_msgdlg.obj \
        $(OBJS)\monolib_nativdlg.obj \
        $(OBJS)\monolib_notebook.obj \
        $(OBJS)\monolib_msgdlg.obj \
        $(OBJS)\monolib_nativdlg.obj \
        $(OBJS)\monolib_notebook.obj \

+       $(OBJS)\monolib_access.obj \

        $(OBJS)\monolib_ownerdrw.obj \
        $(OBJS)\monolib_penwin.obj \
        $(OBJS)\monolib_printdlg.obj \
        $(OBJS)\monolib_ownerdrw.obj \
        $(OBJS)\monolib_penwin.obj \
        $(OBJS)\monolib_printdlg.obj \


@@ -867,40 +878,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_textctrl.obj \
        $(OBJS)\monolib_tglbtn.obj \
        $(OBJS)\monolib_treectrl.obj \
        $(OBJS)\monolib_textctrl.obj \
        $(OBJS)\monolib_tglbtn.obj \
        $(OBJS)\monolib_treectrl.obj \

-       $(OBJS)\monolib_busyinfo.obj \
-       $(OBJS)\monolib_calctrl.obj \
-       $(OBJS)\monolib_choicdgg.obj \
-       $(OBJS)\monolib_dcbuffer.obj \
-       $(OBJS)\monolib_dcpsg.obj \
-       $(OBJS)\monolib_dirctrlg.obj \
-       $(OBJS)\monolib_dragimgg.obj \
-       $(OBJS)\monolib_grid.obj \
-       $(OBJS)\monolib_gridctrl.obj \
-       $(OBJS)\monolib_gridsel.obj \
-       $(OBJS)\monolib_helpext.obj \
-       $(OBJS)\monolib_laywin.obj \
-       $(OBJS)\monolib_logg.obj \
-       $(OBJS)\monolib_numdlgg.obj \
-       $(OBJS)\monolib_panelg.obj \
-       $(OBJS)\monolib_progdlgg.obj \
-       $(OBJS)\monolib_renderg.obj \
-       $(OBJS)\monolib_sashwin.obj \
-       $(OBJS)\monolib_scrlwing.obj \
-       $(OBJS)\monolib_selstore.obj \
-       $(OBJS)\monolib_spinctlg.obj \
-       $(OBJS)\monolib_splash.obj \
-       $(OBJS)\monolib_splitter.obj \
-       $(OBJS)\monolib_tbarsmpl.obj \
-       $(OBJS)\monolib_textdlgg.obj \
-       $(OBJS)\monolib_tipdlg.obj \
-       $(OBJS)\monolib_tipwin.obj \
-       $(OBJS)\monolib_treectlg.obj \
-       $(OBJS)\monolib_vlbox.obj \
-       $(OBJS)\monolib_vscroll.obj \
-       $(OBJS)\monolib_wizard.obj \
-       $(OBJS)\monolib_appcmn.obj \
-       $(OBJS)\monolib_fontmap.obj \
+       $(OBJS)\monolib_uxtheme.obj \

        $(OBJS)\monolib_accesscmn.obj \
        $(OBJS)\monolib_accesscmn.obj \

+       $(OBJS)\monolib_appcmn.obj \

        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \
        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \


@@ -926,9 +906,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \

+       $(OBJS)\monolib_fontmap.obj \

        $(OBJS)\monolib_framecmn.obj \
        $(OBJS)\monolib_framecmn.obj \

-       $(OBJS)\monolib_timercmn.obj \
-       $(OBJS)\monolib_toplvcmn.obj \

        $(OBJS)\monolib_gaugecmn.obj \
        $(OBJS)\monolib_gdicmn.obj \
        $(OBJS)\monolib_geometry.obj \
        $(OBJS)\monolib_gaugecmn.obj \
        $(OBJS)\monolib_gdicmn.obj \
        $(OBJS)\monolib_geometry.obj \


@@ -938,6 +917,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagall.obj \
        $(OBJS)\monolib_imagbmp.obj \
        $(OBJS)\monolib_image.obj \
        $(OBJS)\monolib_imagall.obj \
        $(OBJS)\monolib_imagbmp.obj \
        $(OBJS)\monolib_image.obj \

+       $(OBJS)\monolib_imagfill.obj \

        $(OBJS)\monolib_imaggif.obj \
        $(OBJS)\monolib_imagiff.obj \
        $(OBJS)\monolib_imagjpeg.obj \
        $(OBJS)\monolib_imaggif.obj \
        $(OBJS)\monolib_imagiff.obj \
        $(OBJS)\monolib_imagjpeg.obj \


@@ -946,7 +926,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagpnm.obj \
        $(OBJS)\monolib_imagtiff.obj \
        $(OBJS)\monolib_imagxpm.obj \
        $(OBJS)\monolib_imagpnm.obj \
        $(OBJS)\monolib_imagtiff.obj \
        $(OBJS)\monolib_imagxpm.obj \

-       $(OBJS)\monolib_imagfill.obj \

        $(OBJS)\monolib_layout.obj \
        $(OBJS)\monolib_lboxcmn.obj \
        $(OBJS)\monolib_matrix.obj \
        $(OBJS)\monolib_layout.obj \
        $(OBJS)\monolib_lboxcmn.obj \
        $(OBJS)\monolib_matrix.obj \


@@ -964,15 +943,49 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_statbar.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \
        $(OBJS)\monolib_statbar.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \

+       $(OBJS)\monolib_timercmn.obj \
+       $(OBJS)\monolib_toplvcmn.obj \

        $(OBJS)\monolib_treebase.obj \
        $(OBJS)\monolib_valgen.obj \
        $(OBJS)\monolib_validate.obj \
        $(OBJS)\monolib_valtext.obj \
        $(OBJS)\monolib_wincmn.obj \
        $(OBJS)\monolib_treebase.obj \
        $(OBJS)\monolib_valgen.obj \
        $(OBJS)\monolib_validate.obj \
        $(OBJS)\monolib_valtext.obj \
        $(OBJS)\monolib_wincmn.obj \

-       $(OBJS)\monolib_xpmdecod.obj
+       $(OBJS)\monolib_xpmdecod.obj \
+       $(OBJS)\monolib_busyinfo.obj \
+       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_choicdgg.obj \
+       $(OBJS)\monolib_dcbuffer.obj \
+       $(OBJS)\monolib_dcpsg.obj \
+       $(OBJS)\monolib_dirctrlg.obj \
+       $(OBJS)\monolib_dragimgg.obj \
+       $(OBJS)\monolib_grid.obj \
+       $(OBJS)\monolib_gridctrl.obj \
+       $(OBJS)\monolib_gridsel.obj \
+       $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_logg.obj \
+       $(OBJS)\monolib_numdlgg.obj \
+       $(OBJS)\monolib_panelg.obj \
+       $(OBJS)\monolib_progdlgg.obj \
+       $(OBJS)\monolib_renderg.obj \
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_scrlwing.obj \
+       $(OBJS)\monolib_selstore.obj \
+       $(OBJS)\monolib_spinctlg.obj \
+       $(OBJS)\monolib_splash.obj \
+       $(OBJS)\monolib_splitter.obj \
+       $(OBJS)\monolib_tbarsmpl.obj \
+       $(OBJS)\monolib_textdlgg.obj \
+       $(OBJS)\monolib_tipdlg.obj \
+       $(OBJS)\monolib_tipwin.obj \
+       $(OBJS)\monolib_treectlg.obj \
+       $(OBJS)\monolib_vlbox.obj \
+       $(OBJS)\monolib_vscroll.obj \
+       $(OBJS)\monolib_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \

+       $(OBJS)\monolib_taskbarcmn.obj \

        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \
        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \


@@ -1002,12 +1015,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_joystick.obj \
        $(OBJS)\monolib_minifram.obj \
        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_joystick.obj \
        $(OBJS)\monolib_minifram.obj \

+       $(OBJS)\monolib_automtn.obj \
+       $(OBJS)\monolib_dataobj.obj \
+       $(OBJS)\monolib_dropsrc.obj \
+       $(OBJS)\monolib_droptgt.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_uuid.obj \

        $(OBJS)\monolib_palette.obj \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_settings.obj \
        $(OBJS)\monolib_palette.obj \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_settings.obj \

-       $(OBJS)\monolib_taskbarcmn.obj \

        $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_tooltip.obj \
        $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_tooltip.obj \


@@ -1015,13 +1033,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_utilsgui.obj \
        $(OBJS)\monolib_wave.obj \
        $(OBJS)\monolib_window.obj \
        $(OBJS)\monolib_utilsgui.obj \
        $(OBJS)\monolib_wave.obj \
        $(OBJS)\monolib_window.obj \

-       $(OBJS)\monolib_automtn.obj \
-       $(OBJS)\monolib_dataobj.obj \
-       $(OBJS)\monolib_dropsrc.obj \
-       $(OBJS)\monolib_droptgt.obj \
-       $(OBJS)\monolib_oleutils.obj \
-       $(OBJS)\monolib_uuid.obj \

        $(OBJS)\monolib_textctrl.obj \
        $(OBJS)\monolib_textctrl.obj \

+       $(OBJS)\monolib_accel.obj \
+       $(OBJS)\monolib_colrdlgg.obj \
+       $(OBJS)\monolib_dirdlgg.obj \
+       $(OBJS)\monolib_fdrepdlg.obj \
+       $(OBJS)\monolib_filedlgg.obj \
+       $(OBJS)\monolib_fontdlgg.obj \
+       $(OBJS)\monolib_imaglist.obj \
+       $(OBJS)\monolib_listctrl.obj \
+       $(OBJS)\monolib_mdig.obj \
+       $(OBJS)\monolib_msgdlgg.obj \
+       $(OBJS)\monolib_prntdlgg.obj \
+       $(OBJS)\monolib_tabg.obj \

        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \
        $(OBJS)\monolib_checkbox.obj \
        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \
        $(OBJS)\monolib_checkbox.obj \


@@ -1032,7 +1056,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_control.obj \
        $(OBJS)\monolib_dialog.obj \
        $(OBJS)\monolib_framuniv.obj \
        $(OBJS)\monolib_control.obj \
        $(OBJS)\monolib_dialog.obj \
        $(OBJS)\monolib_framuniv.obj \

-       $(OBJS)\monolib_topluniv.obj \

        $(OBJS)\monolib_gauge.obj \
        $(OBJS)\monolib_inpcons.obj \
        $(OBJS)\monolib_inphand.obj \
        $(OBJS)\monolib_gauge.obj \
        $(OBJS)\monolib_inpcons.obj \
        $(OBJS)\monolib_inphand.obj \


@@ -1052,58 +1075,15 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_statline.obj \
        $(OBJS)\monolib_stattext.obj \
        $(OBJS)\monolib_statusbr.obj \
        $(OBJS)\monolib_statline.obj \
        $(OBJS)\monolib_stattext.obj \
        $(OBJS)\monolib_statusbr.obj \

-       $(OBJS)\monolib_toolbar.obj \

        $(OBJS)\monolib_theme.obj \
        $(OBJS)\monolib_theme.obj \

+       $(OBJS)\monolib_toolbar.obj \
+       $(OBJS)\monolib_topluniv.obj \

        $(OBJS)\monolib_winuniv.obj \
        $(OBJS)\monolib_winuniv.obj \

-       $(OBJS)\monolib_mdig.obj \
-       $(OBJS)\monolib_imaglist.obj \
-       $(OBJS)\monolib_colrdlgg.obj \
-       $(OBJS)\monolib_listctrl.obj \
-       $(OBJS)\monolib_filedlgg.obj \
-       $(OBJS)\monolib_dirdlgg.obj \
-       $(OBJS)\monolib_prntdlgg.obj \
-       $(OBJS)\monolib_accel.obj \
-       $(OBJS)\monolib_msgdlgg.obj \
-       $(OBJS)\monolib_fdrepdlg.obj \
-       $(OBJS)\monolib_fontdlgg.obj \
-       $(OBJS)\monolib_tabg.obj \

        $(OBJS)\monolib_gtk.obj \
        $(OBJS)\monolib_gtk.obj \

-       $(OBJS)\monolib_win32.obj \

        $(OBJS)\monolib_metal.obj \
        $(OBJS)\monolib_metal.obj \

-       $(OBJS)\monolib_busyinfo.obj \
-       $(OBJS)\monolib_calctrl.obj \
-       $(OBJS)\monolib_choicdgg.obj \
-       $(OBJS)\monolib_dcbuffer.obj \
-       $(OBJS)\monolib_dcpsg.obj \
-       $(OBJS)\monolib_dirctrlg.obj \
-       $(OBJS)\monolib_dragimgg.obj \
-       $(OBJS)\monolib_grid.obj \
-       $(OBJS)\monolib_gridctrl.obj \
-       $(OBJS)\monolib_gridsel.obj \
-       $(OBJS)\monolib_helpext.obj \
-       $(OBJS)\monolib_laywin.obj \
-       $(OBJS)\monolib_logg.obj \
-       $(OBJS)\monolib_numdlgg.obj \
-       $(OBJS)\monolib_panelg.obj \
-       $(OBJS)\monolib_progdlgg.obj \
-       $(OBJS)\monolib_renderg.obj \
-       $(OBJS)\monolib_sashwin.obj \
-       $(OBJS)\monolib_scrlwing.obj \
-       $(OBJS)\monolib_selstore.obj \
-       $(OBJS)\monolib_spinctlg.obj \
-       $(OBJS)\monolib_splash.obj \
-       $(OBJS)\monolib_splitter.obj \
-       $(OBJS)\monolib_tbarsmpl.obj \
-       $(OBJS)\monolib_textdlgg.obj \
-       $(OBJS)\monolib_tipdlg.obj \
-       $(OBJS)\monolib_tipwin.obj \
-       $(OBJS)\monolib_treectlg.obj \
-       $(OBJS)\monolib_vlbox.obj \
-       $(OBJS)\monolib_vscroll.obj \
-       $(OBJS)\monolib_wizard.obj \
-       $(OBJS)\monolib_appcmn.obj \
-       $(OBJS)\monolib_fontmap.obj \
+       $(OBJS)\monolib_win32.obj \

        $(OBJS)\monolib_accesscmn.obj \
        $(OBJS)\monolib_accesscmn.obj \

+       $(OBJS)\monolib_appcmn.obj \

        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \
        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \


@@ -1129,9 +1109,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \

+       $(OBJS)\monolib_fontmap.obj \

        $(OBJS)\monolib_framecmn.obj \
        $(OBJS)\monolib_framecmn.obj \

-       $(OBJS)\monolib_timercmn.obj \
-       $(OBJS)\monolib_toplvcmn.obj \

        $(OBJS)\monolib_gaugecmn.obj \
        $(OBJS)\monolib_gdicmn.obj \
        $(OBJS)\monolib_geometry.obj \
        $(OBJS)\monolib_gaugecmn.obj \
        $(OBJS)\monolib_gdicmn.obj \
        $(OBJS)\monolib_geometry.obj \


@@ -1141,6 +1120,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagall.obj \
        $(OBJS)\monolib_imagbmp.obj \
        $(OBJS)\monolib_image.obj \
        $(OBJS)\monolib_imagall.obj \
        $(OBJS)\monolib_imagbmp.obj \
        $(OBJS)\monolib_image.obj \

+       $(OBJS)\monolib_imagfill.obj \

        $(OBJS)\monolib_imaggif.obj \
        $(OBJS)\monolib_imagiff.obj \
        $(OBJS)\monolib_imagjpeg.obj \
        $(OBJS)\monolib_imaggif.obj \
        $(OBJS)\monolib_imagiff.obj \
        $(OBJS)\monolib_imagjpeg.obj \


@@ -1149,7 +1129,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagpnm.obj \
        $(OBJS)\monolib_imagtiff.obj \
        $(OBJS)\monolib_imagxpm.obj \
        $(OBJS)\monolib_imagpnm.obj \
        $(OBJS)\monolib_imagtiff.obj \
        $(OBJS)\monolib_imagxpm.obj \

-       $(OBJS)\monolib_imagfill.obj \

        $(OBJS)\monolib_layout.obj \
        $(OBJS)\monolib_lboxcmn.obj \
        $(OBJS)\monolib_matrix.obj \
        $(OBJS)\monolib_layout.obj \
        $(OBJS)\monolib_lboxcmn.obj \
        $(OBJS)\monolib_matrix.obj \


@@ -1167,15 +1146,49 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_statbar.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \
        $(OBJS)\monolib_statbar.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \

+       $(OBJS)\monolib_timercmn.obj \
+       $(OBJS)\monolib_toplvcmn.obj \

        $(OBJS)\monolib_treebase.obj \
        $(OBJS)\monolib_valgen.obj \
        $(OBJS)\monolib_validate.obj \
        $(OBJS)\monolib_valtext.obj \
        $(OBJS)\monolib_wincmn.obj \
        $(OBJS)\monolib_treebase.obj \
        $(OBJS)\monolib_valgen.obj \
        $(OBJS)\monolib_validate.obj \
        $(OBJS)\monolib_valtext.obj \
        $(OBJS)\monolib_wincmn.obj \

-       $(OBJS)\monolib_xpmdecod.obj
+       $(OBJS)\monolib_xpmdecod.obj \
+       $(OBJS)\monolib_busyinfo.obj \
+       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_choicdgg.obj \
+       $(OBJS)\monolib_dcbuffer.obj \
+       $(OBJS)\monolib_dcpsg.obj \
+       $(OBJS)\monolib_dirctrlg.obj \
+       $(OBJS)\monolib_dragimgg.obj \
+       $(OBJS)\monolib_grid.obj \
+       $(OBJS)\monolib_gridctrl.obj \
+       $(OBJS)\monolib_gridsel.obj \
+       $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_logg.obj \
+       $(OBJS)\monolib_numdlgg.obj \
+       $(OBJS)\monolib_panelg.obj \
+       $(OBJS)\monolib_progdlgg.obj \
+       $(OBJS)\monolib_renderg.obj \
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_scrlwing.obj \
+       $(OBJS)\monolib_selstore.obj \
+       $(OBJS)\monolib_spinctlg.obj \
+       $(OBJS)\monolib_splash.obj \
+       $(OBJS)\monolib_splitter.obj \
+       $(OBJS)\monolib_tbarsmpl.obj \
+       $(OBJS)\monolib_textdlgg.obj \
+       $(OBJS)\monolib_tipdlg.obj \
+       $(OBJS)\monolib_tipwin.obj \
+       $(OBJS)\monolib_treectlg.obj \
+       $(OBJS)\monolib_vlbox.obj \
+       $(OBJS)\monolib_vscroll.obj \
+       $(OBJS)\monolib_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \

+       $(OBJS)\coredll_taskbarcmn.obj \

        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \
        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \


@@ -1205,12 +1218,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_joystick.obj \
        $(OBJS)\coredll_minifram.obj \
        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_joystick.obj \
        $(OBJS)\coredll_minifram.obj \

+       $(OBJS)\coredll_automtn.obj \
+       $(OBJS)\coredll_dataobj.obj \
+       $(OBJS)\coredll_dropsrc.obj \
+       $(OBJS)\coredll_droptgt.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_uuid.obj \

        $(OBJS)\coredll_palette.obj \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_settings.obj \
        $(OBJS)\coredll_palette.obj \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_settings.obj \

-       $(OBJS)\coredll_taskbarcmn.obj \

        $(OBJS)\coredll_taskbar.obj \
        $(OBJS)\coredll_timer.obj \
        $(OBJS)\coredll_tooltip.obj \
        $(OBJS)\coredll_taskbar.obj \
        $(OBJS)\coredll_timer.obj \
        $(OBJS)\coredll_tooltip.obj \


@@ -1218,15 +1236,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_utilsgui.obj \
        $(OBJS)\coredll_wave.obj \
        $(OBJS)\coredll_window.obj \
        $(OBJS)\coredll_utilsgui.obj \
        $(OBJS)\coredll_wave.obj \
        $(OBJS)\coredll_window.obj \

-       $(OBJS)\coredll_automtn.obj \
-       $(OBJS)\coredll_dataobj.obj \
-       $(OBJS)\coredll_dropsrc.obj \
-       $(OBJS)\coredll_droptgt.obj \
-       $(OBJS)\coredll_oleutils.obj \
-       $(OBJS)\coredll_uuid.obj \

        $(OBJS)\coredll_statusbr.obj \
        $(OBJS)\coredll_statusbr.obj \

-       $(OBJS)\coredll_uxtheme.obj \
-       $(OBJS)\coredll_access.obj \

        $(OBJS)\coredll_accel.obj \
        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \
        $(OBJS)\coredll_accel.obj \
        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \


@@ -1254,6 +1264,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_msgdlg.obj \
        $(OBJS)\coredll_nativdlg.obj \
        $(OBJS)\coredll_notebook.obj \
        $(OBJS)\coredll_msgdlg.obj \
        $(OBJS)\coredll_nativdlg.obj \
        $(OBJS)\coredll_notebook.obj \

+       $(OBJS)\coredll_access.obj \

        $(OBJS)\coredll_ownerdrw.obj \
        $(OBJS)\coredll_penwin.obj \
        $(OBJS)\coredll_printdlg.obj \
        $(OBJS)\coredll_ownerdrw.obj \
        $(OBJS)\coredll_penwin.obj \
        $(OBJS)\coredll_printdlg.obj \


@@ -1275,40 +1286,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_textctrl.obj \
        $(OBJS)\coredll_tglbtn.obj \
        $(OBJS)\coredll_treectrl.obj \
        $(OBJS)\coredll_textctrl.obj \
        $(OBJS)\coredll_tglbtn.obj \
        $(OBJS)\coredll_treectrl.obj \

-       $(OBJS)\coredll_busyinfo.obj \
-       $(OBJS)\coredll_calctrl.obj \
-       $(OBJS)\coredll_choicdgg.obj \
-       $(OBJS)\coredll_dcbuffer.obj \
-       $(OBJS)\coredll_dcpsg.obj \
-       $(OBJS)\coredll_dirctrlg.obj \
-       $(OBJS)\coredll_dragimgg.obj \
-       $(OBJS)\coredll_grid.obj \
-       $(OBJS)\coredll_gridctrl.obj \
-       $(OBJS)\coredll_gridsel.obj \
-       $(OBJS)\coredll_helpext.obj \
-       $(OBJS)\coredll_laywin.obj \
-       $(OBJS)\coredll_logg.obj \
-       $(OBJS)\coredll_numdlgg.obj \
-       $(OBJS)\coredll_panelg.obj \
-       $(OBJS)\coredll_progdlgg.obj \
-       $(OBJS)\coredll_renderg.obj \
-       $(OBJS)\coredll_sashwin.obj \
-       $(OBJS)\coredll_scrlwing.obj \
-       $(OBJS)\coredll_selstore.obj \
-       $(OBJS)\coredll_spinctlg.obj \
-       $(OBJS)\coredll_splash.obj \
-       $(OBJS)\coredll_splitter.obj \
-       $(OBJS)\coredll_tbarsmpl.obj \
-       $(OBJS)\coredll_textdlgg.obj \
-       $(OBJS)\coredll_tipdlg.obj \
-       $(OBJS)\coredll_tipwin.obj \
-       $(OBJS)\coredll_treectlg.obj \
-       $(OBJS)\coredll_vlbox.obj \
-       $(OBJS)\coredll_vscroll.obj \
-       $(OBJS)\coredll_wizard.obj \
-       $(OBJS)\coredll_appcmn.obj \
-       $(OBJS)\coredll_fontmap.obj \
+       $(OBJS)\coredll_uxtheme.obj \

        $(OBJS)\coredll_accesscmn.obj \
        $(OBJS)\coredll_accesscmn.obj \

+       $(OBJS)\coredll_appcmn.obj \

        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \
        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \


@@ -1334,9 +1314,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \

+       $(OBJS)\coredll_fontmap.obj \

        $(OBJS)\coredll_framecmn.obj \
        $(OBJS)\coredll_framecmn.obj \

-       $(OBJS)\coredll_timercmn.obj \
-       $(OBJS)\coredll_toplvcmn.obj \

        $(OBJS)\coredll_gaugecmn.obj \
        $(OBJS)\coredll_gdicmn.obj \
        $(OBJS)\coredll_geometry.obj \
        $(OBJS)\coredll_gaugecmn.obj \
        $(OBJS)\coredll_gdicmn.obj \
        $(OBJS)\coredll_geometry.obj \


@@ -1346,6 +1325,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagall.obj \
        $(OBJS)\coredll_imagbmp.obj \
        $(OBJS)\coredll_image.obj \
        $(OBJS)\coredll_imagall.obj \
        $(OBJS)\coredll_imagbmp.obj \
        $(OBJS)\coredll_image.obj \

+       $(OBJS)\coredll_imagfill.obj \

        $(OBJS)\coredll_imaggif.obj \
        $(OBJS)\coredll_imagiff.obj \
        $(OBJS)\coredll_imagjpeg.obj \
        $(OBJS)\coredll_imaggif.obj \
        $(OBJS)\coredll_imagiff.obj \
        $(OBJS)\coredll_imagjpeg.obj \


@@ -1354,7 +1334,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagpnm.obj \
        $(OBJS)\coredll_imagtiff.obj \
        $(OBJS)\coredll_imagxpm.obj \
        $(OBJS)\coredll_imagpnm.obj \
        $(OBJS)\coredll_imagtiff.obj \
        $(OBJS)\coredll_imagxpm.obj \

-       $(OBJS)\coredll_imagfill.obj \

        $(OBJS)\coredll_layout.obj \
        $(OBJS)\coredll_lboxcmn.obj \
        $(OBJS)\coredll_matrix.obj \
        $(OBJS)\coredll_layout.obj \
        $(OBJS)\coredll_lboxcmn.obj \
        $(OBJS)\coredll_matrix.obj \


@@ -1372,15 +1351,49 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \

+       $(OBJS)\coredll_timercmn.obj \
+       $(OBJS)\coredll_toplvcmn.obj \

        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \
        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \

-       $(OBJS)\coredll_xpmdecod.obj
+       $(OBJS)\coredll_xpmdecod.obj \
+       $(OBJS)\coredll_busyinfo.obj \
+       $(OBJS)\coredll_calctrl.obj \
+       $(OBJS)\coredll_choicdgg.obj \
+       $(OBJS)\coredll_dcbuffer.obj \
+       $(OBJS)\coredll_dcpsg.obj \
+       $(OBJS)\coredll_dirctrlg.obj \
+       $(OBJS)\coredll_dragimgg.obj \
+       $(OBJS)\coredll_grid.obj \
+       $(OBJS)\coredll_gridctrl.obj \
+       $(OBJS)\coredll_gridsel.obj \
+       $(OBJS)\coredll_helpext.obj \
+       $(OBJS)\coredll_laywin.obj \
+       $(OBJS)\coredll_logg.obj \
+       $(OBJS)\coredll_numdlgg.obj \
+       $(OBJS)\coredll_panelg.obj \
+       $(OBJS)\coredll_progdlgg.obj \
+       $(OBJS)\coredll_renderg.obj \
+       $(OBJS)\coredll_sashwin.obj \
+       $(OBJS)\coredll_scrlwing.obj \
+       $(OBJS)\coredll_selstore.obj \
+       $(OBJS)\coredll_spinctlg.obj \
+       $(OBJS)\coredll_splash.obj \
+       $(OBJS)\coredll_splitter.obj \
+       $(OBJS)\coredll_tbarsmpl.obj \
+       $(OBJS)\coredll_textdlgg.obj \
+       $(OBJS)\coredll_tipdlg.obj \
+       $(OBJS)\coredll_tipwin.obj \
+       $(OBJS)\coredll_treectlg.obj \
+       $(OBJS)\coredll_vlbox.obj \
+       $(OBJS)\coredll_vscroll.obj \
+       $(OBJS)\coredll_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \

+       $(OBJS)\coredll_taskbarcmn.obj \

        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \
        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \


@@ -1410,12 +1423,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_joystick.obj \
        $(OBJS)\coredll_minifram.obj \
        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_joystick.obj \
        $(OBJS)\coredll_minifram.obj \

+       $(OBJS)\coredll_automtn.obj \
+       $(OBJS)\coredll_dataobj.obj \
+       $(OBJS)\coredll_dropsrc.obj \
+       $(OBJS)\coredll_droptgt.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_uuid.obj \

        $(OBJS)\coredll_palette.obj \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_settings.obj \
        $(OBJS)\coredll_palette.obj \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_settings.obj \

-       $(OBJS)\coredll_taskbarcmn.obj \

        $(OBJS)\coredll_taskbar.obj \
        $(OBJS)\coredll_timer.obj \
        $(OBJS)\coredll_tooltip.obj \
        $(OBJS)\coredll_taskbar.obj \
        $(OBJS)\coredll_timer.obj \
        $(OBJS)\coredll_tooltip.obj \


@@ -1423,13 +1441,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_utilsgui.obj \
        $(OBJS)\coredll_wave.obj \
        $(OBJS)\coredll_window.obj \
        $(OBJS)\coredll_utilsgui.obj \
        $(OBJS)\coredll_wave.obj \
        $(OBJS)\coredll_window.obj \

-       $(OBJS)\coredll_automtn.obj \
-       $(OBJS)\coredll_dataobj.obj \
-       $(OBJS)\coredll_dropsrc.obj \
-       $(OBJS)\coredll_droptgt.obj \
-       $(OBJS)\coredll_oleutils.obj \
-       $(OBJS)\coredll_uuid.obj \

        $(OBJS)\coredll_textctrl.obj \
        $(OBJS)\coredll_textctrl.obj \

+       $(OBJS)\coredll_accel.obj \
+       $(OBJS)\coredll_colrdlgg.obj \
+       $(OBJS)\coredll_dirdlgg.obj \
+       $(OBJS)\coredll_fdrepdlg.obj \
+       $(OBJS)\coredll_filedlgg.obj \
+       $(OBJS)\coredll_fontdlgg.obj \
+       $(OBJS)\coredll_imaglist.obj \
+       $(OBJS)\coredll_listctrl.obj \
+       $(OBJS)\coredll_mdig.obj \
+       $(OBJS)\coredll_msgdlgg.obj \
+       $(OBJS)\coredll_prntdlgg.obj \
+       $(OBJS)\coredll_tabg.obj \

        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \
        $(OBJS)\coredll_checkbox.obj \
        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \
        $(OBJS)\coredll_checkbox.obj \


@@ -1440,7 +1464,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_control.obj \
        $(OBJS)\coredll_dialog.obj \
        $(OBJS)\coredll_framuniv.obj \
        $(OBJS)\coredll_control.obj \
        $(OBJS)\coredll_dialog.obj \
        $(OBJS)\coredll_framuniv.obj \

-       $(OBJS)\coredll_topluniv.obj \

        $(OBJS)\coredll_gauge.obj \
        $(OBJS)\coredll_inpcons.obj \
        $(OBJS)\coredll_inphand.obj \
        $(OBJS)\coredll_gauge.obj \
        $(OBJS)\coredll_inpcons.obj \
        $(OBJS)\coredll_inphand.obj \


@@ -1460,58 +1483,15 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_statline.obj \
        $(OBJS)\coredll_stattext.obj \
        $(OBJS)\coredll_statusbr.obj \
        $(OBJS)\coredll_statline.obj \
        $(OBJS)\coredll_stattext.obj \
        $(OBJS)\coredll_statusbr.obj \

-       $(OBJS)\coredll_toolbar.obj \

        $(OBJS)\coredll_theme.obj \
        $(OBJS)\coredll_theme.obj \

+       $(OBJS)\coredll_toolbar.obj \
+       $(OBJS)\coredll_topluniv.obj \

        $(OBJS)\coredll_winuniv.obj \
        $(OBJS)\coredll_winuniv.obj \

-       $(OBJS)\coredll_mdig.obj \
-       $(OBJS)\coredll_imaglist.obj \
-       $(OBJS)\coredll_colrdlgg.obj \
-       $(OBJS)\coredll_listctrl.obj \
-       $(OBJS)\coredll_filedlgg.obj \
-       $(OBJS)\coredll_dirdlgg.obj \
-       $(OBJS)\coredll_prntdlgg.obj \
-       $(OBJS)\coredll_accel.obj \
-       $(OBJS)\coredll_msgdlgg.obj \
-       $(OBJS)\coredll_fdrepdlg.obj \
-       $(OBJS)\coredll_fontdlgg.obj \
-       $(OBJS)\coredll_tabg.obj \

        $(OBJS)\coredll_gtk.obj \
        $(OBJS)\coredll_gtk.obj \

-       $(OBJS)\coredll_win32.obj \

        $(OBJS)\coredll_metal.obj \
        $(OBJS)\coredll_metal.obj \

-       $(OBJS)\coredll_busyinfo.obj \
-       $(OBJS)\coredll_calctrl.obj \
-       $(OBJS)\coredll_choicdgg.obj \
-       $(OBJS)\coredll_dcbuffer.obj \
-       $(OBJS)\coredll_dcpsg.obj \
-       $(OBJS)\coredll_dirctrlg.obj \
-       $(OBJS)\coredll_dragimgg.obj \
-       $(OBJS)\coredll_grid.obj \
-       $(OBJS)\coredll_gridctrl.obj \
-       $(OBJS)\coredll_gridsel.obj \
-       $(OBJS)\coredll_helpext.obj \
-       $(OBJS)\coredll_laywin.obj \
-       $(OBJS)\coredll_logg.obj \
-       $(OBJS)\coredll_numdlgg.obj \
-       $(OBJS)\coredll_panelg.obj \
-       $(OBJS)\coredll_progdlgg.obj \
-       $(OBJS)\coredll_renderg.obj \
-       $(OBJS)\coredll_sashwin.obj \
-       $(OBJS)\coredll_scrlwing.obj \
-       $(OBJS)\coredll_selstore.obj \
-       $(OBJS)\coredll_spinctlg.obj \
-       $(OBJS)\coredll_splash.obj \
-       $(OBJS)\coredll_splitter.obj \
-       $(OBJS)\coredll_tbarsmpl.obj \
-       $(OBJS)\coredll_textdlgg.obj \
-       $(OBJS)\coredll_tipdlg.obj \
-       $(OBJS)\coredll_tipwin.obj \
-       $(OBJS)\coredll_treectlg.obj \
-       $(OBJS)\coredll_vlbox.obj \
-       $(OBJS)\coredll_vscroll.obj \
-       $(OBJS)\coredll_wizard.obj \
-       $(OBJS)\coredll_appcmn.obj \
-       $(OBJS)\coredll_fontmap.obj \
+       $(OBJS)\coredll_win32.obj \

        $(OBJS)\coredll_accesscmn.obj \
        $(OBJS)\coredll_accesscmn.obj \

+       $(OBJS)\coredll_appcmn.obj \

        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \
        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \


@@ -1537,9 +1517,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \

+       $(OBJS)\coredll_fontmap.obj \

        $(OBJS)\coredll_framecmn.obj \
        $(OBJS)\coredll_framecmn.obj \

-       $(OBJS)\coredll_timercmn.obj \
-       $(OBJS)\coredll_toplvcmn.obj \

        $(OBJS)\coredll_gaugecmn.obj \
        $(OBJS)\coredll_gdicmn.obj \
        $(OBJS)\coredll_geometry.obj \
        $(OBJS)\coredll_gaugecmn.obj \
        $(OBJS)\coredll_gdicmn.obj \
        $(OBJS)\coredll_geometry.obj \


@@ -1549,6 +1528,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagall.obj \
        $(OBJS)\coredll_imagbmp.obj \
        $(OBJS)\coredll_image.obj \
        $(OBJS)\coredll_imagall.obj \
        $(OBJS)\coredll_imagbmp.obj \
        $(OBJS)\coredll_image.obj \

+       $(OBJS)\coredll_imagfill.obj \

        $(OBJS)\coredll_imaggif.obj \
        $(OBJS)\coredll_imagiff.obj \
        $(OBJS)\coredll_imagjpeg.obj \
        $(OBJS)\coredll_imaggif.obj \
        $(OBJS)\coredll_imagiff.obj \
        $(OBJS)\coredll_imagjpeg.obj \


@@ -1557,7 +1537,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagpnm.obj \
        $(OBJS)\coredll_imagtiff.obj \
        $(OBJS)\coredll_imagxpm.obj \
        $(OBJS)\coredll_imagpnm.obj \
        $(OBJS)\coredll_imagtiff.obj \
        $(OBJS)\coredll_imagxpm.obj \

-       $(OBJS)\coredll_imagfill.obj \

        $(OBJS)\coredll_layout.obj \
        $(OBJS)\coredll_lboxcmn.obj \
        $(OBJS)\coredll_matrix.obj \
        $(OBJS)\coredll_layout.obj \
        $(OBJS)\coredll_lboxcmn.obj \
        $(OBJS)\coredll_matrix.obj \


@@ -1575,15 +1554,49 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \

+       $(OBJS)\coredll_timercmn.obj \
+       $(OBJS)\coredll_toplvcmn.obj \

        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \
        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \

-       $(OBJS)\coredll_xpmdecod.obj
+       $(OBJS)\coredll_xpmdecod.obj \
+       $(OBJS)\coredll_busyinfo.obj \
+       $(OBJS)\coredll_calctrl.obj \
+       $(OBJS)\coredll_choicdgg.obj \
+       $(OBJS)\coredll_dcbuffer.obj \
+       $(OBJS)\coredll_dcpsg.obj \
+       $(OBJS)\coredll_dirctrlg.obj \
+       $(OBJS)\coredll_dragimgg.obj \
+       $(OBJS)\coredll_grid.obj \
+       $(OBJS)\coredll_gridctrl.obj \
+       $(OBJS)\coredll_gridsel.obj \
+       $(OBJS)\coredll_helpext.obj \
+       $(OBJS)\coredll_laywin.obj \
+       $(OBJS)\coredll_logg.obj \
+       $(OBJS)\coredll_numdlgg.obj \
+       $(OBJS)\coredll_panelg.obj \
+       $(OBJS)\coredll_progdlgg.obj \
+       $(OBJS)\coredll_renderg.obj \
+       $(OBJS)\coredll_sashwin.obj \
+       $(OBJS)\coredll_scrlwing.obj \
+       $(OBJS)\coredll_selstore.obj \
+       $(OBJS)\coredll_spinctlg.obj \
+       $(OBJS)\coredll_splash.obj \
+       $(OBJS)\coredll_splitter.obj \
+       $(OBJS)\coredll_tbarsmpl.obj \
+       $(OBJS)\coredll_textdlgg.obj \
+       $(OBJS)\coredll_tipdlg.obj \
+       $(OBJS)\coredll_tipwin.obj \
+       $(OBJS)\coredll_treectlg.obj \
+       $(OBJS)\coredll_vlbox.obj \
+       $(OBJS)\coredll_vscroll.obj \
+       $(OBJS)\coredll_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \

+       $(OBJS)\corelib_taskbarcmn.obj \

        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \
        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \


@@ -1613,12 +1626,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_joystick.obj \
        $(OBJS)\corelib_minifram.obj \
        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_joystick.obj \
        $(OBJS)\corelib_minifram.obj \

+       $(OBJS)\corelib_automtn.obj \
+       $(OBJS)\corelib_dataobj.obj \
+       $(OBJS)\corelib_dropsrc.obj \
+       $(OBJS)\corelib_droptgt.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_uuid.obj \

        $(OBJS)\corelib_palette.obj \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_settings.obj \
        $(OBJS)\corelib_palette.obj \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_settings.obj \

-       $(OBJS)\corelib_taskbarcmn.obj \

        $(OBJS)\corelib_taskbar.obj \
        $(OBJS)\corelib_timer.obj \
        $(OBJS)\corelib_tooltip.obj \
        $(OBJS)\corelib_taskbar.obj \
        $(OBJS)\corelib_timer.obj \
        $(OBJS)\corelib_tooltip.obj \


@@ -1626,15 +1644,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_utilsgui.obj \
        $(OBJS)\corelib_wave.obj \
        $(OBJS)\corelib_window.obj \
        $(OBJS)\corelib_utilsgui.obj \
        $(OBJS)\corelib_wave.obj \
        $(OBJS)\corelib_window.obj \

-       $(OBJS)\corelib_automtn.obj \
-       $(OBJS)\corelib_dataobj.obj \
-       $(OBJS)\corelib_dropsrc.obj \
-       $(OBJS)\corelib_droptgt.obj \
-       $(OBJS)\corelib_oleutils.obj \
-       $(OBJS)\corelib_uuid.obj \

        $(OBJS)\corelib_statusbr.obj \
        $(OBJS)\corelib_statusbr.obj \

-       $(OBJS)\corelib_uxtheme.obj \
-       $(OBJS)\corelib_access.obj \

        $(OBJS)\corelib_accel.obj \
        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \
        $(OBJS)\corelib_accel.obj \
        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \


@@ -1662,6 +1672,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_msgdlg.obj \
        $(OBJS)\corelib_nativdlg.obj \
        $(OBJS)\corelib_notebook.obj \
        $(OBJS)\corelib_msgdlg.obj \
        $(OBJS)\corelib_nativdlg.obj \
        $(OBJS)\corelib_notebook.obj \

+       $(OBJS)\corelib_access.obj \

        $(OBJS)\corelib_ownerdrw.obj \
        $(OBJS)\corelib_penwin.obj \
        $(OBJS)\corelib_printdlg.obj \
        $(OBJS)\corelib_ownerdrw.obj \
        $(OBJS)\corelib_penwin.obj \
        $(OBJS)\corelib_printdlg.obj \


@@ -1683,40 +1694,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_textctrl.obj \
        $(OBJS)\corelib_tglbtn.obj \
        $(OBJS)\corelib_treectrl.obj \
        $(OBJS)\corelib_textctrl.obj \
        $(OBJS)\corelib_tglbtn.obj \
        $(OBJS)\corelib_treectrl.obj \

-       $(OBJS)\corelib_busyinfo.obj \
-       $(OBJS)\corelib_calctrl.obj \
-       $(OBJS)\corelib_choicdgg.obj \
-       $(OBJS)\corelib_dcbuffer.obj \
-       $(OBJS)\corelib_dcpsg.obj \
-       $(OBJS)\corelib_dirctrlg.obj \
-       $(OBJS)\corelib_dragimgg.obj \
-       $(OBJS)\corelib_grid.obj \
-       $(OBJS)\corelib_gridctrl.obj \
-       $(OBJS)\corelib_gridsel.obj \
-       $(OBJS)\corelib_helpext.obj \
-       $(OBJS)\corelib_laywin.obj \
-       $(OBJS)\corelib_logg.obj \
-       $(OBJS)\corelib_numdlgg.obj \
-       $(OBJS)\corelib_panelg.obj \
-       $(OBJS)\corelib_progdlgg.obj \
-       $(OBJS)\corelib_renderg.obj \
-       $(OBJS)\corelib_sashwin.obj \
-       $(OBJS)\corelib_scrlwing.obj \
-       $(OBJS)\corelib_selstore.obj \
-       $(OBJS)\corelib_spinctlg.obj \
-       $(OBJS)\corelib_splash.obj \
-       $(OBJS)\corelib_splitter.obj \
-       $(OBJS)\corelib_tbarsmpl.obj \
-       $(OBJS)\corelib_textdlgg.obj \
-       $(OBJS)\corelib_tipdlg.obj \
-       $(OBJS)\corelib_tipwin.obj \
-       $(OBJS)\corelib_treectlg.obj \
-       $(OBJS)\corelib_vlbox.obj \
-       $(OBJS)\corelib_vscroll.obj \
-       $(OBJS)\corelib_wizard.obj \
-       $(OBJS)\corelib_appcmn.obj \
-       $(OBJS)\corelib_fontmap.obj \
+       $(OBJS)\corelib_uxtheme.obj \

        $(OBJS)\corelib_accesscmn.obj \
        $(OBJS)\corelib_accesscmn.obj \

+       $(OBJS)\corelib_appcmn.obj \

        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \
        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \


@@ -1742,9 +1722,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \

+       $(OBJS)\corelib_fontmap.obj \

        $(OBJS)\corelib_framecmn.obj \
        $(OBJS)\corelib_framecmn.obj \

-       $(OBJS)\corelib_timercmn.obj \
-       $(OBJS)\corelib_toplvcmn.obj \

        $(OBJS)\corelib_gaugecmn.obj \
        $(OBJS)\corelib_gdicmn.obj \
        $(OBJS)\corelib_geometry.obj \
        $(OBJS)\corelib_gaugecmn.obj \
        $(OBJS)\corelib_gdicmn.obj \
        $(OBJS)\corelib_geometry.obj \


@@ -1754,6 +1733,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagall.obj \
        $(OBJS)\corelib_imagbmp.obj \
        $(OBJS)\corelib_image.obj \
        $(OBJS)\corelib_imagall.obj \
        $(OBJS)\corelib_imagbmp.obj \
        $(OBJS)\corelib_image.obj \

+       $(OBJS)\corelib_imagfill.obj \

        $(OBJS)\corelib_imaggif.obj \
        $(OBJS)\corelib_imagiff.obj \
        $(OBJS)\corelib_imagjpeg.obj \
        $(OBJS)\corelib_imaggif.obj \
        $(OBJS)\corelib_imagiff.obj \
        $(OBJS)\corelib_imagjpeg.obj \


@@ -1762,7 +1742,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagpnm.obj \
        $(OBJS)\corelib_imagtiff.obj \
        $(OBJS)\corelib_imagxpm.obj \
        $(OBJS)\corelib_imagpnm.obj \
        $(OBJS)\corelib_imagtiff.obj \
        $(OBJS)\corelib_imagxpm.obj \

-       $(OBJS)\corelib_imagfill.obj \

        $(OBJS)\corelib_layout.obj \
        $(OBJS)\corelib_lboxcmn.obj \
        $(OBJS)\corelib_matrix.obj \
        $(OBJS)\corelib_layout.obj \
        $(OBJS)\corelib_lboxcmn.obj \
        $(OBJS)\corelib_matrix.obj \


@@ -1780,15 +1759,49 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \

+       $(OBJS)\corelib_timercmn.obj \
+       $(OBJS)\corelib_toplvcmn.obj \

        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \
        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \

-       $(OBJS)\corelib_xpmdecod.obj
+       $(OBJS)\corelib_xpmdecod.obj \
+       $(OBJS)\corelib_busyinfo.obj \
+       $(OBJS)\corelib_calctrl.obj \
+       $(OBJS)\corelib_choicdgg.obj \
+       $(OBJS)\corelib_dcbuffer.obj \
+       $(OBJS)\corelib_dcpsg.obj \
+       $(OBJS)\corelib_dirctrlg.obj \
+       $(OBJS)\corelib_dragimgg.obj \
+       $(OBJS)\corelib_grid.obj \
+       $(OBJS)\corelib_gridctrl.obj \
+       $(OBJS)\corelib_gridsel.obj \
+       $(OBJS)\corelib_helpext.obj \
+       $(OBJS)\corelib_laywin.obj \
+       $(OBJS)\corelib_logg.obj \
+       $(OBJS)\corelib_numdlgg.obj \
+       $(OBJS)\corelib_panelg.obj \
+       $(OBJS)\corelib_progdlgg.obj \
+       $(OBJS)\corelib_renderg.obj \
+       $(OBJS)\corelib_sashwin.obj \
+       $(OBJS)\corelib_scrlwing.obj \
+       $(OBJS)\corelib_selstore.obj \
+       $(OBJS)\corelib_spinctlg.obj \
+       $(OBJS)\corelib_splash.obj \
+       $(OBJS)\corelib_splitter.obj \
+       $(OBJS)\corelib_tbarsmpl.obj \
+       $(OBJS)\corelib_textdlgg.obj \
+       $(OBJS)\corelib_tipdlg.obj \
+       $(OBJS)\corelib_tipwin.obj \
+       $(OBJS)\corelib_treectlg.obj \
+       $(OBJS)\corelib_vlbox.obj \
+       $(OBJS)\corelib_vscroll.obj \
+       $(OBJS)\corelib_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \

+       $(OBJS)\corelib_taskbarcmn.obj \

        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \
        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \


@@ -1818,12 +1831,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_joystick.obj \
        $(OBJS)\corelib_minifram.obj \
        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_joystick.obj \
        $(OBJS)\corelib_minifram.obj \

+       $(OBJS)\corelib_automtn.obj \
+       $(OBJS)\corelib_dataobj.obj \
+       $(OBJS)\corelib_dropsrc.obj \
+       $(OBJS)\corelib_droptgt.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_uuid.obj \

        $(OBJS)\corelib_palette.obj \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_settings.obj \
        $(OBJS)\corelib_palette.obj \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_settings.obj \

-       $(OBJS)\corelib_taskbarcmn.obj \

        $(OBJS)\corelib_taskbar.obj \
        $(OBJS)\corelib_timer.obj \
        $(OBJS)\corelib_tooltip.obj \
        $(OBJS)\corelib_taskbar.obj \
        $(OBJS)\corelib_timer.obj \
        $(OBJS)\corelib_tooltip.obj \


@@ -1831,13 +1849,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_utilsgui.obj \
        $(OBJS)\corelib_wave.obj \
        $(OBJS)\corelib_window.obj \
        $(OBJS)\corelib_utilsgui.obj \
        $(OBJS)\corelib_wave.obj \
        $(OBJS)\corelib_window.obj \

-       $(OBJS)\corelib_automtn.obj \
-       $(OBJS)\corelib_dataobj.obj \
-       $(OBJS)\corelib_dropsrc.obj \
-       $(OBJS)\corelib_droptgt.obj \
-       $(OBJS)\corelib_oleutils.obj \
-       $(OBJS)\corelib_uuid.obj \

        $(OBJS)\corelib_textctrl.obj \
        $(OBJS)\corelib_textctrl.obj \

+       $(OBJS)\corelib_accel.obj \
+       $(OBJS)\corelib_colrdlgg.obj \
+       $(OBJS)\corelib_dirdlgg.obj \
+       $(OBJS)\corelib_fdrepdlg.obj \
+       $(OBJS)\corelib_filedlgg.obj \
+       $(OBJS)\corelib_fontdlgg.obj \
+       $(OBJS)\corelib_imaglist.obj \
+       $(OBJS)\corelib_listctrl.obj \
+       $(OBJS)\corelib_mdig.obj \
+       $(OBJS)\corelib_msgdlgg.obj \
+       $(OBJS)\corelib_prntdlgg.obj \
+       $(OBJS)\corelib_tabg.obj \

        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \
        $(OBJS)\corelib_checkbox.obj \
        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \
        $(OBJS)\corelib_checkbox.obj \


@@ -1848,7 +1872,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_control.obj \
        $(OBJS)\corelib_dialog.obj \
        $(OBJS)\corelib_framuniv.obj \
        $(OBJS)\corelib_control.obj \
        $(OBJS)\corelib_dialog.obj \
        $(OBJS)\corelib_framuniv.obj \

-       $(OBJS)\corelib_topluniv.obj \

        $(OBJS)\corelib_gauge.obj \
        $(OBJS)\corelib_inpcons.obj \
        $(OBJS)\corelib_inphand.obj \
        $(OBJS)\corelib_gauge.obj \
        $(OBJS)\corelib_inpcons.obj \
        $(OBJS)\corelib_inphand.obj \


@@ -1868,58 +1891,15 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_statline.obj \
        $(OBJS)\corelib_stattext.obj \
        $(OBJS)\corelib_statusbr.obj \
        $(OBJS)\corelib_statline.obj \
        $(OBJS)\corelib_stattext.obj \
        $(OBJS)\corelib_statusbr.obj \

-       $(OBJS)\corelib_toolbar.obj \

        $(OBJS)\corelib_theme.obj \
        $(OBJS)\corelib_theme.obj \

+       $(OBJS)\corelib_toolbar.obj \
+       $(OBJS)\corelib_topluniv.obj \

        $(OBJS)\corelib_winuniv.obj \
        $(OBJS)\corelib_winuniv.obj \

-       $(OBJS)\corelib_mdig.obj \
-       $(OBJS)\corelib_imaglist.obj \
-       $(OBJS)\corelib_colrdlgg.obj \
-       $(OBJS)\corelib_listctrl.obj \
-       $(OBJS)\corelib_filedlgg.obj \
-       $(OBJS)\corelib_dirdlgg.obj \
-       $(OBJS)\corelib_prntdlgg.obj \
-       $(OBJS)\corelib_accel.obj \
-       $(OBJS)\corelib_msgdlgg.obj \
-       $(OBJS)\corelib_fdrepdlg.obj \
-       $(OBJS)\corelib_fontdlgg.obj \
-       $(OBJS)\corelib_tabg.obj \

        $(OBJS)\corelib_gtk.obj \
        $(OBJS)\corelib_gtk.obj \

-       $(OBJS)\corelib_win32.obj \

        $(OBJS)\corelib_metal.obj \
        $(OBJS)\corelib_metal.obj \

-       $(OBJS)\corelib_busyinfo.obj \
-       $(OBJS)\corelib_calctrl.obj \
-       $(OBJS)\corelib_choicdgg.obj \
-       $(OBJS)\corelib_dcbuffer.obj \
-       $(OBJS)\corelib_dcpsg.obj \
-       $(OBJS)\corelib_dirctrlg.obj \
-       $(OBJS)\corelib_dragimgg.obj \
-       $(OBJS)\corelib_grid.obj \
-       $(OBJS)\corelib_gridctrl.obj \
-       $(OBJS)\corelib_gridsel.obj \
-       $(OBJS)\corelib_helpext.obj \
-       $(OBJS)\corelib_laywin.obj \
-       $(OBJS)\corelib_logg.obj \
-       $(OBJS)\corelib_numdlgg.obj \
-       $(OBJS)\corelib_panelg.obj \
-       $(OBJS)\corelib_progdlgg.obj \
-       $(OBJS)\corelib_renderg.obj \
-       $(OBJS)\corelib_sashwin.obj \
-       $(OBJS)\corelib_scrlwing.obj \
-       $(OBJS)\corelib_selstore.obj \
-       $(OBJS)\corelib_spinctlg.obj \
-       $(OBJS)\corelib_splash.obj \
-       $(OBJS)\corelib_splitter.obj \
-       $(OBJS)\corelib_tbarsmpl.obj \
-       $(OBJS)\corelib_textdlgg.obj \
-       $(OBJS)\corelib_tipdlg.obj \
-       $(OBJS)\corelib_tipwin.obj \
-       $(OBJS)\corelib_treectlg.obj \
-       $(OBJS)\corelib_vlbox.obj \
-       $(OBJS)\corelib_vscroll.obj \
-       $(OBJS)\corelib_wizard.obj \
-       $(OBJS)\corelib_appcmn.obj \
-       $(OBJS)\corelib_fontmap.obj \
+       $(OBJS)\corelib_win32.obj \

        $(OBJS)\corelib_accesscmn.obj \
        $(OBJS)\corelib_accesscmn.obj \

+       $(OBJS)\corelib_appcmn.obj \

        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \
        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \


@@ -1945,9 +1925,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \

+       $(OBJS)\corelib_fontmap.obj \

        $(OBJS)\corelib_framecmn.obj \
        $(OBJS)\corelib_framecmn.obj \

-       $(OBJS)\corelib_timercmn.obj \
-       $(OBJS)\corelib_toplvcmn.obj \

        $(OBJS)\corelib_gaugecmn.obj \
        $(OBJS)\corelib_gdicmn.obj \
        $(OBJS)\corelib_geometry.obj \
        $(OBJS)\corelib_gaugecmn.obj \
        $(OBJS)\corelib_gdicmn.obj \
        $(OBJS)\corelib_geometry.obj \


@@ -1957,6 +1936,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagall.obj \
        $(OBJS)\corelib_imagbmp.obj \
        $(OBJS)\corelib_image.obj \
        $(OBJS)\corelib_imagall.obj \
        $(OBJS)\corelib_imagbmp.obj \
        $(OBJS)\corelib_image.obj \

+       $(OBJS)\corelib_imagfill.obj \

        $(OBJS)\corelib_imaggif.obj \
        $(OBJS)\corelib_imagiff.obj \
        $(OBJS)\corelib_imagjpeg.obj \
        $(OBJS)\corelib_imaggif.obj \
        $(OBJS)\corelib_imagiff.obj \
        $(OBJS)\corelib_imagjpeg.obj \


@@ -1965,7 +1945,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagpnm.obj \
        $(OBJS)\corelib_imagtiff.obj \
        $(OBJS)\corelib_imagxpm.obj \
        $(OBJS)\corelib_imagpnm.obj \
        $(OBJS)\corelib_imagtiff.obj \
        $(OBJS)\corelib_imagxpm.obj \

-       $(OBJS)\corelib_imagfill.obj \

        $(OBJS)\corelib_layout.obj \
        $(OBJS)\corelib_lboxcmn.obj \
        $(OBJS)\corelib_matrix.obj \
        $(OBJS)\corelib_layout.obj \
        $(OBJS)\corelib_lboxcmn.obj \
        $(OBJS)\corelib_matrix.obj \


@@ -1983,15 +1962,49 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \

+       $(OBJS)\corelib_timercmn.obj \
+       $(OBJS)\corelib_toplvcmn.obj \

        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \
        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \

-       $(OBJS)\corelib_xpmdecod.obj
+       $(OBJS)\corelib_xpmdecod.obj \
+       $(OBJS)\corelib_busyinfo.obj \
+       $(OBJS)\corelib_calctrl.obj \
+       $(OBJS)\corelib_choicdgg.obj \
+       $(OBJS)\corelib_dcbuffer.obj \
+       $(OBJS)\corelib_dcpsg.obj \
+       $(OBJS)\corelib_dirctrlg.obj \
+       $(OBJS)\corelib_dragimgg.obj \
+       $(OBJS)\corelib_grid.obj \
+       $(OBJS)\corelib_gridctrl.obj \
+       $(OBJS)\corelib_gridsel.obj \
+       $(OBJS)\corelib_helpext.obj \
+       $(OBJS)\corelib_laywin.obj \
+       $(OBJS)\corelib_logg.obj \
+       $(OBJS)\corelib_numdlgg.obj \
+       $(OBJS)\corelib_panelg.obj \
+       $(OBJS)\corelib_progdlgg.obj \
+       $(OBJS)\corelib_renderg.obj \
+       $(OBJS)\corelib_sashwin.obj \
+       $(OBJS)\corelib_scrlwing.obj \
+       $(OBJS)\corelib_selstore.obj \
+       $(OBJS)\corelib_spinctlg.obj \
+       $(OBJS)\corelib_splash.obj \
+       $(OBJS)\corelib_splitter.obj \
+       $(OBJS)\corelib_tbarsmpl.obj \
+       $(OBJS)\corelib_textdlgg.obj \
+       $(OBJS)\corelib_tipdlg.obj \
+       $(OBJS)\corelib_tipwin.obj \
+       $(OBJS)\corelib_treectlg.obj \
+       $(OBJS)\corelib_vlbox.obj \
+       $(OBJS)\corelib_vscroll.obj \
+       $(OBJS)\corelib_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \

+       $(OBJS)\monodll_taskbarcmn.obj \

        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \
        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \


@@ -2021,12 +2034,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_joystick.obj \
        $(OBJS)\monodll_minifram.obj \
        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_joystick.obj \
        $(OBJS)\monodll_minifram.obj \

+       $(OBJS)\monodll_automtn.obj \
+       $(OBJS)\monodll_dataobj.obj \
+       $(OBJS)\monodll_dropsrc.obj \
+       $(OBJS)\monodll_droptgt.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_uuid.obj \

        $(OBJS)\monodll_palette.obj \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_settings.obj \
        $(OBJS)\monodll_palette.obj \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_settings.obj \

-       $(OBJS)\monodll_taskbarcmn.obj \

        $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_tooltip.obj \
        $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_tooltip.obj \


@@ -2034,15 +2052,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_utilsgui.obj \
        $(OBJS)\monodll_wave.obj \
        $(OBJS)\monodll_window.obj \
        $(OBJS)\monodll_utilsgui.obj \
        $(OBJS)\monodll_wave.obj \
        $(OBJS)\monodll_window.obj \

-       $(OBJS)\monodll_automtn.obj \
-       $(OBJS)\monodll_dataobj.obj \
-       $(OBJS)\monodll_dropsrc.obj \
-       $(OBJS)\monodll_droptgt.obj \
-       $(OBJS)\monodll_oleutils.obj \
-       $(OBJS)\monodll_uuid.obj \

        $(OBJS)\monodll_statusbr.obj \
        $(OBJS)\monodll_statusbr.obj \

-       $(OBJS)\monodll_uxtheme.obj \
-       $(OBJS)\monodll_access.obj \

        $(OBJS)\monodll_accel.obj \
        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \
        $(OBJS)\monodll_accel.obj \
        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \


@@ -2070,6 +2080,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_msgdlg.obj \
        $(OBJS)\monodll_nativdlg.obj \
        $(OBJS)\monodll_notebook.obj \
        $(OBJS)\monodll_msgdlg.obj \
        $(OBJS)\monodll_nativdlg.obj \
        $(OBJS)\monodll_notebook.obj \

+       $(OBJS)\monodll_access.obj \

        $(OBJS)\monodll_ownerdrw.obj \
        $(OBJS)\monodll_penwin.obj \
        $(OBJS)\monodll_printdlg.obj \
        $(OBJS)\monodll_ownerdrw.obj \
        $(OBJS)\monodll_penwin.obj \
        $(OBJS)\monodll_printdlg.obj \


@@ -2091,40 +2102,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_textctrl.obj \
        $(OBJS)\monodll_tglbtn.obj \
        $(OBJS)\monodll_treectrl.obj \
        $(OBJS)\monodll_textctrl.obj \
        $(OBJS)\monodll_tglbtn.obj \
        $(OBJS)\monodll_treectrl.obj \

-       $(OBJS)\monodll_busyinfo.obj \
-       $(OBJS)\monodll_calctrl.obj \
-       $(OBJS)\monodll_choicdgg.obj \
-       $(OBJS)\monodll_dcbuffer.obj \
-       $(OBJS)\monodll_dcpsg.obj \
-       $(OBJS)\monodll_dirctrlg.obj \
-       $(OBJS)\monodll_dragimgg.obj \
-       $(OBJS)\monodll_grid.obj \
-       $(OBJS)\monodll_gridctrl.obj \
-       $(OBJS)\monodll_gridsel.obj \
-       $(OBJS)\monodll_helpext.obj \
-       $(OBJS)\monodll_laywin.obj \
-       $(OBJS)\monodll_logg.obj \
-       $(OBJS)\monodll_numdlgg.obj \
-       $(OBJS)\monodll_panelg.obj \
-       $(OBJS)\monodll_progdlgg.obj \
-       $(OBJS)\monodll_renderg.obj \
-       $(OBJS)\monodll_sashwin.obj \
-       $(OBJS)\monodll_scrlwing.obj \
-       $(OBJS)\monodll_selstore.obj \
-       $(OBJS)\monodll_spinctlg.obj \
-       $(OBJS)\monodll_splash.obj \
-       $(OBJS)\monodll_splitter.obj \
-       $(OBJS)\monodll_tbarsmpl.obj \
-       $(OBJS)\monodll_textdlgg.obj \
-       $(OBJS)\monodll_tipdlg.obj \
-       $(OBJS)\monodll_tipwin.obj \
-       $(OBJS)\monodll_treectlg.obj \
-       $(OBJS)\monodll_vlbox.obj \
-       $(OBJS)\monodll_vscroll.obj \
-       $(OBJS)\monodll_wizard.obj \
-       $(OBJS)\monodll_appcmn.obj \
-       $(OBJS)\monodll_fontmap.obj \
+       $(OBJS)\monodll_uxtheme.obj \

        $(OBJS)\monodll_accesscmn.obj \
        $(OBJS)\monodll_accesscmn.obj \

+       $(OBJS)\monodll_appcmn.obj \

        $(OBJS)\monodll_artprov.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \
        $(OBJS)\monodll_artprov.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \


@@ -2150,9 +2130,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_fontcmn.obj \
        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_fontcmn.obj \

+       $(OBJS)\monodll_fontmap.obj \

        $(OBJS)\monodll_framecmn.obj \
        $(OBJS)\monodll_framecmn.obj \

-       $(OBJS)\monodll_timercmn.obj \
-       $(OBJS)\monodll_toplvcmn.obj \

        $(OBJS)\monodll_gaugecmn.obj \
        $(OBJS)\monodll_gdicmn.obj \
        $(OBJS)\monodll_geometry.obj \
        $(OBJS)\monodll_gaugecmn.obj \
        $(OBJS)\monodll_gdicmn.obj \
        $(OBJS)\monodll_geometry.obj \


@@ -2162,6 +2141,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagall.obj \
        $(OBJS)\monodll_imagbmp.obj \
        $(OBJS)\monodll_image.obj \
        $(OBJS)\monodll_imagall.obj \
        $(OBJS)\monodll_imagbmp.obj \
        $(OBJS)\monodll_image.obj \

+       $(OBJS)\monodll_imagfill.obj \

        $(OBJS)\monodll_imaggif.obj \
        $(OBJS)\monodll_imagiff.obj \
        $(OBJS)\monodll_imagjpeg.obj \
        $(OBJS)\monodll_imaggif.obj \
        $(OBJS)\monodll_imagiff.obj \
        $(OBJS)\monodll_imagjpeg.obj \


@@ -2170,7 +2150,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagpnm.obj \
        $(OBJS)\monodll_imagtiff.obj \
        $(OBJS)\monodll_imagxpm.obj \
        $(OBJS)\monodll_imagpnm.obj \
        $(OBJS)\monodll_imagtiff.obj \
        $(OBJS)\monodll_imagxpm.obj \

-       $(OBJS)\monodll_imagfill.obj \

        $(OBJS)\monodll_layout.obj \
        $(OBJS)\monodll_lboxcmn.obj \
        $(OBJS)\monodll_matrix.obj \
        $(OBJS)\monodll_layout.obj \
        $(OBJS)\monodll_lboxcmn.obj \
        $(OBJS)\monodll_matrix.obj \


@@ -2188,15 +2167,49 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_statbar.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \
        $(OBJS)\monodll_statbar.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \

+       $(OBJS)\monodll_timercmn.obj \
+       $(OBJS)\monodll_toplvcmn.obj \

        $(OBJS)\monodll_treebase.obj \
        $(OBJS)\monodll_valgen.obj \
        $(OBJS)\monodll_validate.obj \
        $(OBJS)\monodll_valtext.obj \
        $(OBJS)\monodll_wincmn.obj \
        $(OBJS)\monodll_treebase.obj \
        $(OBJS)\monodll_valgen.obj \
        $(OBJS)\monodll_validate.obj \
        $(OBJS)\monodll_valtext.obj \
        $(OBJS)\monodll_wincmn.obj \

-       $(OBJS)\monodll_xpmdecod.obj
+       $(OBJS)\monodll_xpmdecod.obj \
+       $(OBJS)\monodll_busyinfo.obj \
+       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_choicdgg.obj \
+       $(OBJS)\monodll_dcbuffer.obj \
+       $(OBJS)\monodll_dcpsg.obj \
+       $(OBJS)\monodll_dirctrlg.obj \
+       $(OBJS)\monodll_dragimgg.obj \
+       $(OBJS)\monodll_grid.obj \
+       $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_gridsel.obj \
+       $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_logg.obj \
+       $(OBJS)\monodll_numdlgg.obj \
+       $(OBJS)\monodll_panelg.obj \
+       $(OBJS)\monodll_progdlgg.obj \
+       $(OBJS)\monodll_renderg.obj \
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_scrlwing.obj \
+       $(OBJS)\monodll_selstore.obj \
+       $(OBJS)\monodll_spinctlg.obj \
+       $(OBJS)\monodll_splash.obj \
+       $(OBJS)\monodll_splitter.obj \
+       $(OBJS)\monodll_tbarsmpl.obj \
+       $(OBJS)\monodll_textdlgg.obj \
+       $(OBJS)\monodll_tipdlg.obj \
+       $(OBJS)\monodll_tipwin.obj \
+       $(OBJS)\monodll_treectlg.obj \
+       $(OBJS)\monodll_vlbox.obj \
+       $(OBJS)\monodll_vscroll.obj \
+       $(OBJS)\monodll_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS =  \

+       $(OBJS)\monodll_taskbarcmn.obj \

        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \
        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \


@@ -2226,12 +2239,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_joystick.obj \
        $(OBJS)\monodll_minifram.obj \
        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_joystick.obj \
        $(OBJS)\monodll_minifram.obj \

+       $(OBJS)\monodll_automtn.obj \
+       $(OBJS)\monodll_dataobj.obj \
+       $(OBJS)\monodll_dropsrc.obj \
+       $(OBJS)\monodll_droptgt.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_uuid.obj \

        $(OBJS)\monodll_palette.obj \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_settings.obj \
        $(OBJS)\monodll_palette.obj \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_settings.obj \

-       $(OBJS)\monodll_taskbarcmn.obj \

        $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_tooltip.obj \
        $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_tooltip.obj \


@@ -2239,13 +2257,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_utilsgui.obj \
        $(OBJS)\monodll_wave.obj \
        $(OBJS)\monodll_window.obj \
        $(OBJS)\monodll_utilsgui.obj \
        $(OBJS)\monodll_wave.obj \
        $(OBJS)\monodll_window.obj \

-       $(OBJS)\monodll_automtn.obj \
-       $(OBJS)\monodll_dataobj.obj \
-       $(OBJS)\monodll_dropsrc.obj \
-       $(OBJS)\monodll_droptgt.obj \
-       $(OBJS)\monodll_oleutils.obj \
-       $(OBJS)\monodll_uuid.obj \

        $(OBJS)\monodll_textctrl.obj \
        $(OBJS)\monodll_textctrl.obj \

+       $(OBJS)\monodll_accel.obj \
+       $(OBJS)\monodll_colrdlgg.obj \
+       $(OBJS)\monodll_dirdlgg.obj \
+       $(OBJS)\monodll_fdrepdlg.obj \
+       $(OBJS)\monodll_filedlgg.obj \
+       $(OBJS)\monodll_fontdlgg.obj \
+       $(OBJS)\monodll_imaglist.obj \
+       $(OBJS)\monodll_listctrl.obj \
+       $(OBJS)\monodll_mdig.obj \
+       $(OBJS)\monodll_msgdlgg.obj \
+       $(OBJS)\monodll_prntdlgg.obj \
+       $(OBJS)\monodll_tabg.obj \

        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \
        $(OBJS)\monodll_checkbox.obj \
        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \
        $(OBJS)\monodll_checkbox.obj \


@@ -2256,7 +2280,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_control.obj \
        $(OBJS)\monodll_dialog.obj \
        $(OBJS)\monodll_framuniv.obj \
        $(OBJS)\monodll_control.obj \
        $(OBJS)\monodll_dialog.obj \
        $(OBJS)\monodll_framuniv.obj \

-       $(OBJS)\monodll_topluniv.obj \

        $(OBJS)\monodll_gauge.obj \
        $(OBJS)\monodll_inpcons.obj \
        $(OBJS)\monodll_inphand.obj \
        $(OBJS)\monodll_gauge.obj \
        $(OBJS)\monodll_inpcons.obj \
        $(OBJS)\monodll_inphand.obj \


@@ -2276,58 +2299,15 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_statline.obj \
        $(OBJS)\monodll_stattext.obj \
        $(OBJS)\monodll_statusbr.obj \
        $(OBJS)\monodll_statline.obj \
        $(OBJS)\monodll_stattext.obj \
        $(OBJS)\monodll_statusbr.obj \

-       $(OBJS)\monodll_toolbar.obj \

        $(OBJS)\monodll_theme.obj \
        $(OBJS)\monodll_theme.obj \

+       $(OBJS)\monodll_toolbar.obj \
+       $(OBJS)\monodll_topluniv.obj \

        $(OBJS)\monodll_winuniv.obj \
        $(OBJS)\monodll_winuniv.obj \

-       $(OBJS)\monodll_mdig.obj \
-       $(OBJS)\monodll_imaglist.obj \
-       $(OBJS)\monodll_colrdlgg.obj \
-       $(OBJS)\monodll_listctrl.obj \
-       $(OBJS)\monodll_filedlgg.obj \
-       $(OBJS)\monodll_dirdlgg.obj \
-       $(OBJS)\monodll_prntdlgg.obj \
-       $(OBJS)\monodll_accel.obj \
-       $(OBJS)\monodll_msgdlgg.obj \
-       $(OBJS)\monodll_fdrepdlg.obj \
-       $(OBJS)\monodll_fontdlgg.obj \
-       $(OBJS)\monodll_tabg.obj \

        $(OBJS)\monodll_gtk.obj \
        $(OBJS)\monodll_gtk.obj \

-       $(OBJS)\monodll_win32.obj \

        $(OBJS)\monodll_metal.obj \
        $(OBJS)\monodll_metal.obj \

-       $(OBJS)\monodll_busyinfo.obj \
-       $(OBJS)\monodll_calctrl.obj \
-       $(OBJS)\monodll_choicdgg.obj \
-       $(OBJS)\monodll_dcbuffer.obj \
-       $(OBJS)\monodll_dcpsg.obj \
-       $(OBJS)\monodll_dirctrlg.obj \
-       $(OBJS)\monodll_dragimgg.obj \
-       $(OBJS)\monodll_grid.obj \
-       $(OBJS)\monodll_gridctrl.obj \
-       $(OBJS)\monodll_gridsel.obj \
-       $(OBJS)\monodll_helpext.obj \
-       $(OBJS)\monodll_laywin.obj \
-       $(OBJS)\monodll_logg.obj \
-       $(OBJS)\monodll_numdlgg.obj \
-       $(OBJS)\monodll_panelg.obj \
-       $(OBJS)\monodll_progdlgg.obj \
-       $(OBJS)\monodll_renderg.obj \
-       $(OBJS)\monodll_sashwin.obj \
-       $(OBJS)\monodll_scrlwing.obj \
-       $(OBJS)\monodll_selstore.obj \
-       $(OBJS)\monodll_spinctlg.obj \
-       $(OBJS)\monodll_splash.obj \
-       $(OBJS)\monodll_splitter.obj \
-       $(OBJS)\monodll_tbarsmpl.obj \
-       $(OBJS)\monodll_textdlgg.obj \
-       $(OBJS)\monodll_tipdlg.obj \
-       $(OBJS)\monodll_tipwin.obj \
-       $(OBJS)\monodll_treectlg.obj \
-       $(OBJS)\monodll_vlbox.obj \
-       $(OBJS)\monodll_vscroll.obj \
-       $(OBJS)\monodll_wizard.obj \
-       $(OBJS)\monodll_appcmn.obj \
-       $(OBJS)\monodll_fontmap.obj \
+       $(OBJS)\monodll_win32.obj \

        $(OBJS)\monodll_accesscmn.obj \
        $(OBJS)\monodll_accesscmn.obj \

+       $(OBJS)\monodll_appcmn.obj \

        $(OBJS)\monodll_artprov.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \
        $(OBJS)\monodll_artprov.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \


@@ -2353,9 +2333,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_fontcmn.obj \
        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_fontcmn.obj \

+       $(OBJS)\monodll_fontmap.obj \

        $(OBJS)\monodll_framecmn.obj \
        $(OBJS)\monodll_framecmn.obj \

-       $(OBJS)\monodll_timercmn.obj \
-       $(OBJS)\monodll_toplvcmn.obj \

        $(OBJS)\monodll_gaugecmn.obj \
        $(OBJS)\monodll_gdicmn.obj \
        $(OBJS)\monodll_geometry.obj \
        $(OBJS)\monodll_gaugecmn.obj \
        $(OBJS)\monodll_gdicmn.obj \
        $(OBJS)\monodll_geometry.obj \


@@ -2365,6 +2344,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagall.obj \
        $(OBJS)\monodll_imagbmp.obj \
        $(OBJS)\monodll_image.obj \
        $(OBJS)\monodll_imagall.obj \
        $(OBJS)\monodll_imagbmp.obj \
        $(OBJS)\monodll_image.obj \

+       $(OBJS)\monodll_imagfill.obj \

        $(OBJS)\monodll_imaggif.obj \
        $(OBJS)\monodll_imagiff.obj \
        $(OBJS)\monodll_imagjpeg.obj \
        $(OBJS)\monodll_imaggif.obj \
        $(OBJS)\monodll_imagiff.obj \
        $(OBJS)\monodll_imagjpeg.obj \


@@ -2373,7 +2353,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagpnm.obj \
        $(OBJS)\monodll_imagtiff.obj \
        $(OBJS)\monodll_imagxpm.obj \
        $(OBJS)\monodll_imagpnm.obj \
        $(OBJS)\monodll_imagtiff.obj \
        $(OBJS)\monodll_imagxpm.obj \

-       $(OBJS)\monodll_imagfill.obj \

        $(OBJS)\monodll_layout.obj \
        $(OBJS)\monodll_lboxcmn.obj \
        $(OBJS)\monodll_matrix.obj \
        $(OBJS)\monodll_layout.obj \
        $(OBJS)\monodll_lboxcmn.obj \
        $(OBJS)\monodll_matrix.obj \


@@ -2391,63 +2370,96 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_statbar.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \
        $(OBJS)\monodll_statbar.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \

+       $(OBJS)\monodll_timercmn.obj \
+       $(OBJS)\monodll_toplvcmn.obj \

        $(OBJS)\monodll_treebase.obj \
        $(OBJS)\monodll_valgen.obj \
        $(OBJS)\monodll_validate.obj \
        $(OBJS)\monodll_valtext.obj \
        $(OBJS)\monodll_wincmn.obj \
        $(OBJS)\monodll_treebase.obj \
        $(OBJS)\monodll_valgen.obj \
        $(OBJS)\monodll_validate.obj \
        $(OBJS)\monodll_valtext.obj \
        $(OBJS)\monodll_wincmn.obj \

-       $(OBJS)\monodll_xpmdecod.obj
+       $(OBJS)\monodll_xpmdecod.obj \
+       $(OBJS)\monodll_busyinfo.obj \
+       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_choicdgg.obj \
+       $(OBJS)\monodll_dcbuffer.obj \
+       $(OBJS)\monodll_dcpsg.obj \
+       $(OBJS)\monodll_dirctrlg.obj \
+       $(OBJS)\monodll_dragimgg.obj \
+       $(OBJS)\monodll_grid.obj \
+       $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_gridsel.obj \
+       $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_logg.obj \
+       $(OBJS)\monodll_numdlgg.obj \
+       $(OBJS)\monodll_panelg.obj \
+       $(OBJS)\monodll_progdlgg.obj \
+       $(OBJS)\monodll_renderg.obj \
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_scrlwing.obj \
+       $(OBJS)\monodll_selstore.obj \
+       $(OBJS)\monodll_spinctlg.obj \
+       $(OBJS)\monodll_splash.obj \
+       $(OBJS)\monodll_splitter.obj \
+       $(OBJS)\monodll_tbarsmpl.obj \
+       $(OBJS)\monodll_textdlgg.obj \
+       $(OBJS)\monodll_tipdlg.obj \
+       $(OBJS)\monodll_tipwin.obj \
+       $(OBJS)\monodll_treectlg.obj \
+       $(OBJS)\monodll_vlbox.obj \
+       $(OBJS)\monodll_vscroll.obj \
+       $(OBJS)\monodll_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_helpbest.obj \
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_helpbest.obj \

+       $(OBJS)\monolib_helpctrl.obj \

        $(OBJS)\monolib_helpdata.obj \
        $(OBJS)\monolib_helpfrm.obj \
        $(OBJS)\monolib_helpdata.obj \
        $(OBJS)\monolib_helpfrm.obj \

-       $(OBJS)\monolib_helpctrl.obj \

        $(OBJS)\monolib_htmlcell.obj \
        $(OBJS)\monolib_htmlfilt.obj \
        $(OBJS)\monolib_htmlpars.obj \
        $(OBJS)\monolib_htmltag.obj \
        $(OBJS)\monolib_htmlwin.obj \
        $(OBJS)\monolib_htmlcell.obj \
        $(OBJS)\monolib_htmlfilt.obj \
        $(OBJS)\monolib_htmlpars.obj \
        $(OBJS)\monolib_htmltag.obj \
        $(OBJS)\monolib_htmlwin.obj \

-       $(OBJS)\monolib_winpars.obj \
+       $(OBJS)\monolib_htmprint.obj \
+       $(OBJS)\monolib_m_dflist.obj \

        $(OBJS)\monolib_m_fonts.obj \
        $(OBJS)\monolib_m_hline.obj \
        $(OBJS)\monolib_m_image.obj \
        $(OBJS)\monolib_m_layout.obj \
        $(OBJS)\monolib_m_links.obj \
        $(OBJS)\monolib_m_list.obj \
        $(OBJS)\monolib_m_fonts.obj \
        $(OBJS)\monolib_m_hline.obj \
        $(OBJS)\monolib_m_image.obj \
        $(OBJS)\monolib_m_layout.obj \
        $(OBJS)\monolib_m_links.obj \
        $(OBJS)\monolib_m_list.obj \

-       $(OBJS)\monolib_m_dflist.obj \

        $(OBJS)\monolib_m_pre.obj \
        $(OBJS)\monolib_m_pre.obj \

-       $(OBJS)\monolib_m_tables.obj \

        $(OBJS)\monolib_m_style.obj \
        $(OBJS)\monolib_m_style.obj \

-       $(OBJS)\monolib_htmprint.obj \
+       $(OBJS)\monolib_m_tables.obj \
+       $(OBJS)\monolib_winpars.obj \

        $(OBJS)\monolib_htmllbox.obj
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_helpbest.obj \
        $(OBJS)\monolib_htmllbox.obj
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_helpbest.obj \

+       $(OBJS)\monodll_helpctrl.obj \

        $(OBJS)\monodll_helpdata.obj \
        $(OBJS)\monodll_helpfrm.obj \
        $(OBJS)\monodll_helpdata.obj \
        $(OBJS)\monodll_helpfrm.obj \

-       $(OBJS)\monodll_helpctrl.obj \

        $(OBJS)\monodll_htmlcell.obj \
        $(OBJS)\monodll_htmlfilt.obj \
        $(OBJS)\monodll_htmlpars.obj \
        $(OBJS)\monodll_htmltag.obj \
        $(OBJS)\monodll_htmlwin.obj \
        $(OBJS)\monodll_htmlcell.obj \
        $(OBJS)\monodll_htmlfilt.obj \
        $(OBJS)\monodll_htmlpars.obj \
        $(OBJS)\monodll_htmltag.obj \
        $(OBJS)\monodll_htmlwin.obj \

-       $(OBJS)\monodll_winpars.obj \
+       $(OBJS)\monodll_htmprint.obj \
+       $(OBJS)\monodll_m_dflist.obj \

        $(OBJS)\monodll_m_fonts.obj \
        $(OBJS)\monodll_m_hline.obj \
        $(OBJS)\monodll_m_image.obj \
        $(OBJS)\monodll_m_layout.obj \
        $(OBJS)\monodll_m_links.obj \
        $(OBJS)\monodll_m_list.obj \
        $(OBJS)\monodll_m_fonts.obj \
        $(OBJS)\monodll_m_hline.obj \
        $(OBJS)\monodll_m_image.obj \
        $(OBJS)\monodll_m_layout.obj \
        $(OBJS)\monodll_m_links.obj \
        $(OBJS)\monodll_m_list.obj \

-       $(OBJS)\monodll_m_dflist.obj \

        $(OBJS)\monodll_m_pre.obj \
        $(OBJS)\monodll_m_pre.obj \

-       $(OBJS)\monodll_m_tables.obj \

        $(OBJS)\monodll_m_style.obj \
        $(OBJS)\monodll_m_style.obj \

-       $(OBJS)\monodll_htmprint.obj \
+       $(OBJS)\monodll_m_tables.obj \
+       $(OBJS)\monodll_winpars.obj \

        $(OBJS)\monodll_htmllbox.obj
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
        $(OBJS)\monodll_htmllbox.obj
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"


@@ -8864,7 +8876,7 @@ $(OBJS)\xmllib_xml.obj: ..\src\xml\xml.cpp
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib

-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

        c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
        c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@


@@ -8911,7 +8923,7 @@ clean:
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)

-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

        c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@
        c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@


@@ -8927,7 +8939,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li
 
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
 
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib

-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

        c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@
        c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@


@@ -8943,7 +8955,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib:
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)

-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

        c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@
        c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@


@@ -8965,7 +8977,7 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME)
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib

-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

        c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib   cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
        c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib   cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@


@@ -8984,7 +8996,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)

-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

        c0d32.obj $(NETDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net $@
        c0d32.obj $(NETDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net $@


@@ -9047,7 +9059,7 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)

-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG)  -L$(LIBDIRNAME) @&&|
+       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

        c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml $@
        c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  cw32mt$(__RUNTIME_LIBS_5).lib,,
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml $@

diff --git a/build/makefile.gcc b/build/makefile.gcc
index c67fb72ac1563424466a3811d3fcde29a47cc53b..5067c768af9a3207a44a7d5f8cdcf9f1f898d66a 100644 (file)
--- a/build/makefile.gcc
+++ b/build/makefile.gcc
@@ -12,19 +12,16 @@ include config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-BASEDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS) 
-BASEDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+BASEDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)

-BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) 
-BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS)

-BASEDLL_OBJECTS =  $(OBJS)\basedll_dummy.o $(OBJS)\basedll_appbase.o $(OBJS)\basedll_clntdata.o $(OBJS)\basedll_cmdline.o $(OBJS)\basedll_config.o $(OBJS)\basedll_datetime.o $(OBJS)\basedll_datstrm.o $(OBJS)\basedll_db.o $(OBJS)\basedll_dbtable.o $(OBJS)\basedll_dircmn.o $(OBJS)\basedll_dynarray.o $(OBJS)\basedll_dynlib.o $(OBJS)\basedll_dynload.o $(OBJS)\basedll_encconv.o $(OBJS)\basedll_extended.o $(OBJS)\basedll_ffile.o $(OBJS)\basedll_file.o $(OBJS)\basedll_fileconf.o $(OBJS)\basedll_filefn.o $(OBJS)\basedll_filename.o $(OBJS)\basedll_filesys.o $(OBJS)\basedll_fmapbase.o $(OBJS)\basedll_fs_zip.o $(OBJS)\basedll_hash.o $(OBJS)\basedll_hashmap.o $(OBJS)\basedll_init.o $(OBJS)\basedll_intl.o $(OBJS)\basedll_ipcbase.o $(OBJS)\basedll_list.o $(OBJS)\basedll_log.o $(OBJS)\basedll_longlong.o $(OBJS)\basedll_memory.o $(OBJS)\basedll_mimecmn.o $(OBJS)\basedll_module.o $(OBJS)\basedll_mstream.o $(OBJS)\basedll_object.o $(OBJS)\basedll_process.o $(OBJS)\basedll_regex.o $(OBJS)\basedll_stopwatch.o $(OBJS)\basedll_strconv.o $(OBJS)\basedll_stream.o $(OBJS)\basedll_string.o $(OBJS)\basedll_sysopt.o $(OBJS)\basedll_textbuf.o $(OBJS)\basedll_textfile.o $(OBJS)\basedll_tokenzr.o $(OBJS)\basedll_txtstrm.o $(OBJS)\basedll_unzip.o $(OBJS)\basedll_variant.o $(OBJS)\basedll_wfstream.o $(OBJS)\basedll_wxchar.o $(OBJS)\basedll_zipstrm.o $(OBJS)\basedll_zstream.o $(OBJS)\basedll_basemsw.o $(OBJS)\basedll_dde.o $(OBJS)\basedll_dir.o $(OBJS)\basedll_mimetype.o $(OBJS)\basedll_regconf.o $(OBJS)\basedll_registry.o $(OBJS)\basedll_snglinst.o $(OBJS)\basedll_thread.o $(OBJS)\basedll_utils.o $(OBJS)\basedll_utilsexc.o $(OBJS)\basedll_crashrpt.o $(OBJS)\basedll_event.o $(OBJS)\basedll_fs_mem.o $(OBJS)\basedll_msgout.o $(OBJS)\basedll_utilscmn.o $(OBJS)\basedll_main.o $(OBJS)\basedll_mslu.o $(OBJS)\basedll_volume.o

 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.o \
        $(OBJS)\basedll_appbase.o \
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.o \
        $(OBJS)\basedll_appbase.o \


@@ -80,6 +77,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_zipstrm.o \
        $(OBJS)\basedll_zstream.o \
        $(OBJS)\basedll_basemsw.o \
        $(OBJS)\basedll_zipstrm.o \
        $(OBJS)\basedll_zstream.o \
        $(OBJS)\basedll_basemsw.o \

+       $(OBJS)\basedll_crashrpt.o \

        $(OBJS)\basedll_dde.o \
        $(OBJS)\basedll_dir.o \
        $(OBJS)\basedll_mimetype.o \
        $(OBJS)\basedll_dde.o \
        $(OBJS)\basedll_dir.o \
        $(OBJS)\basedll_mimetype.o \


@@ -89,7 +87,6 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_thread.o \
        $(OBJS)\basedll_utils.o \
        $(OBJS)\basedll_utilsexc.o \
        $(OBJS)\basedll_thread.o \
        $(OBJS)\basedll_utils.o \
        $(OBJS)\basedll_utilsexc.o \

-       $(OBJS)\basedll_crashrpt.o \

        $(OBJS)\basedll_event.o \
        $(OBJS)\basedll_fs_mem.o \
        $(OBJS)\basedll_msgout.o \
        $(OBJS)\basedll_event.o \
        $(OBJS)\basedll_fs_mem.o \
        $(OBJS)\basedll_msgout.o \


@@ -97,19 +94,16 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_main.o \
        $(OBJS)\basedll_mslu.o \
        $(OBJS)\basedll_volume.o
        $(OBJS)\basedll_main.o \
        $(OBJS)\basedll_mslu.o \
        $(OBJS)\basedll_volume.o

-BASELIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)
-BASELIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+BASELIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)

-BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS)
-BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS)

-BASELIB_OBJECTS =  $(OBJS)\baselib_dummy.o $(OBJS)\baselib_appbase.o $(OBJS)\baselib_clntdata.o $(OBJS)\baselib_cmdline.o $(OBJS)\baselib_config.o $(OBJS)\baselib_datetime.o $(OBJS)\baselib_datstrm.o $(OBJS)\baselib_db.o $(OBJS)\baselib_dbtable.o $(OBJS)\baselib_dircmn.o $(OBJS)\baselib_dynarray.o $(OBJS)\baselib_dynlib.o $(OBJS)\baselib_dynload.o $(OBJS)\baselib_encconv.o $(OBJS)\baselib_extended.o $(OBJS)\baselib_ffile.o $(OBJS)\baselib_file.o $(OBJS)\baselib_fileconf.o $(OBJS)\baselib_filefn.o $(OBJS)\baselib_filename.o $(OBJS)\baselib_filesys.o $(OBJS)\baselib_fmapbase.o $(OBJS)\baselib_fs_zip.o $(OBJS)\baselib_hash.o $(OBJS)\baselib_hashmap.o $(OBJS)\baselib_init.o $(OBJS)\baselib_intl.o $(OBJS)\baselib_ipcbase.o $(OBJS)\baselib_list.o $(OBJS)\baselib_log.o $(OBJS)\baselib_longlong.o $(OBJS)\baselib_memory.o $(OBJS)\baselib_mimecmn.o $(OBJS)\baselib_module.o $(OBJS)\baselib_mstream.o $(OBJS)\baselib_object.o $(OBJS)\baselib_process.o $(OBJS)\baselib_regex.o $(OBJS)\baselib_stopwatch.o $(OBJS)\baselib_strconv.o $(OBJS)\baselib_stream.o $(OBJS)\baselib_string.o $(OBJS)\baselib_sysopt.o $(OBJS)\baselib_textbuf.o $(OBJS)\baselib_textfile.o $(OBJS)\baselib_tokenzr.o $(OBJS)\baselib_txtstrm.o $(OBJS)\baselib_unzip.o $(OBJS)\baselib_variant.o $(OBJS)\baselib_wfstream.o $(OBJS)\baselib_wxchar.o $(OBJS)\baselib_zipstrm.o $(OBJS)\baselib_zstream.o $(OBJS)\baselib_basemsw.o $(OBJS)\baselib_dde.o $(OBJS)\baselib_dir.o $(OBJS)\baselib_mimetype.o $(OBJS)\baselib_regconf.o $(OBJS)\baselib_registry.o $(OBJS)\baselib_snglinst.o $(OBJS)\baselib_thread.o $(OBJS)\baselib_utils.o $(OBJS)\baselib_utilsexc.o $(OBJS)\baselib_crashrpt.o $(OBJS)\baselib_event.o $(OBJS)\baselib_fs_mem.o $(OBJS)\baselib_msgout.o $(OBJS)\baselib_utilscmn.o $(OBJS)\baselib_main.o $(OBJS)\baselib_mslu.o $(OBJS)\baselib_volume.o

 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.o \
        $(OBJS)\baselib_appbase.o \
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.o \
        $(OBJS)\baselib_appbase.o \


@@ -165,6 +159,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_zipstrm.o \
        $(OBJS)\baselib_zstream.o \
        $(OBJS)\baselib_basemsw.o \
        $(OBJS)\baselib_zipstrm.o \
        $(OBJS)\baselib_zstream.o \
        $(OBJS)\baselib_basemsw.o \

+       $(OBJS)\baselib_crashrpt.o \

        $(OBJS)\baselib_dde.o \
        $(OBJS)\baselib_dir.o \
        $(OBJS)\baselib_mimetype.o \
        $(OBJS)\baselib_dde.o \
        $(OBJS)\baselib_dir.o \
        $(OBJS)\baselib_mimetype.o \


@@ -174,7 +169,6 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_thread.o \
        $(OBJS)\baselib_utils.o \
        $(OBJS)\baselib_utilsexc.o \
        $(OBJS)\baselib_thread.o \
        $(OBJS)\baselib_utils.o \
        $(OBJS)\baselib_utilsexc.o \

-       $(OBJS)\baselib_crashrpt.o \

        $(OBJS)\baselib_event.o \
        $(OBJS)\baselib_fs_mem.o \
        $(OBJS)\baselib_msgout.o \
        $(OBJS)\baselib_event.o \
        $(OBJS)\baselib_fs_mem.o \
        $(OBJS)\baselib_msgout.o \


@@ -182,13 +176,11 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_main.o \
        $(OBJS)\baselib_mslu.o \
        $(OBJS)\baselib_volume.o
        $(OBJS)\baselib_main.o \
        $(OBJS)\baselib_mslu.o \
        $(OBJS)\baselib_volume.o

-COREDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(CXXFLAGS) 
-COREDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+COREDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(CXXFLAGS)

-COREDLL_OBJECTS =  $(OBJS)\coredll_dummy.o $(OBJS)\coredll_event.o $(OBJS)\coredll_fs_mem.o $(OBJS)\coredll_msgout.o $(OBJS)\coredll_utilscmn.o $(OBJS)\coredll_main.o $(OBJS)\coredll_mslu.o $(OBJS)\coredll_volume.o $(____CORE_SRC_FILENAMES_2_OBJECTS)

 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.o \
        $(OBJS)\coredll_event.o \
 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.o \
        $(OBJS)\coredll_event.o \


@@ -199,13 +191,11 @@ COREDLL_OBJECTS =  \
        $(OBJS)\coredll_mslu.o \
        $(OBJS)\coredll_volume.o \
        $(____CORE_SRC_FILENAMES_2_OBJECTS)
        $(OBJS)\coredll_mslu.o \
        $(OBJS)\coredll_volume.o \
        $(____CORE_SRC_FILENAMES_2_OBJECTS)

-CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DwxUSE_BASE=0 $(CXXFLAGS)
-CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=0 $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=0 $(CXXFLAGS)

-CORELIB_OBJECTS =  $(OBJS)\corelib_dummy.o $(OBJS)\corelib_event.o $(OBJS)\corelib_fs_mem.o $(OBJS)\corelib_msgout.o $(OBJS)\corelib_utilscmn.o $(OBJS)\corelib_main.o $(OBJS)\corelib_mslu.o $(OBJS)\corelib_volume.o $(____CORE_SRC_FILENAMES_3_OBJECTS)

 CORELIB_OBJECTS =  \
        $(OBJS)\corelib_dummy.o \
        $(OBJS)\corelib_event.o \
 CORELIB_OBJECTS =  \
        $(OBJS)\corelib_dummy.o \
        $(OBJS)\corelib_event.o \


@@ -216,104 +206,92 @@ CORELIB_OBJECTS =  \
        $(OBJS)\corelib_mslu.o \
        $(OBJS)\corelib_volume.o \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)
        $(OBJS)\corelib_mslu.o \
        $(OBJS)\corelib_volume.o \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)

-GLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_GL $(CXXFLAGS) 
-GLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+GLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_GL $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_GL $(CXXFLAGS)

-GLDLL_OBJECTS =  $(OBJS)\gldll_dummy.o $(OBJS)\gldll_glcanvas.o

 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.o \
        $(OBJS)\gldll_glcanvas.o
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.o \
        $(OBJS)\gldll_glcanvas.o

-GLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib $(CXXFLAGS)
-GLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+GLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(CXXFLAGS)

-GLLIB_OBJECTS =  $(OBJS)\gllib_dummy.o $(OBJS)\gllib_glcanvas.o

 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.o \
        $(OBJS)\gllib_glcanvas.o
 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.o \
        $(OBJS)\gllib_glcanvas.o

-HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_HTML $(CXXFLAGS) 
-HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+HTMLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_HTML $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_HTML $(CXXFLAGS)

-HTMLDLL_OBJECTS =  $(OBJS)\htmldll_dummy.o $(OBJS)\htmldll_helpbest.o $(OBJS)\htmldll_helpdata.o $(OBJS)\htmldll_helpfrm.o $(OBJS)\htmldll_helpctrl.o $(OBJS)\htmldll_htmlcell.o $(OBJS)\htmldll_htmlfilt.o $(OBJS)\htmldll_htmlpars.o $(OBJS)\htmldll_htmltag.o $(OBJS)\htmldll_htmlwin.o $(OBJS)\htmldll_winpars.o $(OBJS)\htmldll_m_fonts.o $(OBJS)\htmldll_m_hline.o $(OBJS)\htmldll_m_image.o $(OBJS)\htmldll_m_layout.o $(OBJS)\htmldll_m_links.o $(OBJS)\htmldll_m_list.o $(OBJS)\htmldll_m_dflist.o $(OBJS)\htmldll_m_pre.o $(OBJS)\htmldll_m_tables.o $(OBJS)\htmldll_m_style.o $(OBJS)\htmldll_htmprint.o $(OBJS)\htmldll_htmllbox.o

 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.o \
        $(OBJS)\htmldll_helpbest.o \
 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.o \
        $(OBJS)\htmldll_helpbest.o \

+       $(OBJS)\htmldll_helpctrl.o \

        $(OBJS)\htmldll_helpdata.o \
        $(OBJS)\htmldll_helpfrm.o \
        $(OBJS)\htmldll_helpdata.o \
        $(OBJS)\htmldll_helpfrm.o \

-       $(OBJS)\htmldll_helpctrl.o \

        $(OBJS)\htmldll_htmlcell.o \
        $(OBJS)\htmldll_htmlfilt.o \
        $(OBJS)\htmldll_htmlpars.o \
        $(OBJS)\htmldll_htmltag.o \
        $(OBJS)\htmldll_htmlwin.o \
        $(OBJS)\htmldll_htmlcell.o \
        $(OBJS)\htmldll_htmlfilt.o \
        $(OBJS)\htmldll_htmlpars.o \
        $(OBJS)\htmldll_htmltag.o \
        $(OBJS)\htmldll_htmlwin.o \

-       $(OBJS)\htmldll_winpars.o \
+       $(OBJS)\htmldll_htmprint.o \
+       $(OBJS)\htmldll_m_dflist.o \

        $(OBJS)\htmldll_m_fonts.o \
        $(OBJS)\htmldll_m_hline.o \
        $(OBJS)\htmldll_m_image.o \
        $(OBJS)\htmldll_m_layout.o \
        $(OBJS)\htmldll_m_links.o \
        $(OBJS)\htmldll_m_list.o \
        $(OBJS)\htmldll_m_fonts.o \
        $(OBJS)\htmldll_m_hline.o \
        $(OBJS)\htmldll_m_image.o \
        $(OBJS)\htmldll_m_layout.o \
        $(OBJS)\htmldll_m_links.o \
        $(OBJS)\htmldll_m_list.o \

-       $(OBJS)\htmldll_m_dflist.o \

        $(OBJS)\htmldll_m_pre.o \
        $(OBJS)\htmldll_m_pre.o \

-       $(OBJS)\htmldll_m_tables.o \

        $(OBJS)\htmldll_m_style.o \
        $(OBJS)\htmldll_m_style.o \

-       $(OBJS)\htmldll_htmprint.o \
+       $(OBJS)\htmldll_m_tables.o \
+       $(OBJS)\htmldll_winpars.o \

        $(OBJS)\htmldll_htmllbox.o
        $(OBJS)\htmldll_htmllbox.o

-HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib $(CXXFLAGS)
-HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(CXXFLAGS)

-HTMLLIB_OBJECTS =  $(OBJS)\htmllib_dummy.o $(OBJS)\htmllib_helpbest.o $(OBJS)\htmllib_helpdata.o $(OBJS)\htmllib_helpfrm.o $(OBJS)\htmllib_helpctrl.o $(OBJS)\htmllib_htmlcell.o $(OBJS)\htmllib_htmlfilt.o $(OBJS)\htmllib_htmlpars.o $(OBJS)\htmllib_htmltag.o $(OBJS)\htmllib_htmlwin.o $(OBJS)\htmllib_winpars.o $(OBJS)\htmllib_m_fonts.o $(OBJS)\htmllib_m_hline.o $(OBJS)\htmllib_m_image.o $(OBJS)\htmllib_m_layout.o $(OBJS)\htmllib_m_links.o $(OBJS)\htmllib_m_list.o $(OBJS)\htmllib_m_dflist.o $(OBJS)\htmllib_m_pre.o $(OBJS)\htmllib_m_tables.o $(OBJS)\htmllib_m_style.o $(OBJS)\htmllib_htmprint.o $(OBJS)\htmllib_htmllbox.o

 HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_dummy.o \
        $(OBJS)\htmllib_helpbest.o \
 HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_dummy.o \
        $(OBJS)\htmllib_helpbest.o \

+       $(OBJS)\htmllib_helpctrl.o \

        $(OBJS)\htmllib_helpdata.o \
        $(OBJS)\htmllib_helpfrm.o \
        $(OBJS)\htmllib_helpdata.o \
        $(OBJS)\htmllib_helpfrm.o \

-       $(OBJS)\htmllib_helpctrl.o \

        $(OBJS)\htmllib_htmlcell.o \
        $(OBJS)\htmllib_htmlfilt.o \
        $(OBJS)\htmllib_htmlpars.o \
        $(OBJS)\htmllib_htmltag.o \
        $(OBJS)\htmllib_htmlwin.o \
        $(OBJS)\htmllib_htmlcell.o \
        $(OBJS)\htmllib_htmlfilt.o \
        $(OBJS)\htmllib_htmlpars.o \
        $(OBJS)\htmllib_htmltag.o \
        $(OBJS)\htmllib_htmlwin.o \

-       $(OBJS)\htmllib_winpars.o \
+       $(OBJS)\htmllib_htmprint.o \
+       $(OBJS)\htmllib_m_dflist.o \

        $(OBJS)\htmllib_m_fonts.o \
        $(OBJS)\htmllib_m_hline.o \
        $(OBJS)\htmllib_m_image.o \
        $(OBJS)\htmllib_m_layout.o \
        $(OBJS)\htmllib_m_links.o \
        $(OBJS)\htmllib_m_list.o \
        $(OBJS)\htmllib_m_fonts.o \
        $(OBJS)\htmllib_m_hline.o \
        $(OBJS)\htmllib_m_image.o \
        $(OBJS)\htmllib_m_layout.o \
        $(OBJS)\htmllib_m_links.o \
        $(OBJS)\htmllib_m_list.o \

-       $(OBJS)\htmllib_m_dflist.o \

        $(OBJS)\htmllib_m_pre.o \
        $(OBJS)\htmllib_m_pre.o \

-       $(OBJS)\htmllib_m_tables.o \

        $(OBJS)\htmllib_m_style.o \
        $(OBJS)\htmllib_m_style.o \

-       $(OBJS)\htmllib_htmprint.o \
+       $(OBJS)\htmllib_m_tables.o \
+       $(OBJS)\htmllib_winpars.o \

        $(OBJS)\htmllib_htmllbox.o
        $(OBJS)\htmllib_htmllbox.o

-LIBDIRNAME = ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

 LIBDIRNAME = \
        ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = \
        ..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-MONODLL_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS) 
-MONODLL_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+MONODLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS)

-MONODLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) 
-MONODLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+MONODLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS)

-MONODLL_OBJECTS =  $(OBJS)\monodll_dummy.o $(OBJS)\monodll_appbase.o $(OBJS)\monodll_clntdata.o $(OBJS)\monodll_cmdline.o $(OBJS)\monodll_config.o $(OBJS)\monodll_datetime.o $(OBJS)\monodll_datstrm.o $(OBJS)\monodll_db.o $(OBJS)\monodll_dbtable.o $(OBJS)\monodll_dircmn.o $(OBJS)\monodll_dynarray.o $(OBJS)\monodll_dynlib.o $(OBJS)\monodll_dynload.o $(OBJS)\monodll_encconv.o $(OBJS)\monodll_extended.o $(OBJS)\monodll_ffile.o $(OBJS)\monodll_file.o $(OBJS)\monodll_fileconf.o $(OBJS)\monodll_filefn.o $(OBJS)\monodll_filename.o $(OBJS)\monodll_filesys.o $(OBJS)\monodll_fmapbase.o $(OBJS)\monodll_fs_zip.o $(OBJS)\monodll_hash.o $(OBJS)\monodll_hashmap.o $(OBJS)\monodll_init.o $(OBJS)\monodll_intl.o $(OBJS)\monodll_ipcbase.o $(OBJS)\monodll_list.o $(OBJS)\monodll_log.o $(OBJS)\monodll_longlong.o $(OBJS)\monodll_memory.o $(OBJS)\monodll_mimecmn.o $(OBJS)\monodll_module.o $(OBJS)\monodll_mstream.o $(OBJS)\monodll_object.o $(OBJS)\monodll_process.o $(OBJS)\monodll_regex.o $(OBJS)\monodll_stopwatch.o $(OBJS)\monodll_strconv.o $(OBJS)\monodll_stream.o $(OBJS)\monodll_string.o $(OBJS)\monodll_sysopt.o $(OBJS)\monodll_textbuf.o $(OBJS)\monodll_textfile.o $(OBJS)\monodll_tokenzr.o $(OBJS)\monodll_txtstrm.o $(OBJS)\monodll_unzip.o $(OBJS)\monodll_variant.o $(OBJS)\monodll_wfstream.o $(OBJS)\monodll_wxchar.o $(OBJS)\monodll_zipstrm.o $(OBJS)\monodll_zstream.o $(OBJS)\monodll_basemsw.o $(OBJS)\monodll_dde.o $(OBJS)\monodll_dir.o $(OBJS)\monodll_mimetype.o $(OBJS)\monodll_regconf.o $(OBJS)\monodll_registry.o $(OBJS)\monodll_snglinst.o $(OBJS)\monodll_thread.o $(OBJS)\monodll_utils.o $(OBJS)\monodll_utilsexc.o $(OBJS)\monodll_crashrpt.o $(OBJS)\monodll_event.o $(OBJS)\monodll_fs_mem.o $(OBJS)\monodll_msgout.o $(OBJS)\monodll_utilscmn.o $(OBJS)\monodll_main.o $(OBJS)\monodll_mslu.o $(OBJS)\monodll_volume.o $(OBJS)\monodll_fs_inet.o $(OBJS)\monodll_ftp.o $(OBJS)\monodll_http.o $(OBJS)\monodll_protocol.o $(OBJS)\monodll_url.o $(OBJS)\monodll_sckfile.o $(OBJS)\monodll_sckaddr.o $(OBJS)\monodll_sckipc.o $(OBJS)\monodll_sckstrm.o $(OBJS)\monodll_socket.o $(OBJS)\monodll_gsocket.o $(OBJS)\monodll_gsockmsw.o $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) $(OBJS)\monodll_xml.o

 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.o \
        $(OBJS)\monodll_appbase.o \
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.o \
        $(OBJS)\monodll_appbase.o \


@@ -369,6 +347,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_zipstrm.o \
        $(OBJS)\monodll_zstream.o \
        $(OBJS)\monodll_basemsw.o \
        $(OBJS)\monodll_zipstrm.o \
        $(OBJS)\monodll_zstream.o \
        $(OBJS)\monodll_basemsw.o \

+       $(OBJS)\monodll_crashrpt.o \

        $(OBJS)\monodll_dde.o \
        $(OBJS)\monodll_dir.o \
        $(OBJS)\monodll_mimetype.o \
        $(OBJS)\monodll_dde.o \
        $(OBJS)\monodll_dir.o \
        $(OBJS)\monodll_mimetype.o \


@@ -378,7 +357,6 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_thread.o \
        $(OBJS)\monodll_utils.o \
        $(OBJS)\monodll_utilsexc.o \
        $(OBJS)\monodll_thread.o \
        $(OBJS)\monodll_utils.o \
        $(OBJS)\monodll_utilsexc.o \

-       $(OBJS)\monodll_crashrpt.o \

        $(OBJS)\monodll_event.o \
        $(OBJS)\monodll_fs_mem.o \
        $(OBJS)\monodll_msgout.o \
        $(OBJS)\monodll_event.o \
        $(OBJS)\monodll_fs_mem.o \
        $(OBJS)\monodll_msgout.o \


@@ -390,29 +368,26 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_ftp.o \
        $(OBJS)\monodll_http.o \
        $(OBJS)\monodll_protocol.o \
        $(OBJS)\monodll_ftp.o \
        $(OBJS)\monodll_http.o \
        $(OBJS)\monodll_protocol.o \

-       $(OBJS)\monodll_url.o \
-       $(OBJS)\monodll_sckfile.o \

        $(OBJS)\monodll_sckaddr.o \
        $(OBJS)\monodll_sckaddr.o \

+       $(OBJS)\monodll_sckfile.o \

        $(OBJS)\monodll_sckipc.o \
        $(OBJS)\monodll_sckstrm.o \
        $(OBJS)\monodll_socket.o \
        $(OBJS)\monodll_sckipc.o \
        $(OBJS)\monodll_sckstrm.o \
        $(OBJS)\monodll_socket.o \

+       $(OBJS)\monodll_url.o \

        $(OBJS)\monodll_gsocket.o \
        $(OBJS)\monodll_gsockmsw.o \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.o
        $(OBJS)\monodll_gsocket.o \
        $(OBJS)\monodll_gsockmsw.o \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.o

-MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DwxUSE_BASE=1 $(CFLAGS)
-MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 $(CFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 $(CFLAGS)

-MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DwxUSE_BASE=1 $(CXXFLAGS)
-MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DwxUSE_BASE=1 $(CXXFLAGS)

-MONOLIB_OBJECTS =  $(OBJS)\monolib_dummy.o $(OBJS)\monolib_appbase.o $(OBJS)\monolib_clntdata.o $(OBJS)\monolib_cmdline.o $(OBJS)\monolib_config.o $(OBJS)\monolib_datetime.o $(OBJS)\monolib_datstrm.o $(OBJS)\monolib_db.o $(OBJS)\monolib_dbtable.o $(OBJS)\monolib_dircmn.o $(OBJS)\monolib_dynarray.o $(OBJS)\monolib_dynlib.o $(OBJS)\monolib_dynload.o $(OBJS)\monolib_encconv.o $(OBJS)\monolib_extended.o $(OBJS)\monolib_ffile.o $(OBJS)\monolib_file.o $(OBJS)\monolib_fileconf.o $(OBJS)\monolib_filefn.o $(OBJS)\monolib_filename.o $(OBJS)\monolib_filesys.o $(OBJS)\monolib_fmapbase.o $(OBJS)\monolib_fs_zip.o $(OBJS)\monolib_hash.o $(OBJS)\monolib_hashmap.o $(OBJS)\monolib_init.o $(OBJS)\monolib_intl.o $(OBJS)\monolib_ipcbase.o $(OBJS)\monolib_list.o $(OBJS)\monolib_log.o $(OBJS)\monolib_longlong.o $(OBJS)\monolib_memory.o $(OBJS)\monolib_mimecmn.o $(OBJS)\monolib_module.o $(OBJS)\monolib_mstream.o $(OBJS)\monolib_object.o $(OBJS)\monolib_process.o $(OBJS)\monolib_regex.o $(OBJS)\monolib_stopwatch.o $(OBJS)\monolib_strconv.o $(OBJS)\monolib_stream.o $(OBJS)\monolib_string.o $(OBJS)\monolib_sysopt.o $(OBJS)\monolib_textbuf.o $(OBJS)\monolib_textfile.o $(OBJS)\monolib_tokenzr.o $(OBJS)\monolib_txtstrm.o $(OBJS)\monolib_unzip.o $(OBJS)\monolib_variant.o $(OBJS)\monolib_wfstream.o $(OBJS)\monolib_wxchar.o $(OBJS)\monolib_zipstrm.o $(OBJS)\monolib_zstream.o $(OBJS)\monolib_basemsw.o $(OBJS)\monolib_dde.o $(OBJS)\monolib_dir.o $(OBJS)\monolib_mimetype.o $(OBJS)\monolib_regconf.o $(OBJS)\monolib_registry.o $(OBJS)\monolib_snglinst.o $(OBJS)\monolib_thread.o $(OBJS)\monolib_utils.o $(OBJS)\monolib_utilsexc.o $(OBJS)\monolib_crashrpt.o $(OBJS)\monolib_event.o $(OBJS)\monolib_fs_mem.o $(OBJS)\monolib_msgout.o $(OBJS)\monolib_utilscmn.o $(OBJS)\monolib_main.o $(OBJS)\monolib_mslu.o $(OBJS)\monolib_volume.o $(OBJS)\monolib_fs_inet.o $(OBJS)\monolib_ftp.o $(OBJS)\monolib_http.o $(OBJS)\monolib_protocol.o $(OBJS)\monolib_url.o $(OBJS)\monolib_sckfile.o $(OBJS)\monolib_sckaddr.o $(OBJS)\monolib_sckipc.o $(OBJS)\monolib_sckstrm.o $(OBJS)\monolib_socket.o $(OBJS)\monolib_gsocket.o $(OBJS)\monolib_gsockmsw.o $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) $(OBJS)\monolib_xml.o

 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.o \
        $(OBJS)\monolib_appbase.o \
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.o \
        $(OBJS)\monolib_appbase.o \


@@ -468,6 +443,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_zipstrm.o \
        $(OBJS)\monolib_zstream.o \
        $(OBJS)\monolib_basemsw.o \
        $(OBJS)\monolib_zipstrm.o \
        $(OBJS)\monolib_zstream.o \
        $(OBJS)\monolib_basemsw.o \

+       $(OBJS)\monolib_crashrpt.o \

        $(OBJS)\monolib_dde.o \
        $(OBJS)\monolib_dir.o \
        $(OBJS)\monolib_mimetype.o \
        $(OBJS)\monolib_dde.o \
        $(OBJS)\monolib_dir.o \
        $(OBJS)\monolib_mimetype.o \


@@ -477,7 +453,6 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_thread.o \
        $(OBJS)\monolib_utils.o \
        $(OBJS)\monolib_utilsexc.o \
        $(OBJS)\monolib_thread.o \
        $(OBJS)\monolib_utils.o \
        $(OBJS)\monolib_utilsexc.o \

-       $(OBJS)\monolib_crashrpt.o \

        $(OBJS)\monolib_event.o \
        $(OBJS)\monolib_fs_mem.o \
        $(OBJS)\monolib_msgout.o \
        $(OBJS)\monolib_event.o \
        $(OBJS)\monolib_fs_mem.o \
        $(OBJS)\monolib_msgout.o \


@@ -489,85 +464,74 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_ftp.o \
        $(OBJS)\monolib_http.o \
        $(OBJS)\monolib_protocol.o \
        $(OBJS)\monolib_ftp.o \
        $(OBJS)\monolib_http.o \
        $(OBJS)\monolib_protocol.o \

-       $(OBJS)\monolib_url.o \
-       $(OBJS)\monolib_sckfile.o \

        $(OBJS)\monolib_sckaddr.o \
        $(OBJS)\monolib_sckaddr.o \

+       $(OBJS)\monolib_sckfile.o \

        $(OBJS)\monolib_sckipc.o \
        $(OBJS)\monolib_sckstrm.o \
        $(OBJS)\monolib_socket.o \
        $(OBJS)\monolib_sckipc.o \
        $(OBJS)\monolib_sckstrm.o \
        $(OBJS)\monolib_socket.o \

+       $(OBJS)\monolib_url.o \

        $(OBJS)\monolib_gsocket.o \
        $(OBJS)\monolib_gsockmsw.o \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.o
        $(OBJS)\monolib_gsocket.o \
        $(OBJS)\monolib_gsockmsw.o \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.o

-NETDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS) 
-NETDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+NETDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)

-NETDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) 
-NETDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+NETDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS)

-NETDLL_OBJECTS =  $(OBJS)\netdll_dummy.o $(OBJS)\netdll_fs_inet.o $(OBJS)\netdll_ftp.o $(OBJS)\netdll_http.o $(OBJS)\netdll_protocol.o $(OBJS)\netdll_url.o $(OBJS)\netdll_sckfile.o $(OBJS)\netdll_sckaddr.o $(OBJS)\netdll_sckipc.o $(OBJS)\netdll_sckstrm.o $(OBJS)\netdll_socket.o $(OBJS)\netdll_gsocket.o $(OBJS)\netdll_gsockmsw.o

 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.o \
        $(OBJS)\netdll_fs_inet.o \
        $(OBJS)\netdll_ftp.o \
        $(OBJS)\netdll_http.o \
        $(OBJS)\netdll_protocol.o \
 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.o \
        $(OBJS)\netdll_fs_inet.o \
        $(OBJS)\netdll_ftp.o \
        $(OBJS)\netdll_http.o \
        $(OBJS)\netdll_protocol.o \

-       $(OBJS)\netdll_url.o \
-       $(OBJS)\netdll_sckfile.o \

        $(OBJS)\netdll_sckaddr.o \
        $(OBJS)\netdll_sckaddr.o \

+       $(OBJS)\netdll_sckfile.o \

        $(OBJS)\netdll_sckipc.o \
        $(OBJS)\netdll_sckstrm.o \
        $(OBJS)\netdll_socket.o \
        $(OBJS)\netdll_sckipc.o \
        $(OBJS)\netdll_sckstrm.o \
        $(OBJS)\netdll_socket.o \

+       $(OBJS)\netdll_url.o \

        $(OBJS)\netdll_gsocket.o \
        $(OBJS)\netdll_gsockmsw.o
        $(OBJS)\netdll_gsocket.o \
        $(OBJS)\netdll_gsockmsw.o

-NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)
-NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)

-NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS)
-NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS)

-NETLIB_OBJECTS =  $(OBJS)\netlib_dummy.o $(OBJS)\netlib_fs_inet.o $(OBJS)\netlib_ftp.o $(OBJS)\netlib_http.o $(OBJS)\netlib_protocol.o $(OBJS)\netlib_url.o $(OBJS)\netlib_sckfile.o $(OBJS)\netlib_sckaddr.o $(OBJS)\netlib_sckipc.o $(OBJS)\netlib_sckstrm.o $(OBJS)\netlib_socket.o $(OBJS)\netlib_gsocket.o $(OBJS)\netlib_gsockmsw.o

 NETLIB_OBJECTS =  \
        $(OBJS)\netlib_dummy.o \
        $(OBJS)\netlib_fs_inet.o \
        $(OBJS)\netlib_ftp.o \
        $(OBJS)\netlib_http.o \
        $(OBJS)\netlib_protocol.o \
 NETLIB_OBJECTS =  \
        $(OBJS)\netlib_dummy.o \
        $(OBJS)\netlib_fs_inet.o \
        $(OBJS)\netlib_ftp.o \
        $(OBJS)\netlib_http.o \
        $(OBJS)\netlib_protocol.o \

-       $(OBJS)\netlib_url.o \
-       $(OBJS)\netlib_sckfile.o \

        $(OBJS)\netlib_sckaddr.o \
        $(OBJS)\netlib_sckaddr.o \

+       $(OBJS)\netlib_sckfile.o \

        $(OBJS)\netlib_sckipc.o \
        $(OBJS)\netlib_sckstrm.o \
        $(OBJS)\netlib_socket.o \
        $(OBJS)\netlib_sckipc.o \
        $(OBJS)\netlib_sckstrm.o \
        $(OBJS)\netlib_socket.o \

+       $(OBJS)\netlib_url.o \

        $(OBJS)\netlib_gsocket.o \
        $(OBJS)\netlib_gsockmsw.o
        $(OBJS)\netlib_gsocket.o \
        $(OBJS)\netlib_gsockmsw.o

-OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CFLAGS)
-WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CFLAGS)
        -DHAVE_W32API_H -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CFLAGS)

-WXEXPAT_OBJECTS =  $(OBJS)\wxexpat_xmlparse.o $(OBJS)\wxexpat_xmlrole.o $(OBJS)\wxexpat_xmltok.o

 WXEXPAT_OBJECTS =  \
        $(OBJS)\wxexpat_xmlparse.o \
        $(OBJS)\wxexpat_xmlrole.o \
        $(OBJS)\wxexpat_xmltok.o
 WXEXPAT_OBJECTS =  \
        $(OBJS)\wxexpat_xmlparse.o \
        $(OBJS)\wxexpat_xmlrole.o \
        $(OBJS)\wxexpat_xmltok.o

-WXJPEG_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -I$(LIBDIRNAME) $(CFLAGS)
-WXJPEG_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+WXJPEG_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -I$(LIBDIRNAME) $(CFLAGS)
        -DHAVE_W32API_H -I$(LIBDIRNAME) $(CFLAGS)

-WXJPEG_OBJECTS =  $(OBJS)\wxjpeg_jcomapi.o $(OBJS)\wxjpeg_jutils.o $(OBJS)\wxjpeg_jerror.o $(OBJS)\wxjpeg_jmemmgr.o $(OBJS)\wxjpeg_jmemnobs.o $(OBJS)\wxjpeg_jcapimin.o $(OBJS)\wxjpeg_jcapistd.o $(OBJS)\wxjpeg_jctrans.o $(OBJS)\wxjpeg_jcparam.o $(OBJS)\wxjpeg_jdatadst.o $(OBJS)\wxjpeg_jcinit.o $(OBJS)\wxjpeg_jcmaster.o $(OBJS)\wxjpeg_jcmarker.o $(OBJS)\wxjpeg_jcmainct.o $(OBJS)\wxjpeg_jcprepct.o $(OBJS)\wxjpeg_jccoefct.o $(OBJS)\wxjpeg_jccolor.o $(OBJS)\wxjpeg_jcsample.o $(OBJS)\wxjpeg_jchuff.o $(OBJS)\wxjpeg_jcphuff.o $(OBJS)\wxjpeg_jcdctmgr.o $(OBJS)\wxjpeg_jfdctfst.o $(OBJS)\wxjpeg_jfdctflt.o $(OBJS)\wxjpeg_jfdctint.o $(OBJS)\wxjpeg_jdapimin.o $(OBJS)\wxjpeg_jdapistd.o $(OBJS)\wxjpeg_jdtrans.o $(OBJS)\wxjpeg_jdatasrc.o $(OBJS)\wxjpeg_jdmaster.o $(OBJS)\wxjpeg_jdinput.o $(OBJS)\wxjpeg_jdmarker.o $(OBJS)\wxjpeg_jdhuff.o $(OBJS)\wxjpeg_jdphuff.o $(OBJS)\wxjpeg_jdmainct.o $(OBJS)\wxjpeg_jdcoefct.o $(OBJS)\wxjpeg_jdpostct.o $(OBJS)\wxjpeg_jddctmgr.o $(OBJS)\wxjpeg_jidctfst.o $(OBJS)\wxjpeg_jidctflt.o $(OBJS)\wxjpeg_jidctint.o $(OBJS)\wxjpeg_jidctred.o $(OBJS)\wxjpeg_jdsample.o $(OBJS)\wxjpeg_jdcolor.o $(OBJS)\wxjpeg_jquant1.o $(OBJS)\wxjpeg_jquant2.o $(OBJS)\wxjpeg_jdmerge.o

 WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jcomapi.o \
        $(OBJS)\wxjpeg_jutils.o \
 WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jcomapi.o \
        $(OBJS)\wxjpeg_jutils.o \


@@ -615,10 +579,8 @@ WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jquant1.o \
        $(OBJS)\wxjpeg_jquant2.o \
        $(OBJS)\wxjpeg_jdmerge.o
        $(OBJS)\wxjpeg_jquant1.o \
        $(OBJS)\wxjpeg_jquant2.o \
        $(OBJS)\wxjpeg_jdmerge.o

-WXPNG_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -I..\src\zlib $(CFLAGS)
-WXPNG_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+WXPNG_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -I..\src\zlib $(CFLAGS)
        -DHAVE_W32API_H -I..\src\zlib $(CFLAGS)

-WXPNG_OBJECTS =  $(OBJS)\wxpng_png.o $(OBJS)\wxpng_pngerror.o $(OBJS)\wxpng_pnggccrd.o $(OBJS)\wxpng_pngget.o $(OBJS)\wxpng_pngmem.o $(OBJS)\wxpng_pngpread.o $(OBJS)\wxpng_pngread.o $(OBJS)\wxpng_pngrio.o $(OBJS)\wxpng_pngrtran.o $(OBJS)\wxpng_pngrutil.o $(OBJS)\wxpng_pngset.o $(OBJS)\wxpng_pngtrans.o $(OBJS)\wxpng_pngvcrd.o $(OBJS)\wxpng_pngwio.o $(OBJS)\wxpng_pngwrite.o $(OBJS)\wxpng_pngwtran.o $(OBJS)\wxpng_pngwutil.o

 WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_png.o \
        $(OBJS)\wxpng_pngerror.o \
 WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_png.o \
        $(OBJS)\wxpng_pngerror.o \


@@ -637,19 +599,15 @@ WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_pngwrite.o \
        $(OBJS)\wxpng_pngwtran.o \
        $(OBJS)\wxpng_pngwutil.o
        $(OBJS)\wxpng_pngwrite.o \
        $(OBJS)\wxpng_pngwtran.o \
        $(OBJS)\wxpng_pngwutil.o

-WXREGEX_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H $(CFLAGS)
-WXREGEX_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+WXREGEX_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H $(CFLAGS)
        -DHAVE_W32API_H $(CFLAGS)

-WXREGEX_OBJECTS =  $(OBJS)\wxregex_regcomp.o $(OBJS)\wxregex_regexec.o $(OBJS)\wxregex_regerror.o $(OBJS)\wxregex_regfree.o

 WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regcomp.o \
        $(OBJS)\wxregex_regexec.o \
        $(OBJS)\wxregex_regerror.o \
        $(OBJS)\wxregex_regfree.o
 WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regcomp.o \
        $(OBJS)\wxregex_regexec.o \
        $(OBJS)\wxregex_regerror.o \
        $(OBJS)\wxregex_regfree.o

-WXTIFF_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H $(CFLAGS)
-WXTIFF_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+WXTIFF_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H $(CFLAGS)
        -DHAVE_W32API_H $(CFLAGS)

-WXTIFF_OBJECTS =  $(OBJS)\wxtiff_tif_win32.o $(OBJS)\wxtiff_tif_aux.o $(OBJS)\wxtiff_tif_close.o $(OBJS)\wxtiff_tif_codec.o $(OBJS)\wxtiff_tif_compress.o $(OBJS)\wxtiff_tif_dir.o $(OBJS)\wxtiff_tif_dirinfo.o $(OBJS)\wxtiff_tif_dirread.o $(OBJS)\wxtiff_tif_dirwrite.o $(OBJS)\wxtiff_tif_dumpmode.o $(OBJS)\wxtiff_tif_error.o $(OBJS)\wxtiff_tif_fax3.o $(OBJS)\wxtiff_tif_fax3sm.o $(OBJS)\wxtiff_tif_getimage.o $(OBJS)\wxtiff_tif_jpeg.o $(OBJS)\wxtiff_tif_flush.o $(OBJS)\wxtiff_tif_lzw.o $(OBJS)\wxtiff_tif_luv.o $(OBJS)\wxtiff_tif_next.o $(OBJS)\wxtiff_tif_open.o $(OBJS)\wxtiff_tif_packbits.o $(OBJS)\wxtiff_tif_pixarlog.o $(OBJS)\wxtiff_tif_predict.o $(OBJS)\wxtiff_tif_print.o $(OBJS)\wxtiff_tif_read.o $(OBJS)\wxtiff_tif_swab.o $(OBJS)\wxtiff_tif_strip.o $(OBJS)\wxtiff_tif_thunder.o $(OBJS)\wxtiff_tif_tile.o $(OBJS)\wxtiff_tif_version.o $(OBJS)\wxtiff_tif_warning.o $(OBJS)\wxtiff_tif_write.o $(OBJS)\wxtiff_tif_zip.o

 WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_win32.o \
        $(OBJS)\wxtiff_tif_aux.o \
 WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_win32.o \
        $(OBJS)\wxtiff_tif_aux.o \


@@ -684,10 +642,8 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_warning.o \
        $(OBJS)\wxtiff_tif_write.o \
        $(OBJS)\wxtiff_tif_zip.o
        $(OBJS)\wxtiff_tif_warning.o \
        $(OBJS)\wxtiff_tif_write.o \
        $(OBJS)\wxtiff_tif_zip.o

-WXZLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H $(CFLAGS)
-WXZLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+WXZLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H $(CFLAGS)
        -DHAVE_W32API_H $(CFLAGS)

-WXZLIB_OBJECTS =  $(OBJS)\wxzlib_adler32.o $(OBJS)\wxzlib_compress.o $(OBJS)\wxzlib_crc32.o $(OBJS)\wxzlib_gzio.o $(OBJS)\wxzlib_uncompr.o $(OBJS)\wxzlib_deflate.o $(OBJS)\wxzlib_trees.o $(OBJS)\wxzlib_zutil.o $(OBJS)\wxzlib_inflate.o $(OBJS)\wxzlib_infblock.o $(OBJS)\wxzlib_inftrees.o $(OBJS)\wxzlib_infcodes.o $(OBJS)\wxzlib_infutil.o $(OBJS)\wxzlib_inffast.o

 WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_adler32.o \
        $(OBJS)\wxzlib_compress.o \
 WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_adler32.o \
        $(OBJS)\wxzlib_compress.o \


@@ -703,23 +659,19 @@ WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_infcodes.o \
        $(OBJS)\wxzlib_infutil.o \
        $(OBJS)\wxzlib_inffast.o
        $(OBJS)\wxzlib_infcodes.o \
        $(OBJS)\wxzlib_infutil.o \
        $(OBJS)\wxzlib_inffast.o

-XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_XML $(CXXFLAGS) 
-XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_XML $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        -DWXUSINGDLL -DWXMAKINGDLL_XML $(CXXFLAGS)

-XMLDLL_OBJECTS =  $(OBJS)\xmldll_dummy.o $(OBJS)\xmldll_xml.o

 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.o \
        $(OBJS)\xmldll_xml.o
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.o \
        $(OBJS)\xmldll_xml.o

-XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff -I..\src\jpeg -I..\src\png -I..\src\zlib  -I..\src\regex -I..\src\expat\lib $(CXXFLAGS)
-XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(CXXFLAGS)
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \
        -I..\src\jpeg -I..\src\png -I..\src\zlib -I..\src\regex -I..\src\expat\lib \
        $(CXXFLAGS)

-XMLLIB_OBJECTS =  $(OBJS)\xmllib_dummy.o $(OBJS)\xmllib_xml.o

 XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.o \
        $(OBJS)\xmllib_xml.o
 XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.o \
        $(OBJS)\xmllib_xml.o


@@ -742,6 +694,11 @@ ifeq ($(OFFICIAL_BUILD),1)
 VENDORTAG = 
 endif
 ifeq ($(BUILD),debug)
 VENDORTAG = 
 endif
 ifeq ($(BUILD),debug)

+ifeq ($(DEBUG_FLAG),default)
+WXDEBUGFLAG = d
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)

 WXDEBUGFLAG = d
 endif
 ifeq ($(SHARED),1)
 WXDEBUGFLAG = d
 endif
 ifeq ($(SHARED),1)


@@ -754,12 +711,27 @@ ifeq ($(WXUNIV),1)
 WXUNIVNAME = univ
 endif
 ifeq ($(BUILD),debug)
 WXUNIVNAME = univ
 endif
 ifeq ($(BUILD),debug)

-__DEBUGFLAG = -g
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif

 endif
 ifeq ($(BUILD),release)
 endif
 ifeq ($(BUILD),release)

-__DEBUGFLAG = 
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g

 endif
 ifeq ($(BUILD),debug)
 endif
 ifeq ($(BUILD),debug)

+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)

 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
 ifeq ($(USE_GUI),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
 ifeq ($(USE_GUI),1)


@@ -797,6 +769,7 @@ endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \

+       $(OBJS)\monolib_taskbarcmn.o \

        $(OBJS)\monolib_app.o \
        $(OBJS)\monolib_bitmap.o \
        $(OBJS)\monolib_brush.o \
        $(OBJS)\monolib_app.o \
        $(OBJS)\monolib_bitmap.o \
        $(OBJS)\monolib_brush.o \


@@ -826,12 +799,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_icon.o \
        $(OBJS)\monolib_joystick.o \
        $(OBJS)\monolib_minifram.o \
        $(OBJS)\monolib_icon.o \
        $(OBJS)\monolib_joystick.o \
        $(OBJS)\monolib_minifram.o \

+       $(OBJS)\monolib_automtn.o \
+       $(OBJS)\monolib_dataobj.o \
+       $(OBJS)\monolib_dropsrc.o \
+       $(OBJS)\monolib_droptgt.o \
+       $(OBJS)\monolib_oleutils.o \
+       $(OBJS)\monolib_uuid.o \

        $(OBJS)\monolib_palette.o \
        $(OBJS)\monolib_pen.o \
        $(OBJS)\monolib_popupwin.o \
        $(OBJS)\monolib_region.o \
        $(OBJS)\monolib_settings.o \
        $(OBJS)\monolib_palette.o \
        $(OBJS)\monolib_pen.o \
        $(OBJS)\monolib_popupwin.o \
        $(OBJS)\monolib_region.o \
        $(OBJS)\monolib_settings.o \

-       $(OBJS)\monolib_taskbarcmn.o \

        $(OBJS)\monolib_taskbar.o \
        $(OBJS)\monolib_timer.o \
        $(OBJS)\monolib_tooltip.o \
        $(OBJS)\monolib_taskbar.o \
        $(OBJS)\monolib_timer.o \
        $(OBJS)\monolib_tooltip.o \


@@ -839,15 +817,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_utilsgui.o \
        $(OBJS)\monolib_wave.o \
        $(OBJS)\monolib_window.o \
        $(OBJS)\monolib_utilsgui.o \
        $(OBJS)\monolib_wave.o \
        $(OBJS)\monolib_window.o \

-       $(OBJS)\monolib_automtn.o \
-       $(OBJS)\monolib_dataobj.o \
-       $(OBJS)\monolib_dropsrc.o \
-       $(OBJS)\monolib_droptgt.o \
-       $(OBJS)\monolib_oleutils.o \
-       $(OBJS)\monolib_uuid.o \

        $(OBJS)\monolib_statusbr.o \
        $(OBJS)\monolib_statusbr.o \

-       $(OBJS)\monolib_uxtheme.o \
-       $(OBJS)\monolib_access.o \

        $(OBJS)\monolib_accel.o \
        $(OBJS)\monolib_bmpbuttn.o \
        $(OBJS)\monolib_button.o \
        $(OBJS)\monolib_accel.o \
        $(OBJS)\monolib_bmpbuttn.o \
        $(OBJS)\monolib_button.o \


@@ -875,6 +845,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_msgdlg.o \
        $(OBJS)\monolib_nativdlg.o \
        $(OBJS)\monolib_notebook.o \
        $(OBJS)\monolib_msgdlg.o \
        $(OBJS)\monolib_nativdlg.o \
        $(OBJS)\monolib_notebook.o \

+       $(OBJS)\monolib_access.o \

        $(OBJS)\monolib_ownerdrw.o \
        $(OBJS)\monolib_penwin.o \
        $(OBJS)\monolib_printdlg.o \
        $(OBJS)\monolib_ownerdrw.o \
        $(OBJS)\monolib_penwin.o \
        $(OBJS)\monolib_printdlg.o \


@@ -896,40 +867,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_textctrl.o \
        $(OBJS)\monolib_tglbtn.o \
        $(OBJS)\monolib_treectrl.o \
        $(OBJS)\monolib_textctrl.o \
        $(OBJS)\monolib_tglbtn.o \
        $(OBJS)\monolib_treectrl.o \

-       $(OBJS)\monolib_busyinfo.o \
-       $(OBJS)\monolib_calctrl.o \
-       $(OBJS)\monolib_choicdgg.o \
-       $(OBJS)\monolib_dcbuffer.o \
-       $(OBJS)\monolib_dcpsg.o \
-       $(OBJS)\monolib_dirctrlg.o \
-       $(OBJS)\monolib_dragimgg.o \
-       $(OBJS)\monolib_grid.o \
-       $(OBJS)\monolib_gridctrl.o \
-       $(OBJS)\monolib_gridsel.o \
-       $(OBJS)\monolib_helpext.o \
-       $(OBJS)\monolib_laywin.o \
-       $(OBJS)\monolib_logg.o \
-       $(OBJS)\monolib_numdlgg.o \
-       $(OBJS)\monolib_panelg.o \
-       $(OBJS)\monolib_progdlgg.o \
-       $(OBJS)\monolib_renderg.o \
-       $(OBJS)\monolib_sashwin.o \
-       $(OBJS)\monolib_scrlwing.o \
-       $(OBJS)\monolib_selstore.o \
-       $(OBJS)\monolib_spinctlg.o \
-       $(OBJS)\monolib_splash.o \
-       $(OBJS)\monolib_splitter.o \
-       $(OBJS)\monolib_tbarsmpl.o \
-       $(OBJS)\monolib_textdlgg.o \
-       $(OBJS)\monolib_tipdlg.o \
-       $(OBJS)\monolib_tipwin.o \
-       $(OBJS)\monolib_treectlg.o \
-       $(OBJS)\monolib_vlbox.o \
-       $(OBJS)\monolib_vscroll.o \
-       $(OBJS)\monolib_wizard.o \
-       $(OBJS)\monolib_appcmn.o \
-       $(OBJS)\monolib_fontmap.o \
+       $(OBJS)\monolib_uxtheme.o \

        $(OBJS)\monolib_accesscmn.o \
        $(OBJS)\monolib_accesscmn.o \

+       $(OBJS)\monolib_appcmn.o \

        $(OBJS)\monolib_artprov.o \
        $(OBJS)\monolib_artstd.o \
        $(OBJS)\monolib_bmpbase.o \
        $(OBJS)\monolib_artprov.o \
        $(OBJS)\monolib_artstd.o \
        $(OBJS)\monolib_bmpbase.o \


@@ -955,9 +895,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fddlgcmn.o \
        $(OBJS)\monolib_fldlgcmn.o \
        $(OBJS)\monolib_fontcmn.o \
        $(OBJS)\monolib_fddlgcmn.o \
        $(OBJS)\monolib_fldlgcmn.o \
        $(OBJS)\monolib_fontcmn.o \

+       $(OBJS)\monolib_fontmap.o \

        $(OBJS)\monolib_framecmn.o \
        $(OBJS)\monolib_framecmn.o \

-       $(OBJS)\monolib_timercmn.o \
-       $(OBJS)\monolib_toplvcmn.o \

        $(OBJS)\monolib_gaugecmn.o \
        $(OBJS)\monolib_gdicmn.o \
        $(OBJS)\monolib_geometry.o \
        $(OBJS)\monolib_gaugecmn.o \
        $(OBJS)\monolib_gdicmn.o \
        $(OBJS)\monolib_geometry.o \


@@ -967,6 +906,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagall.o \
        $(OBJS)\monolib_imagbmp.o \
        $(OBJS)\monolib_image.o \
        $(OBJS)\monolib_imagall.o \
        $(OBJS)\monolib_imagbmp.o \
        $(OBJS)\monolib_image.o \

+       $(OBJS)\monolib_imagfill.o \

        $(OBJS)\monolib_imaggif.o \
        $(OBJS)\monolib_imagiff.o \
        $(OBJS)\monolib_imagjpeg.o \
        $(OBJS)\monolib_imaggif.o \
        $(OBJS)\monolib_imagiff.o \
        $(OBJS)\monolib_imagjpeg.o \


@@ -975,7 +915,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagpnm.o \
        $(OBJS)\monolib_imagtiff.o \
        $(OBJS)\monolib_imagxpm.o \
        $(OBJS)\monolib_imagpnm.o \
        $(OBJS)\monolib_imagtiff.o \
        $(OBJS)\monolib_imagxpm.o \

-       $(OBJS)\monolib_imagfill.o \

        $(OBJS)\monolib_layout.o \
        $(OBJS)\monolib_lboxcmn.o \
        $(OBJS)\monolib_matrix.o \
        $(OBJS)\monolib_layout.o \
        $(OBJS)\monolib_lboxcmn.o \
        $(OBJS)\monolib_matrix.o \


@@ -993,17 +932,51 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_statbar.o \
        $(OBJS)\monolib_tbarbase.o \
        $(OBJS)\monolib_textcmn.o \
        $(OBJS)\monolib_statbar.o \
        $(OBJS)\monolib_tbarbase.o \
        $(OBJS)\monolib_textcmn.o \

+       $(OBJS)\monolib_timercmn.o \
+       $(OBJS)\monolib_toplvcmn.o \

        $(OBJS)\monolib_treebase.o \
        $(OBJS)\monolib_valgen.o \
        $(OBJS)\monolib_validate.o \
        $(OBJS)\monolib_valtext.o \
        $(OBJS)\monolib_wincmn.o \
        $(OBJS)\monolib_treebase.o \
        $(OBJS)\monolib_valgen.o \
        $(OBJS)\monolib_validate.o \
        $(OBJS)\monolib_valtext.o \
        $(OBJS)\monolib_wincmn.o \

-       $(OBJS)\monolib_xpmdecod.o
+       $(OBJS)\monolib_xpmdecod.o \
+       $(OBJS)\monolib_busyinfo.o \
+       $(OBJS)\monolib_calctrl.o \
+       $(OBJS)\monolib_choicdgg.o \
+       $(OBJS)\monolib_dcbuffer.o \
+       $(OBJS)\monolib_dcpsg.o \
+       $(OBJS)\monolib_dirctrlg.o \
+       $(OBJS)\monolib_dragimgg.o \
+       $(OBJS)\monolib_grid.o \
+       $(OBJS)\monolib_gridctrl.o \
+       $(OBJS)\monolib_gridsel.o \
+       $(OBJS)\monolib_helpext.o \
+       $(OBJS)\monolib_laywin.o \
+       $(OBJS)\monolib_logg.o \
+       $(OBJS)\monolib_numdlgg.o \
+       $(OBJS)\monolib_panelg.o \
+       $(OBJS)\monolib_progdlgg.o \
+       $(OBJS)\monolib_renderg.o \
+       $(OBJS)\monolib_sashwin.o \
+       $(OBJS)\monolib_scrlwing.o \
+       $(OBJS)\monolib_selstore.o \
+       $(OBJS)\monolib_spinctlg.o \
+       $(OBJS)\monolib_splash.o \
+       $(OBJS)\monolib_splitter.o \
+       $(OBJS)\monolib_tbarsmpl.o \
+       $(OBJS)\monolib_textdlgg.o \
+       $(OBJS)\monolib_tipdlg.o \
+       $(OBJS)\monolib_tipwin.o \
+       $(OBJS)\monolib_treectlg.o \
+       $(OBJS)\monolib_vlbox.o \
+       $(OBJS)\monolib_vscroll.o \
+       $(OBJS)\monolib_wizard.o

 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \

+       $(OBJS)\monolib_taskbarcmn.o \

        $(OBJS)\monolib_app.o \
        $(OBJS)\monolib_bitmap.o \
        $(OBJS)\monolib_brush.o \
        $(OBJS)\monolib_app.o \
        $(OBJS)\monolib_bitmap.o \
        $(OBJS)\monolib_brush.o \


@@ -1033,12 +1006,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_icon.o \
        $(OBJS)\monolib_joystick.o \
        $(OBJS)\monolib_minifram.o \
        $(OBJS)\monolib_icon.o \
        $(OBJS)\monolib_joystick.o \
        $(OBJS)\monolib_minifram.o \

+       $(OBJS)\monolib_automtn.o \
+       $(OBJS)\monolib_dataobj.o \
+       $(OBJS)\monolib_dropsrc.o \
+       $(OBJS)\monolib_droptgt.o \
+       $(OBJS)\monolib_oleutils.o \
+       $(OBJS)\monolib_uuid.o \

        $(OBJS)\monolib_palette.o \
        $(OBJS)\monolib_pen.o \
        $(OBJS)\monolib_popupwin.o \
        $(OBJS)\monolib_region.o \
        $(OBJS)\monolib_settings.o \
        $(OBJS)\monolib_palette.o \
        $(OBJS)\monolib_pen.o \
        $(OBJS)\monolib_popupwin.o \
        $(OBJS)\monolib_region.o \
        $(OBJS)\monolib_settings.o \

-       $(OBJS)\monolib_taskbarcmn.o \

        $(OBJS)\monolib_taskbar.o \
        $(OBJS)\monolib_timer.o \
        $(OBJS)\monolib_tooltip.o \
        $(OBJS)\monolib_taskbar.o \
        $(OBJS)\monolib_timer.o \
        $(OBJS)\monolib_tooltip.o \


@@ -1046,13 +1024,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_utilsgui.o \
        $(OBJS)\monolib_wave.o \
        $(OBJS)\monolib_window.o \
        $(OBJS)\monolib_utilsgui.o \
        $(OBJS)\monolib_wave.o \
        $(OBJS)\monolib_window.o \

-       $(OBJS)\monolib_automtn.o \
-       $(OBJS)\monolib_dataobj.o \
-       $(OBJS)\monolib_dropsrc.o \
-       $(OBJS)\monolib_droptgt.o \
-       $(OBJS)\monolib_oleutils.o \
-       $(OBJS)\monolib_uuid.o \

        $(OBJS)\monolib_textctrl.o \
        $(OBJS)\monolib_textctrl.o \

+       $(OBJS)\monolib_accel.o \
+       $(OBJS)\monolib_colrdlgg.o \
+       $(OBJS)\monolib_dirdlgg.o \
+       $(OBJS)\monolib_fdrepdlg.o \
+       $(OBJS)\monolib_filedlgg.o \
+       $(OBJS)\monolib_fontdlgg.o \
+       $(OBJS)\monolib_imaglist.o \
+       $(OBJS)\monolib_listctrl.o \
+       $(OBJS)\monolib_mdig.o \
+       $(OBJS)\monolib_msgdlgg.o \
+       $(OBJS)\monolib_prntdlgg.o \
+       $(OBJS)\monolib_tabg.o \

        $(OBJS)\monolib_bmpbuttn.o \
        $(OBJS)\monolib_button.o \
        $(OBJS)\monolib_checkbox.o \
        $(OBJS)\monolib_bmpbuttn.o \
        $(OBJS)\monolib_button.o \
        $(OBJS)\monolib_checkbox.o \


@@ -1063,7 +1047,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_control.o \
        $(OBJS)\monolib_dialog.o \
        $(OBJS)\monolib_framuniv.o \
        $(OBJS)\monolib_control.o \
        $(OBJS)\monolib_dialog.o \
        $(OBJS)\monolib_framuniv.o \

-       $(OBJS)\monolib_topluniv.o \

        $(OBJS)\monolib_gauge.o \
        $(OBJS)\monolib_inpcons.o \
        $(OBJS)\monolib_inphand.o \
        $(OBJS)\monolib_gauge.o \
        $(OBJS)\monolib_inpcons.o \
        $(OBJS)\monolib_inphand.o \


@@ -1083,58 +1066,15 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_statline.o \
        $(OBJS)\monolib_stattext.o \
        $(OBJS)\monolib_statusbr.o \
        $(OBJS)\monolib_statline.o \
        $(OBJS)\monolib_stattext.o \
        $(OBJS)\monolib_statusbr.o \

-       $(OBJS)\monolib_toolbar.o \

        $(OBJS)\monolib_theme.o \
        $(OBJS)\monolib_theme.o \

+       $(OBJS)\monolib_toolbar.o \
+       $(OBJS)\monolib_topluniv.o \

        $(OBJS)\monolib_winuniv.o \
        $(OBJS)\monolib_winuniv.o \

-       $(OBJS)\monolib_mdig.o \
-       $(OBJS)\monolib_imaglist.o \
-       $(OBJS)\monolib_colrdlgg.o \
-       $(OBJS)\monolib_listctrl.o \
-       $(OBJS)\monolib_filedlgg.o \
-       $(OBJS)\monolib_dirdlgg.o \
-       $(OBJS)\monolib_prntdlgg.o \
-       $(OBJS)\monolib_accel.o \
-       $(OBJS)\monolib_msgdlgg.o \
-       $(OBJS)\monolib_fdrepdlg.o \
-       $(OBJS)\monolib_fontdlgg.o \
-       $(OBJS)\monolib_tabg.o \

        $(OBJS)\monolib_gtk.o \
        $(OBJS)\monolib_gtk.o \

-       $(OBJS)\monolib_win32.o \

        $(OBJS)\monolib_metal.o \
        $(OBJS)\monolib_metal.o \

-       $(OBJS)\monolib_busyinfo.o \
-       $(OBJS)\monolib_calctrl.o \
-       $(OBJS)\monolib_choicdgg.o \
-       $(OBJS)\monolib_dcbuffer.o \
-       $(OBJS)\monolib_dcpsg.o \
-       $(OBJS)\monolib_dirctrlg.o \
-       $(OBJS)\monolib_dragimgg.o \
-       $(OBJS)\monolib_grid.o \
-       $(OBJS)\monolib_gridctrl.o \
-       $(OBJS)\monolib_gridsel.o \
-       $(OBJS)\monolib_helpext.o \
-       $(OBJS)\monolib_laywin.o \
-       $(OBJS)\monolib_logg.o \
-       $(OBJS)\monolib_numdlgg.o \
-       $(OBJS)\monolib_panelg.o \
-       $(OBJS)\monolib_progdlgg.o \
-       $(OBJS)\monolib_renderg.o \
-       $(OBJS)\monolib_sashwin.o \
-       $(OBJS)\monolib_scrlwing.o \
-       $(OBJS)\monolib_selstore.o \
-       $(OBJS)\monolib_spinctlg.o \
-       $(OBJS)\monolib_splash.o \
-       $(OBJS)\monolib_splitter.o \
-       $(OBJS)\monolib_tbarsmpl.o \
-       $(OBJS)\monolib_textdlgg.o \
-       $(OBJS)\monolib_tipdlg.o \
-       $(OBJS)\monolib_tipwin.o \
-       $(OBJS)\monolib_treectlg.o \
-       $(OBJS)\monolib_vlbox.o \
-       $(OBJS)\monolib_vscroll.o \
-       $(OBJS)\monolib_wizard.o \
-       $(OBJS)\monolib_appcmn.o \
-       $(OBJS)\monolib_fontmap.o \
+       $(OBJS)\monolib_win32.o \

        $(OBJS)\monolib_accesscmn.o \
        $(OBJS)\monolib_accesscmn.o \

+       $(OBJS)\monolib_appcmn.o \

        $(OBJS)\monolib_artprov.o \
        $(OBJS)\monolib_artstd.o \
        $(OBJS)\monolib_bmpbase.o \
        $(OBJS)\monolib_artprov.o \
        $(OBJS)\monolib_artstd.o \
        $(OBJS)\monolib_bmpbase.o \


@@ -1160,9 +1100,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fddlgcmn.o \
        $(OBJS)\monolib_fldlgcmn.o \
        $(OBJS)\monolib_fontcmn.o \
        $(OBJS)\monolib_fddlgcmn.o \
        $(OBJS)\monolib_fldlgcmn.o \
        $(OBJS)\monolib_fontcmn.o \

+       $(OBJS)\monolib_fontmap.o \

        $(OBJS)\monolib_framecmn.o \
        $(OBJS)\monolib_framecmn.o \

-       $(OBJS)\monolib_timercmn.o \
-       $(OBJS)\monolib_toplvcmn.o \

        $(OBJS)\monolib_gaugecmn.o \
        $(OBJS)\monolib_gdicmn.o \
        $(OBJS)\monolib_geometry.o \
        $(OBJS)\monolib_gaugecmn.o \
        $(OBJS)\monolib_gdicmn.o \
        $(OBJS)\monolib_geometry.o \


@@ -1172,6 +1111,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagall.o \
        $(OBJS)\monolib_imagbmp.o \
        $(OBJS)\monolib_image.o \
        $(OBJS)\monolib_imagall.o \
        $(OBJS)\monolib_imagbmp.o \
        $(OBJS)\monolib_image.o \

+       $(OBJS)\monolib_imagfill.o \

        $(OBJS)\monolib_imaggif.o \
        $(OBJS)\monolib_imagiff.o \
        $(OBJS)\monolib_imagjpeg.o \
        $(OBJS)\monolib_imaggif.o \
        $(OBJS)\monolib_imagiff.o \
        $(OBJS)\monolib_imagjpeg.o \


@@ -1180,7 +1120,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagpnm.o \
        $(OBJS)\monolib_imagtiff.o \
        $(OBJS)\monolib_imagxpm.o \
        $(OBJS)\monolib_imagpnm.o \
        $(OBJS)\monolib_imagtiff.o \
        $(OBJS)\monolib_imagxpm.o \

-       $(OBJS)\monolib_imagfill.o \

        $(OBJS)\monolib_layout.o \
        $(OBJS)\monolib_lboxcmn.o \
        $(OBJS)\monolib_matrix.o \
        $(OBJS)\monolib_layout.o \
        $(OBJS)\monolib_lboxcmn.o \
        $(OBJS)\monolib_matrix.o \


@@ -1198,17 +1137,51 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_statbar.o \
        $(OBJS)\monolib_tbarbase.o \
        $(OBJS)\monolib_textcmn.o \
        $(OBJS)\monolib_statbar.o \
        $(OBJS)\monolib_tbarbase.o \
        $(OBJS)\monolib_textcmn.o \

+       $(OBJS)\monolib_timercmn.o \
+       $(OBJS)\monolib_toplvcmn.o \

        $(OBJS)\monolib_treebase.o \
        $(OBJS)\monolib_valgen.o \
        $(OBJS)\monolib_validate.o \
        $(OBJS)\monolib_valtext.o \
        $(OBJS)\monolib_wincmn.o \
        $(OBJS)\monolib_treebase.o \
        $(OBJS)\monolib_valgen.o \
        $(OBJS)\monolib_validate.o \
        $(OBJS)\monolib_valtext.o \
        $(OBJS)\monolib_wincmn.o \

-       $(OBJS)\monolib_xpmdecod.o
+       $(OBJS)\monolib_xpmdecod.o \
+       $(OBJS)\monolib_busyinfo.o \
+       $(OBJS)\monolib_calctrl.o \
+       $(OBJS)\monolib_choicdgg.o \
+       $(OBJS)\monolib_dcbuffer.o \
+       $(OBJS)\monolib_dcpsg.o \
+       $(OBJS)\monolib_dirctrlg.o \
+       $(OBJS)\monolib_dragimgg.o \
+       $(OBJS)\monolib_grid.o \
+       $(OBJS)\monolib_gridctrl.o \
+       $(OBJS)\monolib_gridsel.o \
+       $(OBJS)\monolib_helpext.o \
+       $(OBJS)\monolib_laywin.o \
+       $(OBJS)\monolib_logg.o \
+       $(OBJS)\monolib_numdlgg.o \
+       $(OBJS)\monolib_panelg.o \
+       $(OBJS)\monolib_progdlgg.o \
+       $(OBJS)\monolib_renderg.o \
+       $(OBJS)\monolib_sashwin.o \
+       $(OBJS)\monolib_scrlwing.o \
+       $(OBJS)\monolib_selstore.o \
+       $(OBJS)\monolib_spinctlg.o \
+       $(OBJS)\monolib_splash.o \
+       $(OBJS)\monolib_splitter.o \
+       $(OBJS)\monolib_tbarsmpl.o \
+       $(OBJS)\monolib_textdlgg.o \
+       $(OBJS)\monolib_tipdlg.o \
+       $(OBJS)\monolib_tipwin.o \
+       $(OBJS)\monolib_treectlg.o \
+       $(OBJS)\monolib_vlbox.o \
+       $(OBJS)\monolib_vscroll.o \
+       $(OBJS)\monolib_wizard.o

 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \

+       $(OBJS)\coredll_taskbarcmn.o \

        $(OBJS)\coredll_app.o \
        $(OBJS)\coredll_bitmap.o \
        $(OBJS)\coredll_brush.o \
        $(OBJS)\coredll_app.o \
        $(OBJS)\coredll_bitmap.o \
        $(OBJS)\coredll_brush.o \


@@ -1238,12 +1211,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_icon.o \
        $(OBJS)\coredll_joystick.o \
        $(OBJS)\coredll_minifram.o \
        $(OBJS)\coredll_icon.o \
        $(OBJS)\coredll_joystick.o \
        $(OBJS)\coredll_minifram.o \

+       $(OBJS)\coredll_automtn.o \
+       $(OBJS)\coredll_dataobj.o \
+       $(OBJS)\coredll_dropsrc.o \
+       $(OBJS)\coredll_droptgt.o \
+       $(OBJS)\coredll_oleutils.o \
+       $(OBJS)\coredll_uuid.o \

        $(OBJS)\coredll_palette.o \
        $(OBJS)\coredll_pen.o \
        $(OBJS)\coredll_popupwin.o \
        $(OBJS)\coredll_region.o \
        $(OBJS)\coredll_settings.o \
        $(OBJS)\coredll_palette.o \
        $(OBJS)\coredll_pen.o \
        $(OBJS)\coredll_popupwin.o \
        $(OBJS)\coredll_region.o \
        $(OBJS)\coredll_settings.o \

-       $(OBJS)\coredll_taskbarcmn.o \

        $(OBJS)\coredll_taskbar.o \
        $(OBJS)\coredll_timer.o \
        $(OBJS)\coredll_tooltip.o \
        $(OBJS)\coredll_taskbar.o \
        $(OBJS)\coredll_timer.o \
        $(OBJS)\coredll_tooltip.o \


@@ -1251,15 +1229,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_utilsgui.o \
        $(OBJS)\coredll_wave.o \
        $(OBJS)\coredll_window.o \
        $(OBJS)\coredll_utilsgui.o \
        $(OBJS)\coredll_wave.o \
        $(OBJS)\coredll_window.o \

-       $(OBJS)\coredll_automtn.o \
-       $(OBJS)\coredll_dataobj.o \
-       $(OBJS)\coredll_dropsrc.o \
-       $(OBJS)\coredll_droptgt.o \
-       $(OBJS)\coredll_oleutils.o \
-       $(OBJS)\coredll_uuid.o \

        $(OBJS)\coredll_statusbr.o \
        $(OBJS)\coredll_statusbr.o \

-       $(OBJS)\coredll_uxtheme.o \
-       $(OBJS)\coredll_access.o \

        $(OBJS)\coredll_accel.o \
        $(OBJS)\coredll_bmpbuttn.o \
        $(OBJS)\coredll_button.o \
        $(OBJS)\coredll_accel.o \
        $(OBJS)\coredll_bmpbuttn.o \
        $(OBJS)\coredll_button.o \


@@ -1287,6 +1257,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_msgdlg.o \
        $(OBJS)\coredll_nativdlg.o \
        $(OBJS)\coredll_notebook.o \
        $(OBJS)\coredll_msgdlg.o \
        $(OBJS)\coredll_nativdlg.o \
        $(OBJS)\coredll_notebook.o \

+       $(OBJS)\coredll_access.o \

        $(OBJS)\coredll_ownerdrw.o \
        $(OBJS)\coredll_penwin.o \
        $(OBJS)\coredll_printdlg.o \
        $(OBJS)\coredll_ownerdrw.o \
        $(OBJS)\coredll_penwin.o \
        $(OBJS)\coredll_printdlg.o \


@@ -1308,40 +1279,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_textctrl.o \
        $(OBJS)\coredll_tglbtn.o \
        $(OBJS)\coredll_treectrl.o \
        $(OBJS)\coredll_textctrl.o \
        $(OBJS)\coredll_tglbtn.o \
        $(OBJS)\coredll_treectrl.o \

-       $(OBJS)\coredll_busyinfo.o \
-       $(OBJS)\coredll_calctrl.o \
-       $(OBJS)\coredll_choicdgg.o \
-       $(OBJS)\coredll_dcbuffer.o \
-       $(OBJS)\coredll_dcpsg.o \
-       $(OBJS)\coredll_dirctrlg.o \
-       $(OBJS)\coredll_dragimgg.o \
-       $(OBJS)\coredll_grid.o \
-       $(OBJS)\coredll_gridctrl.o \
-       $(OBJS)\coredll_gridsel.o \
-       $(OBJS)\coredll_helpext.o \
-       $(OBJS)\coredll_laywin.o \
-       $(OBJS)\coredll_logg.o \
-       $(OBJS)\coredll_numdlgg.o \
-       $(OBJS)\coredll_panelg.o \
-       $(OBJS)\coredll_progdlgg.o \
-       $(OBJS)\coredll_renderg.o \
-       $(OBJS)\coredll_sashwin.o \
-       $(OBJS)\coredll_scrlwing.o \
-       $(OBJS)\coredll_selstore.o \
-       $(OBJS)\coredll_spinctlg.o \
-       $(OBJS)\coredll_splash.o \
-       $(OBJS)\coredll_splitter.o \
-       $(OBJS)\coredll_tbarsmpl.o \
-       $(OBJS)\coredll_textdlgg.o \
-       $(OBJS)\coredll_tipdlg.o \
-       $(OBJS)\coredll_tipwin.o \
-       $(OBJS)\coredll_treectlg.o \
-       $(OBJS)\coredll_vlbox.o \
-       $(OBJS)\coredll_vscroll.o \
-       $(OBJS)\coredll_wizard.o \
-       $(OBJS)\coredll_appcmn.o \
-       $(OBJS)\coredll_fontmap.o \
+       $(OBJS)\coredll_uxtheme.o \

        $(OBJS)\coredll_accesscmn.o \
        $(OBJS)\coredll_accesscmn.o \

+       $(OBJS)\coredll_appcmn.o \

        $(OBJS)\coredll_artprov.o \
        $(OBJS)\coredll_artstd.o \
        $(OBJS)\coredll_bmpbase.o \
        $(OBJS)\coredll_artprov.o \
        $(OBJS)\coredll_artstd.o \
        $(OBJS)\coredll_bmpbase.o \


@@ -1367,9 +1307,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fddlgcmn.o \
        $(OBJS)\coredll_fldlgcmn.o \
        $(OBJS)\coredll_fontcmn.o \
        $(OBJS)\coredll_fddlgcmn.o \
        $(OBJS)\coredll_fldlgcmn.o \
        $(OBJS)\coredll_fontcmn.o \

+       $(OBJS)\coredll_fontmap.o \

        $(OBJS)\coredll_framecmn.o \
        $(OBJS)\coredll_framecmn.o \

-       $(OBJS)\coredll_timercmn.o \
-       $(OBJS)\coredll_toplvcmn.o \

        $(OBJS)\coredll_gaugecmn.o \
        $(OBJS)\coredll_gdicmn.o \
        $(OBJS)\coredll_geometry.o \
        $(OBJS)\coredll_gaugecmn.o \
        $(OBJS)\coredll_gdicmn.o \
        $(OBJS)\coredll_geometry.o \


@@ -1379,6 +1318,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagall.o \
        $(OBJS)\coredll_imagbmp.o \
        $(OBJS)\coredll_image.o \
        $(OBJS)\coredll_imagall.o \
        $(OBJS)\coredll_imagbmp.o \
        $(OBJS)\coredll_image.o \

+       $(OBJS)\coredll_imagfill.o \

        $(OBJS)\coredll_imaggif.o \
        $(OBJS)\coredll_imagiff.o \
        $(OBJS)\coredll_imagjpeg.o \
        $(OBJS)\coredll_imaggif.o \
        $(OBJS)\coredll_imagiff.o \
        $(OBJS)\coredll_imagjpeg.o \


@@ -1387,7 +1327,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagpnm.o \
        $(OBJS)\coredll_imagtiff.o \
        $(OBJS)\coredll_imagxpm.o \
        $(OBJS)\coredll_imagpnm.o \
        $(OBJS)\coredll_imagtiff.o \
        $(OBJS)\coredll_imagxpm.o \

-       $(OBJS)\coredll_imagfill.o \

        $(OBJS)\coredll_layout.o \
        $(OBJS)\coredll_lboxcmn.o \
        $(OBJS)\coredll_matrix.o \
        $(OBJS)\coredll_layout.o \
        $(OBJS)\coredll_lboxcmn.o \
        $(OBJS)\coredll_matrix.o \


@@ -1405,17 +1344,51 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_statbar.o \
        $(OBJS)\coredll_tbarbase.o \
        $(OBJS)\coredll_textcmn.o \
        $(OBJS)\coredll_statbar.o \
        $(OBJS)\coredll_tbarbase.o \
        $(OBJS)\coredll_textcmn.o \

+       $(OBJS)\coredll_timercmn.o \
+       $(OBJS)\coredll_toplvcmn.o \

        $(OBJS)\coredll_treebase.o \
        $(OBJS)\coredll_valgen.o \
        $(OBJS)\coredll_validate.o \
        $(OBJS)\coredll_valtext.o \
        $(OBJS)\coredll_wincmn.o \
        $(OBJS)\coredll_treebase.o \
        $(OBJS)\coredll_valgen.o \
        $(OBJS)\coredll_validate.o \
        $(OBJS)\coredll_valtext.o \
        $(OBJS)\coredll_wincmn.o \

-       $(OBJS)\coredll_xpmdecod.o
+       $(OBJS)\coredll_xpmdecod.o \
+       $(OBJS)\coredll_busyinfo.o \
+       $(OBJS)\coredll_calctrl.o \
+       $(OBJS)\coredll_choicdgg.o \
+       $(OBJS)\coredll_dcbuffer.o \
+       $(OBJS)\coredll_dcpsg.o \
+       $(OBJS)\coredll_dirctrlg.o \
+       $(OBJS)\coredll_dragimgg.o \
+       $(OBJS)\coredll_grid.o \
+       $(OBJS)\coredll_gridctrl.o \
+       $(OBJS)\coredll_gridsel.o \
+       $(OBJS)\coredll_helpext.o \
+       $(OBJS)\coredll_laywin.o \
+       $(OBJS)\coredll_logg.o \
+       $(OBJS)\coredll_numdlgg.o \
+       $(OBJS)\coredll_panelg.o \
+       $(OBJS)\coredll_progdlgg.o \
+       $(OBJS)\coredll_renderg.o \
+       $(OBJS)\coredll_sashwin.o \
+       $(OBJS)\coredll_scrlwing.o \
+       $(OBJS)\coredll_selstore.o \
+       $(OBJS)\coredll_spinctlg.o \
+       $(OBJS)\coredll_splash.o \
+       $(OBJS)\coredll_splitter.o \
+       $(OBJS)\coredll_tbarsmpl.o \
+       $(OBJS)\coredll_textdlgg.o \
+       $(OBJS)\coredll_tipdlg.o \
+       $(OBJS)\coredll_tipwin.o \
+       $(OBJS)\coredll_treectlg.o \
+       $(OBJS)\coredll_vlbox.o \
+       $(OBJS)\coredll_vscroll.o \
+       $(OBJS)\coredll_wizard.o

 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \

+       $(OBJS)\coredll_taskbarcmn.o \

        $(OBJS)\coredll_app.o \
        $(OBJS)\coredll_bitmap.o \
        $(OBJS)\coredll_brush.o \
        $(OBJS)\coredll_app.o \
        $(OBJS)\coredll_bitmap.o \
        $(OBJS)\coredll_brush.o \


@@ -1445,12 +1418,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_icon.o \
        $(OBJS)\coredll_joystick.o \
        $(OBJS)\coredll_minifram.o \
        $(OBJS)\coredll_icon.o \
        $(OBJS)\coredll_joystick.o \
        $(OBJS)\coredll_minifram.o \

+       $(OBJS)\coredll_automtn.o \
+       $(OBJS)\coredll_dataobj.o \
+       $(OBJS)\coredll_dropsrc.o \
+       $(OBJS)\coredll_droptgt.o \
+       $(OBJS)\coredll_oleutils.o \
+       $(OBJS)\coredll_uuid.o \

        $(OBJS)\coredll_palette.o \
        $(OBJS)\coredll_pen.o \
        $(OBJS)\coredll_popupwin.o \
        $(OBJS)\coredll_region.o \
        $(OBJS)\coredll_settings.o \
        $(OBJS)\coredll_palette.o \
        $(OBJS)\coredll_pen.o \
        $(OBJS)\coredll_popupwin.o \
        $(OBJS)\coredll_region.o \
        $(OBJS)\coredll_settings.o \

-       $(OBJS)\coredll_taskbarcmn.o \

        $(OBJS)\coredll_taskbar.o \
        $(OBJS)\coredll_timer.o \
        $(OBJS)\coredll_tooltip.o \
        $(OBJS)\coredll_taskbar.o \
        $(OBJS)\coredll_timer.o \
        $(OBJS)\coredll_tooltip.o \


@@ -1458,13 +1436,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_utilsgui.o \
        $(OBJS)\coredll_wave.o \
        $(OBJS)\coredll_window.o \
        $(OBJS)\coredll_utilsgui.o \
        $(OBJS)\coredll_wave.o \
        $(OBJS)\coredll_window.o \

-       $(OBJS)\coredll_automtn.o \
-       $(OBJS)\coredll_dataobj.o \
-       $(OBJS)\coredll_dropsrc.o \
-       $(OBJS)\coredll_droptgt.o \
-       $(OBJS)\coredll_oleutils.o \
-       $(OBJS)\coredll_uuid.o \

        $(OBJS)\coredll_textctrl.o \
        $(OBJS)\coredll_textctrl.o \

+       $(OBJS)\coredll_accel.o \
+       $(OBJS)\coredll_colrdlgg.o \
+       $(OBJS)\coredll_dirdlgg.o \
+       $(OBJS)\coredll_fdrepdlg.o \
+       $(OBJS)\coredll_filedlgg.o \
+       $(OBJS)\coredll_fontdlgg.o \
+       $(OBJS)\coredll_imaglist.o \
+       $(OBJS)\coredll_listctrl.o \
+       $(OBJS)\coredll_mdig.o \
+       $(OBJS)\coredll_msgdlgg.o \
+       $(OBJS)\coredll_prntdlgg.o \
+       $(OBJS)\coredll_tabg.o \

        $(OBJS)\coredll_bmpbuttn.o \
        $(OBJS)\coredll_button.o \
        $(OBJS)\coredll_checkbox.o \
        $(OBJS)\coredll_bmpbuttn.o \
        $(OBJS)\coredll_button.o \
        $(OBJS)\coredll_checkbox.o \


@@ -1475,7 +1459,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_control.o \
        $(OBJS)\coredll_dialog.o \
        $(OBJS)\coredll_framuniv.o \
        $(OBJS)\coredll_control.o \
        $(OBJS)\coredll_dialog.o \
        $(OBJS)\coredll_framuniv.o \

-       $(OBJS)\coredll_topluniv.o \

        $(OBJS)\coredll_gauge.o \
        $(OBJS)\coredll_inpcons.o \
        $(OBJS)\coredll_inphand.o \
        $(OBJS)\coredll_gauge.o \
        $(OBJS)\coredll_inpcons.o \
        $(OBJS)\coredll_inphand.o \


@@ -1495,58 +1478,15 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_statline.o \
        $(OBJS)\coredll_stattext.o \
        $(OBJS)\coredll_statusbr.o \
        $(OBJS)\coredll_statline.o \
        $(OBJS)\coredll_stattext.o \
        $(OBJS)\coredll_statusbr.o \

-       $(OBJS)\coredll_toolbar.o \

        $(OBJS)\coredll_theme.o \
        $(OBJS)\coredll_theme.o \

+       $(OBJS)\coredll_toolbar.o \
+       $(OBJS)\coredll_topluniv.o \

        $(OBJS)\coredll_winuniv.o \
        $(OBJS)\coredll_winuniv.o \

-       $(OBJS)\coredll_mdig.o \
-       $(OBJS)\coredll_imaglist.o \
-       $(OBJS)\coredll_colrdlgg.o \
-       $(OBJS)\coredll_listctrl.o \
-       $(OBJS)\coredll_filedlgg.o \
-       $(OBJS)\coredll_dirdlgg.o \
-       $(OBJS)\coredll_prntdlgg.o \
-       $(OBJS)\coredll_accel.o \
-       $(OBJS)\coredll_msgdlgg.o \
-       $(OBJS)\coredll_fdrepdlg.o \
-       $(OBJS)\coredll_fontdlgg.o \
-       $(OBJS)\coredll_tabg.o \

        $(OBJS)\coredll_gtk.o \
        $(OBJS)\coredll_gtk.o \

-       $(OBJS)\coredll_win32.o \

        $(OBJS)\coredll_metal.o \
        $(OBJS)\coredll_metal.o \

-       $(OBJS)\coredll_busyinfo.o \
-       $(OBJS)\coredll_calctrl.o \
-       $(OBJS)\coredll_choicdgg.o \
-       $(OBJS)\coredll_dcbuffer.o \
-       $(OBJS)\coredll_dcpsg.o \
-       $(OBJS)\coredll_dirctrlg.o \
-       $(OBJS)\coredll_dragimgg.o \
-       $(OBJS)\coredll_grid.o \
-       $(OBJS)\coredll_gridctrl.o \
-       $(OBJS)\coredll_gridsel.o \
-       $(OBJS)\coredll_helpext.o \
-       $(OBJS)\coredll_laywin.o \
-       $(OBJS)\coredll_logg.o \
-       $(OBJS)\coredll_numdlgg.o \
-       $(OBJS)\coredll_panelg.o \
-       $(OBJS)\coredll_progdlgg.o \
-       $(OBJS)\coredll_renderg.o \
-       $(OBJS)\coredll_sashwin.o \
-       $(OBJS)\coredll_scrlwing.o \
-       $(OBJS)\coredll_selstore.o \
-       $(OBJS)\coredll_spinctlg.o \
-       $(OBJS)\coredll_splash.o \
-       $(OBJS)\coredll_splitter.o \
-       $(OBJS)\coredll_tbarsmpl.o \
-       $(OBJS)\coredll_textdlgg.o \
-       $(OBJS)\coredll_tipdlg.o \
-       $(OBJS)\coredll_tipwin.o \
-       $(OBJS)\coredll_treectlg.o \
-       $(OBJS)\coredll_vlbox.o \
-       $(OBJS)\coredll_vscroll.o \
-       $(OBJS)\coredll_wizard.o \
-       $(OBJS)\coredll_appcmn.o \
-       $(OBJS)\coredll_fontmap.o \
+       $(OBJS)\coredll_win32.o \

        $(OBJS)\coredll_accesscmn.o \
        $(OBJS)\coredll_accesscmn.o \

+       $(OBJS)\coredll_appcmn.o \

        $(OBJS)\coredll_artprov.o \
        $(OBJS)\coredll_artstd.o \
        $(OBJS)\coredll_bmpbase.o \
        $(OBJS)\coredll_artprov.o \
        $(OBJS)\coredll_artstd.o \
        $(OBJS)\coredll_bmpbase.o \


@@ -1572,9 +1512,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fddlgcmn.o \
        $(OBJS)\coredll_fldlgcmn.o \
        $(OBJS)\coredll_fontcmn.o \
        $(OBJS)\coredll_fddlgcmn.o \
        $(OBJS)\coredll_fldlgcmn.o \
        $(OBJS)\coredll_fontcmn.o \

+       $(OBJS)\coredll_fontmap.o \

        $(OBJS)\coredll_framecmn.o \
        $(OBJS)\coredll_framecmn.o \

-       $(OBJS)\coredll_timercmn.o \
-       $(OBJS)\coredll_toplvcmn.o \

        $(OBJS)\coredll_gaugecmn.o \
        $(OBJS)\coredll_gdicmn.o \
        $(OBJS)\coredll_geometry.o \
        $(OBJS)\coredll_gaugecmn.o \
        $(OBJS)\coredll_gdicmn.o \
        $(OBJS)\coredll_geometry.o \


@@ -1584,6 +1523,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagall.o \
        $(OBJS)\coredll_imagbmp.o \
        $(OBJS)\coredll_image.o \
        $(OBJS)\coredll_imagall.o \
        $(OBJS)\coredll_imagbmp.o \
        $(OBJS)\coredll_image.o \

+       $(OBJS)\coredll_imagfill.o \

        $(OBJS)\coredll_imaggif.o \
        $(OBJS)\coredll_imagiff.o \
        $(OBJS)\coredll_imagjpeg.o \
        $(OBJS)\coredll_imaggif.o \
        $(OBJS)\coredll_imagiff.o \
        $(OBJS)\coredll_imagjpeg.o \


@@ -1592,7 +1532,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagpnm.o \
        $(OBJS)\coredll_imagtiff.o \
        $(OBJS)\coredll_imagxpm.o \
        $(OBJS)\coredll_imagpnm.o \
        $(OBJS)\coredll_imagtiff.o \
        $(OBJS)\coredll_imagxpm.o \

-       $(OBJS)\coredll_imagfill.o \

        $(OBJS)\coredll_layout.o \
        $(OBJS)\coredll_lboxcmn.o \
        $(OBJS)\coredll_matrix.o \
        $(OBJS)\coredll_layout.o \
        $(OBJS)\coredll_lboxcmn.o \
        $(OBJS)\coredll_matrix.o \


@@ -1610,17 +1549,51 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_statbar.o \
        $(OBJS)\coredll_tbarbase.o \
        $(OBJS)\coredll_textcmn.o \
        $(OBJS)\coredll_statbar.o \
        $(OBJS)\coredll_tbarbase.o \
        $(OBJS)\coredll_textcmn.o \

+       $(OBJS)\coredll_timercmn.o \
+       $(OBJS)\coredll_toplvcmn.o \

        $(OBJS)\coredll_treebase.o \
        $(OBJS)\coredll_valgen.o \
        $(OBJS)\coredll_validate.o \
        $(OBJS)\coredll_valtext.o \
        $(OBJS)\coredll_wincmn.o \
        $(OBJS)\coredll_treebase.o \
        $(OBJS)\coredll_valgen.o \
        $(OBJS)\coredll_validate.o \
        $(OBJS)\coredll_valtext.o \
        $(OBJS)\coredll_wincmn.o \

-       $(OBJS)\coredll_xpmdecod.o
+       $(OBJS)\coredll_xpmdecod.o \
+       $(OBJS)\coredll_busyinfo.o \
+       $(OBJS)\coredll_calctrl.o \
+       $(OBJS)\coredll_choicdgg.o \
+       $(OBJS)\coredll_dcbuffer.o \
+       $(OBJS)\coredll_dcpsg.o \
+       $(OBJS)\coredll_dirctrlg.o \
+       $(OBJS)\coredll_dragimgg.o \
+       $(OBJS)\coredll_grid.o \
+       $(OBJS)\coredll_gridctrl.o \
+       $(OBJS)\coredll_gridsel.o \
+       $(OBJS)\coredll_helpext.o \
+       $(OBJS)\coredll_laywin.o \
+       $(OBJS)\coredll_logg.o \
+       $(OBJS)\coredll_numdlgg.o \
+       $(OBJS)\coredll_panelg.o \
+       $(OBJS)\coredll_progdlgg.o \
+       $(OBJS)\coredll_renderg.o \
+       $(OBJS)\coredll_sashwin.o \
+       $(OBJS)\coredll_scrlwing.o \
+       $(OBJS)\coredll_selstore.o \
+       $(OBJS)\coredll_spinctlg.o \
+       $(OBJS)\coredll_splash.o \
+       $(OBJS)\coredll_splitter.o \
+       $(OBJS)\coredll_tbarsmpl.o \
+       $(OBJS)\coredll_textdlgg.o \
+       $(OBJS)\coredll_tipdlg.o \
+       $(OBJS)\coredll_tipwin.o \
+       $(OBJS)\coredll_treectlg.o \
+       $(OBJS)\coredll_vlbox.o \
+       $(OBJS)\coredll_vscroll.o \
+       $(OBJS)\coredll_wizard.o

 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \

+       $(OBJS)\corelib_taskbarcmn.o \

        $(OBJS)\corelib_app.o \
        $(OBJS)\corelib_bitmap.o \
        $(OBJS)\corelib_brush.o \
        $(OBJS)\corelib_app.o \
        $(OBJS)\corelib_bitmap.o \
        $(OBJS)\corelib_brush.o \


@@ -1650,12 +1623,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_icon.o \
        $(OBJS)\corelib_joystick.o \
        $(OBJS)\corelib_minifram.o \
        $(OBJS)\corelib_icon.o \
        $(OBJS)\corelib_joystick.o \
        $(OBJS)\corelib_minifram.o \

+       $(OBJS)\corelib_automtn.o \
+       $(OBJS)\corelib_dataobj.o \
+       $(OBJS)\corelib_dropsrc.o \
+       $(OBJS)\corelib_droptgt.o \
+       $(OBJS)\corelib_oleutils.o \
+       $(OBJS)\corelib_uuid.o \

        $(OBJS)\corelib_palette.o \
        $(OBJS)\corelib_pen.o \
        $(OBJS)\corelib_popupwin.o \
        $(OBJS)\corelib_region.o \
        $(OBJS)\corelib_settings.o \
        $(OBJS)\corelib_palette.o \
        $(OBJS)\corelib_pen.o \
        $(OBJS)\corelib_popupwin.o \
        $(OBJS)\corelib_region.o \
        $(OBJS)\corelib_settings.o \

-       $(OBJS)\corelib_taskbarcmn.o \

        $(OBJS)\corelib_taskbar.o \
        $(OBJS)\corelib_timer.o \
        $(OBJS)\corelib_tooltip.o \
        $(OBJS)\corelib_taskbar.o \
        $(OBJS)\corelib_timer.o \
        $(OBJS)\corelib_tooltip.o \


@@ -1663,15 +1641,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_utilsgui.o \
        $(OBJS)\corelib_wave.o \
        $(OBJS)\corelib_window.o \
        $(OBJS)\corelib_utilsgui.o \
        $(OBJS)\corelib_wave.o \
        $(OBJS)\corelib_window.o \

-       $(OBJS)\corelib_automtn.o \
-       $(OBJS)\corelib_dataobj.o \
-       $(OBJS)\corelib_dropsrc.o \
-       $(OBJS)\corelib_droptgt.o \
-       $(OBJS)\corelib_oleutils.o \
-       $(OBJS)\corelib_uuid.o \

        $(OBJS)\corelib_statusbr.o \
        $(OBJS)\corelib_statusbr.o \

-       $(OBJS)\corelib_uxtheme.o \
-       $(OBJS)\corelib_access.o \

        $(OBJS)\corelib_accel.o \
        $(OBJS)\corelib_bmpbuttn.o \
        $(OBJS)\corelib_button.o \
        $(OBJS)\corelib_accel.o \
        $(OBJS)\corelib_bmpbuttn.o \
        $(OBJS)\corelib_button.o \


@@ -1699,6 +1669,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_msgdlg.o \
        $(OBJS)\corelib_nativdlg.o \
        $(OBJS)\corelib_notebook.o \
        $(OBJS)\corelib_msgdlg.o \
        $(OBJS)\corelib_nativdlg.o \
        $(OBJS)\corelib_notebook.o \

+       $(OBJS)\corelib_access.o \

        $(OBJS)\corelib_ownerdrw.o \
        $(OBJS)\corelib_penwin.o \
        $(OBJS)\corelib_printdlg.o \
        $(OBJS)\corelib_ownerdrw.o \
        $(OBJS)\corelib_penwin.o \
        $(OBJS)\corelib_printdlg.o \


@@ -1720,40 +1691,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_textctrl.o \
        $(OBJS)\corelib_tglbtn.o \
        $(OBJS)\corelib_treectrl.o \
        $(OBJS)\corelib_textctrl.o \
        $(OBJS)\corelib_tglbtn.o \
        $(OBJS)\corelib_treectrl.o \

-       $(OBJS)\corelib_busyinfo.o \
-       $(OBJS)\corelib_calctrl.o \
-       $(OBJS)\corelib_choicdgg.o \
-       $(OBJS)\corelib_dcbuffer.o \
-       $(OBJS)\corelib_dcpsg.o \
-       $(OBJS)\corelib_dirctrlg.o \
-       $(OBJS)\corelib_dragimgg.o \
-       $(OBJS)\corelib_grid.o \
-       $(OBJS)\corelib_gridctrl.o \
-       $(OBJS)\corelib_gridsel.o \
-       $(OBJS)\corelib_helpext.o \
-       $(OBJS)\corelib_laywin.o \
-       $(OBJS)\corelib_logg.o \
-       $(OBJS)\corelib_numdlgg.o \
-       $(OBJS)\corelib_panelg.o \
-       $(OBJS)\corelib_progdlgg.o \
-       $(OBJS)\corelib_renderg.o \
-       $(OBJS)\corelib_sashwin.o \
-       $(OBJS)\corelib_scrlwing.o \
-       $(OBJS)\corelib_selstore.o \
-       $(OBJS)\corelib_spinctlg.o \
-       $(OBJS)\corelib_splash.o \
-       $(OBJS)\corelib_splitter.o \
-       $(OBJS)\corelib_tbarsmpl.o \
-       $(OBJS)\corelib_textdlgg.o \
-       $(OBJS)\corelib_tipdlg.o \
-       $(OBJS)\corelib_tipwin.o \
-       $(OBJS)\corelib_treectlg.o \
-       $(OBJS)\corelib_vlbox.o \
-       $(OBJS)\corelib_vscroll.o \
-       $(OBJS)\corelib_wizard.o \
-       $(OBJS)\corelib_appcmn.o \
-       $(OBJS)\corelib_fontmap.o \
+       $(OBJS)\corelib_uxtheme.o \

        $(OBJS)\corelib_accesscmn.o \
        $(OBJS)\corelib_accesscmn.o \

+       $(OBJS)\corelib_appcmn.o \

        $(OBJS)\corelib_artprov.o \
        $(OBJS)\corelib_artstd.o \
        $(OBJS)\corelib_bmpbase.o \
        $(OBJS)\corelib_artprov.o \
        $(OBJS)\corelib_artstd.o \
        $(OBJS)\corelib_bmpbase.o \


@@ -1779,9 +1719,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fddlgcmn.o \
        $(OBJS)\corelib_fldlgcmn.o \
        $(OBJS)\corelib_fontcmn.o \
        $(OBJS)\corelib_fddlgcmn.o \
        $(OBJS)\corelib_fldlgcmn.o \
        $(OBJS)\corelib_fontcmn.o \

+       $(OBJS)\corelib_fontmap.o \

        $(OBJS)\corelib_framecmn.o \
        $(OBJS)\corelib_framecmn.o \

-       $(OBJS)\corelib_timercmn.o \
-       $(OBJS)\corelib_toplvcmn.o \

        $(OBJS)\corelib_gaugecmn.o \
        $(OBJS)\corelib_gdicmn.o \
        $(OBJS)\corelib_geometry.o \
        $(OBJS)\corelib_gaugecmn.o \
        $(OBJS)\corelib_gdicmn.o \
        $(OBJS)\corelib_geometry.o \


@@ -1791,6 +1730,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagall.o \
        $(OBJS)\corelib_imagbmp.o \
        $(OBJS)\corelib_image.o \
        $(OBJS)\corelib_imagall.o \
        $(OBJS)\corelib_imagbmp.o \
        $(OBJS)\corelib_image.o \

+       $(OBJS)\corelib_imagfill.o \

        $(OBJS)\corelib_imaggif.o \
        $(OBJS)\corelib_imagiff.o \
        $(OBJS)\corelib_imagjpeg.o \
        $(OBJS)\corelib_imaggif.o \
        $(OBJS)\corelib_imagiff.o \
        $(OBJS)\corelib_imagjpeg.o \


@@ -1799,7 +1739,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagpnm.o \
        $(OBJS)\corelib_imagtiff.o \
        $(OBJS)\corelib_imagxpm.o \
        $(OBJS)\corelib_imagpnm.o \
        $(OBJS)\corelib_imagtiff.o \
        $(OBJS)\corelib_imagxpm.o \

-       $(OBJS)\corelib_imagfill.o \

        $(OBJS)\corelib_layout.o \
        $(OBJS)\corelib_lboxcmn.o \
        $(OBJS)\corelib_matrix.o \
        $(OBJS)\corelib_layout.o \
        $(OBJS)\corelib_lboxcmn.o \
        $(OBJS)\corelib_matrix.o \


@@ -1817,17 +1756,51 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_statbar.o \
        $(OBJS)\corelib_tbarbase.o \
        $(OBJS)\corelib_textcmn.o \
        $(OBJS)\corelib_statbar.o \
        $(OBJS)\corelib_tbarbase.o \
        $(OBJS)\corelib_textcmn.o \

+       $(OBJS)\corelib_timercmn.o \
+       $(OBJS)\corelib_toplvcmn.o \

        $(OBJS)\corelib_treebase.o \
        $(OBJS)\corelib_valgen.o \
        $(OBJS)\corelib_validate.o \
        $(OBJS)\corelib_valtext.o \
        $(OBJS)\corelib_wincmn.o \
        $(OBJS)\corelib_treebase.o \
        $(OBJS)\corelib_valgen.o \
        $(OBJS)\corelib_validate.o \
        $(OBJS)\corelib_valtext.o \
        $(OBJS)\corelib_wincmn.o \

-       $(OBJS)\corelib_xpmdecod.o
+       $(OBJS)\corelib_xpmdecod.o \
+       $(OBJS)\corelib_busyinfo.o \
+       $(OBJS)\corelib_calctrl.o \
+       $(OBJS)\corelib_choicdgg.o \
+       $(OBJS)\corelib_dcbuffer.o \
+       $(OBJS)\corelib_dcpsg.o \
+       $(OBJS)\corelib_dirctrlg.o \
+       $(OBJS)\corelib_dragimgg.o \
+       $(OBJS)\corelib_grid.o \
+       $(OBJS)\corelib_gridctrl.o \
+       $(OBJS)\corelib_gridsel.o \
+       $(OBJS)\corelib_helpext.o \
+       $(OBJS)\corelib_laywin.o \
+       $(OBJS)\corelib_logg.o \
+       $(OBJS)\corelib_numdlgg.o \
+       $(OBJS)\corelib_panelg.o \
+       $(OBJS)\corelib_progdlgg.o \
+       $(OBJS)\corelib_renderg.o \
+       $(OBJS)\corelib_sashwin.o \
+       $(OBJS)\corelib_scrlwing.o \
+       $(OBJS)\corelib_selstore.o \
+       $(OBJS)\corelib_spinctlg.o \
+       $(OBJS)\corelib_splash.o \
+       $(OBJS)\corelib_splitter.o \
+       $(OBJS)\corelib_tbarsmpl.o \
+       $(OBJS)\corelib_textdlgg.o \
+       $(OBJS)\corelib_tipdlg.o \
+       $(OBJS)\corelib_tipwin.o \
+       $(OBJS)\corelib_treectlg.o \
+       $(OBJS)\corelib_vlbox.o \
+       $(OBJS)\corelib_vscroll.o \
+       $(OBJS)\corelib_wizard.o

 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \

+       $(OBJS)\corelib_taskbarcmn.o \

        $(OBJS)\corelib_app.o \
        $(OBJS)\corelib_bitmap.o \
        $(OBJS)\corelib_brush.o \
        $(OBJS)\corelib_app.o \
        $(OBJS)\corelib_bitmap.o \
        $(OBJS)\corelib_brush.o \


@@ -1857,12 +1830,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_icon.o \
        $(OBJS)\corelib_joystick.o \
        $(OBJS)\corelib_minifram.o \
        $(OBJS)\corelib_icon.o \
        $(OBJS)\corelib_joystick.o \
        $(OBJS)\corelib_minifram.o \

+       $(OBJS)\corelib_automtn.o \
+       $(OBJS)\corelib_dataobj.o \
+       $(OBJS)\corelib_dropsrc.o \
+       $(OBJS)\corelib_droptgt.o \
+       $(OBJS)\corelib_oleutils.o \
+       $(OBJS)\corelib_uuid.o \

        $(OBJS)\corelib_palette.o \
        $(OBJS)\corelib_pen.o \
        $(OBJS)\corelib_popupwin.o \
        $(OBJS)\corelib_region.o \
        $(OBJS)\corelib_settings.o \
        $(OBJS)\corelib_palette.o \
        $(OBJS)\corelib_pen.o \
        $(OBJS)\corelib_popupwin.o \
        $(OBJS)\corelib_region.o \
        $(OBJS)\corelib_settings.o \

-       $(OBJS)\corelib_taskbarcmn.o \

        $(OBJS)\corelib_taskbar.o \
        $(OBJS)\corelib_timer.o \
        $(OBJS)\corelib_tooltip.o \
        $(OBJS)\corelib_taskbar.o \
        $(OBJS)\corelib_timer.o \
        $(OBJS)\corelib_tooltip.o \


@@ -1870,13 +1848,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_utilsgui.o \
        $(OBJS)\corelib_wave.o \
        $(OBJS)\corelib_window.o \
        $(OBJS)\corelib_utilsgui.o \
        $(OBJS)\corelib_wave.o \
        $(OBJS)\corelib_window.o \

-       $(OBJS)\corelib_automtn.o \
-       $(OBJS)\corelib_dataobj.o \
-       $(OBJS)\corelib_dropsrc.o \
-       $(OBJS)\corelib_droptgt.o \
-       $(OBJS)\corelib_oleutils.o \
-       $(OBJS)\corelib_uuid.o \

        $(OBJS)\corelib_textctrl.o \
        $(OBJS)\corelib_textctrl.o \

+       $(OBJS)\corelib_accel.o \
+       $(OBJS)\corelib_colrdlgg.o \
+       $(OBJS)\corelib_dirdlgg.o \
+       $(OBJS)\corelib_fdrepdlg.o \
+       $(OBJS)\corelib_filedlgg.o \
+       $(OBJS)\corelib_fontdlgg.o \
+       $(OBJS)\corelib_imaglist.o \
+       $(OBJS)\corelib_listctrl.o \
+       $(OBJS)\corelib_mdig.o \
+       $(OBJS)\corelib_msgdlgg.o \
+       $(OBJS)\corelib_prntdlgg.o \
+       $(OBJS)\corelib_tabg.o \

        $(OBJS)\corelib_bmpbuttn.o \
        $(OBJS)\corelib_button.o \
        $(OBJS)\corelib_checkbox.o \
        $(OBJS)\corelib_bmpbuttn.o \
        $(OBJS)\corelib_button.o \
        $(OBJS)\corelib_checkbox.o \


@@ -1887,7 +1871,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_control.o \
        $(OBJS)\corelib_dialog.o \
        $(OBJS)\corelib_framuniv.o \
        $(OBJS)\corelib_control.o \
        $(OBJS)\corelib_dialog.o \
        $(OBJS)\corelib_framuniv.o \

-       $(OBJS)\corelib_topluniv.o \

        $(OBJS)\corelib_gauge.o \
        $(OBJS)\corelib_inpcons.o \
        $(OBJS)\corelib_inphand.o \
        $(OBJS)\corelib_gauge.o \
        $(OBJS)\corelib_inpcons.o \
        $(OBJS)\corelib_inphand.o \


@@ -1907,58 +1890,15 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_statline.o \
        $(OBJS)\corelib_stattext.o \
        $(OBJS)\corelib_statusbr.o \
        $(OBJS)\corelib_statline.o \
        $(OBJS)\corelib_stattext.o \
        $(OBJS)\corelib_statusbr.o \

-       $(OBJS)\corelib_toolbar.o \

        $(OBJS)\corelib_theme.o \
        $(OBJS)\corelib_theme.o \

+       $(OBJS)\corelib_toolbar.o \
+       $(OBJS)\corelib_topluniv.o \

        $(OBJS)\corelib_winuniv.o \
        $(OBJS)\corelib_winuniv.o \

-       $(OBJS)\corelib_mdig.o \
-       $(OBJS)\corelib_imaglist.o \
-       $(OBJS)\corelib_colrdlgg.o \
-       $(OBJS)\corelib_listctrl.o \
-       $(OBJS)\corelib_filedlgg.o \
-       $(OBJS)\corelib_dirdlgg.o \
-       $(OBJS)\corelib_prntdlgg.o \
-       $(OBJS)\corelib_accel.o \
-       $(OBJS)\corelib_msgdlgg.o \
-       $(OBJS)\corelib_fdrepdlg.o \
-       $(OBJS)\corelib_fontdlgg.o \
-       $(OBJS)\corelib_tabg.o \

        $(OBJS)\corelib_gtk.o \
        $(OBJS)\corelib_gtk.o \

-       $(OBJS)\corelib_win32.o \

        $(OBJS)\corelib_metal.o \
        $(OBJS)\corelib_metal.o \

-       $(OBJS)\corelib_busyinfo.o \
-       $(OBJS)\corelib_calctrl.o \
-       $(OBJS)\corelib_choicdgg.o \
-       $(OBJS)\corelib_dcbuffer.o \
-       $(OBJS)\corelib_dcpsg.o \
-       $(OBJS)\corelib_dirctrlg.o \
-       $(OBJS)\corelib_dragimgg.o \
-       $(OBJS)\corelib_grid.o \
-       $(OBJS)\corelib_gridctrl.o \
-       $(OBJS)\corelib_gridsel.o \
-       $(OBJS)\corelib_helpext.o \
-       $(OBJS)\corelib_laywin.o \
-       $(OBJS)\corelib_logg.o \
-       $(OBJS)\corelib_numdlgg.o \
-       $(OBJS)\corelib_panelg.o \
-       $(OBJS)\corelib_progdlgg.o \
-       $(OBJS)\corelib_renderg.o \
-       $(OBJS)\corelib_sashwin.o \
-       $(OBJS)\corelib_scrlwing.o \
-       $(OBJS)\corelib_selstore.o \
-       $(OBJS)\corelib_spinctlg.o \
-       $(OBJS)\corelib_splash.o \
-       $(OBJS)\corelib_splitter.o \
-       $(OBJS)\corelib_tbarsmpl.o \
-       $(OBJS)\corelib_textdlgg.o \
-       $(OBJS)\corelib_tipdlg.o \
-       $(OBJS)\corelib_tipwin.o \
-       $(OBJS)\corelib_treectlg.o \
-       $(OBJS)\corelib_vlbox.o \
-       $(OBJS)\corelib_vscroll.o \
-       $(OBJS)\corelib_wizard.o \
-       $(OBJS)\corelib_appcmn.o \
-       $(OBJS)\corelib_fontmap.o \
+       $(OBJS)\corelib_win32.o \

        $(OBJS)\corelib_accesscmn.o \
        $(OBJS)\corelib_accesscmn.o \

+       $(OBJS)\corelib_appcmn.o \

        $(OBJS)\corelib_artprov.o \
        $(OBJS)\corelib_artstd.o \
        $(OBJS)\corelib_bmpbase.o \
        $(OBJS)\corelib_artprov.o \
        $(OBJS)\corelib_artstd.o \
        $(OBJS)\corelib_bmpbase.o \


@@ -1984,9 +1924,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fddlgcmn.o \
        $(OBJS)\corelib_fldlgcmn.o \
        $(OBJS)\corelib_fontcmn.o \
        $(OBJS)\corelib_fddlgcmn.o \
        $(OBJS)\corelib_fldlgcmn.o \
        $(OBJS)\corelib_fontcmn.o \

+       $(OBJS)\corelib_fontmap.o \

        $(OBJS)\corelib_framecmn.o \
        $(OBJS)\corelib_framecmn.o \

-       $(OBJS)\corelib_timercmn.o \
-       $(OBJS)\corelib_toplvcmn.o \

        $(OBJS)\corelib_gaugecmn.o \
        $(OBJS)\corelib_gdicmn.o \
        $(OBJS)\corelib_geometry.o \
        $(OBJS)\corelib_gaugecmn.o \
        $(OBJS)\corelib_gdicmn.o \
        $(OBJS)\corelib_geometry.o \


@@ -1996,6 +1935,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagall.o \
        $(OBJS)\corelib_imagbmp.o \
        $(OBJS)\corelib_image.o \
        $(OBJS)\corelib_imagall.o \
        $(OBJS)\corelib_imagbmp.o \
        $(OBJS)\corelib_image.o \

+       $(OBJS)\corelib_imagfill.o \

        $(OBJS)\corelib_imaggif.o \
        $(OBJS)\corelib_imagiff.o \
        $(OBJS)\corelib_imagjpeg.o \
        $(OBJS)\corelib_imaggif.o \
        $(OBJS)\corelib_imagiff.o \
        $(OBJS)\corelib_imagjpeg.o \


@@ -2004,7 +1944,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagpnm.o \
        $(OBJS)\corelib_imagtiff.o \
        $(OBJS)\corelib_imagxpm.o \
        $(OBJS)\corelib_imagpnm.o \
        $(OBJS)\corelib_imagtiff.o \
        $(OBJS)\corelib_imagxpm.o \

-       $(OBJS)\corelib_imagfill.o \

        $(OBJS)\corelib_layout.o \
        $(OBJS)\corelib_lboxcmn.o \
        $(OBJS)\corelib_matrix.o \
        $(OBJS)\corelib_layout.o \
        $(OBJS)\corelib_lboxcmn.o \
        $(OBJS)\corelib_matrix.o \


@@ -2022,17 +1961,51 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_statbar.o \
        $(OBJS)\corelib_tbarbase.o \
        $(OBJS)\corelib_textcmn.o \
        $(OBJS)\corelib_statbar.o \
        $(OBJS)\corelib_tbarbase.o \
        $(OBJS)\corelib_textcmn.o \

+       $(OBJS)\corelib_timercmn.o \
+       $(OBJS)\corelib_toplvcmn.o \

        $(OBJS)\corelib_treebase.o \
        $(OBJS)\corelib_valgen.o \
        $(OBJS)\corelib_validate.o \
        $(OBJS)\corelib_valtext.o \
        $(OBJS)\corelib_wincmn.o \
        $(OBJS)\corelib_treebase.o \
        $(OBJS)\corelib_valgen.o \
        $(OBJS)\corelib_validate.o \
        $(OBJS)\corelib_valtext.o \
        $(OBJS)\corelib_wincmn.o \

-       $(OBJS)\corelib_xpmdecod.o
+       $(OBJS)\corelib_xpmdecod.o \
+       $(OBJS)\corelib_busyinfo.o \
+       $(OBJS)\corelib_calctrl.o \
+       $(OBJS)\corelib_choicdgg.o \
+       $(OBJS)\corelib_dcbuffer.o \
+       $(OBJS)\corelib_dcpsg.o \
+       $(OBJS)\corelib_dirctrlg.o \
+       $(OBJS)\corelib_dragimgg.o \
+       $(OBJS)\corelib_grid.o \
+       $(OBJS)\corelib_gridctrl.o \
+       $(OBJS)\corelib_gridsel.o \
+       $(OBJS)\corelib_helpext.o \
+       $(OBJS)\corelib_laywin.o \
+       $(OBJS)\corelib_logg.o \
+       $(OBJS)\corelib_numdlgg.o \
+       $(OBJS)\corelib_panelg.o \
+       $(OBJS)\corelib_progdlgg.o \
+       $(OBJS)\corelib_renderg.o \
+       $(OBJS)\corelib_sashwin.o \
+       $(OBJS)\corelib_scrlwing.o \
+       $(OBJS)\corelib_selstore.o \
+       $(OBJS)\corelib_spinctlg.o \
+       $(OBJS)\corelib_splash.o \
+       $(OBJS)\corelib_splitter.o \
+       $(OBJS)\corelib_tbarsmpl.o \
+       $(OBJS)\corelib_textdlgg.o \
+       $(OBJS)\corelib_tipdlg.o \
+       $(OBJS)\corelib_tipwin.o \
+       $(OBJS)\corelib_treectlg.o \
+       $(OBJS)\corelib_vlbox.o \
+       $(OBJS)\corelib_vscroll.o \
+       $(OBJS)\corelib_wizard.o

 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 ____CORE_SRC_FILENAMES_OBJECTS =  \
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 ____CORE_SRC_FILENAMES_OBJECTS =  \

+       $(OBJS)\monodll_taskbarcmn.o \

        $(OBJS)\monodll_app.o \
        $(OBJS)\monodll_bitmap.o \
        $(OBJS)\monodll_brush.o \
        $(OBJS)\monodll_app.o \
        $(OBJS)\monodll_bitmap.o \
        $(OBJS)\monodll_brush.o \


@@ -2062,12 +2035,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_icon.o \
        $(OBJS)\monodll_joystick.o \
        $(OBJS)\monodll_minifram.o \
        $(OBJS)\monodll_icon.o \
        $(OBJS)\monodll_joystick.o \
        $(OBJS)\monodll_minifram.o \

+       $(OBJS)\monodll_automtn.o \
+       $(OBJS)\monodll_dataobj.o \
+       $(OBJS)\monodll_dropsrc.o \
+       $(OBJS)\monodll_droptgt.o \
+       $(OBJS)\monodll_oleutils.o \
+       $(OBJS)\monodll_uuid.o \

        $(OBJS)\monodll_palette.o \
        $(OBJS)\monodll_pen.o \
        $(OBJS)\monodll_popupwin.o \
        $(OBJS)\monodll_region.o \
        $(OBJS)\monodll_settings.o \
        $(OBJS)\monodll_palette.o \
        $(OBJS)\monodll_pen.o \
        $(OBJS)\monodll_popupwin.o \
        $(OBJS)\monodll_region.o \
        $(OBJS)\monodll_settings.o \

-       $(OBJS)\monodll_taskbarcmn.o \

        $(OBJS)\monodll_taskbar.o \
        $(OBJS)\monodll_timer.o \
        $(OBJS)\monodll_tooltip.o \
        $(OBJS)\monodll_taskbar.o \
        $(OBJS)\monodll_timer.o \
        $(OBJS)\monodll_tooltip.o \


@@ -2075,15 +2053,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_utilsgui.o \
        $(OBJS)\monodll_wave.o \
        $(OBJS)\monodll_window.o \
        $(OBJS)\monodll_utilsgui.o \
        $(OBJS)\monodll_wave.o \
        $(OBJS)\monodll_window.o \

-       $(OBJS)\monodll_automtn.o \
-       $(OBJS)\monodll_dataobj.o \
-       $(OBJS)\monodll_dropsrc.o \
-       $(OBJS)\monodll_droptgt.o \
-       $(OBJS)\monodll_oleutils.o \
-       $(OBJS)\monodll_uuid.o \

        $(OBJS)\monodll_statusbr.o \
        $(OBJS)\monodll_statusbr.o \

-       $(OBJS)\monodll_uxtheme.o \
-       $(OBJS)\monodll_access.o \

        $(OBJS)\monodll_accel.o \
        $(OBJS)\monodll_bmpbuttn.o \
        $(OBJS)\monodll_button.o \
        $(OBJS)\monodll_accel.o \
        $(OBJS)\monodll_bmpbuttn.o \
        $(OBJS)\monodll_button.o \


@@ -2111,6 +2081,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_msgdlg.o \
        $(OBJS)\monodll_nativdlg.o \
        $(OBJS)\monodll_notebook.o \
        $(OBJS)\monodll_msgdlg.o \
        $(OBJS)\monodll_nativdlg.o \
        $(OBJS)\monodll_notebook.o \

+       $(OBJS)\monodll_access.o \

        $(OBJS)\monodll_ownerdrw.o \
        $(OBJS)\monodll_penwin.o \
        $(OBJS)\monodll_printdlg.o \
        $(OBJS)\monodll_ownerdrw.o \
        $(OBJS)\monodll_penwin.o \
        $(OBJS)\monodll_printdlg.o \


@@ -2132,40 +2103,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_textctrl.o \
        $(OBJS)\monodll_tglbtn.o \
        $(OBJS)\monodll_treectrl.o \
        $(OBJS)\monodll_textctrl.o \
        $(OBJS)\monodll_tglbtn.o \
        $(OBJS)\monodll_treectrl.o \

-       $(OBJS)\monodll_busyinfo.o \
-       $(OBJS)\monodll_calctrl.o \
-       $(OBJS)\monodll_choicdgg.o \
-       $(OBJS)\monodll_dcbuffer.o \
-       $(OBJS)\monodll_dcpsg.o \
-       $(OBJS)\monodll_dirctrlg.o \
-       $(OBJS)\monodll_dragimgg.o \
-       $(OBJS)\monodll_grid.o \
-       $(OBJS)\monodll_gridctrl.o \
-       $(OBJS)\monodll_gridsel.o \
-       $(OBJS)\monodll_helpext.o \
-       $(OBJS)\monodll_laywin.o \
-       $(OBJS)\monodll_logg.o \
-       $(OBJS)\monodll_numdlgg.o \
-       $(OBJS)\monodll_panelg.o \
-       $(OBJS)\monodll_progdlgg.o \
-       $(OBJS)\monodll_renderg.o \
-       $(OBJS)\monodll_sashwin.o \
-       $(OBJS)\monodll_scrlwing.o \
-       $(OBJS)\monodll_selstore.o \
-       $(OBJS)\monodll_spinctlg.o \
-       $(OBJS)\monodll_splash.o \
-       $(OBJS)\monodll_splitter.o \
-       $(OBJS)\monodll_tbarsmpl.o \
-       $(OBJS)\monodll_textdlgg.o \
-       $(OBJS)\monodll_tipdlg.o \
-       $(OBJS)\monodll_tipwin.o \
-       $(OBJS)\monodll_treectlg.o \
-       $(OBJS)\monodll_vlbox.o \
-       $(OBJS)\monodll_vscroll.o \
-       $(OBJS)\monodll_wizard.o \
-       $(OBJS)\monodll_appcmn.o \
-       $(OBJS)\monodll_fontmap.o \
+       $(OBJS)\monodll_uxtheme.o \

        $(OBJS)\monodll_accesscmn.o \
        $(OBJS)\monodll_accesscmn.o \

+       $(OBJS)\monodll_appcmn.o \

        $(OBJS)\monodll_artprov.o \
        $(OBJS)\monodll_artstd.o \
        $(OBJS)\monodll_bmpbase.o \
        $(OBJS)\monodll_artprov.o \
        $(OBJS)\monodll_artstd.o \
        $(OBJS)\monodll_bmpbase.o \


@@ -2191,9 +2131,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fddlgcmn.o \
        $(OBJS)\monodll_fldlgcmn.o \
        $(OBJS)\monodll_fontcmn.o \
        $(OBJS)\monodll_fddlgcmn.o \
        $(OBJS)\monodll_fldlgcmn.o \
        $(OBJS)\monodll_fontcmn.o \

+       $(OBJS)\monodll_fontmap.o \

        $(OBJS)\monodll_framecmn.o \
        $(OBJS)\monodll_framecmn.o \

-       $(OBJS)\monodll_timercmn.o \
-       $(OBJS)\monodll_toplvcmn.o \

        $(OBJS)\monodll_gaugecmn.o \
        $(OBJS)\monodll_gdicmn.o \
        $(OBJS)\monodll_geometry.o \
        $(OBJS)\monodll_gaugecmn.o \
        $(OBJS)\monodll_gdicmn.o \
        $(OBJS)\monodll_geometry.o \


@@ -2203,6 +2142,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagall.o \
        $(OBJS)\monodll_imagbmp.o \
        $(OBJS)\monodll_image.o \
        $(OBJS)\monodll_imagall.o \
        $(OBJS)\monodll_imagbmp.o \
        $(OBJS)\monodll_image.o \

+       $(OBJS)\monodll_imagfill.o \

        $(OBJS)\monodll_imaggif.o \
        $(OBJS)\monodll_imagiff.o \
        $(OBJS)\monodll_imagjpeg.o \
        $(OBJS)\monodll_imaggif.o \
        $(OBJS)\monodll_imagiff.o \
        $(OBJS)\monodll_imagjpeg.o \


@@ -2211,7 +2151,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagpnm.o \
        $(OBJS)\monodll_imagtiff.o \
        $(OBJS)\monodll_imagxpm.o \
        $(OBJS)\monodll_imagpnm.o \
        $(OBJS)\monodll_imagtiff.o \
        $(OBJS)\monodll_imagxpm.o \

-       $(OBJS)\monodll_imagfill.o \

        $(OBJS)\monodll_layout.o \
        $(OBJS)\monodll_lboxcmn.o \
        $(OBJS)\monodll_matrix.o \
        $(OBJS)\monodll_layout.o \
        $(OBJS)\monodll_lboxcmn.o \
        $(OBJS)\monodll_matrix.o \


@@ -2229,17 +2168,51 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_statbar.o \
        $(OBJS)\monodll_tbarbase.o \
        $(OBJS)\monodll_textcmn.o \
        $(OBJS)\monodll_statbar.o \
        $(OBJS)\monodll_tbarbase.o \
        $(OBJS)\monodll_textcmn.o \

+       $(OBJS)\monodll_timercmn.o \
+       $(OBJS)\monodll_toplvcmn.o \

        $(OBJS)\monodll_treebase.o \
        $(OBJS)\monodll_valgen.o \
        $(OBJS)\monodll_validate.o \
        $(OBJS)\monodll_valtext.o \
        $(OBJS)\monodll_wincmn.o \
        $(OBJS)\monodll_treebase.o \
        $(OBJS)\monodll_valgen.o \
        $(OBJS)\monodll_validate.o \
        $(OBJS)\monodll_valtext.o \
        $(OBJS)\monodll_wincmn.o \

-       $(OBJS)\monodll_xpmdecod.o
+       $(OBJS)\monodll_xpmdecod.o \
+       $(OBJS)\monodll_busyinfo.o \
+       $(OBJS)\monodll_calctrl.o \
+       $(OBJS)\monodll_choicdgg.o \
+       $(OBJS)\monodll_dcbuffer.o \
+       $(OBJS)\monodll_dcpsg.o \
+       $(OBJS)\monodll_dirctrlg.o \
+       $(OBJS)\monodll_dragimgg.o \
+       $(OBJS)\monodll_grid.o \
+       $(OBJS)\monodll_gridctrl.o \
+       $(OBJS)\monodll_gridsel.o \
+       $(OBJS)\monodll_helpext.o \
+       $(OBJS)\monodll_laywin.o \
+       $(OBJS)\monodll_logg.o \
+       $(OBJS)\monodll_numdlgg.o \
+       $(OBJS)\monodll_panelg.o \
+       $(OBJS)\monodll_progdlgg.o \
+       $(OBJS)\monodll_renderg.o \
+       $(OBJS)\monodll_sashwin.o \
+       $(OBJS)\monodll_scrlwing.o \
+       $(OBJS)\monodll_selstore.o \
+       $(OBJS)\monodll_spinctlg.o \
+       $(OBJS)\monodll_splash.o \
+       $(OBJS)\monodll_splitter.o \
+       $(OBJS)\monodll_tbarsmpl.o \
+       $(OBJS)\monodll_textdlgg.o \
+       $(OBJS)\monodll_tipdlg.o \
+       $(OBJS)\monodll_tipwin.o \
+       $(OBJS)\monodll_treectlg.o \
+       $(OBJS)\monodll_vlbox.o \
+       $(OBJS)\monodll_vscroll.o \
+       $(OBJS)\monodll_wizard.o

 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
 ____CORE_SRC_FILENAMES_OBJECTS =  \
 endif
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),1)
 ____CORE_SRC_FILENAMES_OBJECTS =  \

+       $(OBJS)\monodll_taskbarcmn.o \

        $(OBJS)\monodll_app.o \
        $(OBJS)\monodll_bitmap.o \
        $(OBJS)\monodll_brush.o \
        $(OBJS)\monodll_app.o \
        $(OBJS)\monodll_bitmap.o \
        $(OBJS)\monodll_brush.o \


@@ -2269,12 +2242,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_icon.o \
        $(OBJS)\monodll_joystick.o \
        $(OBJS)\monodll_minifram.o \
        $(OBJS)\monodll_icon.o \
        $(OBJS)\monodll_joystick.o \
        $(OBJS)\monodll_minifram.o \

+       $(OBJS)\monodll_automtn.o \
+       $(OBJS)\monodll_dataobj.o \
+       $(OBJS)\monodll_dropsrc.o \
+       $(OBJS)\monodll_droptgt.o \
+       $(OBJS)\monodll_oleutils.o \
+       $(OBJS)\monodll_uuid.o \

        $(OBJS)\monodll_palette.o \
        $(OBJS)\monodll_pen.o \
        $(OBJS)\monodll_popupwin.o \
        $(OBJS)\monodll_region.o \
        $(OBJS)\monodll_settings.o \
        $(OBJS)\monodll_palette.o \
        $(OBJS)\monodll_pen.o \
        $(OBJS)\monodll_popupwin.o \
        $(OBJS)\monodll_region.o \
        $(OBJS)\monodll_settings.o \

-       $(OBJS)\monodll_taskbarcmn.o \

        $(OBJS)\monodll_taskbar.o \
        $(OBJS)\monodll_timer.o \
        $(OBJS)\monodll_tooltip.o \
        $(OBJS)\monodll_taskbar.o \
        $(OBJS)\monodll_timer.o \
        $(OBJS)\monodll_tooltip.o \


@@ -2282,13 +2260,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_utilsgui.o \
        $(OBJS)\monodll_wave.o \
        $(OBJS)\monodll_window.o \
        $(OBJS)\monodll_utilsgui.o \
        $(OBJS)\monodll_wave.o \
        $(OBJS)\monodll_window.o \

-       $(OBJS)\monodll_automtn.o \
-       $(OBJS)\monodll_dataobj.o \
-       $(OBJS)\monodll_dropsrc.o \
-       $(OBJS)\monodll_droptgt.o \
-       $(OBJS)\monodll_oleutils.o \
-       $(OBJS)\monodll_uuid.o \

        $(OBJS)\monodll_textctrl.o \
        $(OBJS)\monodll_textctrl.o \

+       $(OBJS)\monodll_accel.o \
+       $(OBJS)\monodll_colrdlgg.o \
+       $(OBJS)\monodll_dirdlgg.o \
+       $(OBJS)\monodll_fdrepdlg.o \
+       $(OBJS)\monodll_filedlgg.o \
+       $(OBJS)\monodll_fontdlgg.o \
+       $(OBJS)\monodll_imaglist.o \
+       $(OBJS)\monodll_listctrl.o \
+       $(OBJS)\monodll_mdig.o \
+       $(OBJS)\monodll_msgdlgg.o \
+       $(OBJS)\monodll_prntdlgg.o \
+       $(OBJS)\monodll_tabg.o \

        $(OBJS)\monodll_bmpbuttn.o \
        $(OBJS)\monodll_button.o \
        $(OBJS)\monodll_checkbox.o \
        $(OBJS)\monodll_bmpbuttn.o \
        $(OBJS)\monodll_button.o \
        $(OBJS)\monodll_checkbox.o \


@@ -2299,7 +2283,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_control.o \
        $(OBJS)\monodll_dialog.o \
        $(OBJS)\monodll_framuniv.o \
        $(OBJS)\monodll_control.o \
        $(OBJS)\monodll_dialog.o \
        $(OBJS)\monodll_framuniv.o \

-       $(OBJS)\monodll_topluniv.o \

        $(OBJS)\monodll_gauge.o \
        $(OBJS)\monodll_inpcons.o \
        $(OBJS)\monodll_inphand.o \
        $(OBJS)\monodll_gauge.o \
        $(OBJS)\monodll_inpcons.o \
        $(OBJS)\monodll_inphand.o \


@@ -2319,58 +2302,15 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_statline.o \
        $(OBJS)\monodll_stattext.o \
        $(OBJS)\monodll_statusbr.o \
        $(OBJS)\monodll_statline.o \
        $(OBJS)\monodll_stattext.o \
        $(OBJS)\monodll_statusbr.o \

-       $(OBJS)\monodll_toolbar.o \

        $(OBJS)\monodll_theme.o \
        $(OBJS)\monodll_theme.o \

+       $(OBJS)\monodll_toolbar.o \
+       $(OBJS)\monodll_topluniv.o \

        $(OBJS)\monodll_winuniv.o \
        $(OBJS)\monodll_winuniv.o \

-       $(OBJS)\monodll_mdig.o \
-       $(OBJS)\monodll_imaglist.o \
-       $(OBJS)\monodll_colrdlgg.o \
-       $(OBJS)\monodll_listctrl.o \
-       $(OBJS)\monodll_filedlgg.o \
-       $(OBJS)\monodll_dirdlgg.o \
-       $(OBJS)\monodll_prntdlgg.o \
-       $(OBJS)\monodll_accel.o \
-       $(OBJS)\monodll_msgdlgg.o \
-       $(OBJS)\monodll_fdrepdlg.o \
-       $(OBJS)\monodll_fontdlgg.o \
-       $(OBJS)\monodll_tabg.o \

        $(OBJS)\monodll_gtk.o \
        $(OBJS)\monodll_gtk.o \

-       $(OBJS)\monodll_win32.o \

        $(OBJS)\monodll_metal.o \
        $(OBJS)\monodll_metal.o \

-       $(OBJS)\monodll_busyinfo.o \
-       $(OBJS)\monodll_calctrl.o \
-       $(OBJS)\monodll_choicdgg.o \
-       $(OBJS)\monodll_dcbuffer.o \
-       $(OBJS)\monodll_dcpsg.o \
-       $(OBJS)\monodll_dirctrlg.o \
-       $(OBJS)\monodll_dragimgg.o \
-       $(OBJS)\monodll_grid.o \
-       $(OBJS)\monodll_gridctrl.o \
-       $(OBJS)\monodll_gridsel.o \
-       $(OBJS)\monodll_helpext.o \
-       $(OBJS)\monodll_laywin.o \
-       $(OBJS)\monodll_logg.o \
-       $(OBJS)\monodll_numdlgg.o \
-       $(OBJS)\monodll_panelg.o \
-       $(OBJS)\monodll_progdlgg.o \
-       $(OBJS)\monodll_renderg.o \
-       $(OBJS)\monodll_sashwin.o \
-       $(OBJS)\monodll_scrlwing.o \
-       $(OBJS)\monodll_selstore.o \
-       $(OBJS)\monodll_spinctlg.o \
-       $(OBJS)\monodll_splash.o \
-       $(OBJS)\monodll_splitter.o \
-       $(OBJS)\monodll_tbarsmpl.o \
-       $(OBJS)\monodll_textdlgg.o \
-       $(OBJS)\monodll_tipdlg.o \
-       $(OBJS)\monodll_tipwin.o \
-       $(OBJS)\monodll_treectlg.o \
-       $(OBJS)\monodll_vlbox.o \
-       $(OBJS)\monodll_vscroll.o \
-       $(OBJS)\monodll_wizard.o \
-       $(OBJS)\monodll_appcmn.o \
-       $(OBJS)\monodll_fontmap.o \
+       $(OBJS)\monodll_win32.o \

        $(OBJS)\monodll_accesscmn.o \
        $(OBJS)\monodll_accesscmn.o \

+       $(OBJS)\monodll_appcmn.o \

        $(OBJS)\monodll_artprov.o \
        $(OBJS)\monodll_artstd.o \
        $(OBJS)\monodll_bmpbase.o \
        $(OBJS)\monodll_artprov.o \
        $(OBJS)\monodll_artstd.o \
        $(OBJS)\monodll_bmpbase.o \


@@ -2396,9 +2336,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fddlgcmn.o \
        $(OBJS)\monodll_fldlgcmn.o \
        $(OBJS)\monodll_fontcmn.o \
        $(OBJS)\monodll_fddlgcmn.o \
        $(OBJS)\monodll_fldlgcmn.o \
        $(OBJS)\monodll_fontcmn.o \

+       $(OBJS)\monodll_fontmap.o \

        $(OBJS)\monodll_framecmn.o \
        $(OBJS)\monodll_framecmn.o \

-       $(OBJS)\monodll_timercmn.o \
-       $(OBJS)\monodll_toplvcmn.o \

        $(OBJS)\monodll_gaugecmn.o \
        $(OBJS)\monodll_gdicmn.o \
        $(OBJS)\monodll_geometry.o \
        $(OBJS)\monodll_gaugecmn.o \
        $(OBJS)\monodll_gdicmn.o \
        $(OBJS)\monodll_geometry.o \


@@ -2408,6 +2347,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagall.o \
        $(OBJS)\monodll_imagbmp.o \
        $(OBJS)\monodll_image.o \
        $(OBJS)\monodll_imagall.o \
        $(OBJS)\monodll_imagbmp.o \
        $(OBJS)\monodll_image.o \

+       $(OBJS)\monodll_imagfill.o \

        $(OBJS)\monodll_imaggif.o \
        $(OBJS)\monodll_imagiff.o \
        $(OBJS)\monodll_imagjpeg.o \
        $(OBJS)\monodll_imaggif.o \
        $(OBJS)\monodll_imagiff.o \
        $(OBJS)\monodll_imagjpeg.o \


@@ -2416,7 +2356,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagpnm.o \
        $(OBJS)\monodll_imagtiff.o \
        $(OBJS)\monodll_imagxpm.o \
        $(OBJS)\monodll_imagpnm.o \
        $(OBJS)\monodll_imagtiff.o \
        $(OBJS)\monodll_imagxpm.o \

-       $(OBJS)\monodll_imagfill.o \

        $(OBJS)\monodll_layout.o \
        $(OBJS)\monodll_lboxcmn.o \
        $(OBJS)\monodll_matrix.o \
        $(OBJS)\monodll_layout.o \
        $(OBJS)\monodll_lboxcmn.o \
        $(OBJS)\monodll_matrix.o \


@@ -2434,64 +2373,97 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_statbar.o \
        $(OBJS)\monodll_tbarbase.o \
        $(OBJS)\monodll_textcmn.o \
        $(OBJS)\monodll_statbar.o \
        $(OBJS)\monodll_tbarbase.o \
        $(OBJS)\monodll_textcmn.o \

+       $(OBJS)\monodll_timercmn.o \
+       $(OBJS)\monodll_toplvcmn.o \

        $(OBJS)\monodll_treebase.o \
        $(OBJS)\monodll_valgen.o \
        $(OBJS)\monodll_validate.o \
        $(OBJS)\monodll_valtext.o \
        $(OBJS)\monodll_wincmn.o \
        $(OBJS)\monodll_treebase.o \
        $(OBJS)\monodll_valgen.o \
        $(OBJS)\monodll_validate.o \
        $(OBJS)\monodll_valtext.o \
        $(OBJS)\monodll_wincmn.o \

-       $(OBJS)\monodll_xpmdecod.o
+       $(OBJS)\monodll_xpmdecod.o \
+       $(OBJS)\monodll_busyinfo.o \
+       $(OBJS)\monodll_calctrl.o \
+       $(OBJS)\monodll_choicdgg.o \
+       $(OBJS)\monodll_dcbuffer.o \
+       $(OBJS)\monodll_dcpsg.o \
+       $(OBJS)\monodll_dirctrlg.o \
+       $(OBJS)\monodll_dragimgg.o \
+       $(OBJS)\monodll_grid.o \
+       $(OBJS)\monodll_gridctrl.o \
+       $(OBJS)\monodll_gridsel.o \
+       $(OBJS)\monodll_helpext.o \
+       $(OBJS)\monodll_laywin.o \
+       $(OBJS)\monodll_logg.o \
+       $(OBJS)\monodll_numdlgg.o \
+       $(OBJS)\monodll_panelg.o \
+       $(OBJS)\monodll_progdlgg.o \
+       $(OBJS)\monodll_renderg.o \
+       $(OBJS)\monodll_sashwin.o \
+       $(OBJS)\monodll_scrlwing.o \
+       $(OBJS)\monodll_selstore.o \
+       $(OBJS)\monodll_spinctlg.o \
+       $(OBJS)\monodll_splash.o \
+       $(OBJS)\monodll_splitter.o \
+       $(OBJS)\monodll_tbarsmpl.o \
+       $(OBJS)\monodll_textdlgg.o \
+       $(OBJS)\monodll_tipdlg.o \
+       $(OBJS)\monodll_tipwin.o \
+       $(OBJS)\monodll_treectlg.o \
+       $(OBJS)\monodll_vlbox.o \
+       $(OBJS)\monodll_vscroll.o \
+       $(OBJS)\monodll_wizard.o

 endif
 endif
 ifeq ($(USE_GUI),1)
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_helpbest.o \
 endif
 endif
 ifeq ($(USE_GUI),1)
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_helpbest.o \

+       $(OBJS)\monolib_helpctrl.o \

        $(OBJS)\monolib_helpdata.o \
        $(OBJS)\monolib_helpfrm.o \
        $(OBJS)\monolib_helpdata.o \
        $(OBJS)\monolib_helpfrm.o \

-       $(OBJS)\monolib_helpctrl.o \

        $(OBJS)\monolib_htmlcell.o \
        $(OBJS)\monolib_htmlfilt.o \
        $(OBJS)\monolib_htmlpars.o \
        $(OBJS)\monolib_htmltag.o \
        $(OBJS)\monolib_htmlwin.o \
        $(OBJS)\monolib_htmlcell.o \
        $(OBJS)\monolib_htmlfilt.o \
        $(OBJS)\monolib_htmlpars.o \
        $(OBJS)\monolib_htmltag.o \
        $(OBJS)\monolib_htmlwin.o \

-       $(OBJS)\monolib_winpars.o \
+       $(OBJS)\monolib_htmprint.o \
+       $(OBJS)\monolib_m_dflist.o \

        $(OBJS)\monolib_m_fonts.o \
        $(OBJS)\monolib_m_hline.o \
        $(OBJS)\monolib_m_image.o \
        $(OBJS)\monolib_m_layout.o \
        $(OBJS)\monolib_m_links.o \
        $(OBJS)\monolib_m_list.o \
        $(OBJS)\monolib_m_fonts.o \
        $(OBJS)\monolib_m_hline.o \
        $(OBJS)\monolib_m_image.o \
        $(OBJS)\monolib_m_layout.o \
        $(OBJS)\monolib_m_links.o \
        $(OBJS)\monolib_m_list.o \

-       $(OBJS)\monolib_m_dflist.o \

        $(OBJS)\monolib_m_pre.o \
        $(OBJS)\monolib_m_pre.o \

-       $(OBJS)\monolib_m_tables.o \

        $(OBJS)\monolib_m_style.o \
        $(OBJS)\monolib_m_style.o \

-       $(OBJS)\monolib_htmprint.o \
+       $(OBJS)\monolib_m_tables.o \
+       $(OBJS)\monolib_winpars.o \

        $(OBJS)\monolib_htmllbox.o
 endif
 ifeq ($(USE_GUI),1)
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_helpbest.o \
        $(OBJS)\monolib_htmllbox.o
 endif
 ifeq ($(USE_GUI),1)
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_helpbest.o \

+       $(OBJS)\monodll_helpctrl.o \

        $(OBJS)\monodll_helpdata.o \
        $(OBJS)\monodll_helpfrm.o \
        $(OBJS)\monodll_helpdata.o \
        $(OBJS)\monodll_helpfrm.o \

-       $(OBJS)\monodll_helpctrl.o \

        $(OBJS)\monodll_htmlcell.o \
        $(OBJS)\monodll_htmlfilt.o \
        $(OBJS)\monodll_htmlpars.o \
        $(OBJS)\monodll_htmltag.o \
        $(OBJS)\monodll_htmlwin.o \
        $(OBJS)\monodll_htmlcell.o \
        $(OBJS)\monodll_htmlfilt.o \
        $(OBJS)\monodll_htmlpars.o \
        $(OBJS)\monodll_htmltag.o \
        $(OBJS)\monodll_htmlwin.o \

-       $(OBJS)\monodll_winpars.o \
+       $(OBJS)\monodll_htmprint.o \
+       $(OBJS)\monodll_m_dflist.o \

        $(OBJS)\monodll_m_fonts.o \
        $(OBJS)\monodll_m_hline.o \
        $(OBJS)\monodll_m_image.o \
        $(OBJS)\monodll_m_layout.o \
        $(OBJS)\monodll_m_links.o \
        $(OBJS)\monodll_m_list.o \
        $(OBJS)\monodll_m_fonts.o \
        $(OBJS)\monodll_m_hline.o \
        $(OBJS)\monodll_m_image.o \
        $(OBJS)\monodll_m_layout.o \
        $(OBJS)\monodll_m_links.o \
        $(OBJS)\monodll_m_list.o \

-       $(OBJS)\monodll_m_dflist.o \

        $(OBJS)\monodll_m_pre.o \
        $(OBJS)\monodll_m_pre.o \

-       $(OBJS)\monodll_m_tables.o \

        $(OBJS)\monodll_m_style.o \
        $(OBJS)\monodll_m_style.o \

-       $(OBJS)\monodll_htmprint.o \
+       $(OBJS)\monodll_m_tables.o \
+       $(OBJS)\monodll_winpars.o \

        $(OBJS)\monodll_htmllbox.o
 endif
 ifeq ($(MONOLITHIC),0)
        $(OBJS)\monodll_htmllbox.o
 endif
 ifeq ($(MONOLITHIC),0)


@@ -9365,7 +9337,7 @@ $(OBJS)\xmllib_xml.o: ..\src\xml\xml.cpp
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a

-       $(CXX) -shared -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -shared -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 endif
 endif
 
 endif
 endif
 


@@ -9412,7 +9384,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)

-       $(CXX) -shared -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+       $(CXX) -shared -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a

 endif
 endif
 endif
 endif
 endif
 endif


@@ -9432,7 +9404,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_OPENGL),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_OPENGL),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a

-       $(CXX) -shared -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
+       $(CXX) -shared -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32

 endif
 endif
 endif
 endif
 endif
 endif


@@ -9452,7 +9424,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_HTML),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname)
 ifeq ($(SHARED),1)
 ifeq ($(USE_HTML),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname)

-       $(CXX) -shared -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+       $(CXX) -shared -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a

 endif
 endif
 endif
 endif
 endif
 endif


@@ -9477,7 +9449,7 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME)
 ifeq ($(MONOLITHIC),1)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
 ifeq ($(MONOLITHIC),1)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a

-       $(CXX) -shared -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -shared -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 endif
 endif
 
 endif
 endif
 


@@ -9496,7 +9468,7 @@ endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)

-       $(CXX) -shared -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+       $(CXX) -shared -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a

 endif
 endif
 
 endif
 endif
 


@@ -9553,7 +9525,7 @@ $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a: $(WXZLIB_OBJECTS)
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)

-       $(CXX) -shared -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+       $(CXX) -shared -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a

 endif
 endif
 
 endif
 endif
 

diff --git a/build/makefile.vc b/build/makefile.vc
index c28ddc88a58bfe8771fea400865d7786c61531bf..ac0b9ea5e108de4280f3c19ee294c21cdaaf813d 100644 (file)
--- a/build/makefile.vc
+++ b/build/makefile.vc
@@ -12,21 +12,21 @@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-BASEDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+BASEDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CFLAGS)
-BASEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+       $(____DEBUGRUNTIME_68_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \
+       /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \
+       /I..\src\expat\lib /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CFLAGS)
+BASEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_basedll.pch"
+       $(____DEBUGRUNTIME_68_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \
+       /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \
+       /I..\src\expat\lib /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 /DwxUSE_GUI=0 \
+       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch"

 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_appbase.obj \
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_appbase.obj \


@@ -82,6 +82,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_zipstrm.obj \
        $(OBJS)\basedll_zstream.obj \
        $(OBJS)\basedll_basemsw.obj \
        $(OBJS)\basedll_zipstrm.obj \
        $(OBJS)\basedll_zstream.obj \
        $(OBJS)\basedll_basemsw.obj \

+       $(OBJS)\basedll_crashrpt.obj \

        $(OBJS)\basedll_dde.obj \
        $(OBJS)\basedll_dir.obj \
        $(OBJS)\basedll_mimetype.obj \
        $(OBJS)\basedll_dde.obj \
        $(OBJS)\basedll_dir.obj \
        $(OBJS)\basedll_mimetype.obj \


@@ -91,7 +92,6 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_thread.obj \
        $(OBJS)\basedll_utils.obj \
        $(OBJS)\basedll_utilsexc.obj \
        $(OBJS)\basedll_thread.obj \
        $(OBJS)\basedll_utils.obj \
        $(OBJS)\basedll_utilsexc.obj \

-       $(OBJS)\basedll_crashrpt.obj \

        $(OBJS)\basedll_event.obj \
        $(OBJS)\basedll_fs_mem.obj \
        $(OBJS)\basedll_msgout.obj \
        $(OBJS)\basedll_event.obj \
        $(OBJS)\basedll_fs_mem.obj \
        $(OBJS)\basedll_msgout.obj \


@@ -99,20 +99,20 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_main.obj \
        $(OBJS)\basedll_mslu.obj \
        $(OBJS)\basedll_volume.obj
        $(OBJS)\basedll_main.obj \
        $(OBJS)\basedll_mslu.obj \
        $(OBJS)\basedll_volume.obj

-BASELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+BASELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CFLAGS)
-BASELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+       $(____DEBUGRUNTIME_77_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \
+       /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \
+       /I..\src\expat\lib /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CFLAGS)
+BASELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       $(____DEBUGRUNTIME_77_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \
+       /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \
+       /I..\src\expat\lib /DwxUSE_BASE=1 /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_baselib.pch"
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \
        /Fp"$(OBJS)\wxprec_baselib.pch"
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \


@@ -169,6 +169,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_zipstrm.obj \
        $(OBJS)\baselib_zstream.obj \
        $(OBJS)\baselib_basemsw.obj \
        $(OBJS)\baselib_zipstrm.obj \
        $(OBJS)\baselib_zstream.obj \
        $(OBJS)\baselib_basemsw.obj \

+       $(OBJS)\baselib_crashrpt.obj \

        $(OBJS)\baselib_dde.obj \
        $(OBJS)\baselib_dir.obj \
        $(OBJS)\baselib_mimetype.obj \
        $(OBJS)\baselib_dde.obj \
        $(OBJS)\baselib_dir.obj \
        $(OBJS)\baselib_mimetype.obj \


@@ -178,7 +179,6 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_thread.obj \
        $(OBJS)\baselib_utils.obj \
        $(OBJS)\baselib_utilsexc.obj \
        $(OBJS)\baselib_thread.obj \
        $(OBJS)\baselib_utils.obj \
        $(OBJS)\baselib_utilsexc.obj \

-       $(OBJS)\baselib_crashrpt.obj \

        $(OBJS)\baselib_event.obj \
        $(OBJS)\baselib_fs_mem.obj \
        $(OBJS)\baselib_msgout.obj \
        $(OBJS)\baselib_event.obj \
        $(OBJS)\baselib_fs_mem.obj \
        $(OBJS)\baselib_msgout.obj \


@@ -186,14 +186,14 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_main.obj \
        $(OBJS)\baselib_mslu.obj \
        $(OBJS)\baselib_volume.obj
        $(OBJS)\baselib_main.obj \
        $(OBJS)\baselib_mslu.obj \
        $(OBJS)\baselib_volume.obj

-COREDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+COREDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_105) \
+       /DWIN32 $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(CXXFLAGS) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_coredll.pch"
+       $(____DEBUGRUNTIME_104_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \
+       /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \
+       /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_CORE \
+       /DwxUSE_BASE=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch"

 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.obj \
        $(OBJS)\coredll_event.obj \
 COREDLL_OBJECTS =  \
        $(OBJS)\coredll_dummy.obj \
        $(OBJS)\coredll_event.obj \


@@ -204,13 +204,14 @@ COREDLL_OBJECTS =  \
        $(OBJS)\coredll_mslu.obj \
        $(OBJS)\coredll_volume.obj \
        $(____CORE_SRC_FILENAMES_2_OBJECTS)
        $(OBJS)\coredll_mslu.obj \
        $(OBJS)\coredll_volume.obj \
        $(____CORE_SRC_FILENAMES_2_OBJECTS)

-CORELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+CORELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_114) \
+       /DWIN32 $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DwxUSE_BASE=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch"
+       $(____DEBUGRUNTIME_113_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \
+       /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \
+       /I..\src\regex /I..\src\expat\lib /DwxUSE_BASE=0 $(CXXFLAGS) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch"

 CORELIB_OBJECTS =  \
        $(OBJS)\corelib_dummy.obj \
        $(OBJS)\corelib_event.obj \
 CORELIB_OBJECTS =  \
        $(OBJS)\corelib_dummy.obj \
        $(OBJS)\corelib_event.obj \


@@ -221,106 +222,108 @@ CORELIB_OBJECTS =  \
        $(OBJS)\corelib_mslu.obj \
        $(OBJS)\corelib_volume.obj \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)
        $(OBJS)\corelib_mslu.obj \
        $(OBJS)\corelib_volume.obj \
        $(____CORE_SRC_FILENAMES_3_OBJECTS)

-GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+GLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_159) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_GL $(CXXFLAGS) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_gldll.pch"
+       $(____DEBUGRUNTIME_158_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \
+       /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \
+       /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_GL $(CXXFLAGS) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gldll.pch"

 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \
        $(OBJS)\gldll_glcanvas.obj
 GLDLL_OBJECTS =  \
        $(OBJS)\gldll_dummy.obj \
        $(OBJS)\gldll_glcanvas.obj

-GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+GLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_168) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.pdb \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gllib.pch"
+       $(____DEBUGRUNTIME_167_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \
+       /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \
+       /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_gllib.pch"

 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.obj \
        $(OBJS)\gllib_glcanvas.obj
 GLLIB_OBJECTS =  \
        $(OBJS)\gllib_dummy.obj \
        $(OBJS)\gllib_glcanvas.obj

-HTMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+HTMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_123) \
+       /DWIN32 $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_HTML $(CXXFLAGS) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_htmldll.pch"
+       $(____DEBUGRUNTIME_122_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \
+       /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \
+       /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_HTML \
+       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmldll.pch"

 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.obj \
        $(OBJS)\htmldll_helpbest.obj \
 HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_dummy.obj \
        $(OBJS)\htmldll_helpbest.obj \

+       $(OBJS)\htmldll_helpctrl.obj \

        $(OBJS)\htmldll_helpdata.obj \
        $(OBJS)\htmldll_helpfrm.obj \
        $(OBJS)\htmldll_helpdata.obj \
        $(OBJS)\htmldll_helpfrm.obj \

-       $(OBJS)\htmldll_helpctrl.obj \

        $(OBJS)\htmldll_htmlcell.obj \
        $(OBJS)\htmldll_htmlfilt.obj \
        $(OBJS)\htmldll_htmlpars.obj \
        $(OBJS)\htmldll_htmltag.obj \
        $(OBJS)\htmldll_htmlwin.obj \
        $(OBJS)\htmldll_htmlcell.obj \
        $(OBJS)\htmldll_htmlfilt.obj \
        $(OBJS)\htmldll_htmlpars.obj \
        $(OBJS)\htmldll_htmltag.obj \
        $(OBJS)\htmldll_htmlwin.obj \

-       $(OBJS)\htmldll_winpars.obj \
+       $(OBJS)\htmldll_htmprint.obj \
+       $(OBJS)\htmldll_m_dflist.obj \

        $(OBJS)\htmldll_m_fonts.obj \
        $(OBJS)\htmldll_m_hline.obj \
        $(OBJS)\htmldll_m_image.obj \
        $(OBJS)\htmldll_m_layout.obj \
        $(OBJS)\htmldll_m_links.obj \
        $(OBJS)\htmldll_m_list.obj \
        $(OBJS)\htmldll_m_fonts.obj \
        $(OBJS)\htmldll_m_hline.obj \
        $(OBJS)\htmldll_m_image.obj \
        $(OBJS)\htmldll_m_layout.obj \
        $(OBJS)\htmldll_m_links.obj \
        $(OBJS)\htmldll_m_list.obj \

-       $(OBJS)\htmldll_m_dflist.obj \

        $(OBJS)\htmldll_m_pre.obj \
        $(OBJS)\htmldll_m_pre.obj \

-       $(OBJS)\htmldll_m_tables.obj \

        $(OBJS)\htmldll_m_style.obj \
        $(OBJS)\htmldll_m_style.obj \

-       $(OBJS)\htmldll_htmprint.obj \
+       $(OBJS)\htmldll_m_tables.obj \
+       $(OBJS)\htmldll_winpars.obj \

        $(OBJS)\htmldll_htmllbox.obj
        $(OBJS)\htmldll_htmllbox.obj

-HTMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+HTMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_132) \
+       /DWIN32 $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.pdb \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch"
+       $(____DEBUGRUNTIME_131_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \
+       /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \
+       /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_htmllib.pch"

 HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_dummy.obj \
        $(OBJS)\htmllib_helpbest.obj \
 HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_dummy.obj \
        $(OBJS)\htmllib_helpbest.obj \

+       $(OBJS)\htmllib_helpctrl.obj \

        $(OBJS)\htmllib_helpdata.obj \
        $(OBJS)\htmllib_helpfrm.obj \
        $(OBJS)\htmllib_helpdata.obj \
        $(OBJS)\htmllib_helpfrm.obj \

-       $(OBJS)\htmllib_helpctrl.obj \

        $(OBJS)\htmllib_htmlcell.obj \
        $(OBJS)\htmllib_htmlfilt.obj \
        $(OBJS)\htmllib_htmlpars.obj \
        $(OBJS)\htmllib_htmltag.obj \
        $(OBJS)\htmllib_htmlwin.obj \
        $(OBJS)\htmllib_htmlcell.obj \
        $(OBJS)\htmllib_htmlfilt.obj \
        $(OBJS)\htmllib_htmlpars.obj \
        $(OBJS)\htmllib_htmltag.obj \
        $(OBJS)\htmllib_htmlwin.obj \

-       $(OBJS)\htmllib_winpars.obj \
+       $(OBJS)\htmllib_htmprint.obj \
+       $(OBJS)\htmllib_m_dflist.obj \

        $(OBJS)\htmllib_m_fonts.obj \
        $(OBJS)\htmllib_m_hline.obj \
        $(OBJS)\htmllib_m_image.obj \
        $(OBJS)\htmllib_m_layout.obj \
        $(OBJS)\htmllib_m_links.obj \
        $(OBJS)\htmllib_m_list.obj \
        $(OBJS)\htmllib_m_fonts.obj \
        $(OBJS)\htmllib_m_hline.obj \
        $(OBJS)\htmllib_m_image.obj \
        $(OBJS)\htmllib_m_layout.obj \
        $(OBJS)\htmllib_m_links.obj \
        $(OBJS)\htmllib_m_list.obj \

-       $(OBJS)\htmllib_m_dflist.obj \

        $(OBJS)\htmllib_m_pre.obj \
        $(OBJS)\htmllib_m_pre.obj \

-       $(OBJS)\htmllib_m_tables.obj \

        $(OBJS)\htmllib_m_style.obj \
        $(OBJS)\htmllib_m_style.obj \

-       $(OBJS)\htmllib_htmprint.obj \
+       $(OBJS)\htmllib_m_tables.obj \
+       $(OBJS)\htmllib_winpars.obj \

        $(OBJS)\htmllib_htmllbox.obj
 LIBDIRNAME = \
        ..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
        $(OBJS)\htmllib_htmllbox.obj
 LIBDIRNAME = \
        ..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-MONODLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+MONODLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DwxUSE_BASE=1 /DWXMAKINGDLL $(CFLAGS)
-MONODLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+       $(____DEBUGRUNTIME_50_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \
+       /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \
+       /I..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL $(CFLAGS)
+MONODLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DwxUSE_BASE=1 /DWXMAKINGDLL $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       $(____DEBUGRUNTIME_50_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \
+       /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \
+       /I..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL $(CXXFLAGS) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_monodll.pch"
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \
        /Fp"$(OBJS)\wxprec_monodll.pch"
 MONODLL_OBJECTS =  \
        $(OBJS)\monodll_dummy.obj \


@@ -377,6 +380,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_zipstrm.obj \
        $(OBJS)\monodll_zstream.obj \
        $(OBJS)\monodll_basemsw.obj \
        $(OBJS)\monodll_zipstrm.obj \
        $(OBJS)\monodll_zstream.obj \
        $(OBJS)\monodll_basemsw.obj \

+       $(OBJS)\monodll_crashrpt.obj \

        $(OBJS)\monodll_dde.obj \
        $(OBJS)\monodll_dir.obj \
        $(OBJS)\monodll_mimetype.obj \
        $(OBJS)\monodll_dde.obj \
        $(OBJS)\monodll_dir.obj \
        $(OBJS)\monodll_mimetype.obj \


@@ -386,7 +390,6 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_thread.obj \
        $(OBJS)\monodll_utils.obj \
        $(OBJS)\monodll_utilsexc.obj \
        $(OBJS)\monodll_thread.obj \
        $(OBJS)\monodll_utils.obj \
        $(OBJS)\monodll_utilsexc.obj \

-       $(OBJS)\monodll_crashrpt.obj \

        $(OBJS)\monodll_event.obj \
        $(OBJS)\monodll_fs_mem.obj \
        $(OBJS)\monodll_msgout.obj \
        $(OBJS)\monodll_event.obj \
        $(OBJS)\monodll_fs_mem.obj \
        $(OBJS)\monodll_msgout.obj \


@@ -398,30 +401,31 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_ftp.obj \
        $(OBJS)\monodll_http.obj \
        $(OBJS)\monodll_protocol.obj \
        $(OBJS)\monodll_ftp.obj \
        $(OBJS)\monodll_http.obj \
        $(OBJS)\monodll_protocol.obj \

-       $(OBJS)\monodll_url.obj \
-       $(OBJS)\monodll_sckfile.obj \

        $(OBJS)\monodll_sckaddr.obj \
        $(OBJS)\monodll_sckaddr.obj \

+       $(OBJS)\monodll_sckfile.obj \

        $(OBJS)\monodll_sckipc.obj \
        $(OBJS)\monodll_sckstrm.obj \
        $(OBJS)\monodll_socket.obj \
        $(OBJS)\monodll_sckipc.obj \
        $(OBJS)\monodll_sckstrm.obj \
        $(OBJS)\monodll_socket.obj \

+       $(OBJS)\monodll_url.obj \

        $(OBJS)\monodll_gsocket.obj \
        $(OBJS)\monodll_gsockmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.obj
        $(OBJS)\monodll_gsocket.obj \
        $(OBJS)\monodll_gsockmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_xml.obj

-MONOLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+MONOLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_60) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DwxUSE_BASE=1 $(CFLAGS)
-MONOLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+       $(____DEBUGRUNTIME_59_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \
+       /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \
+       /I..\src\expat\lib /DwxUSE_BASE=1 $(CFLAGS)
+MONOLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_60) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DwxUSE_BASE=1 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monolib.pch"
+       $(____DEBUGRUNTIME_59_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \
+       /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \
+       /I..\src\expat\lib /DwxUSE_BASE=1 $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_monolib.pch"

 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.obj \
        $(OBJS)\monolib_appbase.obj \
 MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_dummy.obj \
        $(OBJS)\monolib_appbase.obj \


@@ -477,6 +481,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_zipstrm.obj \
        $(OBJS)\monolib_zstream.obj \
        $(OBJS)\monolib_basemsw.obj \
        $(OBJS)\monolib_zipstrm.obj \
        $(OBJS)\monolib_zstream.obj \
        $(OBJS)\monolib_basemsw.obj \

+       $(OBJS)\monolib_crashrpt.obj \

        $(OBJS)\monolib_dde.obj \
        $(OBJS)\monolib_dir.obj \
        $(OBJS)\monolib_mimetype.obj \
        $(OBJS)\monolib_dde.obj \
        $(OBJS)\monolib_dir.obj \
        $(OBJS)\monolib_mimetype.obj \


@@ -486,7 +491,6 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_thread.obj \
        $(OBJS)\monolib_utils.obj \
        $(OBJS)\monolib_utilsexc.obj \
        $(OBJS)\monolib_thread.obj \
        $(OBJS)\monolib_utils.obj \
        $(OBJS)\monolib_utilsexc.obj \

-       $(OBJS)\monolib_crashrpt.obj \

        $(OBJS)\monolib_event.obj \
        $(OBJS)\monolib_fs_mem.obj \
        $(OBJS)\monolib_msgout.obj \
        $(OBJS)\monolib_event.obj \
        $(OBJS)\monolib_fs_mem.obj \
        $(OBJS)\monolib_msgout.obj \


@@ -498,88 +502,87 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_ftp.obj \
        $(OBJS)\monolib_http.obj \
        $(OBJS)\monolib_protocol.obj \
        $(OBJS)\monolib_ftp.obj \
        $(OBJS)\monolib_http.obj \
        $(OBJS)\monolib_protocol.obj \

-       $(OBJS)\monolib_url.obj \
-       $(OBJS)\monolib_sckfile.obj \

        $(OBJS)\monolib_sckaddr.obj \
        $(OBJS)\monolib_sckaddr.obj \

+       $(OBJS)\monolib_sckfile.obj \

        $(OBJS)\monolib_sckipc.obj \
        $(OBJS)\monolib_sckstrm.obj \
        $(OBJS)\monolib_socket.obj \
        $(OBJS)\monolib_sckipc.obj \
        $(OBJS)\monolib_sckstrm.obj \
        $(OBJS)\monolib_socket.obj \

+       $(OBJS)\monolib_url.obj \

        $(OBJS)\monolib_gsocket.obj \
        $(OBJS)\monolib_gsockmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.obj
        $(OBJS)\monolib_gsocket.obj \
        $(OBJS)\monolib_gsockmsw.obj \
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_xml.obj

-NETDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+NETDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_NET $(CFLAGS)
-NETDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+       $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \
+       /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \
+       /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET $(CFLAGS)
+NETDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_NET $(CXXFLAGS) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_netdll.pch"
+       $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \
+       /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \
+       /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET $(CXXFLAGS) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch"

 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.obj \
        $(OBJS)\netdll_fs_inet.obj \
        $(OBJS)\netdll_ftp.obj \
        $(OBJS)\netdll_http.obj \
        $(OBJS)\netdll_protocol.obj \
 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.obj \
        $(OBJS)\netdll_fs_inet.obj \
        $(OBJS)\netdll_ftp.obj \
        $(OBJS)\netdll_http.obj \
        $(OBJS)\netdll_protocol.obj \

-       $(OBJS)\netdll_url.obj \
-       $(OBJS)\netdll_sckfile.obj \

        $(OBJS)\netdll_sckaddr.obj \
        $(OBJS)\netdll_sckaddr.obj \

+       $(OBJS)\netdll_sckfile.obj \

        $(OBJS)\netdll_sckipc.obj \
        $(OBJS)\netdll_sckstrm.obj \
        $(OBJS)\netdll_socket.obj \
        $(OBJS)\netdll_sckipc.obj \
        $(OBJS)\netdll_sckstrm.obj \
        $(OBJS)\netdll_socket.obj \

+       $(OBJS)\netdll_url.obj \

        $(OBJS)\netdll_gsocket.obj \
        $(OBJS)\netdll_gsockmsw.obj
        $(OBJS)\netdll_gsocket.obj \
        $(OBJS)\netdll_gsockmsw.obj

-NETLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+NETLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_NET $(CFLAGS)
-NETLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+       $(____DEBUGRUNTIME_95_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \
+       /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \
+       /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET $(CFLAGS)
+NETLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_NET $(CXXFLAGS) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_netlib.pch"
+       $(____DEBUGRUNTIME_95_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) \
+       /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex \
+       /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET $(CXXFLAGS) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch"

 NETLIB_OBJECTS =  \
        $(OBJS)\netlib_dummy.obj \
        $(OBJS)\netlib_fs_inet.obj \
        $(OBJS)\netlib_ftp.obj \
        $(OBJS)\netlib_http.obj \
        $(OBJS)\netlib_protocol.obj \
 NETLIB_OBJECTS =  \
        $(OBJS)\netlib_dummy.obj \
        $(OBJS)\netlib_fs_inet.obj \
        $(OBJS)\netlib_ftp.obj \
        $(OBJS)\netlib_http.obj \
        $(OBJS)\netlib_protocol.obj \

-       $(OBJS)\netlib_url.obj \
-       $(OBJS)\netlib_sckfile.obj \

        $(OBJS)\netlib_sckaddr.obj \
        $(OBJS)\netlib_sckaddr.obj \

+       $(OBJS)\netlib_sckfile.obj \

        $(OBJS)\netlib_sckipc.obj \
        $(OBJS)\netlib_sckstrm.obj \
        $(OBJS)\netlib_socket.obj \
        $(OBJS)\netlib_sckipc.obj \
        $(OBJS)\netlib_sckstrm.obj \
        $(OBJS)\netlib_socket.obj \

+       $(OBJS)\netlib_url.obj \

        $(OBJS)\netlib_gsocket.obj \
        $(OBJS)\netlib_gsockmsw.obj
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
        $(OBJS)\netlib_gsocket.obj \
        $(OBJS)\netlib_gsockmsw.obj
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-WXEXPAT_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
-       /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) \
-       /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CFLAGS)
+WXEXPAT_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_43) /DWIN32 \
+       $(__DEBUGINFO_29) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
+       $(____DEBUGRUNTIME_42_p) $(__OPTIMIZEFLAG) /I$(LIBDIRNAME) \
+       /DCOMPILED_FROM_DSP $(CFLAGS)

 WXEXPAT_OBJECTS =  \
        $(OBJS)\wxexpat_xmlparse.obj \
        $(OBJS)\wxexpat_xmlrole.obj \
        $(OBJS)\wxexpat_xmltok.obj
 WXEXPAT_OBJECTS =  \
        $(OBJS)\wxexpat_xmlparse.obj \
        $(OBJS)\wxexpat_xmlrole.obj \
        $(OBJS)\wxexpat_xmltok.obj

-WXJPEG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
-       /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) \
-       /I$(LIBDIRNAME) $(CFLAGS)
+WXJPEG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_27) /DWIN32 \
+       $(__DEBUGINFO_29) /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb \
+       $(____DEBUGRUNTIME_26_p) $(__OPTIMIZEFLAG) /I$(LIBDIRNAME) $(CFLAGS)

 WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jcomapi.obj \
        $(OBJS)\wxjpeg_jutils.obj \
 WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jcomapi.obj \
        $(OBJS)\wxjpeg_jutils.obj \


@@ -627,10 +630,9 @@ WXJPEG_OBJECTS =  \
        $(OBJS)\wxjpeg_jquant1.obj \
        $(OBJS)\wxjpeg_jquant2.obj \
        $(OBJS)\wxjpeg_jdmerge.obj
        $(OBJS)\wxjpeg_jquant1.obj \
        $(OBJS)\wxjpeg_jquant2.obj \
        $(OBJS)\wxjpeg_jdmerge.obj

-WXPNG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
-       /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) /I..\src\zlib \
-       $(CFLAGS)
+WXPNG_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_19) /DWIN32 \
+       $(__DEBUGINFO_29) /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb \
+       $(____DEBUGRUNTIME_18_p) $(__OPTIMIZEFLAG) /I..\src\zlib $(CFLAGS)

 WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_png.obj \
        $(OBJS)\wxpng_pngerror.obj \
 WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_png.obj \
        $(OBJS)\wxpng_pngerror.obj \


@@ -649,17 +651,17 @@ WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_pngwrite.obj \
        $(OBJS)\wxpng_pngwtran.obj \
        $(OBJS)\wxpng_pngwutil.obj
        $(OBJS)\wxpng_pngwrite.obj \
        $(OBJS)\wxpng_pngwtran.obj \
        $(OBJS)\wxpng_pngwutil.obj

-WXREGEX_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
-       /Fd$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) $(CFLAGS)
+WXREGEX_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
+       $(__DEBUGINFO_29) /Fd$(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).pdb \
+       $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(CFLAGS)

 WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regcomp.obj \
        $(OBJS)\wxregex_regexec.obj \
        $(OBJS)\wxregex_regerror.obj \
        $(OBJS)\wxregex_regfree.obj
 WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regcomp.obj \
        $(OBJS)\wxregex_regexec.obj \
        $(OBJS)\wxregex_regerror.obj \
        $(OBJS)\wxregex_regfree.obj

-WXTIFF_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
-       /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) $(CFLAGS)
+WXTIFF_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_35) /DWIN32 \
+       $(__DEBUGINFO_29) /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb \
+       $(____DEBUGRUNTIME_34_p) $(__OPTIMIZEFLAG) $(CFLAGS)

 WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_win32.obj \
        $(OBJS)\wxtiff_tif_aux.obj \
 WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_win32.obj \
        $(OBJS)\wxtiff_tif_aux.obj \


@@ -694,9 +696,9 @@ WXTIFF_OBJECTS =  \
        $(OBJS)\wxtiff_tif_warning.obj \
        $(OBJS)\wxtiff_tif_write.obj \
        $(OBJS)\wxtiff_tif_zip.obj
        $(OBJS)\wxtiff_tif_warning.obj \
        $(OBJS)\wxtiff_tif_write.obj \
        $(OBJS)\wxtiff_tif_zip.obj

-WXZLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
-       /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(__OPTIMIZEFLAG) $(CFLAGS)
+WXZLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_11) /DWIN32 \
+       $(__DEBUGINFO_29) /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb \
+       $(____DEBUGRUNTIME_10_p) $(__OPTIMIZEFLAG) $(CFLAGS)

 WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_adler32.obj \
        $(OBJS)\wxzlib_compress.obj \
 WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_adler32.obj \
        $(OBJS)\wxzlib_compress.obj \


@@ -712,24 +714,25 @@ WXZLIB_OBJECTS =  \
        $(OBJS)\wxzlib_infcodes.obj \
        $(OBJS)\wxzlib_infutil.obj \
        $(OBJS)\wxzlib_inffast.obj
        $(OBJS)\wxzlib_infcodes.obj \
        $(OBJS)\wxzlib_infutil.obj \
        $(OBJS)\wxzlib_inffast.obj

-XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_141) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_xmldll.pch"
+       $(____DEBUGRUNTIME_140_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \
+       /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \
+       /I..\src\regex /I..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) \
+       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch"

 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \
        $(OBJS)\xmldll_xml.obj
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \
        $(OBJS)\xmldll_xml.obj

-XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_45) /DWIN32 \
-       $(__DEBUGFLAG_46) $(____DEBUGFLAG) \
+XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_150) /DWIN32 \
+       $(__DEBUGINFO_29) \

        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.pdb \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.pdb \

-       $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I..\include /I$(LIBDIRNAME) /I..\src\tiff \
-       /I..\src\jpeg /I..\src\png /I..\src\zlib /I..\src\regex /I..\src\expat\lib \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch"
+       $(____DEBUGRUNTIME_149_p) $(__OPTIMIZEFLAG) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\include \
+       /I$(LIBDIRNAME) /I..\src\tiff /I..\src\jpeg /I..\src\png /I..\src\zlib \
+       /I..\src\regex /I..\src\expat\lib $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_xmllib.pch"

 XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.obj \
        $(OBJS)\xmllib_xml.obj
 XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.obj \
        $(OBJS)\xmllib_xml.obj


@@ -748,7 +751,10 @@ VENDORTAG = _$(VENDOR)
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif
 !if "$(OFFICIAL_BUILD)" == "1"
 VENDORTAG = 
 !endif

-!if "$(BUILD)" == "debug"
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_FLAG)" == "1"

 WXDEBUGFLAG = d
 !endif
 !if "$(SHARED)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(SHARED)" == "1"


@@ -760,25 +766,226 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG = /DEBUG
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = d

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG = 
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = 

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_45 = d
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = 

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG_45 = 
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = d

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG_46 = /Zi
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_28 = /DEBUG

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG_46 = 
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_28 = 

 !endif
 !endif

-!if "$(BUILD)" == "debug"
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_28 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_28 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_29 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_29 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_29 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_29 = /Zi
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_105 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_105 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_105 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_11 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_11 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_11 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_114 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_114 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_114 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_123 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_123 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_123 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_132 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_132 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_132 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_141 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_141 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_141 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_150 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_150 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_150 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_159 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_159 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_159 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_168 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_168 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_168 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_19 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_19 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_19 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_27 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_27 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_27 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_3 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_3 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_3 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_35 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_35 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_35 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_43 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_43 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_43 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_51 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_51 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_51 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_60 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_60 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_60 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_69 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_69 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_69 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_78 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_78 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_78 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_87 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_87 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_87 = $(__DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_96 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_96 = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_96 = $(__DEBUGINFO)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p = /D__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"

 __DEBUG_DEFINE_p = /D__WXDEBUG__
 !endif
 !if "$(USE_GUI)" == "1"
 __DEBUG_DEFINE_p = /D__WXDEBUG__
 !endif
 !if "$(USE_GUI)" == "1"


@@ -821,6 +1028,7 @@ __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \

+       $(OBJS)\monolib_taskbarcmn.obj \

        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \
        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \


@@ -850,12 +1058,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_joystick.obj \
        $(OBJS)\monolib_minifram.obj \
        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_joystick.obj \
        $(OBJS)\monolib_minifram.obj \

+       $(OBJS)\monolib_automtn.obj \
+       $(OBJS)\monolib_dataobj.obj \
+       $(OBJS)\monolib_dropsrc.obj \
+       $(OBJS)\monolib_droptgt.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_uuid.obj \

        $(OBJS)\monolib_palette.obj \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_settings.obj \
        $(OBJS)\monolib_palette.obj \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_settings.obj \

-       $(OBJS)\monolib_taskbarcmn.obj \

        $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_tooltip.obj \
        $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_tooltip.obj \


@@ -863,15 +1076,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_utilsgui.obj \
        $(OBJS)\monolib_wave.obj \
        $(OBJS)\monolib_window.obj \
        $(OBJS)\monolib_utilsgui.obj \
        $(OBJS)\monolib_wave.obj \
        $(OBJS)\monolib_window.obj \

-       $(OBJS)\monolib_automtn.obj \
-       $(OBJS)\monolib_dataobj.obj \
-       $(OBJS)\monolib_dropsrc.obj \
-       $(OBJS)\monolib_droptgt.obj \
-       $(OBJS)\monolib_oleutils.obj \
-       $(OBJS)\monolib_uuid.obj \

        $(OBJS)\monolib_statusbr.obj \
        $(OBJS)\monolib_statusbr.obj \

-       $(OBJS)\monolib_uxtheme.obj \
-       $(OBJS)\monolib_access.obj \

        $(OBJS)\monolib_accel.obj \
        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \
        $(OBJS)\monolib_accel.obj \
        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \


@@ -899,6 +1104,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_msgdlg.obj \
        $(OBJS)\monolib_nativdlg.obj \
        $(OBJS)\monolib_notebook.obj \
        $(OBJS)\monolib_msgdlg.obj \
        $(OBJS)\monolib_nativdlg.obj \
        $(OBJS)\monolib_notebook.obj \

+       $(OBJS)\monolib_access.obj \

        $(OBJS)\monolib_ownerdrw.obj \
        $(OBJS)\monolib_penwin.obj \
        $(OBJS)\monolib_printdlg.obj \
        $(OBJS)\monolib_ownerdrw.obj \
        $(OBJS)\monolib_penwin.obj \
        $(OBJS)\monolib_printdlg.obj \


@@ -920,40 +1126,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_textctrl.obj \
        $(OBJS)\monolib_tglbtn.obj \
        $(OBJS)\monolib_treectrl.obj \
        $(OBJS)\monolib_textctrl.obj \
        $(OBJS)\monolib_tglbtn.obj \
        $(OBJS)\monolib_treectrl.obj \

-       $(OBJS)\monolib_busyinfo.obj \
-       $(OBJS)\monolib_calctrl.obj \
-       $(OBJS)\monolib_choicdgg.obj \
-       $(OBJS)\monolib_dcbuffer.obj \
-       $(OBJS)\monolib_dcpsg.obj \
-       $(OBJS)\monolib_dirctrlg.obj \
-       $(OBJS)\monolib_dragimgg.obj \
-       $(OBJS)\monolib_grid.obj \
-       $(OBJS)\monolib_gridctrl.obj \
-       $(OBJS)\monolib_gridsel.obj \
-       $(OBJS)\monolib_helpext.obj \
-       $(OBJS)\monolib_laywin.obj \
-       $(OBJS)\monolib_logg.obj \
-       $(OBJS)\monolib_numdlgg.obj \
-       $(OBJS)\monolib_panelg.obj \
-       $(OBJS)\monolib_progdlgg.obj \
-       $(OBJS)\monolib_renderg.obj \
-       $(OBJS)\monolib_sashwin.obj \
-       $(OBJS)\monolib_scrlwing.obj \
-       $(OBJS)\monolib_selstore.obj \
-       $(OBJS)\monolib_spinctlg.obj \
-       $(OBJS)\monolib_splash.obj \
-       $(OBJS)\monolib_splitter.obj \
-       $(OBJS)\monolib_tbarsmpl.obj \
-       $(OBJS)\monolib_textdlgg.obj \
-       $(OBJS)\monolib_tipdlg.obj \
-       $(OBJS)\monolib_tipwin.obj \
-       $(OBJS)\monolib_treectlg.obj \
-       $(OBJS)\monolib_vlbox.obj \
-       $(OBJS)\monolib_vscroll.obj \
-       $(OBJS)\monolib_wizard.obj \
-       $(OBJS)\monolib_appcmn.obj \
-       $(OBJS)\monolib_fontmap.obj \
+       $(OBJS)\monolib_uxtheme.obj \

        $(OBJS)\monolib_accesscmn.obj \
        $(OBJS)\monolib_accesscmn.obj \

+       $(OBJS)\monolib_appcmn.obj \

        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \
        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \


@@ -979,9 +1154,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \

+       $(OBJS)\monolib_fontmap.obj \

        $(OBJS)\monolib_framecmn.obj \
        $(OBJS)\monolib_framecmn.obj \

-       $(OBJS)\monolib_timercmn.obj \
-       $(OBJS)\monolib_toplvcmn.obj \

        $(OBJS)\monolib_gaugecmn.obj \
        $(OBJS)\monolib_gdicmn.obj \
        $(OBJS)\monolib_geometry.obj \
        $(OBJS)\monolib_gaugecmn.obj \
        $(OBJS)\monolib_gdicmn.obj \
        $(OBJS)\monolib_geometry.obj \


@@ -991,6 +1165,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagall.obj \
        $(OBJS)\monolib_imagbmp.obj \
        $(OBJS)\monolib_image.obj \
        $(OBJS)\monolib_imagall.obj \
        $(OBJS)\monolib_imagbmp.obj \
        $(OBJS)\monolib_image.obj \

+       $(OBJS)\monolib_imagfill.obj \

        $(OBJS)\monolib_imaggif.obj \
        $(OBJS)\monolib_imagiff.obj \
        $(OBJS)\monolib_imagjpeg.obj \
        $(OBJS)\monolib_imaggif.obj \
        $(OBJS)\monolib_imagiff.obj \
        $(OBJS)\monolib_imagjpeg.obj \


@@ -999,7 +1174,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagpnm.obj \
        $(OBJS)\monolib_imagtiff.obj \
        $(OBJS)\monolib_imagxpm.obj \
        $(OBJS)\monolib_imagpnm.obj \
        $(OBJS)\monolib_imagtiff.obj \
        $(OBJS)\monolib_imagxpm.obj \

-       $(OBJS)\monolib_imagfill.obj \

        $(OBJS)\monolib_layout.obj \
        $(OBJS)\monolib_lboxcmn.obj \
        $(OBJS)\monolib_matrix.obj \
        $(OBJS)\monolib_layout.obj \
        $(OBJS)\monolib_lboxcmn.obj \
        $(OBJS)\monolib_matrix.obj \


@@ -1017,15 +1191,49 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_statbar.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \
        $(OBJS)\monolib_statbar.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \

+       $(OBJS)\monolib_timercmn.obj \
+       $(OBJS)\monolib_toplvcmn.obj \

        $(OBJS)\monolib_treebase.obj \
        $(OBJS)\monolib_valgen.obj \
        $(OBJS)\monolib_validate.obj \
        $(OBJS)\monolib_valtext.obj \
        $(OBJS)\monolib_wincmn.obj \
        $(OBJS)\monolib_treebase.obj \
        $(OBJS)\monolib_valgen.obj \
        $(OBJS)\monolib_validate.obj \
        $(OBJS)\monolib_valtext.obj \
        $(OBJS)\monolib_wincmn.obj \

-       $(OBJS)\monolib_xpmdecod.obj
+       $(OBJS)\monolib_xpmdecod.obj \
+       $(OBJS)\monolib_busyinfo.obj \
+       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_choicdgg.obj \
+       $(OBJS)\monolib_dcbuffer.obj \
+       $(OBJS)\monolib_dcpsg.obj \
+       $(OBJS)\monolib_dirctrlg.obj \
+       $(OBJS)\monolib_dragimgg.obj \
+       $(OBJS)\monolib_grid.obj \
+       $(OBJS)\monolib_gridctrl.obj \
+       $(OBJS)\monolib_gridsel.obj \
+       $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_logg.obj \
+       $(OBJS)\monolib_numdlgg.obj \
+       $(OBJS)\monolib_panelg.obj \
+       $(OBJS)\monolib_progdlgg.obj \
+       $(OBJS)\monolib_renderg.obj \
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_scrlwing.obj \
+       $(OBJS)\monolib_selstore.obj \
+       $(OBJS)\monolib_spinctlg.obj \
+       $(OBJS)\monolib_splash.obj \
+       $(OBJS)\monolib_splitter.obj \
+       $(OBJS)\monolib_tbarsmpl.obj \
+       $(OBJS)\monolib_textdlgg.obj \
+       $(OBJS)\monolib_tipdlg.obj \
+       $(OBJS)\monolib_tipwin.obj \
+       $(OBJS)\monolib_treectlg.obj \
+       $(OBJS)\monolib_vlbox.obj \
+       $(OBJS)\monolib_vscroll.obj \
+       $(OBJS)\monolib_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \

+       $(OBJS)\monolib_taskbarcmn.obj \

        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \
        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \


@@ -1055,12 +1263,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_joystick.obj \
        $(OBJS)\monolib_minifram.obj \
        $(OBJS)\monolib_icon.obj \
        $(OBJS)\monolib_joystick.obj \
        $(OBJS)\monolib_minifram.obj \

+       $(OBJS)\monolib_automtn.obj \
+       $(OBJS)\monolib_dataobj.obj \
+       $(OBJS)\monolib_dropsrc.obj \
+       $(OBJS)\monolib_droptgt.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_uuid.obj \

        $(OBJS)\monolib_palette.obj \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_settings.obj \
        $(OBJS)\monolib_palette.obj \
        $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \
        $(OBJS)\monolib_region.obj \
        $(OBJS)\monolib_settings.obj \

-       $(OBJS)\monolib_taskbarcmn.obj \

        $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_tooltip.obj \
        $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_timer.obj \
        $(OBJS)\monolib_tooltip.obj \


@@ -1068,13 +1281,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_utilsgui.obj \
        $(OBJS)\monolib_wave.obj \
        $(OBJS)\monolib_window.obj \
        $(OBJS)\monolib_utilsgui.obj \
        $(OBJS)\monolib_wave.obj \
        $(OBJS)\monolib_window.obj \

-       $(OBJS)\monolib_automtn.obj \
-       $(OBJS)\monolib_dataobj.obj \
-       $(OBJS)\monolib_dropsrc.obj \
-       $(OBJS)\monolib_droptgt.obj \
-       $(OBJS)\monolib_oleutils.obj \
-       $(OBJS)\monolib_uuid.obj \

        $(OBJS)\monolib_textctrl.obj \
        $(OBJS)\monolib_textctrl.obj \

+       $(OBJS)\monolib_accel.obj \
+       $(OBJS)\monolib_colrdlgg.obj \
+       $(OBJS)\monolib_dirdlgg.obj \
+       $(OBJS)\monolib_fdrepdlg.obj \
+       $(OBJS)\monolib_filedlgg.obj \
+       $(OBJS)\monolib_fontdlgg.obj \
+       $(OBJS)\monolib_imaglist.obj \
+       $(OBJS)\monolib_listctrl.obj \
+       $(OBJS)\monolib_mdig.obj \
+       $(OBJS)\monolib_msgdlgg.obj \
+       $(OBJS)\monolib_prntdlgg.obj \
+       $(OBJS)\monolib_tabg.obj \

        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \
        $(OBJS)\monolib_checkbox.obj \
        $(OBJS)\monolib_bmpbuttn.obj \
        $(OBJS)\monolib_button.obj \
        $(OBJS)\monolib_checkbox.obj \


@@ -1085,7 +1304,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_control.obj \
        $(OBJS)\monolib_dialog.obj \
        $(OBJS)\monolib_framuniv.obj \
        $(OBJS)\monolib_control.obj \
        $(OBJS)\monolib_dialog.obj \
        $(OBJS)\monolib_framuniv.obj \

-       $(OBJS)\monolib_topluniv.obj \

        $(OBJS)\monolib_gauge.obj \
        $(OBJS)\monolib_inpcons.obj \
        $(OBJS)\monolib_inphand.obj \
        $(OBJS)\monolib_gauge.obj \
        $(OBJS)\monolib_inpcons.obj \
        $(OBJS)\monolib_inphand.obj \


@@ -1105,58 +1323,15 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_statline.obj \
        $(OBJS)\monolib_stattext.obj \
        $(OBJS)\monolib_statusbr.obj \
        $(OBJS)\monolib_statline.obj \
        $(OBJS)\monolib_stattext.obj \
        $(OBJS)\monolib_statusbr.obj \

-       $(OBJS)\monolib_toolbar.obj \

        $(OBJS)\monolib_theme.obj \
        $(OBJS)\monolib_theme.obj \

+       $(OBJS)\monolib_toolbar.obj \
+       $(OBJS)\monolib_topluniv.obj \

        $(OBJS)\monolib_winuniv.obj \
        $(OBJS)\monolib_winuniv.obj \

-       $(OBJS)\monolib_mdig.obj \
-       $(OBJS)\monolib_imaglist.obj \
-       $(OBJS)\monolib_colrdlgg.obj \
-       $(OBJS)\monolib_listctrl.obj \
-       $(OBJS)\monolib_filedlgg.obj \
-       $(OBJS)\monolib_dirdlgg.obj \
-       $(OBJS)\monolib_prntdlgg.obj \
-       $(OBJS)\monolib_accel.obj \
-       $(OBJS)\monolib_msgdlgg.obj \
-       $(OBJS)\monolib_fdrepdlg.obj \
-       $(OBJS)\monolib_fontdlgg.obj \
-       $(OBJS)\monolib_tabg.obj \

        $(OBJS)\monolib_gtk.obj \
        $(OBJS)\monolib_gtk.obj \

-       $(OBJS)\monolib_win32.obj \

        $(OBJS)\monolib_metal.obj \
        $(OBJS)\monolib_metal.obj \

-       $(OBJS)\monolib_busyinfo.obj \
-       $(OBJS)\monolib_calctrl.obj \
-       $(OBJS)\monolib_choicdgg.obj \
-       $(OBJS)\monolib_dcbuffer.obj \
-       $(OBJS)\monolib_dcpsg.obj \
-       $(OBJS)\monolib_dirctrlg.obj \
-       $(OBJS)\monolib_dragimgg.obj \
-       $(OBJS)\monolib_grid.obj \
-       $(OBJS)\monolib_gridctrl.obj \
-       $(OBJS)\monolib_gridsel.obj \
-       $(OBJS)\monolib_helpext.obj \
-       $(OBJS)\monolib_laywin.obj \
-       $(OBJS)\monolib_logg.obj \
-       $(OBJS)\monolib_numdlgg.obj \
-       $(OBJS)\monolib_panelg.obj \
-       $(OBJS)\monolib_progdlgg.obj \
-       $(OBJS)\monolib_renderg.obj \
-       $(OBJS)\monolib_sashwin.obj \
-       $(OBJS)\monolib_scrlwing.obj \
-       $(OBJS)\monolib_selstore.obj \
-       $(OBJS)\monolib_spinctlg.obj \
-       $(OBJS)\monolib_splash.obj \
-       $(OBJS)\monolib_splitter.obj \
-       $(OBJS)\monolib_tbarsmpl.obj \
-       $(OBJS)\monolib_textdlgg.obj \
-       $(OBJS)\monolib_tipdlg.obj \
-       $(OBJS)\monolib_tipwin.obj \
-       $(OBJS)\monolib_treectlg.obj \
-       $(OBJS)\monolib_vlbox.obj \
-       $(OBJS)\monolib_vscroll.obj \
-       $(OBJS)\monolib_wizard.obj \
-       $(OBJS)\monolib_appcmn.obj \
-       $(OBJS)\monolib_fontmap.obj \
+       $(OBJS)\monolib_win32.obj \

        $(OBJS)\monolib_accesscmn.obj \
        $(OBJS)\monolib_accesscmn.obj \

+       $(OBJS)\monolib_appcmn.obj \

        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \
        $(OBJS)\monolib_artprov.obj \
        $(OBJS)\monolib_artstd.obj \
        $(OBJS)\monolib_bmpbase.obj \


@@ -1182,9 +1357,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \
        $(OBJS)\monolib_fddlgcmn.obj \
        $(OBJS)\monolib_fldlgcmn.obj \
        $(OBJS)\monolib_fontcmn.obj \

+       $(OBJS)\monolib_fontmap.obj \

        $(OBJS)\monolib_framecmn.obj \
        $(OBJS)\monolib_framecmn.obj \

-       $(OBJS)\monolib_timercmn.obj \
-       $(OBJS)\monolib_toplvcmn.obj \

        $(OBJS)\monolib_gaugecmn.obj \
        $(OBJS)\monolib_gdicmn.obj \
        $(OBJS)\monolib_geometry.obj \
        $(OBJS)\monolib_gaugecmn.obj \
        $(OBJS)\monolib_gdicmn.obj \
        $(OBJS)\monolib_geometry.obj \


@@ -1194,6 +1368,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagall.obj \
        $(OBJS)\monolib_imagbmp.obj \
        $(OBJS)\monolib_image.obj \
        $(OBJS)\monolib_imagall.obj \
        $(OBJS)\monolib_imagbmp.obj \
        $(OBJS)\monolib_image.obj \

+       $(OBJS)\monolib_imagfill.obj \

        $(OBJS)\monolib_imaggif.obj \
        $(OBJS)\monolib_imagiff.obj \
        $(OBJS)\monolib_imagjpeg.obj \
        $(OBJS)\monolib_imaggif.obj \
        $(OBJS)\monolib_imagiff.obj \
        $(OBJS)\monolib_imagjpeg.obj \


@@ -1202,7 +1377,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_imagpnm.obj \
        $(OBJS)\monolib_imagtiff.obj \
        $(OBJS)\monolib_imagxpm.obj \
        $(OBJS)\monolib_imagpnm.obj \
        $(OBJS)\monolib_imagtiff.obj \
        $(OBJS)\monolib_imagxpm.obj \

-       $(OBJS)\monolib_imagfill.obj \

        $(OBJS)\monolib_layout.obj \
        $(OBJS)\monolib_lboxcmn.obj \
        $(OBJS)\monolib_matrix.obj \
        $(OBJS)\monolib_layout.obj \
        $(OBJS)\monolib_lboxcmn.obj \
        $(OBJS)\monolib_matrix.obj \


@@ -1220,15 +1394,49 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_statbar.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \
        $(OBJS)\monolib_statbar.obj \
        $(OBJS)\monolib_tbarbase.obj \
        $(OBJS)\monolib_textcmn.obj \

+       $(OBJS)\monolib_timercmn.obj \
+       $(OBJS)\monolib_toplvcmn.obj \

        $(OBJS)\monolib_treebase.obj \
        $(OBJS)\monolib_valgen.obj \
        $(OBJS)\monolib_validate.obj \
        $(OBJS)\monolib_valtext.obj \
        $(OBJS)\monolib_wincmn.obj \
        $(OBJS)\monolib_treebase.obj \
        $(OBJS)\monolib_valgen.obj \
        $(OBJS)\monolib_validate.obj \
        $(OBJS)\monolib_valtext.obj \
        $(OBJS)\monolib_wincmn.obj \

-       $(OBJS)\monolib_xpmdecod.obj
+       $(OBJS)\monolib_xpmdecod.obj \
+       $(OBJS)\monolib_busyinfo.obj \
+       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_choicdgg.obj \
+       $(OBJS)\monolib_dcbuffer.obj \
+       $(OBJS)\monolib_dcpsg.obj \
+       $(OBJS)\monolib_dirctrlg.obj \
+       $(OBJS)\monolib_dragimgg.obj \
+       $(OBJS)\monolib_grid.obj \
+       $(OBJS)\monolib_gridctrl.obj \
+       $(OBJS)\monolib_gridsel.obj \
+       $(OBJS)\monolib_helpext.obj \
+       $(OBJS)\monolib_laywin.obj \
+       $(OBJS)\monolib_logg.obj \
+       $(OBJS)\monolib_numdlgg.obj \
+       $(OBJS)\monolib_panelg.obj \
+       $(OBJS)\monolib_progdlgg.obj \
+       $(OBJS)\monolib_renderg.obj \
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_scrlwing.obj \
+       $(OBJS)\monolib_selstore.obj \
+       $(OBJS)\monolib_spinctlg.obj \
+       $(OBJS)\monolib_splash.obj \
+       $(OBJS)\monolib_splitter.obj \
+       $(OBJS)\monolib_tbarsmpl.obj \
+       $(OBJS)\monolib_textdlgg.obj \
+       $(OBJS)\monolib_tipdlg.obj \
+       $(OBJS)\monolib_tipwin.obj \
+       $(OBJS)\monolib_treectlg.obj \
+       $(OBJS)\monolib_vlbox.obj \
+       $(OBJS)\monolib_vscroll.obj \
+       $(OBJS)\monolib_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \

+       $(OBJS)\coredll_taskbarcmn.obj \

        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \
        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \


@@ -1258,12 +1466,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_joystick.obj \
        $(OBJS)\coredll_minifram.obj \
        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_joystick.obj \
        $(OBJS)\coredll_minifram.obj \

+       $(OBJS)\coredll_automtn.obj \
+       $(OBJS)\coredll_dataobj.obj \
+       $(OBJS)\coredll_dropsrc.obj \
+       $(OBJS)\coredll_droptgt.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_uuid.obj \

        $(OBJS)\coredll_palette.obj \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_settings.obj \
        $(OBJS)\coredll_palette.obj \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_settings.obj \

-       $(OBJS)\coredll_taskbarcmn.obj \

        $(OBJS)\coredll_taskbar.obj \
        $(OBJS)\coredll_timer.obj \
        $(OBJS)\coredll_tooltip.obj \
        $(OBJS)\coredll_taskbar.obj \
        $(OBJS)\coredll_timer.obj \
        $(OBJS)\coredll_tooltip.obj \


@@ -1271,15 +1484,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_utilsgui.obj \
        $(OBJS)\coredll_wave.obj \
        $(OBJS)\coredll_window.obj \
        $(OBJS)\coredll_utilsgui.obj \
        $(OBJS)\coredll_wave.obj \
        $(OBJS)\coredll_window.obj \

-       $(OBJS)\coredll_automtn.obj \
-       $(OBJS)\coredll_dataobj.obj \
-       $(OBJS)\coredll_dropsrc.obj \
-       $(OBJS)\coredll_droptgt.obj \
-       $(OBJS)\coredll_oleutils.obj \
-       $(OBJS)\coredll_uuid.obj \

        $(OBJS)\coredll_statusbr.obj \
        $(OBJS)\coredll_statusbr.obj \

-       $(OBJS)\coredll_uxtheme.obj \
-       $(OBJS)\coredll_access.obj \

        $(OBJS)\coredll_accel.obj \
        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \
        $(OBJS)\coredll_accel.obj \
        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \


@@ -1307,6 +1512,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_msgdlg.obj \
        $(OBJS)\coredll_nativdlg.obj \
        $(OBJS)\coredll_notebook.obj \
        $(OBJS)\coredll_msgdlg.obj \
        $(OBJS)\coredll_nativdlg.obj \
        $(OBJS)\coredll_notebook.obj \

+       $(OBJS)\coredll_access.obj \

        $(OBJS)\coredll_ownerdrw.obj \
        $(OBJS)\coredll_penwin.obj \
        $(OBJS)\coredll_printdlg.obj \
        $(OBJS)\coredll_ownerdrw.obj \
        $(OBJS)\coredll_penwin.obj \
        $(OBJS)\coredll_printdlg.obj \


@@ -1328,40 +1534,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_textctrl.obj \
        $(OBJS)\coredll_tglbtn.obj \
        $(OBJS)\coredll_treectrl.obj \
        $(OBJS)\coredll_textctrl.obj \
        $(OBJS)\coredll_tglbtn.obj \
        $(OBJS)\coredll_treectrl.obj \

-       $(OBJS)\coredll_busyinfo.obj \
-       $(OBJS)\coredll_calctrl.obj \
-       $(OBJS)\coredll_choicdgg.obj \
-       $(OBJS)\coredll_dcbuffer.obj \
-       $(OBJS)\coredll_dcpsg.obj \
-       $(OBJS)\coredll_dirctrlg.obj \
-       $(OBJS)\coredll_dragimgg.obj \
-       $(OBJS)\coredll_grid.obj \
-       $(OBJS)\coredll_gridctrl.obj \
-       $(OBJS)\coredll_gridsel.obj \
-       $(OBJS)\coredll_helpext.obj \
-       $(OBJS)\coredll_laywin.obj \
-       $(OBJS)\coredll_logg.obj \
-       $(OBJS)\coredll_numdlgg.obj \
-       $(OBJS)\coredll_panelg.obj \
-       $(OBJS)\coredll_progdlgg.obj \
-       $(OBJS)\coredll_renderg.obj \
-       $(OBJS)\coredll_sashwin.obj \
-       $(OBJS)\coredll_scrlwing.obj \
-       $(OBJS)\coredll_selstore.obj \
-       $(OBJS)\coredll_spinctlg.obj \
-       $(OBJS)\coredll_splash.obj \
-       $(OBJS)\coredll_splitter.obj \
-       $(OBJS)\coredll_tbarsmpl.obj \
-       $(OBJS)\coredll_textdlgg.obj \
-       $(OBJS)\coredll_tipdlg.obj \
-       $(OBJS)\coredll_tipwin.obj \
-       $(OBJS)\coredll_treectlg.obj \
-       $(OBJS)\coredll_vlbox.obj \
-       $(OBJS)\coredll_vscroll.obj \
-       $(OBJS)\coredll_wizard.obj \
-       $(OBJS)\coredll_appcmn.obj \
-       $(OBJS)\coredll_fontmap.obj \
+       $(OBJS)\coredll_uxtheme.obj \

        $(OBJS)\coredll_accesscmn.obj \
        $(OBJS)\coredll_accesscmn.obj \

+       $(OBJS)\coredll_appcmn.obj \

        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \
        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \


@@ -1387,9 +1562,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \

+       $(OBJS)\coredll_fontmap.obj \

        $(OBJS)\coredll_framecmn.obj \
        $(OBJS)\coredll_framecmn.obj \

-       $(OBJS)\coredll_timercmn.obj \
-       $(OBJS)\coredll_toplvcmn.obj \

        $(OBJS)\coredll_gaugecmn.obj \
        $(OBJS)\coredll_gdicmn.obj \
        $(OBJS)\coredll_geometry.obj \
        $(OBJS)\coredll_gaugecmn.obj \
        $(OBJS)\coredll_gdicmn.obj \
        $(OBJS)\coredll_geometry.obj \


@@ -1399,6 +1573,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagall.obj \
        $(OBJS)\coredll_imagbmp.obj \
        $(OBJS)\coredll_image.obj \
        $(OBJS)\coredll_imagall.obj \
        $(OBJS)\coredll_imagbmp.obj \
        $(OBJS)\coredll_image.obj \

+       $(OBJS)\coredll_imagfill.obj \

        $(OBJS)\coredll_imaggif.obj \
        $(OBJS)\coredll_imagiff.obj \
        $(OBJS)\coredll_imagjpeg.obj \
        $(OBJS)\coredll_imaggif.obj \
        $(OBJS)\coredll_imagiff.obj \
        $(OBJS)\coredll_imagjpeg.obj \


@@ -1407,7 +1582,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagpnm.obj \
        $(OBJS)\coredll_imagtiff.obj \
        $(OBJS)\coredll_imagxpm.obj \
        $(OBJS)\coredll_imagpnm.obj \
        $(OBJS)\coredll_imagtiff.obj \
        $(OBJS)\coredll_imagxpm.obj \

-       $(OBJS)\coredll_imagfill.obj \

        $(OBJS)\coredll_layout.obj \
        $(OBJS)\coredll_lboxcmn.obj \
        $(OBJS)\coredll_matrix.obj \
        $(OBJS)\coredll_layout.obj \
        $(OBJS)\coredll_lboxcmn.obj \
        $(OBJS)\coredll_matrix.obj \


@@ -1425,15 +1599,49 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \

+       $(OBJS)\coredll_timercmn.obj \
+       $(OBJS)\coredll_toplvcmn.obj \

        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \
        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \

-       $(OBJS)\coredll_xpmdecod.obj
+       $(OBJS)\coredll_xpmdecod.obj \
+       $(OBJS)\coredll_busyinfo.obj \
+       $(OBJS)\coredll_calctrl.obj \
+       $(OBJS)\coredll_choicdgg.obj \
+       $(OBJS)\coredll_dcbuffer.obj \
+       $(OBJS)\coredll_dcpsg.obj \
+       $(OBJS)\coredll_dirctrlg.obj \
+       $(OBJS)\coredll_dragimgg.obj \
+       $(OBJS)\coredll_grid.obj \
+       $(OBJS)\coredll_gridctrl.obj \
+       $(OBJS)\coredll_gridsel.obj \
+       $(OBJS)\coredll_helpext.obj \
+       $(OBJS)\coredll_laywin.obj \
+       $(OBJS)\coredll_logg.obj \
+       $(OBJS)\coredll_numdlgg.obj \
+       $(OBJS)\coredll_panelg.obj \
+       $(OBJS)\coredll_progdlgg.obj \
+       $(OBJS)\coredll_renderg.obj \
+       $(OBJS)\coredll_sashwin.obj \
+       $(OBJS)\coredll_scrlwing.obj \
+       $(OBJS)\coredll_selstore.obj \
+       $(OBJS)\coredll_spinctlg.obj \
+       $(OBJS)\coredll_splash.obj \
+       $(OBJS)\coredll_splitter.obj \
+       $(OBJS)\coredll_tbarsmpl.obj \
+       $(OBJS)\coredll_textdlgg.obj \
+       $(OBJS)\coredll_tipdlg.obj \
+       $(OBJS)\coredll_tipwin.obj \
+       $(OBJS)\coredll_treectlg.obj \
+       $(OBJS)\coredll_vlbox.obj \
+       $(OBJS)\coredll_vscroll.obj \
+       $(OBJS)\coredll_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \

+       $(OBJS)\coredll_taskbarcmn.obj \

        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \
        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \


@@ -1463,12 +1671,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_joystick.obj \
        $(OBJS)\coredll_minifram.obj \
        $(OBJS)\coredll_icon.obj \
        $(OBJS)\coredll_joystick.obj \
        $(OBJS)\coredll_minifram.obj \

+       $(OBJS)\coredll_automtn.obj \
+       $(OBJS)\coredll_dataobj.obj \
+       $(OBJS)\coredll_dropsrc.obj \
+       $(OBJS)\coredll_droptgt.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_uuid.obj \

        $(OBJS)\coredll_palette.obj \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_settings.obj \
        $(OBJS)\coredll_palette.obj \
        $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \
        $(OBJS)\coredll_region.obj \
        $(OBJS)\coredll_settings.obj \

-       $(OBJS)\coredll_taskbarcmn.obj \

        $(OBJS)\coredll_taskbar.obj \
        $(OBJS)\coredll_timer.obj \
        $(OBJS)\coredll_tooltip.obj \
        $(OBJS)\coredll_taskbar.obj \
        $(OBJS)\coredll_timer.obj \
        $(OBJS)\coredll_tooltip.obj \


@@ -1476,13 +1689,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_utilsgui.obj \
        $(OBJS)\coredll_wave.obj \
        $(OBJS)\coredll_window.obj \
        $(OBJS)\coredll_utilsgui.obj \
        $(OBJS)\coredll_wave.obj \
        $(OBJS)\coredll_window.obj \

-       $(OBJS)\coredll_automtn.obj \
-       $(OBJS)\coredll_dataobj.obj \
-       $(OBJS)\coredll_dropsrc.obj \
-       $(OBJS)\coredll_droptgt.obj \
-       $(OBJS)\coredll_oleutils.obj \
-       $(OBJS)\coredll_uuid.obj \

        $(OBJS)\coredll_textctrl.obj \
        $(OBJS)\coredll_textctrl.obj \

+       $(OBJS)\coredll_accel.obj \
+       $(OBJS)\coredll_colrdlgg.obj \
+       $(OBJS)\coredll_dirdlgg.obj \
+       $(OBJS)\coredll_fdrepdlg.obj \
+       $(OBJS)\coredll_filedlgg.obj \
+       $(OBJS)\coredll_fontdlgg.obj \
+       $(OBJS)\coredll_imaglist.obj \
+       $(OBJS)\coredll_listctrl.obj \
+       $(OBJS)\coredll_mdig.obj \
+       $(OBJS)\coredll_msgdlgg.obj \
+       $(OBJS)\coredll_prntdlgg.obj \
+       $(OBJS)\coredll_tabg.obj \

        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \
        $(OBJS)\coredll_checkbox.obj \
        $(OBJS)\coredll_bmpbuttn.obj \
        $(OBJS)\coredll_button.obj \
        $(OBJS)\coredll_checkbox.obj \


@@ -1493,7 +1712,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_control.obj \
        $(OBJS)\coredll_dialog.obj \
        $(OBJS)\coredll_framuniv.obj \
        $(OBJS)\coredll_control.obj \
        $(OBJS)\coredll_dialog.obj \
        $(OBJS)\coredll_framuniv.obj \

-       $(OBJS)\coredll_topluniv.obj \

        $(OBJS)\coredll_gauge.obj \
        $(OBJS)\coredll_inpcons.obj \
        $(OBJS)\coredll_inphand.obj \
        $(OBJS)\coredll_gauge.obj \
        $(OBJS)\coredll_inpcons.obj \
        $(OBJS)\coredll_inphand.obj \


@@ -1513,58 +1731,15 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_statline.obj \
        $(OBJS)\coredll_stattext.obj \
        $(OBJS)\coredll_statusbr.obj \
        $(OBJS)\coredll_statline.obj \
        $(OBJS)\coredll_stattext.obj \
        $(OBJS)\coredll_statusbr.obj \

-       $(OBJS)\coredll_toolbar.obj \

        $(OBJS)\coredll_theme.obj \
        $(OBJS)\coredll_theme.obj \

+       $(OBJS)\coredll_toolbar.obj \
+       $(OBJS)\coredll_topluniv.obj \

        $(OBJS)\coredll_winuniv.obj \
        $(OBJS)\coredll_winuniv.obj \

-       $(OBJS)\coredll_mdig.obj \
-       $(OBJS)\coredll_imaglist.obj \
-       $(OBJS)\coredll_colrdlgg.obj \
-       $(OBJS)\coredll_listctrl.obj \
-       $(OBJS)\coredll_filedlgg.obj \
-       $(OBJS)\coredll_dirdlgg.obj \
-       $(OBJS)\coredll_prntdlgg.obj \
-       $(OBJS)\coredll_accel.obj \
-       $(OBJS)\coredll_msgdlgg.obj \
-       $(OBJS)\coredll_fdrepdlg.obj \
-       $(OBJS)\coredll_fontdlgg.obj \
-       $(OBJS)\coredll_tabg.obj \

        $(OBJS)\coredll_gtk.obj \
        $(OBJS)\coredll_gtk.obj \

-       $(OBJS)\coredll_win32.obj \

        $(OBJS)\coredll_metal.obj \
        $(OBJS)\coredll_metal.obj \

-       $(OBJS)\coredll_busyinfo.obj \
-       $(OBJS)\coredll_calctrl.obj \
-       $(OBJS)\coredll_choicdgg.obj \
-       $(OBJS)\coredll_dcbuffer.obj \
-       $(OBJS)\coredll_dcpsg.obj \
-       $(OBJS)\coredll_dirctrlg.obj \
-       $(OBJS)\coredll_dragimgg.obj \
-       $(OBJS)\coredll_grid.obj \
-       $(OBJS)\coredll_gridctrl.obj \
-       $(OBJS)\coredll_gridsel.obj \
-       $(OBJS)\coredll_helpext.obj \
-       $(OBJS)\coredll_laywin.obj \
-       $(OBJS)\coredll_logg.obj \
-       $(OBJS)\coredll_numdlgg.obj \
-       $(OBJS)\coredll_panelg.obj \
-       $(OBJS)\coredll_progdlgg.obj \
-       $(OBJS)\coredll_renderg.obj \
-       $(OBJS)\coredll_sashwin.obj \
-       $(OBJS)\coredll_scrlwing.obj \
-       $(OBJS)\coredll_selstore.obj \
-       $(OBJS)\coredll_spinctlg.obj \
-       $(OBJS)\coredll_splash.obj \
-       $(OBJS)\coredll_splitter.obj \
-       $(OBJS)\coredll_tbarsmpl.obj \
-       $(OBJS)\coredll_textdlgg.obj \
-       $(OBJS)\coredll_tipdlg.obj \
-       $(OBJS)\coredll_tipwin.obj \
-       $(OBJS)\coredll_treectlg.obj \
-       $(OBJS)\coredll_vlbox.obj \
-       $(OBJS)\coredll_vscroll.obj \
-       $(OBJS)\coredll_wizard.obj \
-       $(OBJS)\coredll_appcmn.obj \
-       $(OBJS)\coredll_fontmap.obj \
+       $(OBJS)\coredll_win32.obj \

        $(OBJS)\coredll_accesscmn.obj \
        $(OBJS)\coredll_accesscmn.obj \

+       $(OBJS)\coredll_appcmn.obj \

        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \
        $(OBJS)\coredll_artprov.obj \
        $(OBJS)\coredll_artstd.obj \
        $(OBJS)\coredll_bmpbase.obj \


@@ -1590,9 +1765,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \
        $(OBJS)\coredll_fddlgcmn.obj \
        $(OBJS)\coredll_fldlgcmn.obj \
        $(OBJS)\coredll_fontcmn.obj \

+       $(OBJS)\coredll_fontmap.obj \

        $(OBJS)\coredll_framecmn.obj \
        $(OBJS)\coredll_framecmn.obj \

-       $(OBJS)\coredll_timercmn.obj \
-       $(OBJS)\coredll_toplvcmn.obj \

        $(OBJS)\coredll_gaugecmn.obj \
        $(OBJS)\coredll_gdicmn.obj \
        $(OBJS)\coredll_geometry.obj \
        $(OBJS)\coredll_gaugecmn.obj \
        $(OBJS)\coredll_gdicmn.obj \
        $(OBJS)\coredll_geometry.obj \


@@ -1602,6 +1776,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagall.obj \
        $(OBJS)\coredll_imagbmp.obj \
        $(OBJS)\coredll_image.obj \
        $(OBJS)\coredll_imagall.obj \
        $(OBJS)\coredll_imagbmp.obj \
        $(OBJS)\coredll_image.obj \

+       $(OBJS)\coredll_imagfill.obj \

        $(OBJS)\coredll_imaggif.obj \
        $(OBJS)\coredll_imagiff.obj \
        $(OBJS)\coredll_imagjpeg.obj \
        $(OBJS)\coredll_imaggif.obj \
        $(OBJS)\coredll_imagiff.obj \
        $(OBJS)\coredll_imagjpeg.obj \


@@ -1610,7 +1785,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_imagpnm.obj \
        $(OBJS)\coredll_imagtiff.obj \
        $(OBJS)\coredll_imagxpm.obj \
        $(OBJS)\coredll_imagpnm.obj \
        $(OBJS)\coredll_imagtiff.obj \
        $(OBJS)\coredll_imagxpm.obj \

-       $(OBJS)\coredll_imagfill.obj \

        $(OBJS)\coredll_layout.obj \
        $(OBJS)\coredll_lboxcmn.obj \
        $(OBJS)\coredll_matrix.obj \
        $(OBJS)\coredll_layout.obj \
        $(OBJS)\coredll_lboxcmn.obj \
        $(OBJS)\coredll_matrix.obj \


@@ -1628,28 +1802,62 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_tbarbase.obj \
        $(OBJS)\coredll_textcmn.obj \

+       $(OBJS)\coredll_timercmn.obj \
+       $(OBJS)\coredll_toplvcmn.obj \

        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \
        $(OBJS)\coredll_treebase.obj \
        $(OBJS)\coredll_valgen.obj \
        $(OBJS)\coredll_validate.obj \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \

-       $(OBJS)\coredll_xpmdecod.obj
-!endif
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-____CORE_SRC_FILENAMES_3_OBJECTS =  \
-       $(OBJS)\corelib_app.obj \
-       $(OBJS)\corelib_bitmap.obj \
-       $(OBJS)\corelib_brush.obj \
-       $(OBJS)\corelib_caret.obj \
-       $(OBJS)\corelib_clipbrd.obj \
-       $(OBJS)\corelib_colour.obj \
-       $(OBJS)\corelib_cursor.obj \
-       $(OBJS)\corelib_data.obj \
-       $(OBJS)\corelib_dc.obj \
-       $(OBJS)\corelib_dcclient.obj \
-       $(OBJS)\corelib_dcmemory.obj \
-       $(OBJS)\corelib_dcprint.obj \
-       $(OBJS)\corelib_dcscreen.obj \
+       $(OBJS)\coredll_xpmdecod.obj \
+       $(OBJS)\coredll_busyinfo.obj \
+       $(OBJS)\coredll_calctrl.obj \
+       $(OBJS)\coredll_choicdgg.obj \
+       $(OBJS)\coredll_dcbuffer.obj \
+       $(OBJS)\coredll_dcpsg.obj \
+       $(OBJS)\coredll_dirctrlg.obj \
+       $(OBJS)\coredll_dragimgg.obj \
+       $(OBJS)\coredll_grid.obj \
+       $(OBJS)\coredll_gridctrl.obj \
+       $(OBJS)\coredll_gridsel.obj \
+       $(OBJS)\coredll_helpext.obj \
+       $(OBJS)\coredll_laywin.obj \
+       $(OBJS)\coredll_logg.obj \
+       $(OBJS)\coredll_numdlgg.obj \
+       $(OBJS)\coredll_panelg.obj \
+       $(OBJS)\coredll_progdlgg.obj \
+       $(OBJS)\coredll_renderg.obj \
+       $(OBJS)\coredll_sashwin.obj \
+       $(OBJS)\coredll_scrlwing.obj \
+       $(OBJS)\coredll_selstore.obj \
+       $(OBJS)\coredll_spinctlg.obj \
+       $(OBJS)\coredll_splash.obj \
+       $(OBJS)\coredll_splitter.obj \
+       $(OBJS)\coredll_tbarsmpl.obj \
+       $(OBJS)\coredll_textdlgg.obj \
+       $(OBJS)\coredll_tipdlg.obj \
+       $(OBJS)\coredll_tipwin.obj \
+       $(OBJS)\coredll_treectlg.obj \
+       $(OBJS)\coredll_vlbox.obj \
+       $(OBJS)\coredll_vscroll.obj \
+       $(OBJS)\coredll_wizard.obj
+!endif
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+____CORE_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_taskbarcmn.obj \
+       $(OBJS)\corelib_app.obj \
+       $(OBJS)\corelib_bitmap.obj \
+       $(OBJS)\corelib_brush.obj \
+       $(OBJS)\corelib_caret.obj \
+       $(OBJS)\corelib_clipbrd.obj \
+       $(OBJS)\corelib_colour.obj \
+       $(OBJS)\corelib_cursor.obj \
+       $(OBJS)\corelib_data.obj \
+       $(OBJS)\corelib_dc.obj \
+       $(OBJS)\corelib_dcclient.obj \
+       $(OBJS)\corelib_dcmemory.obj \
+       $(OBJS)\corelib_dcprint.obj \
+       $(OBJS)\corelib_dcscreen.obj \

        $(OBJS)\corelib_dialup.obj \
        $(OBJS)\corelib_dib.obj \
        $(OBJS)\corelib_dirdlg.obj \
        $(OBJS)\corelib_dialup.obj \
        $(OBJS)\corelib_dib.obj \
        $(OBJS)\corelib_dirdlg.obj \


@@ -1666,12 +1874,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_joystick.obj \
        $(OBJS)\corelib_minifram.obj \
        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_joystick.obj \
        $(OBJS)\corelib_minifram.obj \

+       $(OBJS)\corelib_automtn.obj \
+       $(OBJS)\corelib_dataobj.obj \
+       $(OBJS)\corelib_dropsrc.obj \
+       $(OBJS)\corelib_droptgt.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_uuid.obj \

        $(OBJS)\corelib_palette.obj \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_settings.obj \
        $(OBJS)\corelib_palette.obj \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_settings.obj \

-       $(OBJS)\corelib_taskbarcmn.obj \

        $(OBJS)\corelib_taskbar.obj \
        $(OBJS)\corelib_timer.obj \
        $(OBJS)\corelib_tooltip.obj \
        $(OBJS)\corelib_taskbar.obj \
        $(OBJS)\corelib_timer.obj \
        $(OBJS)\corelib_tooltip.obj \


@@ -1679,15 +1892,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_utilsgui.obj \
        $(OBJS)\corelib_wave.obj \
        $(OBJS)\corelib_window.obj \
        $(OBJS)\corelib_utilsgui.obj \
        $(OBJS)\corelib_wave.obj \
        $(OBJS)\corelib_window.obj \

-       $(OBJS)\corelib_automtn.obj \
-       $(OBJS)\corelib_dataobj.obj \
-       $(OBJS)\corelib_dropsrc.obj \
-       $(OBJS)\corelib_droptgt.obj \
-       $(OBJS)\corelib_oleutils.obj \
-       $(OBJS)\corelib_uuid.obj \

        $(OBJS)\corelib_statusbr.obj \
        $(OBJS)\corelib_statusbr.obj \

-       $(OBJS)\corelib_uxtheme.obj \
-       $(OBJS)\corelib_access.obj \

        $(OBJS)\corelib_accel.obj \
        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \
        $(OBJS)\corelib_accel.obj \
        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \


@@ -1715,6 +1920,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_msgdlg.obj \
        $(OBJS)\corelib_nativdlg.obj \
        $(OBJS)\corelib_notebook.obj \
        $(OBJS)\corelib_msgdlg.obj \
        $(OBJS)\corelib_nativdlg.obj \
        $(OBJS)\corelib_notebook.obj \

+       $(OBJS)\corelib_access.obj \

        $(OBJS)\corelib_ownerdrw.obj \
        $(OBJS)\corelib_penwin.obj \
        $(OBJS)\corelib_printdlg.obj \
        $(OBJS)\corelib_ownerdrw.obj \
        $(OBJS)\corelib_penwin.obj \
        $(OBJS)\corelib_printdlg.obj \


@@ -1736,40 +1942,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_textctrl.obj \
        $(OBJS)\corelib_tglbtn.obj \
        $(OBJS)\corelib_treectrl.obj \
        $(OBJS)\corelib_textctrl.obj \
        $(OBJS)\corelib_tglbtn.obj \
        $(OBJS)\corelib_treectrl.obj \

-       $(OBJS)\corelib_busyinfo.obj \
-       $(OBJS)\corelib_calctrl.obj \
-       $(OBJS)\corelib_choicdgg.obj \
-       $(OBJS)\corelib_dcbuffer.obj \
-       $(OBJS)\corelib_dcpsg.obj \
-       $(OBJS)\corelib_dirctrlg.obj \
-       $(OBJS)\corelib_dragimgg.obj \
-       $(OBJS)\corelib_grid.obj \
-       $(OBJS)\corelib_gridctrl.obj \
-       $(OBJS)\corelib_gridsel.obj \
-       $(OBJS)\corelib_helpext.obj \
-       $(OBJS)\corelib_laywin.obj \
-       $(OBJS)\corelib_logg.obj \
-       $(OBJS)\corelib_numdlgg.obj \
-       $(OBJS)\corelib_panelg.obj \
-       $(OBJS)\corelib_progdlgg.obj \
-       $(OBJS)\corelib_renderg.obj \
-       $(OBJS)\corelib_sashwin.obj \
-       $(OBJS)\corelib_scrlwing.obj \
-       $(OBJS)\corelib_selstore.obj \
-       $(OBJS)\corelib_spinctlg.obj \
-       $(OBJS)\corelib_splash.obj \
-       $(OBJS)\corelib_splitter.obj \
-       $(OBJS)\corelib_tbarsmpl.obj \
-       $(OBJS)\corelib_textdlgg.obj \
-       $(OBJS)\corelib_tipdlg.obj \
-       $(OBJS)\corelib_tipwin.obj \
-       $(OBJS)\corelib_treectlg.obj \
-       $(OBJS)\corelib_vlbox.obj \
-       $(OBJS)\corelib_vscroll.obj \
-       $(OBJS)\corelib_wizard.obj \
-       $(OBJS)\corelib_appcmn.obj \
-       $(OBJS)\corelib_fontmap.obj \
+       $(OBJS)\corelib_uxtheme.obj \

        $(OBJS)\corelib_accesscmn.obj \
        $(OBJS)\corelib_accesscmn.obj \

+       $(OBJS)\corelib_appcmn.obj \

        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \
        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \


@@ -1795,9 +1970,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \

+       $(OBJS)\corelib_fontmap.obj \

        $(OBJS)\corelib_framecmn.obj \
        $(OBJS)\corelib_framecmn.obj \

-       $(OBJS)\corelib_timercmn.obj \
-       $(OBJS)\corelib_toplvcmn.obj \

        $(OBJS)\corelib_gaugecmn.obj \
        $(OBJS)\corelib_gdicmn.obj \
        $(OBJS)\corelib_geometry.obj \
        $(OBJS)\corelib_gaugecmn.obj \
        $(OBJS)\corelib_gdicmn.obj \
        $(OBJS)\corelib_geometry.obj \


@@ -1807,6 +1981,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagall.obj \
        $(OBJS)\corelib_imagbmp.obj \
        $(OBJS)\corelib_image.obj \
        $(OBJS)\corelib_imagall.obj \
        $(OBJS)\corelib_imagbmp.obj \
        $(OBJS)\corelib_image.obj \

+       $(OBJS)\corelib_imagfill.obj \

        $(OBJS)\corelib_imaggif.obj \
        $(OBJS)\corelib_imagiff.obj \
        $(OBJS)\corelib_imagjpeg.obj \
        $(OBJS)\corelib_imaggif.obj \
        $(OBJS)\corelib_imagiff.obj \
        $(OBJS)\corelib_imagjpeg.obj \


@@ -1815,7 +1990,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagpnm.obj \
        $(OBJS)\corelib_imagtiff.obj \
        $(OBJS)\corelib_imagxpm.obj \
        $(OBJS)\corelib_imagpnm.obj \
        $(OBJS)\corelib_imagtiff.obj \
        $(OBJS)\corelib_imagxpm.obj \

-       $(OBJS)\corelib_imagfill.obj \

        $(OBJS)\corelib_layout.obj \
        $(OBJS)\corelib_lboxcmn.obj \
        $(OBJS)\corelib_matrix.obj \
        $(OBJS)\corelib_layout.obj \
        $(OBJS)\corelib_lboxcmn.obj \
        $(OBJS)\corelib_matrix.obj \


@@ -1833,15 +2007,49 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \

+       $(OBJS)\corelib_timercmn.obj \
+       $(OBJS)\corelib_toplvcmn.obj \

        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \
        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \

-       $(OBJS)\corelib_xpmdecod.obj
+       $(OBJS)\corelib_xpmdecod.obj \
+       $(OBJS)\corelib_busyinfo.obj \
+       $(OBJS)\corelib_calctrl.obj \
+       $(OBJS)\corelib_choicdgg.obj \
+       $(OBJS)\corelib_dcbuffer.obj \
+       $(OBJS)\corelib_dcpsg.obj \
+       $(OBJS)\corelib_dirctrlg.obj \
+       $(OBJS)\corelib_dragimgg.obj \
+       $(OBJS)\corelib_grid.obj \
+       $(OBJS)\corelib_gridctrl.obj \
+       $(OBJS)\corelib_gridsel.obj \
+       $(OBJS)\corelib_helpext.obj \
+       $(OBJS)\corelib_laywin.obj \
+       $(OBJS)\corelib_logg.obj \
+       $(OBJS)\corelib_numdlgg.obj \
+       $(OBJS)\corelib_panelg.obj \
+       $(OBJS)\corelib_progdlgg.obj \
+       $(OBJS)\corelib_renderg.obj \
+       $(OBJS)\corelib_sashwin.obj \
+       $(OBJS)\corelib_scrlwing.obj \
+       $(OBJS)\corelib_selstore.obj \
+       $(OBJS)\corelib_spinctlg.obj \
+       $(OBJS)\corelib_splash.obj \
+       $(OBJS)\corelib_splitter.obj \
+       $(OBJS)\corelib_tbarsmpl.obj \
+       $(OBJS)\corelib_textdlgg.obj \
+       $(OBJS)\corelib_tipdlg.obj \
+       $(OBJS)\corelib_tipwin.obj \
+       $(OBJS)\corelib_treectlg.obj \
+       $(OBJS)\corelib_vlbox.obj \
+       $(OBJS)\corelib_vscroll.obj \
+       $(OBJS)\corelib_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \

+       $(OBJS)\corelib_taskbarcmn.obj \

        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \
        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \


@@ -1871,12 +2079,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_joystick.obj \
        $(OBJS)\corelib_minifram.obj \
        $(OBJS)\corelib_icon.obj \
        $(OBJS)\corelib_joystick.obj \
        $(OBJS)\corelib_minifram.obj \

+       $(OBJS)\corelib_automtn.obj \
+       $(OBJS)\corelib_dataobj.obj \
+       $(OBJS)\corelib_dropsrc.obj \
+       $(OBJS)\corelib_droptgt.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_uuid.obj \

        $(OBJS)\corelib_palette.obj \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_settings.obj \
        $(OBJS)\corelib_palette.obj \
        $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \
        $(OBJS)\corelib_region.obj \
        $(OBJS)\corelib_settings.obj \

-       $(OBJS)\corelib_taskbarcmn.obj \

        $(OBJS)\corelib_taskbar.obj \
        $(OBJS)\corelib_timer.obj \
        $(OBJS)\corelib_tooltip.obj \
        $(OBJS)\corelib_taskbar.obj \
        $(OBJS)\corelib_timer.obj \
        $(OBJS)\corelib_tooltip.obj \


@@ -1884,13 +2097,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_utilsgui.obj \
        $(OBJS)\corelib_wave.obj \
        $(OBJS)\corelib_window.obj \
        $(OBJS)\corelib_utilsgui.obj \
        $(OBJS)\corelib_wave.obj \
        $(OBJS)\corelib_window.obj \

-       $(OBJS)\corelib_automtn.obj \
-       $(OBJS)\corelib_dataobj.obj \
-       $(OBJS)\corelib_dropsrc.obj \
-       $(OBJS)\corelib_droptgt.obj \
-       $(OBJS)\corelib_oleutils.obj \
-       $(OBJS)\corelib_uuid.obj \

        $(OBJS)\corelib_textctrl.obj \
        $(OBJS)\corelib_textctrl.obj \

+       $(OBJS)\corelib_accel.obj \
+       $(OBJS)\corelib_colrdlgg.obj \
+       $(OBJS)\corelib_dirdlgg.obj \
+       $(OBJS)\corelib_fdrepdlg.obj \
+       $(OBJS)\corelib_filedlgg.obj \
+       $(OBJS)\corelib_fontdlgg.obj \
+       $(OBJS)\corelib_imaglist.obj \
+       $(OBJS)\corelib_listctrl.obj \
+       $(OBJS)\corelib_mdig.obj \
+       $(OBJS)\corelib_msgdlgg.obj \
+       $(OBJS)\corelib_prntdlgg.obj \
+       $(OBJS)\corelib_tabg.obj \

        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \
        $(OBJS)\corelib_checkbox.obj \
        $(OBJS)\corelib_bmpbuttn.obj \
        $(OBJS)\corelib_button.obj \
        $(OBJS)\corelib_checkbox.obj \


@@ -1901,7 +2120,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_control.obj \
        $(OBJS)\corelib_dialog.obj \
        $(OBJS)\corelib_framuniv.obj \
        $(OBJS)\corelib_control.obj \
        $(OBJS)\corelib_dialog.obj \
        $(OBJS)\corelib_framuniv.obj \

-       $(OBJS)\corelib_topluniv.obj \

        $(OBJS)\corelib_gauge.obj \
        $(OBJS)\corelib_inpcons.obj \
        $(OBJS)\corelib_inphand.obj \
        $(OBJS)\corelib_gauge.obj \
        $(OBJS)\corelib_inpcons.obj \
        $(OBJS)\corelib_inphand.obj \


@@ -1921,58 +2139,15 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_statline.obj \
        $(OBJS)\corelib_stattext.obj \
        $(OBJS)\corelib_statusbr.obj \
        $(OBJS)\corelib_statline.obj \
        $(OBJS)\corelib_stattext.obj \
        $(OBJS)\corelib_statusbr.obj \

-       $(OBJS)\corelib_toolbar.obj \

        $(OBJS)\corelib_theme.obj \
        $(OBJS)\corelib_theme.obj \

+       $(OBJS)\corelib_toolbar.obj \
+       $(OBJS)\corelib_topluniv.obj \

        $(OBJS)\corelib_winuniv.obj \
        $(OBJS)\corelib_winuniv.obj \

-       $(OBJS)\corelib_mdig.obj \
-       $(OBJS)\corelib_imaglist.obj \
-       $(OBJS)\corelib_colrdlgg.obj \
-       $(OBJS)\corelib_listctrl.obj \
-       $(OBJS)\corelib_filedlgg.obj \
-       $(OBJS)\corelib_dirdlgg.obj \
-       $(OBJS)\corelib_prntdlgg.obj \
-       $(OBJS)\corelib_accel.obj \
-       $(OBJS)\corelib_msgdlgg.obj \
-       $(OBJS)\corelib_fdrepdlg.obj \
-       $(OBJS)\corelib_fontdlgg.obj \
-       $(OBJS)\corelib_tabg.obj \

        $(OBJS)\corelib_gtk.obj \
        $(OBJS)\corelib_gtk.obj \

-       $(OBJS)\corelib_win32.obj \

        $(OBJS)\corelib_metal.obj \
        $(OBJS)\corelib_metal.obj \

-       $(OBJS)\corelib_busyinfo.obj \
-       $(OBJS)\corelib_calctrl.obj \
-       $(OBJS)\corelib_choicdgg.obj \
-       $(OBJS)\corelib_dcbuffer.obj \
-       $(OBJS)\corelib_dcpsg.obj \
-       $(OBJS)\corelib_dirctrlg.obj \
-       $(OBJS)\corelib_dragimgg.obj \
-       $(OBJS)\corelib_grid.obj \
-       $(OBJS)\corelib_gridctrl.obj \
-       $(OBJS)\corelib_gridsel.obj \
-       $(OBJS)\corelib_helpext.obj \
-       $(OBJS)\corelib_laywin.obj \
-       $(OBJS)\corelib_logg.obj \
-       $(OBJS)\corelib_numdlgg.obj \
-       $(OBJS)\corelib_panelg.obj \
-       $(OBJS)\corelib_progdlgg.obj \
-       $(OBJS)\corelib_renderg.obj \
-       $(OBJS)\corelib_sashwin.obj \
-       $(OBJS)\corelib_scrlwing.obj \
-       $(OBJS)\corelib_selstore.obj \
-       $(OBJS)\corelib_spinctlg.obj \
-       $(OBJS)\corelib_splash.obj \
-       $(OBJS)\corelib_splitter.obj \
-       $(OBJS)\corelib_tbarsmpl.obj \
-       $(OBJS)\corelib_textdlgg.obj \
-       $(OBJS)\corelib_tipdlg.obj \
-       $(OBJS)\corelib_tipwin.obj \
-       $(OBJS)\corelib_treectlg.obj \
-       $(OBJS)\corelib_vlbox.obj \
-       $(OBJS)\corelib_vscroll.obj \
-       $(OBJS)\corelib_wizard.obj \
-       $(OBJS)\corelib_appcmn.obj \
-       $(OBJS)\corelib_fontmap.obj \
+       $(OBJS)\corelib_win32.obj \

        $(OBJS)\corelib_accesscmn.obj \
        $(OBJS)\corelib_accesscmn.obj \

+       $(OBJS)\corelib_appcmn.obj \

        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \
        $(OBJS)\corelib_artprov.obj \
        $(OBJS)\corelib_artstd.obj \
        $(OBJS)\corelib_bmpbase.obj \


@@ -1998,9 +2173,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \
        $(OBJS)\corelib_fddlgcmn.obj \
        $(OBJS)\corelib_fldlgcmn.obj \
        $(OBJS)\corelib_fontcmn.obj \

+       $(OBJS)\corelib_fontmap.obj \

        $(OBJS)\corelib_framecmn.obj \
        $(OBJS)\corelib_framecmn.obj \

-       $(OBJS)\corelib_timercmn.obj \
-       $(OBJS)\corelib_toplvcmn.obj \

        $(OBJS)\corelib_gaugecmn.obj \
        $(OBJS)\corelib_gdicmn.obj \
        $(OBJS)\corelib_geometry.obj \
        $(OBJS)\corelib_gaugecmn.obj \
        $(OBJS)\corelib_gdicmn.obj \
        $(OBJS)\corelib_geometry.obj \


@@ -2010,6 +2184,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagall.obj \
        $(OBJS)\corelib_imagbmp.obj \
        $(OBJS)\corelib_image.obj \
        $(OBJS)\corelib_imagall.obj \
        $(OBJS)\corelib_imagbmp.obj \
        $(OBJS)\corelib_image.obj \

+       $(OBJS)\corelib_imagfill.obj \

        $(OBJS)\corelib_imaggif.obj \
        $(OBJS)\corelib_imagiff.obj \
        $(OBJS)\corelib_imagjpeg.obj \
        $(OBJS)\corelib_imaggif.obj \
        $(OBJS)\corelib_imagiff.obj \
        $(OBJS)\corelib_imagjpeg.obj \


@@ -2018,7 +2193,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_imagpnm.obj \
        $(OBJS)\corelib_imagtiff.obj \
        $(OBJS)\corelib_imagxpm.obj \
        $(OBJS)\corelib_imagpnm.obj \
        $(OBJS)\corelib_imagtiff.obj \
        $(OBJS)\corelib_imagxpm.obj \

-       $(OBJS)\corelib_imagfill.obj \

        $(OBJS)\corelib_layout.obj \
        $(OBJS)\corelib_lboxcmn.obj \
        $(OBJS)\corelib_matrix.obj \
        $(OBJS)\corelib_layout.obj \
        $(OBJS)\corelib_lboxcmn.obj \
        $(OBJS)\corelib_matrix.obj \


@@ -2036,15 +2210,49 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_tbarbase.obj \
        $(OBJS)\corelib_textcmn.obj \

+       $(OBJS)\corelib_timercmn.obj \
+       $(OBJS)\corelib_toplvcmn.obj \

        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \
        $(OBJS)\corelib_treebase.obj \
        $(OBJS)\corelib_valgen.obj \
        $(OBJS)\corelib_validate.obj \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \

-       $(OBJS)\corelib_xpmdecod.obj
+       $(OBJS)\corelib_xpmdecod.obj \
+       $(OBJS)\corelib_busyinfo.obj \
+       $(OBJS)\corelib_calctrl.obj \
+       $(OBJS)\corelib_choicdgg.obj \
+       $(OBJS)\corelib_dcbuffer.obj \
+       $(OBJS)\corelib_dcpsg.obj \
+       $(OBJS)\corelib_dirctrlg.obj \
+       $(OBJS)\corelib_dragimgg.obj \
+       $(OBJS)\corelib_grid.obj \
+       $(OBJS)\corelib_gridctrl.obj \
+       $(OBJS)\corelib_gridsel.obj \
+       $(OBJS)\corelib_helpext.obj \
+       $(OBJS)\corelib_laywin.obj \
+       $(OBJS)\corelib_logg.obj \
+       $(OBJS)\corelib_numdlgg.obj \
+       $(OBJS)\corelib_panelg.obj \
+       $(OBJS)\corelib_progdlgg.obj \
+       $(OBJS)\corelib_renderg.obj \
+       $(OBJS)\corelib_sashwin.obj \
+       $(OBJS)\corelib_scrlwing.obj \
+       $(OBJS)\corelib_selstore.obj \
+       $(OBJS)\corelib_spinctlg.obj \
+       $(OBJS)\corelib_splash.obj \
+       $(OBJS)\corelib_splitter.obj \
+       $(OBJS)\corelib_tbarsmpl.obj \
+       $(OBJS)\corelib_textdlgg.obj \
+       $(OBJS)\corelib_tipdlg.obj \
+       $(OBJS)\corelib_tipwin.obj \
+       $(OBJS)\corelib_treectlg.obj \
+       $(OBJS)\corelib_vlbox.obj \
+       $(OBJS)\corelib_vscroll.obj \
+       $(OBJS)\corelib_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \

+       $(OBJS)\monodll_taskbarcmn.obj \

        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \
        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \


@@ -2074,12 +2282,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_joystick.obj \
        $(OBJS)\monodll_minifram.obj \
        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_joystick.obj \
        $(OBJS)\monodll_minifram.obj \

+       $(OBJS)\monodll_automtn.obj \
+       $(OBJS)\monodll_dataobj.obj \
+       $(OBJS)\monodll_dropsrc.obj \
+       $(OBJS)\monodll_droptgt.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_uuid.obj \

        $(OBJS)\monodll_palette.obj \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_settings.obj \
        $(OBJS)\monodll_palette.obj \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_settings.obj \

-       $(OBJS)\monodll_taskbarcmn.obj \

        $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_tooltip.obj \
        $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_tooltip.obj \


@@ -2087,15 +2300,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_utilsgui.obj \
        $(OBJS)\monodll_wave.obj \
        $(OBJS)\monodll_window.obj \
        $(OBJS)\monodll_utilsgui.obj \
        $(OBJS)\monodll_wave.obj \
        $(OBJS)\monodll_window.obj \

-       $(OBJS)\monodll_automtn.obj \
-       $(OBJS)\monodll_dataobj.obj \
-       $(OBJS)\monodll_dropsrc.obj \
-       $(OBJS)\monodll_droptgt.obj \
-       $(OBJS)\monodll_oleutils.obj \
-       $(OBJS)\monodll_uuid.obj \

        $(OBJS)\monodll_statusbr.obj \
        $(OBJS)\monodll_statusbr.obj \

-       $(OBJS)\monodll_uxtheme.obj \
-       $(OBJS)\monodll_access.obj \

        $(OBJS)\monodll_accel.obj \
        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \
        $(OBJS)\monodll_accel.obj \
        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \


@@ -2123,6 +2328,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_msgdlg.obj \
        $(OBJS)\monodll_nativdlg.obj \
        $(OBJS)\monodll_notebook.obj \
        $(OBJS)\monodll_msgdlg.obj \
        $(OBJS)\monodll_nativdlg.obj \
        $(OBJS)\monodll_notebook.obj \

+       $(OBJS)\monodll_access.obj \

        $(OBJS)\monodll_ownerdrw.obj \
        $(OBJS)\monodll_penwin.obj \
        $(OBJS)\monodll_printdlg.obj \
        $(OBJS)\monodll_ownerdrw.obj \
        $(OBJS)\monodll_penwin.obj \
        $(OBJS)\monodll_printdlg.obj \


@@ -2144,40 +2350,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_textctrl.obj \
        $(OBJS)\monodll_tglbtn.obj \
        $(OBJS)\monodll_treectrl.obj \
        $(OBJS)\monodll_textctrl.obj \
        $(OBJS)\monodll_tglbtn.obj \
        $(OBJS)\monodll_treectrl.obj \

-       $(OBJS)\monodll_busyinfo.obj \
-       $(OBJS)\monodll_calctrl.obj \
-       $(OBJS)\monodll_choicdgg.obj \
-       $(OBJS)\monodll_dcbuffer.obj \
-       $(OBJS)\monodll_dcpsg.obj \
-       $(OBJS)\monodll_dirctrlg.obj \
-       $(OBJS)\monodll_dragimgg.obj \
-       $(OBJS)\monodll_grid.obj \
-       $(OBJS)\monodll_gridctrl.obj \
-       $(OBJS)\monodll_gridsel.obj \
-       $(OBJS)\monodll_helpext.obj \
-       $(OBJS)\monodll_laywin.obj \
-       $(OBJS)\monodll_logg.obj \
-       $(OBJS)\monodll_numdlgg.obj \
-       $(OBJS)\monodll_panelg.obj \
-       $(OBJS)\monodll_progdlgg.obj \
-       $(OBJS)\monodll_renderg.obj \
-       $(OBJS)\monodll_sashwin.obj \
-       $(OBJS)\monodll_scrlwing.obj \
-       $(OBJS)\monodll_selstore.obj \
-       $(OBJS)\monodll_spinctlg.obj \
-       $(OBJS)\monodll_splash.obj \
-       $(OBJS)\monodll_splitter.obj \
-       $(OBJS)\monodll_tbarsmpl.obj \
-       $(OBJS)\monodll_textdlgg.obj \
-       $(OBJS)\monodll_tipdlg.obj \
-       $(OBJS)\monodll_tipwin.obj \
-       $(OBJS)\monodll_treectlg.obj \
-       $(OBJS)\monodll_vlbox.obj \
-       $(OBJS)\monodll_vscroll.obj \
-       $(OBJS)\monodll_wizard.obj \
-       $(OBJS)\monodll_appcmn.obj \
-       $(OBJS)\monodll_fontmap.obj \
+       $(OBJS)\monodll_uxtheme.obj \

        $(OBJS)\monodll_accesscmn.obj \
        $(OBJS)\monodll_accesscmn.obj \

+       $(OBJS)\monodll_appcmn.obj \

        $(OBJS)\monodll_artprov.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \
        $(OBJS)\monodll_artprov.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \


@@ -2203,9 +2378,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_fontcmn.obj \
        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_fontcmn.obj \

+       $(OBJS)\monodll_fontmap.obj \

        $(OBJS)\monodll_framecmn.obj \
        $(OBJS)\monodll_framecmn.obj \

-       $(OBJS)\monodll_timercmn.obj \
-       $(OBJS)\monodll_toplvcmn.obj \

        $(OBJS)\monodll_gaugecmn.obj \
        $(OBJS)\monodll_gdicmn.obj \
        $(OBJS)\monodll_geometry.obj \
        $(OBJS)\monodll_gaugecmn.obj \
        $(OBJS)\monodll_gdicmn.obj \
        $(OBJS)\monodll_geometry.obj \


@@ -2215,6 +2389,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagall.obj \
        $(OBJS)\monodll_imagbmp.obj \
        $(OBJS)\monodll_image.obj \
        $(OBJS)\monodll_imagall.obj \
        $(OBJS)\monodll_imagbmp.obj \
        $(OBJS)\monodll_image.obj \

+       $(OBJS)\monodll_imagfill.obj \

        $(OBJS)\monodll_imaggif.obj \
        $(OBJS)\monodll_imagiff.obj \
        $(OBJS)\monodll_imagjpeg.obj \
        $(OBJS)\monodll_imaggif.obj \
        $(OBJS)\monodll_imagiff.obj \
        $(OBJS)\monodll_imagjpeg.obj \


@@ -2223,7 +2398,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagpnm.obj \
        $(OBJS)\monodll_imagtiff.obj \
        $(OBJS)\monodll_imagxpm.obj \
        $(OBJS)\monodll_imagpnm.obj \
        $(OBJS)\monodll_imagtiff.obj \
        $(OBJS)\monodll_imagxpm.obj \

-       $(OBJS)\monodll_imagfill.obj \

        $(OBJS)\monodll_layout.obj \
        $(OBJS)\monodll_lboxcmn.obj \
        $(OBJS)\monodll_matrix.obj \
        $(OBJS)\monodll_layout.obj \
        $(OBJS)\monodll_lboxcmn.obj \
        $(OBJS)\monodll_matrix.obj \


@@ -2241,15 +2415,49 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_statbar.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \
        $(OBJS)\monodll_statbar.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \

+       $(OBJS)\monodll_timercmn.obj \
+       $(OBJS)\monodll_toplvcmn.obj \

        $(OBJS)\monodll_treebase.obj \
        $(OBJS)\monodll_valgen.obj \
        $(OBJS)\monodll_validate.obj \
        $(OBJS)\monodll_valtext.obj \
        $(OBJS)\monodll_wincmn.obj \
        $(OBJS)\monodll_treebase.obj \
        $(OBJS)\monodll_valgen.obj \
        $(OBJS)\monodll_validate.obj \
        $(OBJS)\monodll_valtext.obj \
        $(OBJS)\monodll_wincmn.obj \

-       $(OBJS)\monodll_xpmdecod.obj
+       $(OBJS)\monodll_xpmdecod.obj \
+       $(OBJS)\monodll_busyinfo.obj \
+       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_choicdgg.obj \
+       $(OBJS)\monodll_dcbuffer.obj \
+       $(OBJS)\monodll_dcpsg.obj \
+       $(OBJS)\monodll_dirctrlg.obj \
+       $(OBJS)\monodll_dragimgg.obj \
+       $(OBJS)\monodll_grid.obj \
+       $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_gridsel.obj \
+       $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_logg.obj \
+       $(OBJS)\monodll_numdlgg.obj \
+       $(OBJS)\monodll_panelg.obj \
+       $(OBJS)\monodll_progdlgg.obj \
+       $(OBJS)\monodll_renderg.obj \
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_scrlwing.obj \
+       $(OBJS)\monodll_selstore.obj \
+       $(OBJS)\monodll_spinctlg.obj \
+       $(OBJS)\monodll_splash.obj \
+       $(OBJS)\monodll_splitter.obj \
+       $(OBJS)\monodll_tbarsmpl.obj \
+       $(OBJS)\monodll_textdlgg.obj \
+       $(OBJS)\monodll_tipdlg.obj \
+       $(OBJS)\monodll_tipwin.obj \
+       $(OBJS)\monodll_treectlg.obj \
+       $(OBJS)\monodll_vlbox.obj \
+       $(OBJS)\monodll_vscroll.obj \
+       $(OBJS)\monodll_wizard.obj

 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS =  \

+       $(OBJS)\monodll_taskbarcmn.obj \

        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \
        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \


@@ -2279,12 +2487,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_joystick.obj \
        $(OBJS)\monodll_minifram.obj \
        $(OBJS)\monodll_icon.obj \
        $(OBJS)\monodll_joystick.obj \
        $(OBJS)\monodll_minifram.obj \

+       $(OBJS)\monodll_automtn.obj \
+       $(OBJS)\monodll_dataobj.obj \
+       $(OBJS)\monodll_dropsrc.obj \
+       $(OBJS)\monodll_droptgt.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_uuid.obj \

        $(OBJS)\monodll_palette.obj \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_settings.obj \
        $(OBJS)\monodll_palette.obj \
        $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \
        $(OBJS)\monodll_region.obj \
        $(OBJS)\monodll_settings.obj \

-       $(OBJS)\monodll_taskbarcmn.obj \

        $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_tooltip.obj \
        $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_timer.obj \
        $(OBJS)\monodll_tooltip.obj \


@@ -2292,13 +2505,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_utilsgui.obj \
        $(OBJS)\monodll_wave.obj \
        $(OBJS)\monodll_window.obj \
        $(OBJS)\monodll_utilsgui.obj \
        $(OBJS)\monodll_wave.obj \
        $(OBJS)\monodll_window.obj \

-       $(OBJS)\monodll_automtn.obj \
-       $(OBJS)\monodll_dataobj.obj \
-       $(OBJS)\monodll_dropsrc.obj \
-       $(OBJS)\monodll_droptgt.obj \
-       $(OBJS)\monodll_oleutils.obj \
-       $(OBJS)\monodll_uuid.obj \

        $(OBJS)\monodll_textctrl.obj \
        $(OBJS)\monodll_textctrl.obj \

+       $(OBJS)\monodll_accel.obj \
+       $(OBJS)\monodll_colrdlgg.obj \
+       $(OBJS)\monodll_dirdlgg.obj \
+       $(OBJS)\monodll_fdrepdlg.obj \
+       $(OBJS)\monodll_filedlgg.obj \
+       $(OBJS)\monodll_fontdlgg.obj \
+       $(OBJS)\monodll_imaglist.obj \
+       $(OBJS)\monodll_listctrl.obj \
+       $(OBJS)\monodll_mdig.obj \
+       $(OBJS)\monodll_msgdlgg.obj \
+       $(OBJS)\monodll_prntdlgg.obj \
+       $(OBJS)\monodll_tabg.obj \

        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \
        $(OBJS)\monodll_checkbox.obj \
        $(OBJS)\monodll_bmpbuttn.obj \
        $(OBJS)\monodll_button.obj \
        $(OBJS)\monodll_checkbox.obj \


@@ -2309,7 +2528,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_control.obj \
        $(OBJS)\monodll_dialog.obj \
        $(OBJS)\monodll_framuniv.obj \
        $(OBJS)\monodll_control.obj \
        $(OBJS)\monodll_dialog.obj \
        $(OBJS)\monodll_framuniv.obj \

-       $(OBJS)\monodll_topluniv.obj \

        $(OBJS)\monodll_gauge.obj \
        $(OBJS)\monodll_inpcons.obj \
        $(OBJS)\monodll_inphand.obj \
        $(OBJS)\monodll_gauge.obj \
        $(OBJS)\monodll_inpcons.obj \
        $(OBJS)\monodll_inphand.obj \


@@ -2329,58 +2547,15 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_statline.obj \
        $(OBJS)\monodll_stattext.obj \
        $(OBJS)\monodll_statusbr.obj \
        $(OBJS)\monodll_statline.obj \
        $(OBJS)\monodll_stattext.obj \
        $(OBJS)\monodll_statusbr.obj \

-       $(OBJS)\monodll_toolbar.obj \

        $(OBJS)\monodll_theme.obj \
        $(OBJS)\monodll_theme.obj \

+       $(OBJS)\monodll_toolbar.obj \
+       $(OBJS)\monodll_topluniv.obj \

        $(OBJS)\monodll_winuniv.obj \
        $(OBJS)\monodll_winuniv.obj \

-       $(OBJS)\monodll_mdig.obj \
-       $(OBJS)\monodll_imaglist.obj \
-       $(OBJS)\monodll_colrdlgg.obj \
-       $(OBJS)\monodll_listctrl.obj \
-       $(OBJS)\monodll_filedlgg.obj \
-       $(OBJS)\monodll_dirdlgg.obj \
-       $(OBJS)\monodll_prntdlgg.obj \
-       $(OBJS)\monodll_accel.obj \
-       $(OBJS)\monodll_msgdlgg.obj \
-       $(OBJS)\monodll_fdrepdlg.obj \
-       $(OBJS)\monodll_fontdlgg.obj \
-       $(OBJS)\monodll_tabg.obj \

        $(OBJS)\monodll_gtk.obj \
        $(OBJS)\monodll_gtk.obj \

-       $(OBJS)\monodll_win32.obj \

        $(OBJS)\monodll_metal.obj \
        $(OBJS)\monodll_metal.obj \

-       $(OBJS)\monodll_busyinfo.obj \
-       $(OBJS)\monodll_calctrl.obj \
-       $(OBJS)\monodll_choicdgg.obj \
-       $(OBJS)\monodll_dcbuffer.obj \
-       $(OBJS)\monodll_dcpsg.obj \
-       $(OBJS)\monodll_dirctrlg.obj \
-       $(OBJS)\monodll_dragimgg.obj \
-       $(OBJS)\monodll_grid.obj \
-       $(OBJS)\monodll_gridctrl.obj \
-       $(OBJS)\monodll_gridsel.obj \
-       $(OBJS)\monodll_helpext.obj \
-       $(OBJS)\monodll_laywin.obj \
-       $(OBJS)\monodll_logg.obj \
-       $(OBJS)\monodll_numdlgg.obj \
-       $(OBJS)\monodll_panelg.obj \
-       $(OBJS)\monodll_progdlgg.obj \
-       $(OBJS)\monodll_renderg.obj \
-       $(OBJS)\monodll_sashwin.obj \
-       $(OBJS)\monodll_scrlwing.obj \
-       $(OBJS)\monodll_selstore.obj \
-       $(OBJS)\monodll_spinctlg.obj \
-       $(OBJS)\monodll_splash.obj \
-       $(OBJS)\monodll_splitter.obj \
-       $(OBJS)\monodll_tbarsmpl.obj \
-       $(OBJS)\monodll_textdlgg.obj \
-       $(OBJS)\monodll_tipdlg.obj \
-       $(OBJS)\monodll_tipwin.obj \
-       $(OBJS)\monodll_treectlg.obj \
-       $(OBJS)\monodll_vlbox.obj \
-       $(OBJS)\monodll_vscroll.obj \
-       $(OBJS)\monodll_wizard.obj \
-       $(OBJS)\monodll_appcmn.obj \
-       $(OBJS)\monodll_fontmap.obj \
+       $(OBJS)\monodll_win32.obj \

        $(OBJS)\monodll_accesscmn.obj \
        $(OBJS)\monodll_accesscmn.obj \

+       $(OBJS)\monodll_appcmn.obj \

        $(OBJS)\monodll_artprov.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \
        $(OBJS)\monodll_artprov.obj \
        $(OBJS)\monodll_artstd.obj \
        $(OBJS)\monodll_bmpbase.obj \


@@ -2406,9 +2581,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_fontcmn.obj \
        $(OBJS)\monodll_fddlgcmn.obj \
        $(OBJS)\monodll_fldlgcmn.obj \
        $(OBJS)\monodll_fontcmn.obj \

+       $(OBJS)\monodll_fontmap.obj \

        $(OBJS)\monodll_framecmn.obj \
        $(OBJS)\monodll_framecmn.obj \

-       $(OBJS)\monodll_timercmn.obj \
-       $(OBJS)\monodll_toplvcmn.obj \

        $(OBJS)\monodll_gaugecmn.obj \
        $(OBJS)\monodll_gdicmn.obj \
        $(OBJS)\monodll_geometry.obj \
        $(OBJS)\monodll_gaugecmn.obj \
        $(OBJS)\monodll_gdicmn.obj \
        $(OBJS)\monodll_geometry.obj \


@@ -2418,6 +2592,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagall.obj \
        $(OBJS)\monodll_imagbmp.obj \
        $(OBJS)\monodll_image.obj \
        $(OBJS)\monodll_imagall.obj \
        $(OBJS)\monodll_imagbmp.obj \
        $(OBJS)\monodll_image.obj \

+       $(OBJS)\monodll_imagfill.obj \

        $(OBJS)\monodll_imaggif.obj \
        $(OBJS)\monodll_imagiff.obj \
        $(OBJS)\monodll_imagjpeg.obj \
        $(OBJS)\monodll_imaggif.obj \
        $(OBJS)\monodll_imagiff.obj \
        $(OBJS)\monodll_imagjpeg.obj \


@@ -2426,7 +2601,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_imagpnm.obj \
        $(OBJS)\monodll_imagtiff.obj \
        $(OBJS)\monodll_imagxpm.obj \
        $(OBJS)\monodll_imagpnm.obj \
        $(OBJS)\monodll_imagtiff.obj \
        $(OBJS)\monodll_imagxpm.obj \

-       $(OBJS)\monodll_imagfill.obj \

        $(OBJS)\monodll_layout.obj \
        $(OBJS)\monodll_lboxcmn.obj \
        $(OBJS)\monodll_matrix.obj \
        $(OBJS)\monodll_layout.obj \
        $(OBJS)\monodll_lboxcmn.obj \
        $(OBJS)\monodll_matrix.obj \


@@ -2444,69 +2618,288 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_statbar.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \
        $(OBJS)\monodll_statbar.obj \
        $(OBJS)\monodll_tbarbase.obj \
        $(OBJS)\monodll_textcmn.obj \

+       $(OBJS)\monodll_timercmn.obj \
+       $(OBJS)\monodll_toplvcmn.obj \

        $(OBJS)\monodll_treebase.obj \
        $(OBJS)\monodll_valgen.obj \
        $(OBJS)\monodll_validate.obj \
        $(OBJS)\monodll_valtext.obj \
        $(OBJS)\monodll_wincmn.obj \
        $(OBJS)\monodll_treebase.obj \
        $(OBJS)\monodll_valgen.obj \
        $(OBJS)\monodll_validate.obj \
        $(OBJS)\monodll_valtext.obj \
        $(OBJS)\monodll_wincmn.obj \

-       $(OBJS)\monodll_xpmdecod.obj
+       $(OBJS)\monodll_xpmdecod.obj \
+       $(OBJS)\monodll_busyinfo.obj \
+       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_choicdgg.obj \
+       $(OBJS)\monodll_dcbuffer.obj \
+       $(OBJS)\monodll_dcpsg.obj \
+       $(OBJS)\monodll_dirctrlg.obj \
+       $(OBJS)\monodll_dragimgg.obj \
+       $(OBJS)\monodll_grid.obj \
+       $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_gridsel.obj \
+       $(OBJS)\monodll_helpext.obj \
+       $(OBJS)\monodll_laywin.obj \
+       $(OBJS)\monodll_logg.obj \
+       $(OBJS)\monodll_numdlgg.obj \
+       $(OBJS)\monodll_panelg.obj \
+       $(OBJS)\monodll_progdlgg.obj \
+       $(OBJS)\monodll_renderg.obj \
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_scrlwing.obj \
+       $(OBJS)\monodll_selstore.obj \
+       $(OBJS)\monodll_spinctlg.obj \
+       $(OBJS)\monodll_splash.obj \
+       $(OBJS)\monodll_splitter.obj \
+       $(OBJS)\monodll_tbarsmpl.obj \
+       $(OBJS)\monodll_textdlgg.obj \
+       $(OBJS)\monodll_tipdlg.obj \
+       $(OBJS)\monodll_tipwin.obj \
+       $(OBJS)\monodll_treectlg.obj \
+       $(OBJS)\monodll_vlbox.obj \
+       $(OBJS)\monodll_vscroll.obj \
+       $(OBJS)\monodll_wizard.obj

 !endif
 !endif

-!if "$(BUILD)" == "debug"
-____DEBUGFLAG = /D_DEBUG
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+____DEBUGINFO = /D_DEBUG

 !endif
 !endif

-!if "$(BUILD)" == "release"
-____DEBUGFLAG = /DNDEBUG
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+____DEBUGINFO = /DNDEBUG
+!endif
+!if "$(DEBUG_INFO)" == "0"
+____DEBUGINFO = /DNDEBUG
+!endif
+!if "$(DEBUG_INFO)" == "1"
+____DEBUGINFO = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_104_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_104_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_104_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_10_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_10_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_10_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_113_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_113_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_113_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_122_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_122_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_122_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_131_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_131_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_131_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_140_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_140_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_140_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_149_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_149_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_149_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_158_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_158_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_158_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_167_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_167_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_167_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_18_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_18_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_18_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_26_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_26_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_26_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_2_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_2_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_34_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_34_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_34_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_42_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_42_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_42_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_50_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_50_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_50_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_59_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_59_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_59_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_68_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_68_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_68_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_77_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_77_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_77_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_86_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_86_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_86_p = $(____DEBUGINFO)
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_95_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_95_p = /D_DEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_95_p = $(____DEBUGINFO)

 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_helpbest.obj \
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_1_OBJECTS) \
        $(OBJS)\monolib_helpbest.obj \

+       $(OBJS)\monolib_helpctrl.obj \

        $(OBJS)\monolib_helpdata.obj \
        $(OBJS)\monolib_helpfrm.obj \
        $(OBJS)\monolib_helpdata.obj \
        $(OBJS)\monolib_helpfrm.obj \

-       $(OBJS)\monolib_helpctrl.obj \

        $(OBJS)\monolib_htmlcell.obj \
        $(OBJS)\monolib_htmlfilt.obj \
        $(OBJS)\monolib_htmlpars.obj \
        $(OBJS)\monolib_htmltag.obj \
        $(OBJS)\monolib_htmlwin.obj \
        $(OBJS)\monolib_htmlcell.obj \
        $(OBJS)\monolib_htmlfilt.obj \
        $(OBJS)\monolib_htmlpars.obj \
        $(OBJS)\monolib_htmltag.obj \
        $(OBJS)\monolib_htmlwin.obj \

-       $(OBJS)\monolib_winpars.obj \
+       $(OBJS)\monolib_htmprint.obj \
+       $(OBJS)\monolib_m_dflist.obj \

        $(OBJS)\monolib_m_fonts.obj \
        $(OBJS)\monolib_m_hline.obj \
        $(OBJS)\monolib_m_image.obj \
        $(OBJS)\monolib_m_layout.obj \
        $(OBJS)\monolib_m_links.obj \
        $(OBJS)\monolib_m_list.obj \
        $(OBJS)\monolib_m_fonts.obj \
        $(OBJS)\monolib_m_hline.obj \
        $(OBJS)\monolib_m_image.obj \
        $(OBJS)\monolib_m_layout.obj \
        $(OBJS)\monolib_m_links.obj \
        $(OBJS)\monolib_m_list.obj \

-       $(OBJS)\monolib_m_dflist.obj \

        $(OBJS)\monolib_m_pre.obj \
        $(OBJS)\monolib_m_pre.obj \

-       $(OBJS)\monolib_m_tables.obj \

        $(OBJS)\monolib_m_style.obj \
        $(OBJS)\monolib_m_style.obj \

-       $(OBJS)\monolib_htmprint.obj \
+       $(OBJS)\monolib_m_tables.obj \
+       $(OBJS)\monolib_winpars.obj \

        $(OBJS)\monolib_htmllbox.obj
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_helpbest.obj \
        $(OBJS)\monolib_htmllbox.obj
 !endif
 !if "$(USE_GUI)" == "1"
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(____CORE_SRC_FILENAMES_OBJECTS) \
        $(OBJS)\monodll_helpbest.obj \

+       $(OBJS)\monodll_helpctrl.obj \

        $(OBJS)\monodll_helpdata.obj \
        $(OBJS)\monodll_helpfrm.obj \
        $(OBJS)\monodll_helpdata.obj \
        $(OBJS)\monodll_helpfrm.obj \

-       $(OBJS)\monodll_helpctrl.obj \

        $(OBJS)\monodll_htmlcell.obj \
        $(OBJS)\monodll_htmlfilt.obj \
        $(OBJS)\monodll_htmlpars.obj \
        $(OBJS)\monodll_htmltag.obj \
        $(OBJS)\monodll_htmlwin.obj \
        $(OBJS)\monodll_htmlcell.obj \
        $(OBJS)\monodll_htmlfilt.obj \
        $(OBJS)\monodll_htmlpars.obj \
        $(OBJS)\monodll_htmltag.obj \
        $(OBJS)\monodll_htmlwin.obj \

-       $(OBJS)\monodll_winpars.obj \
+       $(OBJS)\monodll_htmprint.obj \
+       $(OBJS)\monodll_m_dflist.obj \

        $(OBJS)\monodll_m_fonts.obj \
        $(OBJS)\monodll_m_hline.obj \
        $(OBJS)\monodll_m_image.obj \
        $(OBJS)\monodll_m_layout.obj \
        $(OBJS)\monodll_m_links.obj \
        $(OBJS)\monodll_m_list.obj \
        $(OBJS)\monodll_m_fonts.obj \
        $(OBJS)\monodll_m_hline.obj \
        $(OBJS)\monodll_m_image.obj \
        $(OBJS)\monodll_m_layout.obj \
        $(OBJS)\monodll_m_links.obj \
        $(OBJS)\monodll_m_list.obj \

-       $(OBJS)\monodll_m_dflist.obj \

        $(OBJS)\monodll_m_pre.obj \
        $(OBJS)\monodll_m_pre.obj \

-       $(OBJS)\monodll_m_tables.obj \

        $(OBJS)\monodll_m_style.obj \
        $(OBJS)\monodll_m_style.obj \

-       $(OBJS)\monodll_htmprint.obj \
+       $(OBJS)\monodll_m_tables.obj \
+       $(OBJS)\monodll_winpars.obj \

        $(OBJS)\monodll_htmllbox.obj
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
        $(OBJS)\monodll_htmllbox.obj
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"


@@ -8923,7 +9316,7 @@ $(OBJS)\xmllib_xml.obj: ..\src\xml\xml.cpp
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib

-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<

        $(BASEDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 <<
 !endif
        $(BASEDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 <<
 !endif


@@ -8969,7 +9362,7 @@ clean:
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<

        $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 <<
 !endif
        $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 <<
 !endif


@@ -8984,7 +9377,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li
 
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
 
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib

-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<

        $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
 <<
 !endif
        $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
 <<
 !endif


@@ -8999,7 +9392,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib:
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<

        $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
 <<
 !endif
        $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
 <<
 !endif


@@ -9020,7 +9413,7 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME)
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
 
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib

-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<

        $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib   /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 <<
 !endif
        $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib   /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 <<
 !endif


@@ -9038,7 +9431,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<

        $(NETDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
 <<
 !endif
        $(NETDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
 <<
 !endif


@@ -9100,7 +9493,7 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
 
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)

-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG)  /LIBPATH:$(LIBDIRNAME) @<<
+       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_28)  /LIBPATH:$(LIBDIRNAME) @<<

        $(XMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
 <<
 !endif
        $(XMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
 <<
 !endif

diff --git a/build/makefile.wat b/build/makefile.wat
index ecd1e73e0c1ddbca51a96862ba29f64eb3b4235e..edba1ebfb43f703cdb424ce609fc7f2ec1e75129 100644 (file)
--- a/build/makefile.wat
+++ b/build/makefile.wat
@@ -43,6 +43,11 @@ VENDORTAG =
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug

+!ifeq DEBUG_FLAG default
+WXDEBUGFLAG = d
+!endif
+!endif
+!ifeq DEBUG_FLAG 1

 WXDEBUGFLAG = d
 !endif
 WXDLLFLAG =
 WXDEBUGFLAG = d
 !endif
 WXDLLFLAG =


@@ -57,22 +62,47 @@ WXUNIVNAME =
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif
 !ifeq WXUNIV 1
 WXUNIVNAME = univ
 !endif

-__DEBUGFLAG =
+__DEBUGINFO =

 !ifeq BUILD debug
 !ifeq BUILD debug

-__DEBUGFLAG = -d2
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d2
+!endif

 !endif
 !ifeq BUILD release
 !endif
 !ifeq BUILD release

-__DEBUGFLAG = -d0
+!ifeq DEBUG_INFO default
+__DEBUGINFO = -d0

 !endif
 !endif

-__DEBUGFLAG_7 =
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO = -d2
+!endif
+__DEBUGINFO_7 =

 !ifeq BUILD debug
 !ifeq BUILD debug

-__DEBUGFLAG_7 = debug all
+!ifeq DEBUG_INFO default
+__DEBUGINFO_7 = debug all
+!endif

 !endif
 !ifeq BUILD release
 !endif
 !ifeq BUILD release

-__DEBUGFLAG_7 = 
+!ifeq DEBUG_INFO default
+__DEBUGINFO_7 = 
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_7 = 
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_7 = debug all

 !endif
 __DEBUG_DEFINE_p =
 !ifeq BUILD debug
 !endif
 __DEBUG_DEFINE_p =
 !ifeq BUILD debug

+!ifeq DEBUG_FLAG default
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+!endif
+!ifeq DEBUG_FLAG 1

 __DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif
 __LIB_JPEG_p =
 __DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif
 __LIB_JPEG_p =


@@ -127,6 +157,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_1_OBJECTS =  &

+       $(OBJS)\monolib_taskbarcmn.obj &

        $(OBJS)\monolib_app.obj &
        $(OBJS)\monolib_bitmap.obj &
        $(OBJS)\monolib_brush.obj &
        $(OBJS)\monolib_app.obj &
        $(OBJS)\monolib_bitmap.obj &
        $(OBJS)\monolib_brush.obj &


@@ -156,12 +187,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_icon.obj &
        $(OBJS)\monolib_joystick.obj &
        $(OBJS)\monolib_minifram.obj &
        $(OBJS)\monolib_icon.obj &
        $(OBJS)\monolib_joystick.obj &
        $(OBJS)\monolib_minifram.obj &

+       $(OBJS)\monolib_automtn.obj &
+       $(OBJS)\monolib_dataobj.obj &
+       $(OBJS)\monolib_dropsrc.obj &
+       $(OBJS)\monolib_droptgt.obj &
+       $(OBJS)\monolib_oleutils.obj &
+       $(OBJS)\monolib_uuid.obj &

        $(OBJS)\monolib_palette.obj &
        $(OBJS)\monolib_pen.obj &
        $(OBJS)\monolib_popupwin.obj &
        $(OBJS)\monolib_region.obj &
        $(OBJS)\monolib_settings.obj &
        $(OBJS)\monolib_palette.obj &
        $(OBJS)\monolib_pen.obj &
        $(OBJS)\monolib_popupwin.obj &
        $(OBJS)\monolib_region.obj &
        $(OBJS)\monolib_settings.obj &

-       $(OBJS)\monolib_taskbarcmn.obj &

        $(OBJS)\monolib_taskbar.obj &
        $(OBJS)\monolib_timer.obj &
        $(OBJS)\monolib_tooltip.obj &
        $(OBJS)\monolib_taskbar.obj &
        $(OBJS)\monolib_timer.obj &
        $(OBJS)\monolib_tooltip.obj &


@@ -169,15 +205,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_utilsgui.obj &
        $(OBJS)\monolib_wave.obj &
        $(OBJS)\monolib_window.obj &
        $(OBJS)\monolib_utilsgui.obj &
        $(OBJS)\monolib_wave.obj &
        $(OBJS)\monolib_window.obj &

-       $(OBJS)\monolib_automtn.obj &
-       $(OBJS)\monolib_dataobj.obj &
-       $(OBJS)\monolib_dropsrc.obj &
-       $(OBJS)\monolib_droptgt.obj &
-       $(OBJS)\monolib_oleutils.obj &
-       $(OBJS)\monolib_uuid.obj &

        $(OBJS)\monolib_statusbr.obj &
        $(OBJS)\monolib_statusbr.obj &

-       $(OBJS)\monolib_uxtheme.obj &
-       $(OBJS)\monolib_access.obj &

        $(OBJS)\monolib_accel.obj &
        $(OBJS)\monolib_bmpbuttn.obj &
        $(OBJS)\monolib_button.obj &
        $(OBJS)\monolib_accel.obj &
        $(OBJS)\monolib_bmpbuttn.obj &
        $(OBJS)\monolib_button.obj &


@@ -205,6 +233,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_msgdlg.obj &
        $(OBJS)\monolib_nativdlg.obj &
        $(OBJS)\monolib_notebook.obj &
        $(OBJS)\monolib_msgdlg.obj &
        $(OBJS)\monolib_nativdlg.obj &
        $(OBJS)\monolib_notebook.obj &

+       $(OBJS)\monolib_access.obj &

        $(OBJS)\monolib_ownerdrw.obj &
        $(OBJS)\monolib_penwin.obj &
        $(OBJS)\monolib_printdlg.obj &
        $(OBJS)\monolib_ownerdrw.obj &
        $(OBJS)\monolib_penwin.obj &
        $(OBJS)\monolib_printdlg.obj &


@@ -226,40 +255,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_textctrl.obj &
        $(OBJS)\monolib_tglbtn.obj &
        $(OBJS)\monolib_treectrl.obj &
        $(OBJS)\monolib_textctrl.obj &
        $(OBJS)\monolib_tglbtn.obj &
        $(OBJS)\monolib_treectrl.obj &

-       $(OBJS)\monolib_busyinfo.obj &
-       $(OBJS)\monolib_calctrl.obj &
-       $(OBJS)\monolib_choicdgg.obj &
-       $(OBJS)\monolib_dcbuffer.obj &
-       $(OBJS)\monolib_dcpsg.obj &
-       $(OBJS)\monolib_dirctrlg.obj &
-       $(OBJS)\monolib_dragimgg.obj &
-       $(OBJS)\monolib_grid.obj &
-       $(OBJS)\monolib_gridctrl.obj &
-       $(OBJS)\monolib_gridsel.obj &
-       $(OBJS)\monolib_helpext.obj &
-       $(OBJS)\monolib_laywin.obj &
-       $(OBJS)\monolib_logg.obj &
-       $(OBJS)\monolib_numdlgg.obj &
-       $(OBJS)\monolib_panelg.obj &
-       $(OBJS)\monolib_progdlgg.obj &
-       $(OBJS)\monolib_renderg.obj &
-       $(OBJS)\monolib_sashwin.obj &
-       $(OBJS)\monolib_scrlwing.obj &
-       $(OBJS)\monolib_selstore.obj &
-       $(OBJS)\monolib_spinctlg.obj &
-       $(OBJS)\monolib_splash.obj &
-       $(OBJS)\monolib_splitter.obj &
-       $(OBJS)\monolib_tbarsmpl.obj &
-       $(OBJS)\monolib_textdlgg.obj &
-       $(OBJS)\monolib_tipdlg.obj &
-       $(OBJS)\monolib_tipwin.obj &
-       $(OBJS)\monolib_treectlg.obj &
-       $(OBJS)\monolib_vlbox.obj &
-       $(OBJS)\monolib_vscroll.obj &
-       $(OBJS)\monolib_wizard.obj &
-       $(OBJS)\monolib_appcmn.obj &
-       $(OBJS)\monolib_fontmap.obj &
+       $(OBJS)\monolib_uxtheme.obj &

        $(OBJS)\monolib_accesscmn.obj &
        $(OBJS)\monolib_accesscmn.obj &

+       $(OBJS)\monolib_appcmn.obj &

        $(OBJS)\monolib_artprov.obj &
        $(OBJS)\monolib_artstd.obj &
        $(OBJS)\monolib_bmpbase.obj &
        $(OBJS)\monolib_artprov.obj &
        $(OBJS)\monolib_artstd.obj &
        $(OBJS)\monolib_bmpbase.obj &


@@ -285,9 +283,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_fddlgcmn.obj &
        $(OBJS)\monolib_fldlgcmn.obj &
        $(OBJS)\monolib_fontcmn.obj &
        $(OBJS)\monolib_fddlgcmn.obj &
        $(OBJS)\monolib_fldlgcmn.obj &
        $(OBJS)\monolib_fontcmn.obj &

+       $(OBJS)\monolib_fontmap.obj &

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

-       $(OBJS)\monolib_timercmn.obj &
-       $(OBJS)\monolib_toplvcmn.obj &

        $(OBJS)\monolib_gaugecmn.obj &
        $(OBJS)\monolib_gdicmn.obj &
        $(OBJS)\monolib_geometry.obj &
        $(OBJS)\monolib_gaugecmn.obj &
        $(OBJS)\monolib_gdicmn.obj &
        $(OBJS)\monolib_geometry.obj &


@@ -297,6 +294,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_imagall.obj &
        $(OBJS)\monolib_imagbmp.obj &
        $(OBJS)\monolib_image.obj &
        $(OBJS)\monolib_imagall.obj &
        $(OBJS)\monolib_imagbmp.obj &
        $(OBJS)\monolib_image.obj &

+       $(OBJS)\monolib_imagfill.obj &

        $(OBJS)\monolib_imaggif.obj &
        $(OBJS)\monolib_imagiff.obj &
        $(OBJS)\monolib_imagjpeg.obj &
        $(OBJS)\monolib_imaggif.obj &
        $(OBJS)\monolib_imagiff.obj &
        $(OBJS)\monolib_imagjpeg.obj &


@@ -305,7 +303,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_imagpnm.obj &
        $(OBJS)\monolib_imagtiff.obj &
        $(OBJS)\monolib_imagxpm.obj &
        $(OBJS)\monolib_imagpnm.obj &
        $(OBJS)\monolib_imagtiff.obj &
        $(OBJS)\monolib_imagxpm.obj &

-       $(OBJS)\monolib_imagfill.obj &

        $(OBJS)\monolib_layout.obj &
        $(OBJS)\monolib_lboxcmn.obj &
        $(OBJS)\monolib_matrix.obj &
        $(OBJS)\monolib_layout.obj &
        $(OBJS)\monolib_lboxcmn.obj &
        $(OBJS)\monolib_matrix.obj &


@@ -323,17 +320,51 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_statbar.obj &
        $(OBJS)\monolib_tbarbase.obj &
        $(OBJS)\monolib_textcmn.obj &
        $(OBJS)\monolib_statbar.obj &
        $(OBJS)\monolib_tbarbase.obj &
        $(OBJS)\monolib_textcmn.obj &

+       $(OBJS)\monolib_timercmn.obj &
+       $(OBJS)\monolib_toplvcmn.obj &

        $(OBJS)\monolib_treebase.obj &
        $(OBJS)\monolib_valgen.obj &
        $(OBJS)\monolib_validate.obj &
        $(OBJS)\monolib_valtext.obj &
        $(OBJS)\monolib_wincmn.obj &
        $(OBJS)\monolib_treebase.obj &
        $(OBJS)\monolib_valgen.obj &
        $(OBJS)\monolib_validate.obj &
        $(OBJS)\monolib_valtext.obj &
        $(OBJS)\monolib_wincmn.obj &

-       $(OBJS)\monolib_xpmdecod.obj
+       $(OBJS)\monolib_xpmdecod.obj &
+       $(OBJS)\monolib_busyinfo.obj &
+       $(OBJS)\monolib_calctrl.obj &
+       $(OBJS)\monolib_choicdgg.obj &
+       $(OBJS)\monolib_dcbuffer.obj &
+       $(OBJS)\monolib_dcpsg.obj &
+       $(OBJS)\monolib_dirctrlg.obj &
+       $(OBJS)\monolib_dragimgg.obj &
+       $(OBJS)\monolib_grid.obj &
+       $(OBJS)\monolib_gridctrl.obj &
+       $(OBJS)\monolib_gridsel.obj &
+       $(OBJS)\monolib_helpext.obj &
+       $(OBJS)\monolib_laywin.obj &
+       $(OBJS)\monolib_logg.obj &
+       $(OBJS)\monolib_numdlgg.obj &
+       $(OBJS)\monolib_panelg.obj &
+       $(OBJS)\monolib_progdlgg.obj &
+       $(OBJS)\monolib_renderg.obj &
+       $(OBJS)\monolib_sashwin.obj &
+       $(OBJS)\monolib_scrlwing.obj &
+       $(OBJS)\monolib_selstore.obj &
+       $(OBJS)\monolib_spinctlg.obj &
+       $(OBJS)\monolib_splash.obj &
+       $(OBJS)\monolib_splitter.obj &
+       $(OBJS)\monolib_tbarsmpl.obj &
+       $(OBJS)\monolib_textdlgg.obj &
+       $(OBJS)\monolib_tipdlg.obj &
+       $(OBJS)\monolib_tipwin.obj &
+       $(OBJS)\monolib_treectlg.obj &
+       $(OBJS)\monolib_vlbox.obj &
+       $(OBJS)\monolib_vscroll.obj &
+       $(OBJS)\monolib_wizard.obj

 !endif
 !endif
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 !endif
 !endif
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_1_OBJECTS =  &

+       $(OBJS)\monolib_taskbarcmn.obj &

        $(OBJS)\monolib_app.obj &
        $(OBJS)\monolib_bitmap.obj &
        $(OBJS)\monolib_brush.obj &
        $(OBJS)\monolib_app.obj &
        $(OBJS)\monolib_bitmap.obj &
        $(OBJS)\monolib_brush.obj &


@@ -363,12 +394,17 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_icon.obj &
        $(OBJS)\monolib_joystick.obj &
        $(OBJS)\monolib_minifram.obj &
        $(OBJS)\monolib_icon.obj &
        $(OBJS)\monolib_joystick.obj &
        $(OBJS)\monolib_minifram.obj &

+       $(OBJS)\monolib_automtn.obj &
+       $(OBJS)\monolib_dataobj.obj &
+       $(OBJS)\monolib_dropsrc.obj &
+       $(OBJS)\monolib_droptgt.obj &
+       $(OBJS)\monolib_oleutils.obj &
+       $(OBJS)\monolib_uuid.obj &

        $(OBJS)\monolib_palette.obj &
        $(OBJS)\monolib_pen.obj &
        $(OBJS)\monolib_popupwin.obj &
        $(OBJS)\monolib_region.obj &
        $(OBJS)\monolib_settings.obj &
        $(OBJS)\monolib_palette.obj &
        $(OBJS)\monolib_pen.obj &
        $(OBJS)\monolib_popupwin.obj &
        $(OBJS)\monolib_region.obj &
        $(OBJS)\monolib_settings.obj &

-       $(OBJS)\monolib_taskbarcmn.obj &

        $(OBJS)\monolib_taskbar.obj &
        $(OBJS)\monolib_timer.obj &
        $(OBJS)\monolib_tooltip.obj &
        $(OBJS)\monolib_taskbar.obj &
        $(OBJS)\monolib_timer.obj &
        $(OBJS)\monolib_tooltip.obj &


@@ -376,13 +412,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_utilsgui.obj &
        $(OBJS)\monolib_wave.obj &
        $(OBJS)\monolib_window.obj &
        $(OBJS)\monolib_utilsgui.obj &
        $(OBJS)\monolib_wave.obj &
        $(OBJS)\monolib_window.obj &

-       $(OBJS)\monolib_automtn.obj &
-       $(OBJS)\monolib_dataobj.obj &
-       $(OBJS)\monolib_dropsrc.obj &
-       $(OBJS)\monolib_droptgt.obj &
-       $(OBJS)\monolib_oleutils.obj &
-       $(OBJS)\monolib_uuid.obj &

        $(OBJS)\monolib_textctrl.obj &
        $(OBJS)\monolib_textctrl.obj &

+       $(OBJS)\monolib_accel.obj &
+       $(OBJS)\monolib_colrdlgg.obj &
+       $(OBJS)\monolib_dirdlgg.obj &
+       $(OBJS)\monolib_fdrepdlg.obj &
+       $(OBJS)\monolib_filedlgg.obj &
+       $(OBJS)\monolib_fontdlgg.obj &
+       $(OBJS)\monolib_imaglist.obj &
+       $(OBJS)\monolib_listctrl.obj &
+       $(OBJS)\monolib_mdig.obj &
+       $(OBJS)\monolib_msgdlgg.obj &
+       $(OBJS)\monolib_prntdlgg.obj &
+       $(OBJS)\monolib_tabg.obj &

        $(OBJS)\monolib_bmpbuttn.obj &
        $(OBJS)\monolib_button.obj &
        $(OBJS)\monolib_checkbox.obj &
        $(OBJS)\monolib_bmpbuttn.obj &
        $(OBJS)\monolib_button.obj &
        $(OBJS)\monolib_checkbox.obj &


@@ -393,7 +435,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_control.obj &
        $(OBJS)\monolib_dialog.obj &
        $(OBJS)\monolib_framuniv.obj &
        $(OBJS)\monolib_control.obj &
        $(OBJS)\monolib_dialog.obj &
        $(OBJS)\monolib_framuniv.obj &

-       $(OBJS)\monolib_topluniv.obj &

        $(OBJS)\monolib_gauge.obj &
        $(OBJS)\monolib_inpcons.obj &
        $(OBJS)\monolib_inphand.obj &
        $(OBJS)\monolib_gauge.obj &
        $(OBJS)\monolib_inpcons.obj &
        $(OBJS)\monolib_inphand.obj &


@@ -413,58 +454,15 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_statline.obj &
        $(OBJS)\monolib_stattext.obj &
        $(OBJS)\monolib_statusbr.obj &
        $(OBJS)\monolib_statline.obj &
        $(OBJS)\monolib_stattext.obj &
        $(OBJS)\monolib_statusbr.obj &

-       $(OBJS)\monolib_toolbar.obj &

        $(OBJS)\monolib_theme.obj &
        $(OBJS)\monolib_theme.obj &

+       $(OBJS)\monolib_toolbar.obj &
+       $(OBJS)\monolib_topluniv.obj &

        $(OBJS)\monolib_winuniv.obj &
        $(OBJS)\monolib_winuniv.obj &

-       $(OBJS)\monolib_mdig.obj &
-       $(OBJS)\monolib_imaglist.obj &
-       $(OBJS)\monolib_colrdlgg.obj &
-       $(OBJS)\monolib_listctrl.obj &
-       $(OBJS)\monolib_filedlgg.obj &
-       $(OBJS)\monolib_dirdlgg.obj &
-       $(OBJS)\monolib_prntdlgg.obj &
-       $(OBJS)\monolib_accel.obj &
-       $(OBJS)\monolib_msgdlgg.obj &
-       $(OBJS)\monolib_fdrepdlg.obj &
-       $(OBJS)\monolib_fontdlgg.obj &
-       $(OBJS)\monolib_tabg.obj &

        $(OBJS)\monolib_gtk.obj &
        $(OBJS)\monolib_gtk.obj &

-       $(OBJS)\monolib_win32.obj &

        $(OBJS)\monolib_metal.obj &
        $(OBJS)\monolib_metal.obj &

-       $(OBJS)\monolib_busyinfo.obj &
-       $(OBJS)\monolib_calctrl.obj &
-       $(OBJS)\monolib_choicdgg.obj &
-       $(OBJS)\monolib_dcbuffer.obj &
-       $(OBJS)\monolib_dcpsg.obj &
-       $(OBJS)\monolib_dirctrlg.obj &
-       $(OBJS)\monolib_dragimgg.obj &
-       $(OBJS)\monolib_grid.obj &
-       $(OBJS)\monolib_gridctrl.obj &
-       $(OBJS)\monolib_gridsel.obj &
-       $(OBJS)\monolib_helpext.obj &
-       $(OBJS)\monolib_laywin.obj &
-       $(OBJS)\monolib_logg.obj &
-       $(OBJS)\monolib_numdlgg.obj &
-       $(OBJS)\monolib_panelg.obj &
-       $(OBJS)\monolib_progdlgg.obj &
-       $(OBJS)\monolib_renderg.obj &
-       $(OBJS)\monolib_sashwin.obj &
-       $(OBJS)\monolib_scrlwing.obj &
-       $(OBJS)\monolib_selstore.obj &
-       $(OBJS)\monolib_spinctlg.obj &
-       $(OBJS)\monolib_splash.obj &
-       $(OBJS)\monolib_splitter.obj &
-       $(OBJS)\monolib_tbarsmpl.obj &
-       $(OBJS)\monolib_textdlgg.obj &
-       $(OBJS)\monolib_tipdlg.obj &
-       $(OBJS)\monolib_tipwin.obj &
-       $(OBJS)\monolib_treectlg.obj &
-       $(OBJS)\monolib_vlbox.obj &
-       $(OBJS)\monolib_vscroll.obj &
-       $(OBJS)\monolib_wizard.obj &
-       $(OBJS)\monolib_appcmn.obj &
-       $(OBJS)\monolib_fontmap.obj &
+       $(OBJS)\monolib_win32.obj &

        $(OBJS)\monolib_accesscmn.obj &
        $(OBJS)\monolib_accesscmn.obj &

+       $(OBJS)\monolib_appcmn.obj &

        $(OBJS)\monolib_artprov.obj &
        $(OBJS)\monolib_artstd.obj &
        $(OBJS)\monolib_bmpbase.obj &
        $(OBJS)\monolib_artprov.obj &
        $(OBJS)\monolib_artstd.obj &
        $(OBJS)\monolib_bmpbase.obj &


@@ -490,9 +488,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_fddlgcmn.obj &
        $(OBJS)\monolib_fldlgcmn.obj &
        $(OBJS)\monolib_fontcmn.obj &
        $(OBJS)\monolib_fddlgcmn.obj &
        $(OBJS)\monolib_fldlgcmn.obj &
        $(OBJS)\monolib_fontcmn.obj &

+       $(OBJS)\monolib_fontmap.obj &

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

-       $(OBJS)\monolib_timercmn.obj &
-       $(OBJS)\monolib_toplvcmn.obj &

        $(OBJS)\monolib_gaugecmn.obj &
        $(OBJS)\monolib_gdicmn.obj &
        $(OBJS)\monolib_geometry.obj &
        $(OBJS)\monolib_gaugecmn.obj &
        $(OBJS)\monolib_gdicmn.obj &
        $(OBJS)\monolib_geometry.obj &


@@ -502,6 +499,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_imagall.obj &
        $(OBJS)\monolib_imagbmp.obj &
        $(OBJS)\monolib_image.obj &
        $(OBJS)\monolib_imagall.obj &
        $(OBJS)\monolib_imagbmp.obj &
        $(OBJS)\monolib_image.obj &

+       $(OBJS)\monolib_imagfill.obj &

        $(OBJS)\monolib_imaggif.obj &
        $(OBJS)\monolib_imagiff.obj &
        $(OBJS)\monolib_imagjpeg.obj &
        $(OBJS)\monolib_imaggif.obj &
        $(OBJS)\monolib_imagiff.obj &
        $(OBJS)\monolib_imagjpeg.obj &


@@ -510,7 +508,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_imagpnm.obj &
        $(OBJS)\monolib_imagtiff.obj &
        $(OBJS)\monolib_imagxpm.obj &
        $(OBJS)\monolib_imagpnm.obj &
        $(OBJS)\monolib_imagtiff.obj &
        $(OBJS)\monolib_imagxpm.obj &

-       $(OBJS)\monolib_imagfill.obj &

        $(OBJS)\monolib_layout.obj &
        $(OBJS)\monolib_lboxcmn.obj &
        $(OBJS)\monolib_matrix.obj &
        $(OBJS)\monolib_layout.obj &
        $(OBJS)\monolib_lboxcmn.obj &
        $(OBJS)\monolib_matrix.obj &


@@ -528,18 +525,52 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_statbar.obj &
        $(OBJS)\monolib_tbarbase.obj &
        $(OBJS)\monolib_textcmn.obj &
        $(OBJS)\monolib_statbar.obj &
        $(OBJS)\monolib_tbarbase.obj &
        $(OBJS)\monolib_textcmn.obj &

+       $(OBJS)\monolib_timercmn.obj &
+       $(OBJS)\monolib_toplvcmn.obj &

        $(OBJS)\monolib_treebase.obj &
        $(OBJS)\monolib_valgen.obj &
        $(OBJS)\monolib_validate.obj &
        $(OBJS)\monolib_valtext.obj &
        $(OBJS)\monolib_wincmn.obj &
        $(OBJS)\monolib_treebase.obj &
        $(OBJS)\monolib_valgen.obj &
        $(OBJS)\monolib_validate.obj &
        $(OBJS)\monolib_valtext.obj &
        $(OBJS)\monolib_wincmn.obj &

-       $(OBJS)\monolib_xpmdecod.obj
+       $(OBJS)\monolib_xpmdecod.obj &
+       $(OBJS)\monolib_busyinfo.obj &
+       $(OBJS)\monolib_calctrl.obj &
+       $(OBJS)\monolib_choicdgg.obj &
+       $(OBJS)\monolib_dcbuffer.obj &
+       $(OBJS)\monolib_dcpsg.obj &
+       $(OBJS)\monolib_dirctrlg.obj &
+       $(OBJS)\monolib_dragimgg.obj &
+       $(OBJS)\monolib_grid.obj &
+       $(OBJS)\monolib_gridctrl.obj &
+       $(OBJS)\monolib_gridsel.obj &
+       $(OBJS)\monolib_helpext.obj &
+       $(OBJS)\monolib_laywin.obj &
+       $(OBJS)\monolib_logg.obj &
+       $(OBJS)\monolib_numdlgg.obj &
+       $(OBJS)\monolib_panelg.obj &
+       $(OBJS)\monolib_progdlgg.obj &
+       $(OBJS)\monolib_renderg.obj &
+       $(OBJS)\monolib_sashwin.obj &
+       $(OBJS)\monolib_scrlwing.obj &
+       $(OBJS)\monolib_selstore.obj &
+       $(OBJS)\monolib_spinctlg.obj &
+       $(OBJS)\monolib_splash.obj &
+       $(OBJS)\monolib_splitter.obj &
+       $(OBJS)\monolib_tbarsmpl.obj &
+       $(OBJS)\monolib_textdlgg.obj &
+       $(OBJS)\monolib_tipdlg.obj &
+       $(OBJS)\monolib_tipwin.obj &
+       $(OBJS)\monolib_treectlg.obj &
+       $(OBJS)\monolib_vlbox.obj &
+       $(OBJS)\monolib_vscroll.obj &
+       $(OBJS)\monolib_wizard.obj

 !endif
 !endif
 ____CORE_SRC_FILENAMES_2_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 !endif
 !endif
 ____CORE_SRC_FILENAMES_2_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_2_OBJECTS =  &

+       $(OBJS)\coredll_taskbarcmn.obj &

        $(OBJS)\coredll_app.obj &
        $(OBJS)\coredll_bitmap.obj &
        $(OBJS)\coredll_brush.obj &
        $(OBJS)\coredll_app.obj &
        $(OBJS)\coredll_bitmap.obj &
        $(OBJS)\coredll_brush.obj &


@@ -569,12 +600,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_icon.obj &
        $(OBJS)\coredll_joystick.obj &
        $(OBJS)\coredll_minifram.obj &
        $(OBJS)\coredll_icon.obj &
        $(OBJS)\coredll_joystick.obj &
        $(OBJS)\coredll_minifram.obj &

+       $(OBJS)\coredll_automtn.obj &
+       $(OBJS)\coredll_dataobj.obj &
+       $(OBJS)\coredll_dropsrc.obj &
+       $(OBJS)\coredll_droptgt.obj &
+       $(OBJS)\coredll_oleutils.obj &
+       $(OBJS)\coredll_uuid.obj &

        $(OBJS)\coredll_palette.obj &
        $(OBJS)\coredll_pen.obj &
        $(OBJS)\coredll_popupwin.obj &
        $(OBJS)\coredll_region.obj &
        $(OBJS)\coredll_settings.obj &
        $(OBJS)\coredll_palette.obj &
        $(OBJS)\coredll_pen.obj &
        $(OBJS)\coredll_popupwin.obj &
        $(OBJS)\coredll_region.obj &
        $(OBJS)\coredll_settings.obj &

-       $(OBJS)\coredll_taskbarcmn.obj &

        $(OBJS)\coredll_taskbar.obj &
        $(OBJS)\coredll_timer.obj &
        $(OBJS)\coredll_tooltip.obj &
        $(OBJS)\coredll_taskbar.obj &
        $(OBJS)\coredll_timer.obj &
        $(OBJS)\coredll_tooltip.obj &


@@ -582,15 +618,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_utilsgui.obj &
        $(OBJS)\coredll_wave.obj &
        $(OBJS)\coredll_window.obj &
        $(OBJS)\coredll_utilsgui.obj &
        $(OBJS)\coredll_wave.obj &
        $(OBJS)\coredll_window.obj &

-       $(OBJS)\coredll_automtn.obj &
-       $(OBJS)\coredll_dataobj.obj &
-       $(OBJS)\coredll_dropsrc.obj &
-       $(OBJS)\coredll_droptgt.obj &
-       $(OBJS)\coredll_oleutils.obj &
-       $(OBJS)\coredll_uuid.obj &

        $(OBJS)\coredll_statusbr.obj &
        $(OBJS)\coredll_statusbr.obj &

-       $(OBJS)\coredll_uxtheme.obj &
-       $(OBJS)\coredll_access.obj &

        $(OBJS)\coredll_accel.obj &
        $(OBJS)\coredll_bmpbuttn.obj &
        $(OBJS)\coredll_button.obj &
        $(OBJS)\coredll_accel.obj &
        $(OBJS)\coredll_bmpbuttn.obj &
        $(OBJS)\coredll_button.obj &


@@ -618,6 +646,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_msgdlg.obj &
        $(OBJS)\coredll_nativdlg.obj &
        $(OBJS)\coredll_notebook.obj &
        $(OBJS)\coredll_msgdlg.obj &
        $(OBJS)\coredll_nativdlg.obj &
        $(OBJS)\coredll_notebook.obj &

+       $(OBJS)\coredll_access.obj &

        $(OBJS)\coredll_ownerdrw.obj &
        $(OBJS)\coredll_penwin.obj &
        $(OBJS)\coredll_printdlg.obj &
        $(OBJS)\coredll_ownerdrw.obj &
        $(OBJS)\coredll_penwin.obj &
        $(OBJS)\coredll_printdlg.obj &


@@ -639,40 +668,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_textctrl.obj &
        $(OBJS)\coredll_tglbtn.obj &
        $(OBJS)\coredll_treectrl.obj &
        $(OBJS)\coredll_textctrl.obj &
        $(OBJS)\coredll_tglbtn.obj &
        $(OBJS)\coredll_treectrl.obj &

-       $(OBJS)\coredll_busyinfo.obj &
-       $(OBJS)\coredll_calctrl.obj &
-       $(OBJS)\coredll_choicdgg.obj &
-       $(OBJS)\coredll_dcbuffer.obj &
-       $(OBJS)\coredll_dcpsg.obj &
-       $(OBJS)\coredll_dirctrlg.obj &
-       $(OBJS)\coredll_dragimgg.obj &
-       $(OBJS)\coredll_grid.obj &
-       $(OBJS)\coredll_gridctrl.obj &
-       $(OBJS)\coredll_gridsel.obj &
-       $(OBJS)\coredll_helpext.obj &
-       $(OBJS)\coredll_laywin.obj &
-       $(OBJS)\coredll_logg.obj &
-       $(OBJS)\coredll_numdlgg.obj &
-       $(OBJS)\coredll_panelg.obj &
-       $(OBJS)\coredll_progdlgg.obj &
-       $(OBJS)\coredll_renderg.obj &
-       $(OBJS)\coredll_sashwin.obj &
-       $(OBJS)\coredll_scrlwing.obj &
-       $(OBJS)\coredll_selstore.obj &
-       $(OBJS)\coredll_spinctlg.obj &
-       $(OBJS)\coredll_splash.obj &
-       $(OBJS)\coredll_splitter.obj &
-       $(OBJS)\coredll_tbarsmpl.obj &
-       $(OBJS)\coredll_textdlgg.obj &
-       $(OBJS)\coredll_tipdlg.obj &
-       $(OBJS)\coredll_tipwin.obj &
-       $(OBJS)\coredll_treectlg.obj &
-       $(OBJS)\coredll_vlbox.obj &
-       $(OBJS)\coredll_vscroll.obj &
-       $(OBJS)\coredll_wizard.obj &
-       $(OBJS)\coredll_appcmn.obj &
-       $(OBJS)\coredll_fontmap.obj &
+       $(OBJS)\coredll_uxtheme.obj &

        $(OBJS)\coredll_accesscmn.obj &
        $(OBJS)\coredll_accesscmn.obj &

+       $(OBJS)\coredll_appcmn.obj &

        $(OBJS)\coredll_artprov.obj &
        $(OBJS)\coredll_artstd.obj &
        $(OBJS)\coredll_bmpbase.obj &
        $(OBJS)\coredll_artprov.obj &
        $(OBJS)\coredll_artstd.obj &
        $(OBJS)\coredll_bmpbase.obj &


@@ -698,9 +696,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_fddlgcmn.obj &
        $(OBJS)\coredll_fldlgcmn.obj &
        $(OBJS)\coredll_fontcmn.obj &
        $(OBJS)\coredll_fddlgcmn.obj &
        $(OBJS)\coredll_fldlgcmn.obj &
        $(OBJS)\coredll_fontcmn.obj &

+       $(OBJS)\coredll_fontmap.obj &

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

-       $(OBJS)\coredll_timercmn.obj &
-       $(OBJS)\coredll_toplvcmn.obj &

        $(OBJS)\coredll_gaugecmn.obj &
        $(OBJS)\coredll_gdicmn.obj &
        $(OBJS)\coredll_geometry.obj &
        $(OBJS)\coredll_gaugecmn.obj &
        $(OBJS)\coredll_gdicmn.obj &
        $(OBJS)\coredll_geometry.obj &


@@ -710,6 +707,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_imagall.obj &
        $(OBJS)\coredll_imagbmp.obj &
        $(OBJS)\coredll_image.obj &
        $(OBJS)\coredll_imagall.obj &
        $(OBJS)\coredll_imagbmp.obj &
        $(OBJS)\coredll_image.obj &

+       $(OBJS)\coredll_imagfill.obj &

        $(OBJS)\coredll_imaggif.obj &
        $(OBJS)\coredll_imagiff.obj &
        $(OBJS)\coredll_imagjpeg.obj &
        $(OBJS)\coredll_imaggif.obj &
        $(OBJS)\coredll_imagiff.obj &
        $(OBJS)\coredll_imagjpeg.obj &


@@ -718,7 +716,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_imagpnm.obj &
        $(OBJS)\coredll_imagtiff.obj &
        $(OBJS)\coredll_imagxpm.obj &
        $(OBJS)\coredll_imagpnm.obj &
        $(OBJS)\coredll_imagtiff.obj &
        $(OBJS)\coredll_imagxpm.obj &

-       $(OBJS)\coredll_imagfill.obj &

        $(OBJS)\coredll_layout.obj &
        $(OBJS)\coredll_lboxcmn.obj &
        $(OBJS)\coredll_matrix.obj &
        $(OBJS)\coredll_layout.obj &
        $(OBJS)\coredll_lboxcmn.obj &
        $(OBJS)\coredll_matrix.obj &


@@ -736,17 +733,51 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_statbar.obj &
        $(OBJS)\coredll_tbarbase.obj &
        $(OBJS)\coredll_textcmn.obj &
        $(OBJS)\coredll_statbar.obj &
        $(OBJS)\coredll_tbarbase.obj &
        $(OBJS)\coredll_textcmn.obj &

+       $(OBJS)\coredll_timercmn.obj &
+       $(OBJS)\coredll_toplvcmn.obj &

        $(OBJS)\coredll_treebase.obj &
        $(OBJS)\coredll_valgen.obj &
        $(OBJS)\coredll_validate.obj &
        $(OBJS)\coredll_valtext.obj &
        $(OBJS)\coredll_wincmn.obj &
        $(OBJS)\coredll_treebase.obj &
        $(OBJS)\coredll_valgen.obj &
        $(OBJS)\coredll_validate.obj &
        $(OBJS)\coredll_valtext.obj &
        $(OBJS)\coredll_wincmn.obj &

-       $(OBJS)\coredll_xpmdecod.obj
+       $(OBJS)\coredll_xpmdecod.obj &
+       $(OBJS)\coredll_busyinfo.obj &
+       $(OBJS)\coredll_calctrl.obj &
+       $(OBJS)\coredll_choicdgg.obj &
+       $(OBJS)\coredll_dcbuffer.obj &
+       $(OBJS)\coredll_dcpsg.obj &
+       $(OBJS)\coredll_dirctrlg.obj &
+       $(OBJS)\coredll_dragimgg.obj &
+       $(OBJS)\coredll_grid.obj &
+       $(OBJS)\coredll_gridctrl.obj &
+       $(OBJS)\coredll_gridsel.obj &
+       $(OBJS)\coredll_helpext.obj &
+       $(OBJS)\coredll_laywin.obj &
+       $(OBJS)\coredll_logg.obj &
+       $(OBJS)\coredll_numdlgg.obj &
+       $(OBJS)\coredll_panelg.obj &
+       $(OBJS)\coredll_progdlgg.obj &
+       $(OBJS)\coredll_renderg.obj &
+       $(OBJS)\coredll_sashwin.obj &
+       $(OBJS)\coredll_scrlwing.obj &
+       $(OBJS)\coredll_selstore.obj &
+       $(OBJS)\coredll_spinctlg.obj &
+       $(OBJS)\coredll_splash.obj &
+       $(OBJS)\coredll_splitter.obj &
+       $(OBJS)\coredll_tbarsmpl.obj &
+       $(OBJS)\coredll_textdlgg.obj &
+       $(OBJS)\coredll_tipdlg.obj &
+       $(OBJS)\coredll_tipwin.obj &
+       $(OBJS)\coredll_treectlg.obj &
+       $(OBJS)\coredll_vlbox.obj &
+       $(OBJS)\coredll_vscroll.obj &
+       $(OBJS)\coredll_wizard.obj

 !endif
 !endif
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 !endif
 !endif
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_2_OBJECTS =  &

+       $(OBJS)\coredll_taskbarcmn.obj &

        $(OBJS)\coredll_app.obj &
        $(OBJS)\coredll_bitmap.obj &
        $(OBJS)\coredll_brush.obj &
        $(OBJS)\coredll_app.obj &
        $(OBJS)\coredll_bitmap.obj &
        $(OBJS)\coredll_brush.obj &


@@ -776,12 +807,17 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_icon.obj &
        $(OBJS)\coredll_joystick.obj &
        $(OBJS)\coredll_minifram.obj &
        $(OBJS)\coredll_icon.obj &
        $(OBJS)\coredll_joystick.obj &
        $(OBJS)\coredll_minifram.obj &

+       $(OBJS)\coredll_automtn.obj &
+       $(OBJS)\coredll_dataobj.obj &
+       $(OBJS)\coredll_dropsrc.obj &
+       $(OBJS)\coredll_droptgt.obj &
+       $(OBJS)\coredll_oleutils.obj &
+       $(OBJS)\coredll_uuid.obj &

        $(OBJS)\coredll_palette.obj &
        $(OBJS)\coredll_pen.obj &
        $(OBJS)\coredll_popupwin.obj &
        $(OBJS)\coredll_region.obj &
        $(OBJS)\coredll_settings.obj &
        $(OBJS)\coredll_palette.obj &
        $(OBJS)\coredll_pen.obj &
        $(OBJS)\coredll_popupwin.obj &
        $(OBJS)\coredll_region.obj &
        $(OBJS)\coredll_settings.obj &

-       $(OBJS)\coredll_taskbarcmn.obj &

        $(OBJS)\coredll_taskbar.obj &
        $(OBJS)\coredll_timer.obj &
        $(OBJS)\coredll_tooltip.obj &
        $(OBJS)\coredll_taskbar.obj &
        $(OBJS)\coredll_timer.obj &
        $(OBJS)\coredll_tooltip.obj &


@@ -789,13 +825,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_utilsgui.obj &
        $(OBJS)\coredll_wave.obj &
        $(OBJS)\coredll_window.obj &
        $(OBJS)\coredll_utilsgui.obj &
        $(OBJS)\coredll_wave.obj &
        $(OBJS)\coredll_window.obj &

-       $(OBJS)\coredll_automtn.obj &
-       $(OBJS)\coredll_dataobj.obj &
-       $(OBJS)\coredll_dropsrc.obj &
-       $(OBJS)\coredll_droptgt.obj &
-       $(OBJS)\coredll_oleutils.obj &
-       $(OBJS)\coredll_uuid.obj &

        $(OBJS)\coredll_textctrl.obj &
        $(OBJS)\coredll_textctrl.obj &

+       $(OBJS)\coredll_accel.obj &
+       $(OBJS)\coredll_colrdlgg.obj &
+       $(OBJS)\coredll_dirdlgg.obj &
+       $(OBJS)\coredll_fdrepdlg.obj &
+       $(OBJS)\coredll_filedlgg.obj &
+       $(OBJS)\coredll_fontdlgg.obj &
+       $(OBJS)\coredll_imaglist.obj &
+       $(OBJS)\coredll_listctrl.obj &
+       $(OBJS)\coredll_mdig.obj &
+       $(OBJS)\coredll_msgdlgg.obj &
+       $(OBJS)\coredll_prntdlgg.obj &
+       $(OBJS)\coredll_tabg.obj &

        $(OBJS)\coredll_bmpbuttn.obj &
        $(OBJS)\coredll_button.obj &
        $(OBJS)\coredll_checkbox.obj &
        $(OBJS)\coredll_bmpbuttn.obj &
        $(OBJS)\coredll_button.obj &
        $(OBJS)\coredll_checkbox.obj &


@@ -806,7 +848,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_control.obj &
        $(OBJS)\coredll_dialog.obj &
        $(OBJS)\coredll_framuniv.obj &
        $(OBJS)\coredll_control.obj &
        $(OBJS)\coredll_dialog.obj &
        $(OBJS)\coredll_framuniv.obj &

-       $(OBJS)\coredll_topluniv.obj &

        $(OBJS)\coredll_gauge.obj &
        $(OBJS)\coredll_inpcons.obj &
        $(OBJS)\coredll_inphand.obj &
        $(OBJS)\coredll_gauge.obj &
        $(OBJS)\coredll_inpcons.obj &
        $(OBJS)\coredll_inphand.obj &


@@ -826,58 +867,15 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_statline.obj &
        $(OBJS)\coredll_stattext.obj &
        $(OBJS)\coredll_statusbr.obj &
        $(OBJS)\coredll_statline.obj &
        $(OBJS)\coredll_stattext.obj &
        $(OBJS)\coredll_statusbr.obj &

-       $(OBJS)\coredll_toolbar.obj &

        $(OBJS)\coredll_theme.obj &
        $(OBJS)\coredll_theme.obj &

+       $(OBJS)\coredll_toolbar.obj &
+       $(OBJS)\coredll_topluniv.obj &

        $(OBJS)\coredll_winuniv.obj &
        $(OBJS)\coredll_winuniv.obj &

-       $(OBJS)\coredll_mdig.obj &
-       $(OBJS)\coredll_imaglist.obj &
-       $(OBJS)\coredll_colrdlgg.obj &
-       $(OBJS)\coredll_listctrl.obj &
-       $(OBJS)\coredll_filedlgg.obj &
-       $(OBJS)\coredll_dirdlgg.obj &
-       $(OBJS)\coredll_prntdlgg.obj &
-       $(OBJS)\coredll_accel.obj &
-       $(OBJS)\coredll_msgdlgg.obj &
-       $(OBJS)\coredll_fdrepdlg.obj &
-       $(OBJS)\coredll_fontdlgg.obj &
-       $(OBJS)\coredll_tabg.obj &

        $(OBJS)\coredll_gtk.obj &
        $(OBJS)\coredll_gtk.obj &

-       $(OBJS)\coredll_win32.obj &

        $(OBJS)\coredll_metal.obj &
        $(OBJS)\coredll_metal.obj &

-       $(OBJS)\coredll_busyinfo.obj &
-       $(OBJS)\coredll_calctrl.obj &
-       $(OBJS)\coredll_choicdgg.obj &
-       $(OBJS)\coredll_dcbuffer.obj &
-       $(OBJS)\coredll_dcpsg.obj &
-       $(OBJS)\coredll_dirctrlg.obj &
-       $(OBJS)\coredll_dragimgg.obj &
-       $(OBJS)\coredll_grid.obj &
-       $(OBJS)\coredll_gridctrl.obj &
-       $(OBJS)\coredll_gridsel.obj &
-       $(OBJS)\coredll_helpext.obj &
-       $(OBJS)\coredll_laywin.obj &
-       $(OBJS)\coredll_logg.obj &
-       $(OBJS)\coredll_numdlgg.obj &
-       $(OBJS)\coredll_panelg.obj &
-       $(OBJS)\coredll_progdlgg.obj &
-       $(OBJS)\coredll_renderg.obj &
-       $(OBJS)\coredll_sashwin.obj &
-       $(OBJS)\coredll_scrlwing.obj &
-       $(OBJS)\coredll_selstore.obj &
-       $(OBJS)\coredll_spinctlg.obj &
-       $(OBJS)\coredll_splash.obj &
-       $(OBJS)\coredll_splitter.obj &
-       $(OBJS)\coredll_tbarsmpl.obj &
-       $(OBJS)\coredll_textdlgg.obj &
-       $(OBJS)\coredll_tipdlg.obj &
-       $(OBJS)\coredll_tipwin.obj &
-       $(OBJS)\coredll_treectlg.obj &
-       $(OBJS)\coredll_vlbox.obj &
-       $(OBJS)\coredll_vscroll.obj &
-       $(OBJS)\coredll_wizard.obj &
-       $(OBJS)\coredll_appcmn.obj &
-       $(OBJS)\coredll_fontmap.obj &
+       $(OBJS)\coredll_win32.obj &

        $(OBJS)\coredll_accesscmn.obj &
        $(OBJS)\coredll_accesscmn.obj &

+       $(OBJS)\coredll_appcmn.obj &

        $(OBJS)\coredll_artprov.obj &
        $(OBJS)\coredll_artstd.obj &
        $(OBJS)\coredll_bmpbase.obj &
        $(OBJS)\coredll_artprov.obj &
        $(OBJS)\coredll_artstd.obj &
        $(OBJS)\coredll_bmpbase.obj &


@@ -903,9 +901,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_fddlgcmn.obj &
        $(OBJS)\coredll_fldlgcmn.obj &
        $(OBJS)\coredll_fontcmn.obj &
        $(OBJS)\coredll_fddlgcmn.obj &
        $(OBJS)\coredll_fldlgcmn.obj &
        $(OBJS)\coredll_fontcmn.obj &

+       $(OBJS)\coredll_fontmap.obj &

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

-       $(OBJS)\coredll_timercmn.obj &
-       $(OBJS)\coredll_toplvcmn.obj &

        $(OBJS)\coredll_gaugecmn.obj &
        $(OBJS)\coredll_gdicmn.obj &
        $(OBJS)\coredll_geometry.obj &
        $(OBJS)\coredll_gaugecmn.obj &
        $(OBJS)\coredll_gdicmn.obj &
        $(OBJS)\coredll_geometry.obj &


@@ -915,6 +912,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_imagall.obj &
        $(OBJS)\coredll_imagbmp.obj &
        $(OBJS)\coredll_image.obj &
        $(OBJS)\coredll_imagall.obj &
        $(OBJS)\coredll_imagbmp.obj &
        $(OBJS)\coredll_image.obj &

+       $(OBJS)\coredll_imagfill.obj &

        $(OBJS)\coredll_imaggif.obj &
        $(OBJS)\coredll_imagiff.obj &
        $(OBJS)\coredll_imagjpeg.obj &
        $(OBJS)\coredll_imaggif.obj &
        $(OBJS)\coredll_imagiff.obj &
        $(OBJS)\coredll_imagjpeg.obj &


@@ -923,7 +921,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_imagpnm.obj &
        $(OBJS)\coredll_imagtiff.obj &
        $(OBJS)\coredll_imagxpm.obj &
        $(OBJS)\coredll_imagpnm.obj &
        $(OBJS)\coredll_imagtiff.obj &
        $(OBJS)\coredll_imagxpm.obj &

-       $(OBJS)\coredll_imagfill.obj &

        $(OBJS)\coredll_layout.obj &
        $(OBJS)\coredll_lboxcmn.obj &
        $(OBJS)\coredll_matrix.obj &
        $(OBJS)\coredll_layout.obj &
        $(OBJS)\coredll_lboxcmn.obj &
        $(OBJS)\coredll_matrix.obj &


@@ -941,18 +938,52 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_statbar.obj &
        $(OBJS)\coredll_tbarbase.obj &
        $(OBJS)\coredll_textcmn.obj &
        $(OBJS)\coredll_statbar.obj &
        $(OBJS)\coredll_tbarbase.obj &
        $(OBJS)\coredll_textcmn.obj &

+       $(OBJS)\coredll_timercmn.obj &
+       $(OBJS)\coredll_toplvcmn.obj &

        $(OBJS)\coredll_treebase.obj &
        $(OBJS)\coredll_valgen.obj &
        $(OBJS)\coredll_validate.obj &
        $(OBJS)\coredll_valtext.obj &
        $(OBJS)\coredll_wincmn.obj &
        $(OBJS)\coredll_treebase.obj &
        $(OBJS)\coredll_valgen.obj &
        $(OBJS)\coredll_validate.obj &
        $(OBJS)\coredll_valtext.obj &
        $(OBJS)\coredll_wincmn.obj &

-       $(OBJS)\coredll_xpmdecod.obj
+       $(OBJS)\coredll_xpmdecod.obj &
+       $(OBJS)\coredll_busyinfo.obj &
+       $(OBJS)\coredll_calctrl.obj &
+       $(OBJS)\coredll_choicdgg.obj &
+       $(OBJS)\coredll_dcbuffer.obj &
+       $(OBJS)\coredll_dcpsg.obj &
+       $(OBJS)\coredll_dirctrlg.obj &
+       $(OBJS)\coredll_dragimgg.obj &
+       $(OBJS)\coredll_grid.obj &
+       $(OBJS)\coredll_gridctrl.obj &
+       $(OBJS)\coredll_gridsel.obj &
+       $(OBJS)\coredll_helpext.obj &
+       $(OBJS)\coredll_laywin.obj &
+       $(OBJS)\coredll_logg.obj &
+       $(OBJS)\coredll_numdlgg.obj &
+       $(OBJS)\coredll_panelg.obj &
+       $(OBJS)\coredll_progdlgg.obj &
+       $(OBJS)\coredll_renderg.obj &
+       $(OBJS)\coredll_sashwin.obj &
+       $(OBJS)\coredll_scrlwing.obj &
+       $(OBJS)\coredll_selstore.obj &
+       $(OBJS)\coredll_spinctlg.obj &
+       $(OBJS)\coredll_splash.obj &
+       $(OBJS)\coredll_splitter.obj &
+       $(OBJS)\coredll_tbarsmpl.obj &
+       $(OBJS)\coredll_textdlgg.obj &
+       $(OBJS)\coredll_tipdlg.obj &
+       $(OBJS)\coredll_tipwin.obj &
+       $(OBJS)\coredll_treectlg.obj &
+       $(OBJS)\coredll_vlbox.obj &
+       $(OBJS)\coredll_vscroll.obj &
+       $(OBJS)\coredll_wizard.obj

 !endif
 !endif
 ____CORE_SRC_FILENAMES_3_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 !endif
 !endif
 ____CORE_SRC_FILENAMES_3_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_3_OBJECTS =  &

+       $(OBJS)\corelib_taskbarcmn.obj &

        $(OBJS)\corelib_app.obj &
        $(OBJS)\corelib_bitmap.obj &
        $(OBJS)\corelib_brush.obj &
        $(OBJS)\corelib_app.obj &
        $(OBJS)\corelib_bitmap.obj &
        $(OBJS)\corelib_brush.obj &


@@ -982,12 +1013,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_icon.obj &
        $(OBJS)\corelib_joystick.obj &
        $(OBJS)\corelib_minifram.obj &
        $(OBJS)\corelib_icon.obj &
        $(OBJS)\corelib_joystick.obj &
        $(OBJS)\corelib_minifram.obj &

+       $(OBJS)\corelib_automtn.obj &
+       $(OBJS)\corelib_dataobj.obj &
+       $(OBJS)\corelib_dropsrc.obj &
+       $(OBJS)\corelib_droptgt.obj &
+       $(OBJS)\corelib_oleutils.obj &
+       $(OBJS)\corelib_uuid.obj &

        $(OBJS)\corelib_palette.obj &
        $(OBJS)\corelib_pen.obj &
        $(OBJS)\corelib_popupwin.obj &
        $(OBJS)\corelib_region.obj &
        $(OBJS)\corelib_settings.obj &
        $(OBJS)\corelib_palette.obj &
        $(OBJS)\corelib_pen.obj &
        $(OBJS)\corelib_popupwin.obj &
        $(OBJS)\corelib_region.obj &
        $(OBJS)\corelib_settings.obj &

-       $(OBJS)\corelib_taskbarcmn.obj &

        $(OBJS)\corelib_taskbar.obj &
        $(OBJS)\corelib_timer.obj &
        $(OBJS)\corelib_tooltip.obj &
        $(OBJS)\corelib_taskbar.obj &
        $(OBJS)\corelib_timer.obj &
        $(OBJS)\corelib_tooltip.obj &


@@ -995,15 +1031,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_utilsgui.obj &
        $(OBJS)\corelib_wave.obj &
        $(OBJS)\corelib_window.obj &
        $(OBJS)\corelib_utilsgui.obj &
        $(OBJS)\corelib_wave.obj &
        $(OBJS)\corelib_window.obj &

-       $(OBJS)\corelib_automtn.obj &
-       $(OBJS)\corelib_dataobj.obj &
-       $(OBJS)\corelib_dropsrc.obj &
-       $(OBJS)\corelib_droptgt.obj &
-       $(OBJS)\corelib_oleutils.obj &
-       $(OBJS)\corelib_uuid.obj &

        $(OBJS)\corelib_statusbr.obj &
        $(OBJS)\corelib_statusbr.obj &

-       $(OBJS)\corelib_uxtheme.obj &
-       $(OBJS)\corelib_access.obj &

        $(OBJS)\corelib_accel.obj &
        $(OBJS)\corelib_bmpbuttn.obj &
        $(OBJS)\corelib_button.obj &
        $(OBJS)\corelib_accel.obj &
        $(OBJS)\corelib_bmpbuttn.obj &
        $(OBJS)\corelib_button.obj &


@@ -1031,6 +1059,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_msgdlg.obj &
        $(OBJS)\corelib_nativdlg.obj &
        $(OBJS)\corelib_notebook.obj &
        $(OBJS)\corelib_msgdlg.obj &
        $(OBJS)\corelib_nativdlg.obj &
        $(OBJS)\corelib_notebook.obj &

+       $(OBJS)\corelib_access.obj &

        $(OBJS)\corelib_ownerdrw.obj &
        $(OBJS)\corelib_penwin.obj &
        $(OBJS)\corelib_printdlg.obj &
        $(OBJS)\corelib_ownerdrw.obj &
        $(OBJS)\corelib_penwin.obj &
        $(OBJS)\corelib_printdlg.obj &


@@ -1052,40 +1081,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_textctrl.obj &
        $(OBJS)\corelib_tglbtn.obj &
        $(OBJS)\corelib_treectrl.obj &
        $(OBJS)\corelib_textctrl.obj &
        $(OBJS)\corelib_tglbtn.obj &
        $(OBJS)\corelib_treectrl.obj &

-       $(OBJS)\corelib_busyinfo.obj &
-       $(OBJS)\corelib_calctrl.obj &
-       $(OBJS)\corelib_choicdgg.obj &
-       $(OBJS)\corelib_dcbuffer.obj &
-       $(OBJS)\corelib_dcpsg.obj &
-       $(OBJS)\corelib_dirctrlg.obj &
-       $(OBJS)\corelib_dragimgg.obj &
-       $(OBJS)\corelib_grid.obj &
-       $(OBJS)\corelib_gridctrl.obj &
-       $(OBJS)\corelib_gridsel.obj &
-       $(OBJS)\corelib_helpext.obj &
-       $(OBJS)\corelib_laywin.obj &
-       $(OBJS)\corelib_logg.obj &
-       $(OBJS)\corelib_numdlgg.obj &
-       $(OBJS)\corelib_panelg.obj &
-       $(OBJS)\corelib_progdlgg.obj &
-       $(OBJS)\corelib_renderg.obj &
-       $(OBJS)\corelib_sashwin.obj &
-       $(OBJS)\corelib_scrlwing.obj &
-       $(OBJS)\corelib_selstore.obj &
-       $(OBJS)\corelib_spinctlg.obj &
-       $(OBJS)\corelib_splash.obj &
-       $(OBJS)\corelib_splitter.obj &
-       $(OBJS)\corelib_tbarsmpl.obj &
-       $(OBJS)\corelib_textdlgg.obj &
-       $(OBJS)\corelib_tipdlg.obj &
-       $(OBJS)\corelib_tipwin.obj &
-       $(OBJS)\corelib_treectlg.obj &
-       $(OBJS)\corelib_vlbox.obj &
-       $(OBJS)\corelib_vscroll.obj &
-       $(OBJS)\corelib_wizard.obj &
-       $(OBJS)\corelib_appcmn.obj &
-       $(OBJS)\corelib_fontmap.obj &
+       $(OBJS)\corelib_uxtheme.obj &

        $(OBJS)\corelib_accesscmn.obj &
        $(OBJS)\corelib_accesscmn.obj &

+       $(OBJS)\corelib_appcmn.obj &

        $(OBJS)\corelib_artprov.obj &
        $(OBJS)\corelib_artstd.obj &
        $(OBJS)\corelib_bmpbase.obj &
        $(OBJS)\corelib_artprov.obj &
        $(OBJS)\corelib_artstd.obj &
        $(OBJS)\corelib_bmpbase.obj &


@@ -1111,9 +1109,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_fddlgcmn.obj &
        $(OBJS)\corelib_fldlgcmn.obj &
        $(OBJS)\corelib_fontcmn.obj &
        $(OBJS)\corelib_fddlgcmn.obj &
        $(OBJS)\corelib_fldlgcmn.obj &
        $(OBJS)\corelib_fontcmn.obj &

+       $(OBJS)\corelib_fontmap.obj &

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

-       $(OBJS)\corelib_timercmn.obj &
-       $(OBJS)\corelib_toplvcmn.obj &

        $(OBJS)\corelib_gaugecmn.obj &
        $(OBJS)\corelib_gdicmn.obj &
        $(OBJS)\corelib_geometry.obj &
        $(OBJS)\corelib_gaugecmn.obj &
        $(OBJS)\corelib_gdicmn.obj &
        $(OBJS)\corelib_geometry.obj &


@@ -1123,6 +1120,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_imagall.obj &
        $(OBJS)\corelib_imagbmp.obj &
        $(OBJS)\corelib_image.obj &
        $(OBJS)\corelib_imagall.obj &
        $(OBJS)\corelib_imagbmp.obj &
        $(OBJS)\corelib_image.obj &

+       $(OBJS)\corelib_imagfill.obj &

        $(OBJS)\corelib_imaggif.obj &
        $(OBJS)\corelib_imagiff.obj &
        $(OBJS)\corelib_imagjpeg.obj &
        $(OBJS)\corelib_imaggif.obj &
        $(OBJS)\corelib_imagiff.obj &
        $(OBJS)\corelib_imagjpeg.obj &


@@ -1131,7 +1129,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_imagpnm.obj &
        $(OBJS)\corelib_imagtiff.obj &
        $(OBJS)\corelib_imagxpm.obj &
        $(OBJS)\corelib_imagpnm.obj &
        $(OBJS)\corelib_imagtiff.obj &
        $(OBJS)\corelib_imagxpm.obj &

-       $(OBJS)\corelib_imagfill.obj &

        $(OBJS)\corelib_layout.obj &
        $(OBJS)\corelib_lboxcmn.obj &
        $(OBJS)\corelib_matrix.obj &
        $(OBJS)\corelib_layout.obj &
        $(OBJS)\corelib_lboxcmn.obj &
        $(OBJS)\corelib_matrix.obj &


@@ -1149,17 +1146,51 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_statbar.obj &
        $(OBJS)\corelib_tbarbase.obj &
        $(OBJS)\corelib_textcmn.obj &
        $(OBJS)\corelib_statbar.obj &
        $(OBJS)\corelib_tbarbase.obj &
        $(OBJS)\corelib_textcmn.obj &

+       $(OBJS)\corelib_timercmn.obj &
+       $(OBJS)\corelib_toplvcmn.obj &

        $(OBJS)\corelib_treebase.obj &
        $(OBJS)\corelib_valgen.obj &
        $(OBJS)\corelib_validate.obj &
        $(OBJS)\corelib_valtext.obj &
        $(OBJS)\corelib_wincmn.obj &
        $(OBJS)\corelib_treebase.obj &
        $(OBJS)\corelib_valgen.obj &
        $(OBJS)\corelib_validate.obj &
        $(OBJS)\corelib_valtext.obj &
        $(OBJS)\corelib_wincmn.obj &

-       $(OBJS)\corelib_xpmdecod.obj
+       $(OBJS)\corelib_xpmdecod.obj &
+       $(OBJS)\corelib_busyinfo.obj &
+       $(OBJS)\corelib_calctrl.obj &
+       $(OBJS)\corelib_choicdgg.obj &
+       $(OBJS)\corelib_dcbuffer.obj &
+       $(OBJS)\corelib_dcpsg.obj &
+       $(OBJS)\corelib_dirctrlg.obj &
+       $(OBJS)\corelib_dragimgg.obj &
+       $(OBJS)\corelib_grid.obj &
+       $(OBJS)\corelib_gridctrl.obj &
+       $(OBJS)\corelib_gridsel.obj &
+       $(OBJS)\corelib_helpext.obj &
+       $(OBJS)\corelib_laywin.obj &
+       $(OBJS)\corelib_logg.obj &
+       $(OBJS)\corelib_numdlgg.obj &
+       $(OBJS)\corelib_panelg.obj &
+       $(OBJS)\corelib_progdlgg.obj &
+       $(OBJS)\corelib_renderg.obj &
+       $(OBJS)\corelib_sashwin.obj &
+       $(OBJS)\corelib_scrlwing.obj &
+       $(OBJS)\corelib_selstore.obj &
+       $(OBJS)\corelib_spinctlg.obj &
+       $(OBJS)\corelib_splash.obj &
+       $(OBJS)\corelib_splitter.obj &
+       $(OBJS)\corelib_tbarsmpl.obj &
+       $(OBJS)\corelib_textdlgg.obj &
+       $(OBJS)\corelib_tipdlg.obj &
+       $(OBJS)\corelib_tipwin.obj &
+       $(OBJS)\corelib_treectlg.obj &
+       $(OBJS)\corelib_vlbox.obj &
+       $(OBJS)\corelib_vscroll.obj &
+       $(OBJS)\corelib_wizard.obj

 !endif
 !endif
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 !endif
 !endif
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_3_OBJECTS =  &

+       $(OBJS)\corelib_taskbarcmn.obj &

        $(OBJS)\corelib_app.obj &
        $(OBJS)\corelib_bitmap.obj &
        $(OBJS)\corelib_brush.obj &
        $(OBJS)\corelib_app.obj &
        $(OBJS)\corelib_bitmap.obj &
        $(OBJS)\corelib_brush.obj &


@@ -1189,12 +1220,17 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_icon.obj &
        $(OBJS)\corelib_joystick.obj &
        $(OBJS)\corelib_minifram.obj &
        $(OBJS)\corelib_icon.obj &
        $(OBJS)\corelib_joystick.obj &
        $(OBJS)\corelib_minifram.obj &

+       $(OBJS)\corelib_automtn.obj &
+       $(OBJS)\corelib_dataobj.obj &
+       $(OBJS)\corelib_dropsrc.obj &
+       $(OBJS)\corelib_droptgt.obj &
+       $(OBJS)\corelib_oleutils.obj &
+       $(OBJS)\corelib_uuid.obj &

        $(OBJS)\corelib_palette.obj &
        $(OBJS)\corelib_pen.obj &
        $(OBJS)\corelib_popupwin.obj &
        $(OBJS)\corelib_region.obj &
        $(OBJS)\corelib_settings.obj &
        $(OBJS)\corelib_palette.obj &
        $(OBJS)\corelib_pen.obj &
        $(OBJS)\corelib_popupwin.obj &
        $(OBJS)\corelib_region.obj &
        $(OBJS)\corelib_settings.obj &

-       $(OBJS)\corelib_taskbarcmn.obj &

        $(OBJS)\corelib_taskbar.obj &
        $(OBJS)\corelib_timer.obj &
        $(OBJS)\corelib_tooltip.obj &
        $(OBJS)\corelib_taskbar.obj &
        $(OBJS)\corelib_timer.obj &
        $(OBJS)\corelib_tooltip.obj &


@@ -1202,13 +1238,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_utilsgui.obj &
        $(OBJS)\corelib_wave.obj &
        $(OBJS)\corelib_window.obj &
        $(OBJS)\corelib_utilsgui.obj &
        $(OBJS)\corelib_wave.obj &
        $(OBJS)\corelib_window.obj &

-       $(OBJS)\corelib_automtn.obj &
-       $(OBJS)\corelib_dataobj.obj &
-       $(OBJS)\corelib_dropsrc.obj &
-       $(OBJS)\corelib_droptgt.obj &
-       $(OBJS)\corelib_oleutils.obj &
-       $(OBJS)\corelib_uuid.obj &

        $(OBJS)\corelib_textctrl.obj &
        $(OBJS)\corelib_textctrl.obj &

+       $(OBJS)\corelib_accel.obj &
+       $(OBJS)\corelib_colrdlgg.obj &
+       $(OBJS)\corelib_dirdlgg.obj &
+       $(OBJS)\corelib_fdrepdlg.obj &
+       $(OBJS)\corelib_filedlgg.obj &
+       $(OBJS)\corelib_fontdlgg.obj &
+       $(OBJS)\corelib_imaglist.obj &
+       $(OBJS)\corelib_listctrl.obj &
+       $(OBJS)\corelib_mdig.obj &
+       $(OBJS)\corelib_msgdlgg.obj &
+       $(OBJS)\corelib_prntdlgg.obj &
+       $(OBJS)\corelib_tabg.obj &

        $(OBJS)\corelib_bmpbuttn.obj &
        $(OBJS)\corelib_button.obj &
        $(OBJS)\corelib_checkbox.obj &
        $(OBJS)\corelib_bmpbuttn.obj &
        $(OBJS)\corelib_button.obj &
        $(OBJS)\corelib_checkbox.obj &


@@ -1219,7 +1261,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_control.obj &
        $(OBJS)\corelib_dialog.obj &
        $(OBJS)\corelib_framuniv.obj &
        $(OBJS)\corelib_control.obj &
        $(OBJS)\corelib_dialog.obj &
        $(OBJS)\corelib_framuniv.obj &

-       $(OBJS)\corelib_topluniv.obj &

        $(OBJS)\corelib_gauge.obj &
        $(OBJS)\corelib_inpcons.obj &
        $(OBJS)\corelib_inphand.obj &
        $(OBJS)\corelib_gauge.obj &
        $(OBJS)\corelib_inpcons.obj &
        $(OBJS)\corelib_inphand.obj &


@@ -1239,58 +1280,15 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_statline.obj &
        $(OBJS)\corelib_stattext.obj &
        $(OBJS)\corelib_statusbr.obj &
        $(OBJS)\corelib_statline.obj &
        $(OBJS)\corelib_stattext.obj &
        $(OBJS)\corelib_statusbr.obj &

-       $(OBJS)\corelib_toolbar.obj &

        $(OBJS)\corelib_theme.obj &
        $(OBJS)\corelib_theme.obj &

+       $(OBJS)\corelib_toolbar.obj &
+       $(OBJS)\corelib_topluniv.obj &

        $(OBJS)\corelib_winuniv.obj &
        $(OBJS)\corelib_winuniv.obj &

-       $(OBJS)\corelib_mdig.obj &
-       $(OBJS)\corelib_imaglist.obj &
-       $(OBJS)\corelib_colrdlgg.obj &
-       $(OBJS)\corelib_listctrl.obj &
-       $(OBJS)\corelib_filedlgg.obj &
-       $(OBJS)\corelib_dirdlgg.obj &
-       $(OBJS)\corelib_prntdlgg.obj &
-       $(OBJS)\corelib_accel.obj &
-       $(OBJS)\corelib_msgdlgg.obj &
-       $(OBJS)\corelib_fdrepdlg.obj &
-       $(OBJS)\corelib_fontdlgg.obj &
-       $(OBJS)\corelib_tabg.obj &

        $(OBJS)\corelib_gtk.obj &
        $(OBJS)\corelib_gtk.obj &

-       $(OBJS)\corelib_win32.obj &

        $(OBJS)\corelib_metal.obj &
        $(OBJS)\corelib_metal.obj &

-       $(OBJS)\corelib_busyinfo.obj &
-       $(OBJS)\corelib_calctrl.obj &
-       $(OBJS)\corelib_choicdgg.obj &
-       $(OBJS)\corelib_dcbuffer.obj &
-       $(OBJS)\corelib_dcpsg.obj &
-       $(OBJS)\corelib_dirctrlg.obj &
-       $(OBJS)\corelib_dragimgg.obj &
-       $(OBJS)\corelib_grid.obj &
-       $(OBJS)\corelib_gridctrl.obj &
-       $(OBJS)\corelib_gridsel.obj &
-       $(OBJS)\corelib_helpext.obj &
-       $(OBJS)\corelib_laywin.obj &
-       $(OBJS)\corelib_logg.obj &
-       $(OBJS)\corelib_numdlgg.obj &
-       $(OBJS)\corelib_panelg.obj &
-       $(OBJS)\corelib_progdlgg.obj &
-       $(OBJS)\corelib_renderg.obj &
-       $(OBJS)\corelib_sashwin.obj &
-       $(OBJS)\corelib_scrlwing.obj &
-       $(OBJS)\corelib_selstore.obj &
-       $(OBJS)\corelib_spinctlg.obj &
-       $(OBJS)\corelib_splash.obj &
-       $(OBJS)\corelib_splitter.obj &
-       $(OBJS)\corelib_tbarsmpl.obj &
-       $(OBJS)\corelib_textdlgg.obj &
-       $(OBJS)\corelib_tipdlg.obj &
-       $(OBJS)\corelib_tipwin.obj &
-       $(OBJS)\corelib_treectlg.obj &
-       $(OBJS)\corelib_vlbox.obj &
-       $(OBJS)\corelib_vscroll.obj &
-       $(OBJS)\corelib_wizard.obj &
-       $(OBJS)\corelib_appcmn.obj &
-       $(OBJS)\corelib_fontmap.obj &
+       $(OBJS)\corelib_win32.obj &

        $(OBJS)\corelib_accesscmn.obj &
        $(OBJS)\corelib_accesscmn.obj &

+       $(OBJS)\corelib_appcmn.obj &

        $(OBJS)\corelib_artprov.obj &
        $(OBJS)\corelib_artstd.obj &
        $(OBJS)\corelib_bmpbase.obj &
        $(OBJS)\corelib_artprov.obj &
        $(OBJS)\corelib_artstd.obj &
        $(OBJS)\corelib_bmpbase.obj &


@@ -1316,9 +1314,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_fddlgcmn.obj &
        $(OBJS)\corelib_fldlgcmn.obj &
        $(OBJS)\corelib_fontcmn.obj &
        $(OBJS)\corelib_fddlgcmn.obj &
        $(OBJS)\corelib_fldlgcmn.obj &
        $(OBJS)\corelib_fontcmn.obj &

+       $(OBJS)\corelib_fontmap.obj &

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

-       $(OBJS)\corelib_timercmn.obj &
-       $(OBJS)\corelib_toplvcmn.obj &

        $(OBJS)\corelib_gaugecmn.obj &
        $(OBJS)\corelib_gdicmn.obj &
        $(OBJS)\corelib_geometry.obj &
        $(OBJS)\corelib_gaugecmn.obj &
        $(OBJS)\corelib_gdicmn.obj &
        $(OBJS)\corelib_geometry.obj &


@@ -1328,6 +1325,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_imagall.obj &
        $(OBJS)\corelib_imagbmp.obj &
        $(OBJS)\corelib_image.obj &
        $(OBJS)\corelib_imagall.obj &
        $(OBJS)\corelib_imagbmp.obj &
        $(OBJS)\corelib_image.obj &

+       $(OBJS)\corelib_imagfill.obj &

        $(OBJS)\corelib_imaggif.obj &
        $(OBJS)\corelib_imagiff.obj &
        $(OBJS)\corelib_imagjpeg.obj &
        $(OBJS)\corelib_imaggif.obj &
        $(OBJS)\corelib_imagiff.obj &
        $(OBJS)\corelib_imagjpeg.obj &


@@ -1336,7 +1334,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_imagpnm.obj &
        $(OBJS)\corelib_imagtiff.obj &
        $(OBJS)\corelib_imagxpm.obj &
        $(OBJS)\corelib_imagpnm.obj &
        $(OBJS)\corelib_imagtiff.obj &
        $(OBJS)\corelib_imagxpm.obj &

-       $(OBJS)\corelib_imagfill.obj &

        $(OBJS)\corelib_layout.obj &
        $(OBJS)\corelib_lboxcmn.obj &
        $(OBJS)\corelib_matrix.obj &
        $(OBJS)\corelib_layout.obj &
        $(OBJS)\corelib_lboxcmn.obj &
        $(OBJS)\corelib_matrix.obj &


@@ -1354,18 +1351,52 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_statbar.obj &
        $(OBJS)\corelib_tbarbase.obj &
        $(OBJS)\corelib_textcmn.obj &
        $(OBJS)\corelib_statbar.obj &
        $(OBJS)\corelib_tbarbase.obj &
        $(OBJS)\corelib_textcmn.obj &

+       $(OBJS)\corelib_timercmn.obj &
+       $(OBJS)\corelib_toplvcmn.obj &

        $(OBJS)\corelib_treebase.obj &
        $(OBJS)\corelib_valgen.obj &
        $(OBJS)\corelib_validate.obj &
        $(OBJS)\corelib_valtext.obj &
        $(OBJS)\corelib_wincmn.obj &
        $(OBJS)\corelib_treebase.obj &
        $(OBJS)\corelib_valgen.obj &
        $(OBJS)\corelib_validate.obj &
        $(OBJS)\corelib_valtext.obj &
        $(OBJS)\corelib_wincmn.obj &

-       $(OBJS)\corelib_xpmdecod.obj
+       $(OBJS)\corelib_xpmdecod.obj &
+       $(OBJS)\corelib_busyinfo.obj &
+       $(OBJS)\corelib_calctrl.obj &
+       $(OBJS)\corelib_choicdgg.obj &
+       $(OBJS)\corelib_dcbuffer.obj &
+       $(OBJS)\corelib_dcpsg.obj &
+       $(OBJS)\corelib_dirctrlg.obj &
+       $(OBJS)\corelib_dragimgg.obj &
+       $(OBJS)\corelib_grid.obj &
+       $(OBJS)\corelib_gridctrl.obj &
+       $(OBJS)\corelib_gridsel.obj &
+       $(OBJS)\corelib_helpext.obj &
+       $(OBJS)\corelib_laywin.obj &
+       $(OBJS)\corelib_logg.obj &
+       $(OBJS)\corelib_numdlgg.obj &
+       $(OBJS)\corelib_panelg.obj &
+       $(OBJS)\corelib_progdlgg.obj &
+       $(OBJS)\corelib_renderg.obj &
+       $(OBJS)\corelib_sashwin.obj &
+       $(OBJS)\corelib_scrlwing.obj &
+       $(OBJS)\corelib_selstore.obj &
+       $(OBJS)\corelib_spinctlg.obj &
+       $(OBJS)\corelib_splash.obj &
+       $(OBJS)\corelib_splitter.obj &
+       $(OBJS)\corelib_tbarsmpl.obj &
+       $(OBJS)\corelib_textdlgg.obj &
+       $(OBJS)\corelib_tipdlg.obj &
+       $(OBJS)\corelib_tipwin.obj &
+       $(OBJS)\corelib_treectlg.obj &
+       $(OBJS)\corelib_vlbox.obj &
+       $(OBJS)\corelib_vscroll.obj &
+       $(OBJS)\corelib_wizard.obj

 !endif
 !endif
 ____CORE_SRC_FILENAMES_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_OBJECTS =  &
 !endif
 !endif
 ____CORE_SRC_FILENAMES_OBJECTS =
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 ____CORE_SRC_FILENAMES_OBJECTS =  &

+       $(OBJS)\monodll_taskbarcmn.obj &

        $(OBJS)\monodll_app.obj &
        $(OBJS)\monodll_bitmap.obj &
        $(OBJS)\monodll_brush.obj &
        $(OBJS)\monodll_app.obj &
        $(OBJS)\monodll_bitmap.obj &
        $(OBJS)\monodll_brush.obj &


@@ -1395,28 +1426,25 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_icon.obj &
        $(OBJS)\monodll_joystick.obj &
        $(OBJS)\monodll_minifram.obj &
        $(OBJS)\monodll_icon.obj &
        $(OBJS)\monodll_joystick.obj &
        $(OBJS)\monodll_minifram.obj &

+       $(OBJS)\monodll_automtn.obj &
+       $(OBJS)\monodll_dataobj.obj &
+       $(OBJS)\monodll_dropsrc.obj &
+       $(OBJS)\monodll_droptgt.obj &
+       $(OBJS)\monodll_oleutils.obj &
+       $(OBJS)\monodll_uuid.obj &

        $(OBJS)\monodll_palette.obj &
        $(OBJS)\monodll_pen.obj &
        $(OBJS)\monodll_popupwin.obj &
        $(OBJS)\monodll_region.obj &
        $(OBJS)\monodll_settings.obj &
        $(OBJS)\monodll_palette.obj &
        $(OBJS)\monodll_pen.obj &
        $(OBJS)\monodll_popupwin.obj &
        $(OBJS)\monodll_region.obj &
        $(OBJS)\monodll_settings.obj &

-       $(OBJS)\monodll_taskbarcmn.obj &

        $(OBJS)\monodll_taskbar.obj &
        $(OBJS)\monodll_timer.obj &
        $(OBJS)\monodll_tooltip.obj &
        $(OBJS)\monodll_taskbar.obj &
        $(OBJS)\monodll_timer.obj &
        $(OBJS)\monodll_tooltip.obj &

-       $(OBJS)\monodll_toplevel.obj &
-       $(OBJS)\monodll_utilsgui.obj &
-       $(OBJS)\monodll_wave.obj &
-       $(OBJS)\monodll_window.obj &
-       $(OBJS)\monodll_automtn.obj &
-       $(OBJS)\monodll_dataobj.obj &
-       $(OBJS)\monodll_dropsrc.obj &
-       $(OBJS)\monodll_droptgt.obj &
-       $(OBJS)\monodll_oleutils.obj &
-       $(OBJS)\monodll_uuid.obj &
+       $(OBJS)\monodll_toplevel.obj &
+       $(OBJS)\monodll_utilsgui.obj &
+       $(OBJS)\monodll_wave.obj &
+       $(OBJS)\monodll_window.obj &

        $(OBJS)\monodll_statusbr.obj &
        $(OBJS)\monodll_statusbr.obj &

-       $(OBJS)\monodll_uxtheme.obj &
-       $(OBJS)\monodll_access.obj &

        $(OBJS)\monodll_accel.obj &
        $(OBJS)\monodll_bmpbuttn.obj &
        $(OBJS)\monodll_button.obj &
        $(OBJS)\monodll_accel.obj &
        $(OBJS)\monodll_bmpbuttn.obj &
        $(OBJS)\monodll_button.obj &


@@ -1444,6 +1472,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_msgdlg.obj &
        $(OBJS)\monodll_nativdlg.obj &
        $(OBJS)\monodll_notebook.obj &
        $(OBJS)\monodll_msgdlg.obj &
        $(OBJS)\monodll_nativdlg.obj &
        $(OBJS)\monodll_notebook.obj &

+       $(OBJS)\monodll_access.obj &

        $(OBJS)\monodll_ownerdrw.obj &
        $(OBJS)\monodll_penwin.obj &
        $(OBJS)\monodll_printdlg.obj &
        $(OBJS)\monodll_ownerdrw.obj &
        $(OBJS)\monodll_penwin.obj &
        $(OBJS)\monodll_printdlg.obj &


@@ -1465,40 +1494,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_textctrl.obj &
        $(OBJS)\monodll_tglbtn.obj &
        $(OBJS)\monodll_treectrl.obj &
        $(OBJS)\monodll_textctrl.obj &
        $(OBJS)\monodll_tglbtn.obj &
        $(OBJS)\monodll_treectrl.obj &

-       $(OBJS)\monodll_busyinfo.obj &
-       $(OBJS)\monodll_calctrl.obj &
-       $(OBJS)\monodll_choicdgg.obj &
-       $(OBJS)\monodll_dcbuffer.obj &
-       $(OBJS)\monodll_dcpsg.obj &
-       $(OBJS)\monodll_dirctrlg.obj &
-       $(OBJS)\monodll_dragimgg.obj &
-       $(OBJS)\monodll_grid.obj &
-       $(OBJS)\monodll_gridctrl.obj &
-       $(OBJS)\monodll_gridsel.obj &
-       $(OBJS)\monodll_helpext.obj &
-       $(OBJS)\monodll_laywin.obj &
-       $(OBJS)\monodll_logg.obj &
-       $(OBJS)\monodll_numdlgg.obj &
-       $(OBJS)\monodll_panelg.obj &
-       $(OBJS)\monodll_progdlgg.obj &
-       $(OBJS)\monodll_renderg.obj &
-       $(OBJS)\monodll_sashwin.obj &
-       $(OBJS)\monodll_scrlwing.obj &
-       $(OBJS)\monodll_selstore.obj &
-       $(OBJS)\monodll_spinctlg.obj &
-       $(OBJS)\monodll_splash.obj &
-       $(OBJS)\monodll_splitter.obj &
-       $(OBJS)\monodll_tbarsmpl.obj &
-       $(OBJS)\monodll_textdlgg.obj &
-       $(OBJS)\monodll_tipdlg.obj &
-       $(OBJS)\monodll_tipwin.obj &
-       $(OBJS)\monodll_treectlg.obj &
-       $(OBJS)\monodll_vlbox.obj &
-       $(OBJS)\monodll_vscroll.obj &
-       $(OBJS)\monodll_wizard.obj &
-       $(OBJS)\monodll_appcmn.obj &
-       $(OBJS)\monodll_fontmap.obj &
+       $(OBJS)\monodll_uxtheme.obj &

        $(OBJS)\monodll_accesscmn.obj &
        $(OBJS)\monodll_accesscmn.obj &

+       $(OBJS)\monodll_appcmn.obj &

        $(OBJS)\monodll_artprov.obj &
        $(OBJS)\monodll_artstd.obj &
        $(OBJS)\monodll_bmpbase.obj &
        $(OBJS)\monodll_artprov.obj &
        $(OBJS)\monodll_artstd.obj &
        $(OBJS)\monodll_bmpbase.obj &


@@ -1524,9 +1522,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_fddlgcmn.obj &
        $(OBJS)\monodll_fldlgcmn.obj &
        $(OBJS)\monodll_fontcmn.obj &
        $(OBJS)\monodll_fddlgcmn.obj &
        $(OBJS)\monodll_fldlgcmn.obj &
        $(OBJS)\monodll_fontcmn.obj &

+       $(OBJS)\monodll_fontmap.obj &

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

-       $(OBJS)\monodll_timercmn.obj &
-       $(OBJS)\monodll_toplvcmn.obj &

        $(OBJS)\monodll_gaugecmn.obj &
        $(OBJS)\monodll_gdicmn.obj &
        $(OBJS)\monodll_geometry.obj &
        $(OBJS)\monodll_gaugecmn.obj &
        $(OBJS)\monodll_gdicmn.obj &
        $(OBJS)\monodll_geometry.obj &


@@ -1536,6 +1533,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_imagall.obj &
        $(OBJS)\monodll_imagbmp.obj &
        $(OBJS)\monodll_image.obj &
        $(OBJS)\monodll_imagall.obj &
        $(OBJS)\monodll_imagbmp.obj &
        $(OBJS)\monodll_image.obj &

+       $(OBJS)\monodll_imagfill.obj &

        $(OBJS)\monodll_imaggif.obj &
        $(OBJS)\monodll_imagiff.obj &
        $(OBJS)\monodll_imagjpeg.obj &
        $(OBJS)\monodll_imaggif.obj &
        $(OBJS)\monodll_imagiff.obj &
        $(OBJS)\monodll_imagjpeg.obj &


@@ -1544,7 +1542,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_imagpnm.obj &
        $(OBJS)\monodll_imagtiff.obj &
        $(OBJS)\monodll_imagxpm.obj &
        $(OBJS)\monodll_imagpnm.obj &
        $(OBJS)\monodll_imagtiff.obj &
        $(OBJS)\monodll_imagxpm.obj &

-       $(OBJS)\monodll_imagfill.obj &

        $(OBJS)\monodll_layout.obj &
        $(OBJS)\monodll_lboxcmn.obj &
        $(OBJS)\monodll_matrix.obj &
        $(OBJS)\monodll_layout.obj &
        $(OBJS)\monodll_lboxcmn.obj &
        $(OBJS)\monodll_matrix.obj &


@@ -1562,17 +1559,51 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_statbar.obj &
        $(OBJS)\monodll_tbarbase.obj &
        $(OBJS)\monodll_textcmn.obj &
        $(OBJS)\monodll_statbar.obj &
        $(OBJS)\monodll_tbarbase.obj &
        $(OBJS)\monodll_textcmn.obj &

+       $(OBJS)\monodll_timercmn.obj &
+       $(OBJS)\monodll_toplvcmn.obj &

        $(OBJS)\monodll_treebase.obj &
        $(OBJS)\monodll_valgen.obj &
        $(OBJS)\monodll_validate.obj &
        $(OBJS)\monodll_valtext.obj &
        $(OBJS)\monodll_wincmn.obj &
        $(OBJS)\monodll_treebase.obj &
        $(OBJS)\monodll_valgen.obj &
        $(OBJS)\monodll_validate.obj &
        $(OBJS)\monodll_valtext.obj &
        $(OBJS)\monodll_wincmn.obj &

-       $(OBJS)\monodll_xpmdecod.obj
+       $(OBJS)\monodll_xpmdecod.obj &
+       $(OBJS)\monodll_busyinfo.obj &
+       $(OBJS)\monodll_calctrl.obj &
+       $(OBJS)\monodll_choicdgg.obj &
+       $(OBJS)\monodll_dcbuffer.obj &
+       $(OBJS)\monodll_dcpsg.obj &
+       $(OBJS)\monodll_dirctrlg.obj &
+       $(OBJS)\monodll_dragimgg.obj &
+       $(OBJS)\monodll_grid.obj &
+       $(OBJS)\monodll_gridctrl.obj &
+       $(OBJS)\monodll_gridsel.obj &
+       $(OBJS)\monodll_helpext.obj &
+       $(OBJS)\monodll_laywin.obj &
+       $(OBJS)\monodll_logg.obj &
+       $(OBJS)\monodll_numdlgg.obj &
+       $(OBJS)\monodll_panelg.obj &
+       $(OBJS)\monodll_progdlgg.obj &
+       $(OBJS)\monodll_renderg.obj &
+       $(OBJS)\monodll_sashwin.obj &
+       $(OBJS)\monodll_scrlwing.obj &
+       $(OBJS)\monodll_selstore.obj &
+       $(OBJS)\monodll_spinctlg.obj &
+       $(OBJS)\monodll_splash.obj &
+       $(OBJS)\monodll_splitter.obj &
+       $(OBJS)\monodll_tbarsmpl.obj &
+       $(OBJS)\monodll_textdlgg.obj &
+       $(OBJS)\monodll_tipdlg.obj &
+       $(OBJS)\monodll_tipwin.obj &
+       $(OBJS)\monodll_treectlg.obj &
+       $(OBJS)\monodll_vlbox.obj &
+       $(OBJS)\monodll_vscroll.obj &
+       $(OBJS)\monodll_wizard.obj

 !endif
 !endif
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_OBJECTS =  &
 !endif
 !endif
 !ifeq USE_GUI 1
 !ifeq WXUNIV 1
 ____CORE_SRC_FILENAMES_OBJECTS =  &

+       $(OBJS)\monodll_taskbarcmn.obj &

        $(OBJS)\monodll_app.obj &
        $(OBJS)\monodll_bitmap.obj &
        $(OBJS)\monodll_brush.obj &
        $(OBJS)\monodll_app.obj &
        $(OBJS)\monodll_bitmap.obj &
        $(OBJS)\monodll_brush.obj &


@@ -1602,12 +1633,17 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_icon.obj &
        $(OBJS)\monodll_joystick.obj &
        $(OBJS)\monodll_minifram.obj &
        $(OBJS)\monodll_icon.obj &
        $(OBJS)\monodll_joystick.obj &
        $(OBJS)\monodll_minifram.obj &

+       $(OBJS)\monodll_automtn.obj &
+       $(OBJS)\monodll_dataobj.obj &
+       $(OBJS)\monodll_dropsrc.obj &
+       $(OBJS)\monodll_droptgt.obj &
+       $(OBJS)\monodll_oleutils.obj &
+       $(OBJS)\monodll_uuid.obj &

        $(OBJS)\monodll_palette.obj &
        $(OBJS)\monodll_pen.obj &
        $(OBJS)\monodll_popupwin.obj &
        $(OBJS)\monodll_region.obj &
        $(OBJS)\monodll_settings.obj &
        $(OBJS)\monodll_palette.obj &
        $(OBJS)\monodll_pen.obj &
        $(OBJS)\monodll_popupwin.obj &
        $(OBJS)\monodll_region.obj &
        $(OBJS)\monodll_settings.obj &

-       $(OBJS)\monodll_taskbarcmn.obj &

        $(OBJS)\monodll_taskbar.obj &
        $(OBJS)\monodll_timer.obj &
        $(OBJS)\monodll_tooltip.obj &
        $(OBJS)\monodll_taskbar.obj &
        $(OBJS)\monodll_timer.obj &
        $(OBJS)\monodll_tooltip.obj &


@@ -1615,13 +1651,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_utilsgui.obj &
        $(OBJS)\monodll_wave.obj &
        $(OBJS)\monodll_window.obj &
        $(OBJS)\monodll_utilsgui.obj &
        $(OBJS)\monodll_wave.obj &
        $(OBJS)\monodll_window.obj &

-       $(OBJS)\monodll_automtn.obj &
-       $(OBJS)\monodll_dataobj.obj &
-       $(OBJS)\monodll_dropsrc.obj &
-       $(OBJS)\monodll_droptgt.obj &
-       $(OBJS)\monodll_oleutils.obj &
-       $(OBJS)\monodll_uuid.obj &

        $(OBJS)\monodll_textctrl.obj &
        $(OBJS)\monodll_textctrl.obj &

+       $(OBJS)\monodll_accel.obj &
+       $(OBJS)\monodll_colrdlgg.obj &
+       $(OBJS)\monodll_dirdlgg.obj &
+       $(OBJS)\monodll_fdrepdlg.obj &
+       $(OBJS)\monodll_filedlgg.obj &
+       $(OBJS)\monodll_fontdlgg.obj &
+       $(OBJS)\monodll_imaglist.obj &
+       $(OBJS)\monodll_listctrl.obj &
+       $(OBJS)\monodll_mdig.obj &
+       $(OBJS)\monodll_msgdlgg.obj &
+       $(OBJS)\monodll_prntdlgg.obj &
+       $(OBJS)\monodll_tabg.obj &

        $(OBJS)\monodll_bmpbuttn.obj &
        $(OBJS)\monodll_button.obj &
        $(OBJS)\monodll_checkbox.obj &
        $(OBJS)\monodll_bmpbuttn.obj &
        $(OBJS)\monodll_button.obj &
        $(OBJS)\monodll_checkbox.obj &


@@ -1632,7 +1674,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_control.obj &
        $(OBJS)\monodll_dialog.obj &
        $(OBJS)\monodll_framuniv.obj &
        $(OBJS)\monodll_control.obj &
        $(OBJS)\monodll_dialog.obj &
        $(OBJS)\monodll_framuniv.obj &

-       $(OBJS)\monodll_topluniv.obj &

        $(OBJS)\monodll_gauge.obj &
        $(OBJS)\monodll_inpcons.obj &
        $(OBJS)\monodll_inphand.obj &
        $(OBJS)\monodll_gauge.obj &
        $(OBJS)\monodll_inpcons.obj &
        $(OBJS)\monodll_inphand.obj &


@@ -1652,58 +1693,15 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_statline.obj &
        $(OBJS)\monodll_stattext.obj &
        $(OBJS)\monodll_statusbr.obj &
        $(OBJS)\monodll_statline.obj &
        $(OBJS)\monodll_stattext.obj &
        $(OBJS)\monodll_statusbr.obj &

-       $(OBJS)\monodll_toolbar.obj &

        $(OBJS)\monodll_theme.obj &
        $(OBJS)\monodll_theme.obj &

+       $(OBJS)\monodll_toolbar.obj &
+       $(OBJS)\monodll_topluniv.obj &

        $(OBJS)\monodll_winuniv.obj &
        $(OBJS)\monodll_winuniv.obj &

-       $(OBJS)\monodll_mdig.obj &
-       $(OBJS)\monodll_imaglist.obj &
-       $(OBJS)\monodll_colrdlgg.obj &
-       $(OBJS)\monodll_listctrl.obj &
-       $(OBJS)\monodll_filedlgg.obj &
-       $(OBJS)\monodll_dirdlgg.obj &
-       $(OBJS)\monodll_prntdlgg.obj &
-       $(OBJS)\monodll_accel.obj &
-       $(OBJS)\monodll_msgdlgg.obj &
-       $(OBJS)\monodll_fdrepdlg.obj &
-       $(OBJS)\monodll_fontdlgg.obj &
-       $(OBJS)\monodll_tabg.obj &

        $(OBJS)\monodll_gtk.obj &
        $(OBJS)\monodll_gtk.obj &

-       $(OBJS)\monodll_win32.obj &

        $(OBJS)\monodll_metal.obj &
        $(OBJS)\monodll_metal.obj &

-       $(OBJS)\monodll_busyinfo.obj &
-       $(OBJS)\monodll_calctrl.obj &
-       $(OBJS)\monodll_choicdgg.obj &
-       $(OBJS)\monodll_dcbuffer.obj &
-       $(OBJS)\monodll_dcpsg.obj &
-       $(OBJS)\monodll_dirctrlg.obj &
-       $(OBJS)\monodll_dragimgg.obj &
-       $(OBJS)\monodll_grid.obj &
-       $(OBJS)\monodll_gridctrl.obj &
-       $(OBJS)\monodll_gridsel.obj &
-       $(OBJS)\monodll_helpext.obj &
-       $(OBJS)\monodll_laywin.obj &
-       $(OBJS)\monodll_logg.obj &
-       $(OBJS)\monodll_numdlgg.obj &
-       $(OBJS)\monodll_panelg.obj &
-       $(OBJS)\monodll_progdlgg.obj &
-       $(OBJS)\monodll_renderg.obj &
-       $(OBJS)\monodll_sashwin.obj &
-       $(OBJS)\monodll_scrlwing.obj &
-       $(OBJS)\monodll_selstore.obj &
-       $(OBJS)\monodll_spinctlg.obj &
-       $(OBJS)\monodll_splash.obj &
-       $(OBJS)\monodll_splitter.obj &
-       $(OBJS)\monodll_tbarsmpl.obj &
-       $(OBJS)\monodll_textdlgg.obj &
-       $(OBJS)\monodll_tipdlg.obj &
-       $(OBJS)\monodll_tipwin.obj &
-       $(OBJS)\monodll_treectlg.obj &
-       $(OBJS)\monodll_vlbox.obj &
-       $(OBJS)\monodll_vscroll.obj &
-       $(OBJS)\monodll_wizard.obj &
-       $(OBJS)\monodll_appcmn.obj &
-       $(OBJS)\monodll_fontmap.obj &
+       $(OBJS)\monodll_win32.obj &

        $(OBJS)\monodll_accesscmn.obj &
        $(OBJS)\monodll_accesscmn.obj &

+       $(OBJS)\monodll_appcmn.obj &

        $(OBJS)\monodll_artprov.obj &
        $(OBJS)\monodll_artstd.obj &
        $(OBJS)\monodll_bmpbase.obj &
        $(OBJS)\monodll_artprov.obj &
        $(OBJS)\monodll_artstd.obj &
        $(OBJS)\monodll_bmpbase.obj &


@@ -1729,9 +1727,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_fddlgcmn.obj &
        $(OBJS)\monodll_fldlgcmn.obj &
        $(OBJS)\monodll_fontcmn.obj &
        $(OBJS)\monodll_fddlgcmn.obj &
        $(OBJS)\monodll_fldlgcmn.obj &
        $(OBJS)\monodll_fontcmn.obj &

+       $(OBJS)\monodll_fontmap.obj &

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

-       $(OBJS)\monodll_timercmn.obj &
-       $(OBJS)\monodll_toplvcmn.obj &

        $(OBJS)\monodll_gaugecmn.obj &
        $(OBJS)\monodll_gdicmn.obj &
        $(OBJS)\monodll_geometry.obj &
        $(OBJS)\monodll_gaugecmn.obj &
        $(OBJS)\monodll_gdicmn.obj &
        $(OBJS)\monodll_geometry.obj &


@@ -1741,6 +1738,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_imagall.obj &
        $(OBJS)\monodll_imagbmp.obj &
        $(OBJS)\monodll_image.obj &
        $(OBJS)\monodll_imagall.obj &
        $(OBJS)\monodll_imagbmp.obj &
        $(OBJS)\monodll_image.obj &

+       $(OBJS)\monodll_imagfill.obj &

        $(OBJS)\monodll_imaggif.obj &
        $(OBJS)\monodll_imagiff.obj &
        $(OBJS)\monodll_imagjpeg.obj &
        $(OBJS)\monodll_imaggif.obj &
        $(OBJS)\monodll_imagiff.obj &
        $(OBJS)\monodll_imagjpeg.obj &


@@ -1749,7 +1747,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_imagpnm.obj &
        $(OBJS)\monodll_imagtiff.obj &
        $(OBJS)\monodll_imagxpm.obj &
        $(OBJS)\monodll_imagpnm.obj &
        $(OBJS)\monodll_imagtiff.obj &
        $(OBJS)\monodll_imagxpm.obj &

-       $(OBJS)\monodll_imagfill.obj &

        $(OBJS)\monodll_layout.obj &
        $(OBJS)\monodll_lboxcmn.obj &
        $(OBJS)\monodll_matrix.obj &
        $(OBJS)\monodll_layout.obj &
        $(OBJS)\monodll_lboxcmn.obj &
        $(OBJS)\monodll_matrix.obj &


@@ -1767,12 +1764,45 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_statbar.obj &
        $(OBJS)\monodll_tbarbase.obj &
        $(OBJS)\monodll_textcmn.obj &
        $(OBJS)\monodll_statbar.obj &
        $(OBJS)\monodll_tbarbase.obj &
        $(OBJS)\monodll_textcmn.obj &

+       $(OBJS)\monodll_timercmn.obj &
+       $(OBJS)\monodll_toplvcmn.obj &

        $(OBJS)\monodll_treebase.obj &
        $(OBJS)\monodll_valgen.obj &
        $(OBJS)\monodll_validate.obj &
        $(OBJS)\monodll_valtext.obj &
        $(OBJS)\monodll_wincmn.obj &
        $(OBJS)\monodll_treebase.obj &
        $(OBJS)\monodll_valgen.obj &
        $(OBJS)\monodll_validate.obj &
        $(OBJS)\monodll_valtext.obj &
        $(OBJS)\monodll_wincmn.obj &

-       $(OBJS)\monodll_xpmdecod.obj
+       $(OBJS)\monodll_xpmdecod.obj &
+       $(OBJS)\monodll_busyinfo.obj &
+       $(OBJS)\monodll_calctrl.obj &
+       $(OBJS)\monodll_choicdgg.obj &
+       $(OBJS)\monodll_dcbuffer.obj &
+       $(OBJS)\monodll_dcpsg.obj &
+       $(OBJS)\monodll_dirctrlg.obj &
+       $(OBJS)\monodll_dragimgg.obj &
+       $(OBJS)\monodll_grid.obj &
+       $(OBJS)\monodll_gridctrl.obj &
+       $(OBJS)\monodll_gridsel.obj &
+       $(OBJS)\monodll_helpext.obj &
+       $(OBJS)\monodll_laywin.obj &
+       $(OBJS)\monodll_logg.obj &
+       $(OBJS)\monodll_numdlgg.obj &
+       $(OBJS)\monodll_panelg.obj &
+       $(OBJS)\monodll_progdlgg.obj &
+       $(OBJS)\monodll_renderg.obj &
+       $(OBJS)\monodll_sashwin.obj &
+       $(OBJS)\monodll_scrlwing.obj &
+       $(OBJS)\monodll_selstore.obj &
+       $(OBJS)\monodll_spinctlg.obj &
+       $(OBJS)\monodll_splash.obj &
+       $(OBJS)\monodll_splitter.obj &
+       $(OBJS)\monodll_tbarsmpl.obj &
+       $(OBJS)\monodll_textdlgg.obj &
+       $(OBJS)\monodll_tipdlg.obj &
+       $(OBJS)\monodll_tipwin.obj &
+       $(OBJS)\monodll_treectlg.obj &
+       $(OBJS)\monodll_vlbox.obj &
+       $(OBJS)\monodll_vscroll.obj &
+       $(OBJS)\monodll_wizard.obj

 !endif
 !endif
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =
 !endif
 !endif
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =


@@ -1780,26 +1810,26 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(____CORE_SRC_FILENAMES_1_OBJECTS) &
        $(OBJS)\monolib_helpbest.obj &
 ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(____CORE_SRC_FILENAMES_1_OBJECTS) &
        $(OBJS)\monolib_helpbest.obj &

+       $(OBJS)\monolib_helpctrl.obj &

        $(OBJS)\monolib_helpdata.obj &
        $(OBJS)\monolib_helpfrm.obj &
        $(OBJS)\monolib_helpdata.obj &
        $(OBJS)\monolib_helpfrm.obj &

-       $(OBJS)\monolib_helpctrl.obj &

        $(OBJS)\monolib_htmlcell.obj &
        $(OBJS)\monolib_htmlfilt.obj &
        $(OBJS)\monolib_htmlpars.obj &
        $(OBJS)\monolib_htmltag.obj &
        $(OBJS)\monolib_htmlwin.obj &
        $(OBJS)\monolib_htmlcell.obj &
        $(OBJS)\monolib_htmlfilt.obj &
        $(OBJS)\monolib_htmlpars.obj &
        $(OBJS)\monolib_htmltag.obj &
        $(OBJS)\monolib_htmlwin.obj &

-       $(OBJS)\monolib_winpars.obj &
+       $(OBJS)\monolib_htmprint.obj &
+       $(OBJS)\monolib_m_dflist.obj &

        $(OBJS)\monolib_m_fonts.obj &
        $(OBJS)\monolib_m_hline.obj &
        $(OBJS)\monolib_m_image.obj &
        $(OBJS)\monolib_m_layout.obj &
        $(OBJS)\monolib_m_links.obj &
        $(OBJS)\monolib_m_list.obj &
        $(OBJS)\monolib_m_fonts.obj &
        $(OBJS)\monolib_m_hline.obj &
        $(OBJS)\monolib_m_image.obj &
        $(OBJS)\monolib_m_layout.obj &
        $(OBJS)\monolib_m_links.obj &
        $(OBJS)\monolib_m_list.obj &

-       $(OBJS)\monolib_m_dflist.obj &

        $(OBJS)\monolib_m_pre.obj &
        $(OBJS)\monolib_m_pre.obj &

-       $(OBJS)\monolib_m_tables.obj &

        $(OBJS)\monolib_m_style.obj &
        $(OBJS)\monolib_m_style.obj &

-       $(OBJS)\monolib_htmprint.obj &
+       $(OBJS)\monolib_m_tables.obj &
+       $(OBJS)\monolib_winpars.obj &

        $(OBJS)\monolib_htmllbox.obj
 !endif
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =
        $(OBJS)\monolib_htmllbox.obj
 !endif
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =


@@ -1807,26 +1837,26 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(____CORE_SRC_FILENAMES_OBJECTS) &
        $(OBJS)\monodll_helpbest.obj &
 ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(____CORE_SRC_FILENAMES_OBJECTS) &
        $(OBJS)\monodll_helpbest.obj &

+       $(OBJS)\monodll_helpctrl.obj &

        $(OBJS)\monodll_helpdata.obj &
        $(OBJS)\monodll_helpfrm.obj &
        $(OBJS)\monodll_helpdata.obj &
        $(OBJS)\monodll_helpfrm.obj &

-       $(OBJS)\monodll_helpctrl.obj &

        $(OBJS)\monodll_htmlcell.obj &
        $(OBJS)\monodll_htmlfilt.obj &
        $(OBJS)\monodll_htmlpars.obj &
        $(OBJS)\monodll_htmltag.obj &
        $(OBJS)\monodll_htmlwin.obj &
        $(OBJS)\monodll_htmlcell.obj &
        $(OBJS)\monodll_htmlfilt.obj &
        $(OBJS)\monodll_htmlpars.obj &
        $(OBJS)\monodll_htmltag.obj &
        $(OBJS)\monodll_htmlwin.obj &

-       $(OBJS)\monodll_winpars.obj &
+       $(OBJS)\monodll_htmprint.obj &
+       $(OBJS)\monodll_m_dflist.obj &

        $(OBJS)\monodll_m_fonts.obj &
        $(OBJS)\monodll_m_hline.obj &
        $(OBJS)\monodll_m_image.obj &
        $(OBJS)\monodll_m_layout.obj &
        $(OBJS)\monodll_m_links.obj &
        $(OBJS)\monodll_m_list.obj &
        $(OBJS)\monodll_m_fonts.obj &
        $(OBJS)\monodll_m_hline.obj &
        $(OBJS)\monodll_m_image.obj &
        $(OBJS)\monodll_m_layout.obj &
        $(OBJS)\monodll_m_links.obj &
        $(OBJS)\monodll_m_list.obj &

-       $(OBJS)\monodll_m_dflist.obj &

        $(OBJS)\monodll_m_pre.obj &
        $(OBJS)\monodll_m_pre.obj &

-       $(OBJS)\monodll_m_tables.obj &

        $(OBJS)\monodll_m_style.obj &
        $(OBJS)\monodll_m_style.obj &

-       $(OBJS)\monodll_htmprint.obj &
+       $(OBJS)\monodll_m_tables.obj &
+       $(OBJS)\monodll_winpars.obj &

        $(OBJS)\monodll_htmllbox.obj
 !endif
 __basedll___depname =
        $(OBJS)\monodll_htmllbox.obj
 !endif
 __basedll___depname =


@@ -1954,13 +1984,13 @@ __xmllib___depname = &
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-BASEDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+BASEDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        -i=..\src\expat\lib -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 -dwxUSE_GUI=0 &
        $(CFLAGS)
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        -i=..\src\expat\lib -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 -dwxUSE_GUI=0 &
        $(CFLAGS)

-BASEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+BASEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2021,6 +2051,7 @@ BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_zipstrm.obj &
        $(OBJS)\basedll_zstream.obj &
        $(OBJS)\basedll_basemsw.obj &
        $(OBJS)\basedll_zipstrm.obj &
        $(OBJS)\basedll_zstream.obj &
        $(OBJS)\basedll_basemsw.obj &

+       $(OBJS)\basedll_crashrpt.obj &

        $(OBJS)\basedll_dde.obj &
        $(OBJS)\basedll_dir.obj &
        $(OBJS)\basedll_mimetype.obj &
        $(OBJS)\basedll_dde.obj &
        $(OBJS)\basedll_dir.obj &
        $(OBJS)\basedll_mimetype.obj &


@@ -2030,7 +2061,6 @@ BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_thread.obj &
        $(OBJS)\basedll_utils.obj &
        $(OBJS)\basedll_utilsexc.obj &
        $(OBJS)\basedll_thread.obj &
        $(OBJS)\basedll_utils.obj &
        $(OBJS)\basedll_utilsexc.obj &

-       $(OBJS)\basedll_crashrpt.obj &

        $(OBJS)\basedll_event.obj &
        $(OBJS)\basedll_fs_mem.obj &
        $(OBJS)\basedll_msgout.obj &
        $(OBJS)\basedll_event.obj &
        $(OBJS)\basedll_fs_mem.obj &
        $(OBJS)\basedll_msgout.obj &


@@ -2038,12 +2068,12 @@ BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_main.obj &
        $(OBJS)\basedll_mslu.obj &
        $(OBJS)\basedll_volume.obj
        $(OBJS)\basedll_main.obj &
        $(OBJS)\basedll_mslu.obj &
        $(OBJS)\basedll_volume.obj

-BASELIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+BASELIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        -i=..\src\expat\lib -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CFLAGS)
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        -i=..\src\expat\lib -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CFLAGS)

-BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2104,6 +2134,7 @@ BASELIB_OBJECTS =  &
        $(OBJS)\baselib_zipstrm.obj &
        $(OBJS)\baselib_zstream.obj &
        $(OBJS)\baselib_basemsw.obj &
        $(OBJS)\baselib_zipstrm.obj &
        $(OBJS)\baselib_zstream.obj &
        $(OBJS)\baselib_basemsw.obj &

+       $(OBJS)\baselib_crashrpt.obj &

        $(OBJS)\baselib_dde.obj &
        $(OBJS)\baselib_dir.obj &
        $(OBJS)\baselib_mimetype.obj &
        $(OBJS)\baselib_dde.obj &
        $(OBJS)\baselib_dir.obj &
        $(OBJS)\baselib_mimetype.obj &


@@ -2113,7 +2144,6 @@ BASELIB_OBJECTS =  &
        $(OBJS)\baselib_thread.obj &
        $(OBJS)\baselib_utils.obj &
        $(OBJS)\baselib_utilsexc.obj &
        $(OBJS)\baselib_thread.obj &
        $(OBJS)\baselib_utils.obj &
        $(OBJS)\baselib_utilsexc.obj &

-       $(OBJS)\baselib_crashrpt.obj &

        $(OBJS)\baselib_event.obj &
        $(OBJS)\baselib_fs_mem.obj &
        $(OBJS)\baselib_msgout.obj &
        $(OBJS)\baselib_event.obj &
        $(OBJS)\baselib_fs_mem.obj &
        $(OBJS)\baselib_msgout.obj &


@@ -2121,7 +2151,7 @@ BASELIB_OBJECTS =  &
        $(OBJS)\baselib_main.obj &
        $(OBJS)\baselib_mslu.obj &
        $(OBJS)\baselib_volume.obj
        $(OBJS)\baselib_main.obj &
        $(OBJS)\baselib_mslu.obj &
        $(OBJS)\baselib_volume.obj

-COREDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+COREDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2137,7 +2167,7 @@ COREDLL_OBJECTS =  &
        $(OBJS)\coredll_mslu.obj &
        $(OBJS)\coredll_volume.obj &
        $(____CORE_SRC_FILENAMES_2_OBJECTS)
        $(OBJS)\coredll_mslu.obj &
        $(OBJS)\coredll_volume.obj &
        $(____CORE_SRC_FILENAMES_2_OBJECTS)

-CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+CORELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2153,7 +2183,7 @@ CORELIB_OBJECTS =  &
        $(OBJS)\corelib_mslu.obj &
        $(OBJS)\corelib_volume.obj &
        $(____CORE_SRC_FILENAMES_3_OBJECTS)
        $(OBJS)\corelib_mslu.obj &
        $(OBJS)\corelib_volume.obj &
        $(____CORE_SRC_FILENAMES_3_OBJECTS)

-GLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+GLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2162,7 +2192,7 @@ GLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 GLDLL_OBJECTS =  &
        $(OBJS)\gldll_dummy.obj &
        $(OBJS)\gldll_glcanvas.obj
 GLDLL_OBJECTS =  &
        $(OBJS)\gldll_dummy.obj &
        $(OBJS)\gldll_glcanvas.obj

-GLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+GLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2170,7 +2200,7 @@ GLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 GLLIB_OBJECTS =  &
        $(OBJS)\gllib_dummy.obj &
        $(OBJS)\gllib_glcanvas.obj
 GLLIB_OBJECTS =  &
        $(OBJS)\gllib_dummy.obj &
        $(OBJS)\gllib_glcanvas.obj

-HTMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+HTMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2179,28 +2209,28 @@ HTMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 HTMLDLL_OBJECTS =  &
        $(OBJS)\htmldll_dummy.obj &
        $(OBJS)\htmldll_helpbest.obj &
 HTMLDLL_OBJECTS =  &
        $(OBJS)\htmldll_dummy.obj &
        $(OBJS)\htmldll_helpbest.obj &

+       $(OBJS)\htmldll_helpctrl.obj &

        $(OBJS)\htmldll_helpdata.obj &
        $(OBJS)\htmldll_helpfrm.obj &
        $(OBJS)\htmldll_helpdata.obj &
        $(OBJS)\htmldll_helpfrm.obj &

-       $(OBJS)\htmldll_helpctrl.obj &

        $(OBJS)\htmldll_htmlcell.obj &
        $(OBJS)\htmldll_htmlfilt.obj &
        $(OBJS)\htmldll_htmlpars.obj &
        $(OBJS)\htmldll_htmltag.obj &
        $(OBJS)\htmldll_htmlwin.obj &
        $(OBJS)\htmldll_htmlcell.obj &
        $(OBJS)\htmldll_htmlfilt.obj &
        $(OBJS)\htmldll_htmlpars.obj &
        $(OBJS)\htmldll_htmltag.obj &
        $(OBJS)\htmldll_htmlwin.obj &

-       $(OBJS)\htmldll_winpars.obj &
+       $(OBJS)\htmldll_htmprint.obj &
+       $(OBJS)\htmldll_m_dflist.obj &

        $(OBJS)\htmldll_m_fonts.obj &
        $(OBJS)\htmldll_m_hline.obj &
        $(OBJS)\htmldll_m_image.obj &
        $(OBJS)\htmldll_m_layout.obj &
        $(OBJS)\htmldll_m_links.obj &
        $(OBJS)\htmldll_m_list.obj &
        $(OBJS)\htmldll_m_fonts.obj &
        $(OBJS)\htmldll_m_hline.obj &
        $(OBJS)\htmldll_m_image.obj &
        $(OBJS)\htmldll_m_layout.obj &
        $(OBJS)\htmldll_m_links.obj &
        $(OBJS)\htmldll_m_list.obj &

-       $(OBJS)\htmldll_m_dflist.obj &

        $(OBJS)\htmldll_m_pre.obj &
        $(OBJS)\htmldll_m_pre.obj &

-       $(OBJS)\htmldll_m_tables.obj &

        $(OBJS)\htmldll_m_style.obj &
        $(OBJS)\htmldll_m_style.obj &

-       $(OBJS)\htmldll_htmprint.obj &
+       $(OBJS)\htmldll_m_tables.obj &
+       $(OBJS)\htmldll_winpars.obj &

        $(OBJS)\htmldll_htmllbox.obj
        $(OBJS)\htmldll_htmllbox.obj

-HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2208,35 +2238,35 @@ HTMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 HTMLLIB_OBJECTS =  &
        $(OBJS)\htmllib_dummy.obj &
        $(OBJS)\htmllib_helpbest.obj &
 HTMLLIB_OBJECTS =  &
        $(OBJS)\htmllib_dummy.obj &
        $(OBJS)\htmllib_helpbest.obj &

+       $(OBJS)\htmllib_helpctrl.obj &

        $(OBJS)\htmllib_helpdata.obj &
        $(OBJS)\htmllib_helpfrm.obj &
        $(OBJS)\htmllib_helpdata.obj &
        $(OBJS)\htmllib_helpfrm.obj &

-       $(OBJS)\htmllib_helpctrl.obj &

        $(OBJS)\htmllib_htmlcell.obj &
        $(OBJS)\htmllib_htmlfilt.obj &
        $(OBJS)\htmllib_htmlpars.obj &
        $(OBJS)\htmllib_htmltag.obj &
        $(OBJS)\htmllib_htmlwin.obj &
        $(OBJS)\htmllib_htmlcell.obj &
        $(OBJS)\htmllib_htmlfilt.obj &
        $(OBJS)\htmllib_htmlpars.obj &
        $(OBJS)\htmllib_htmltag.obj &
        $(OBJS)\htmllib_htmlwin.obj &

-       $(OBJS)\htmllib_winpars.obj &
+       $(OBJS)\htmllib_htmprint.obj &
+       $(OBJS)\htmllib_m_dflist.obj &

        $(OBJS)\htmllib_m_fonts.obj &
        $(OBJS)\htmllib_m_hline.obj &
        $(OBJS)\htmllib_m_image.obj &
        $(OBJS)\htmllib_m_layout.obj &
        $(OBJS)\htmllib_m_links.obj &
        $(OBJS)\htmllib_m_list.obj &
        $(OBJS)\htmllib_m_fonts.obj &
        $(OBJS)\htmllib_m_hline.obj &
        $(OBJS)\htmllib_m_image.obj &
        $(OBJS)\htmllib_m_layout.obj &
        $(OBJS)\htmllib_m_links.obj &
        $(OBJS)\htmllib_m_list.obj &

-       $(OBJS)\htmllib_m_dflist.obj &

        $(OBJS)\htmllib_m_pre.obj &
        $(OBJS)\htmllib_m_pre.obj &

-       $(OBJS)\htmllib_m_tables.obj &

        $(OBJS)\htmllib_m_style.obj &
        $(OBJS)\htmllib_m_style.obj &

-       $(OBJS)\htmllib_htmprint.obj &
+       $(OBJS)\htmllib_m_tables.obj &
+       $(OBJS)\htmllib_winpars.obj &

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

-MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        -i=..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL $(CFLAGS)
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        -i=..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL $(CFLAGS)

-MONODLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+MONODLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2297,6 +2327,7 @@ MONODLL_OBJECTS =  &
        $(OBJS)\monodll_zipstrm.obj &
        $(OBJS)\monodll_zstream.obj &
        $(OBJS)\monodll_basemsw.obj &
        $(OBJS)\monodll_zipstrm.obj &
        $(OBJS)\monodll_zstream.obj &
        $(OBJS)\monodll_basemsw.obj &

+       $(OBJS)\monodll_crashrpt.obj &

        $(OBJS)\monodll_dde.obj &
        $(OBJS)\monodll_dir.obj &
        $(OBJS)\monodll_mimetype.obj &
        $(OBJS)\monodll_dde.obj &
        $(OBJS)\monodll_dir.obj &
        $(OBJS)\monodll_mimetype.obj &


@@ -2306,7 +2337,6 @@ MONODLL_OBJECTS =  &
        $(OBJS)\monodll_thread.obj &
        $(OBJS)\monodll_utils.obj &
        $(OBJS)\monodll_utilsexc.obj &
        $(OBJS)\monodll_thread.obj &
        $(OBJS)\monodll_utils.obj &
        $(OBJS)\monodll_utilsexc.obj &

-       $(OBJS)\monodll_crashrpt.obj &

        $(OBJS)\monodll_event.obj &
        $(OBJS)\monodll_fs_mem.obj &
        $(OBJS)\monodll_msgout.obj &
        $(OBJS)\monodll_event.obj &
        $(OBJS)\monodll_fs_mem.obj &
        $(OBJS)\monodll_msgout.obj &


@@ -2318,22 +2348,22 @@ MONODLL_OBJECTS =  &
        $(OBJS)\monodll_ftp.obj &
        $(OBJS)\monodll_http.obj &
        $(OBJS)\monodll_protocol.obj &
        $(OBJS)\monodll_ftp.obj &
        $(OBJS)\monodll_http.obj &
        $(OBJS)\monodll_protocol.obj &

-       $(OBJS)\monodll_url.obj &
-       $(OBJS)\monodll_sckfile.obj &

        $(OBJS)\monodll_sckaddr.obj &
        $(OBJS)\monodll_sckaddr.obj &

+       $(OBJS)\monodll_sckfile.obj &

        $(OBJS)\monodll_sckipc.obj &
        $(OBJS)\monodll_sckstrm.obj &
        $(OBJS)\monodll_socket.obj &
        $(OBJS)\monodll_sckipc.obj &
        $(OBJS)\monodll_sckstrm.obj &
        $(OBJS)\monodll_socket.obj &

+       $(OBJS)\monodll_url.obj &

        $(OBJS)\monodll_gsocket.obj &
        $(OBJS)\monodll_gsockmsw.obj &
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) &
        $(OBJS)\monodll_xml.obj
        $(OBJS)\monodll_gsocket.obj &
        $(OBJS)\monodll_gsockmsw.obj &
        $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) &
        $(OBJS)\monodll_xml.obj

-MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+MONOLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        -i=..\src\expat\lib -dwxUSE_BASE=1 $(CFLAGS)
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        -i=..\src\expat\lib -dwxUSE_BASE=1 $(CFLAGS)

-MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+MONOLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2394,6 +2424,7 @@ MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_zipstrm.obj &
        $(OBJS)\monolib_zstream.obj &
        $(OBJS)\monolib_basemsw.obj &
        $(OBJS)\monolib_zipstrm.obj &
        $(OBJS)\monolib_zstream.obj &
        $(OBJS)\monolib_basemsw.obj &

+       $(OBJS)\monolib_crashrpt.obj &

        $(OBJS)\monolib_dde.obj &
        $(OBJS)\monolib_dir.obj &
        $(OBJS)\monolib_mimetype.obj &
        $(OBJS)\monolib_dde.obj &
        $(OBJS)\monolib_dir.obj &
        $(OBJS)\monolib_mimetype.obj &


@@ -2403,7 +2434,6 @@ MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_thread.obj &
        $(OBJS)\monolib_utils.obj &
        $(OBJS)\monolib_utilsexc.obj &
        $(OBJS)\monolib_thread.obj &
        $(OBJS)\monolib_utils.obj &
        $(OBJS)\monolib_utilsexc.obj &

-       $(OBJS)\monolib_crashrpt.obj &

        $(OBJS)\monolib_event.obj &
        $(OBJS)\monolib_fs_mem.obj &
        $(OBJS)\monolib_msgout.obj &
        $(OBJS)\monolib_event.obj &
        $(OBJS)\monolib_fs_mem.obj &
        $(OBJS)\monolib_msgout.obj &


@@ -2415,22 +2445,22 @@ MONOLIB_OBJECTS =  &
        $(OBJS)\monolib_ftp.obj &
        $(OBJS)\monolib_http.obj &
        $(OBJS)\monolib_protocol.obj &
        $(OBJS)\monolib_ftp.obj &
        $(OBJS)\monolib_http.obj &
        $(OBJS)\monolib_protocol.obj &

-       $(OBJS)\monolib_url.obj &
-       $(OBJS)\monolib_sckfile.obj &

        $(OBJS)\monolib_sckaddr.obj &
        $(OBJS)\monolib_sckaddr.obj &

+       $(OBJS)\monolib_sckfile.obj &

        $(OBJS)\monolib_sckipc.obj &
        $(OBJS)\monolib_sckstrm.obj &
        $(OBJS)\monolib_socket.obj &
        $(OBJS)\monolib_sckipc.obj &
        $(OBJS)\monolib_sckstrm.obj &
        $(OBJS)\monolib_socket.obj &

+       $(OBJS)\monolib_url.obj &

        $(OBJS)\monolib_gsocket.obj &
        $(OBJS)\monolib_gsockmsw.obj &
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) &
        $(OBJS)\monolib_xml.obj
        $(OBJS)\monolib_gsocket.obj &
        $(OBJS)\monolib_gsockmsw.obj &
        $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) &
        $(OBJS)\monolib_xml.obj

-NETDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+NETDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CFLAGS)
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CFLAGS)

-NETDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+NETDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2442,20 +2472,20 @@ NETDLL_OBJECTS =  &
        $(OBJS)\netdll_ftp.obj &
        $(OBJS)\netdll_http.obj &
        $(OBJS)\netdll_protocol.obj &
        $(OBJS)\netdll_ftp.obj &
        $(OBJS)\netdll_http.obj &
        $(OBJS)\netdll_protocol.obj &

-       $(OBJS)\netdll_url.obj &
-       $(OBJS)\netdll_sckfile.obj &

        $(OBJS)\netdll_sckaddr.obj &
        $(OBJS)\netdll_sckaddr.obj &

+       $(OBJS)\netdll_sckfile.obj &

        $(OBJS)\netdll_sckipc.obj &
        $(OBJS)\netdll_sckstrm.obj &
        $(OBJS)\netdll_socket.obj &
        $(OBJS)\netdll_sckipc.obj &
        $(OBJS)\netdll_sckstrm.obj &
        $(OBJS)\netdll_socket.obj &

+       $(OBJS)\netdll_url.obj &

        $(OBJS)\netdll_gsocket.obj &
        $(OBJS)\netdll_gsockmsw.obj
        $(OBJS)\netdll_gsocket.obj &
        $(OBJS)\netdll_gsockmsw.obj

-NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CFLAGS)
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        -i=..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CFLAGS)

-NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2467,23 +2497,23 @@ NETLIB_OBJECTS =  &
        $(OBJS)\netlib_ftp.obj &
        $(OBJS)\netlib_http.obj &
        $(OBJS)\netlib_protocol.obj &
        $(OBJS)\netlib_ftp.obj &
        $(OBJS)\netlib_http.obj &
        $(OBJS)\netlib_protocol.obj &

-       $(OBJS)\netlib_url.obj &
-       $(OBJS)\netlib_sckfile.obj &

        $(OBJS)\netlib_sckaddr.obj &
        $(OBJS)\netlib_sckaddr.obj &

+       $(OBJS)\netlib_sckfile.obj &

        $(OBJS)\netlib_sckipc.obj &
        $(OBJS)\netlib_sckstrm.obj &
        $(OBJS)\netlib_socket.obj &
        $(OBJS)\netlib_sckipc.obj &
        $(OBJS)\netlib_sckstrm.obj &
        $(OBJS)\netlib_socket.obj &

+       $(OBJS)\netlib_url.obj &

        $(OBJS)\netlib_gsocket.obj &
        $(OBJS)\netlib_gsockmsw.obj
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
        $(OBJS)\netlib_gsocket.obj &
        $(OBJS)\netlib_gsockmsw.obj
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+WXEXPAT_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -i=$(LIBDIRNAME) -dCOMPILED_FROM_DSP $(CFLAGS)
 WXEXPAT_OBJECTS =  &
        $(OBJS)\wxexpat_xmlparse.obj &
        $(OBJS)\wxexpat_xmlrole.obj &
        $(OBJS)\wxexpat_xmltok.obj
        $(__RUNTIME_LIBS) -i=$(LIBDIRNAME) -dCOMPILED_FROM_DSP $(CFLAGS)
 WXEXPAT_OBJECTS =  &
        $(OBJS)\wxexpat_xmlparse.obj &
        $(OBJS)\wxexpat_xmlrole.obj &
        $(OBJS)\wxexpat_xmltok.obj

-WXJPEG_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+WXJPEG_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -i=$(LIBDIRNAME) $(CFLAGS)
 WXJPEG_OBJECTS =  &
        $(OBJS)\wxjpeg_jcomapi.obj &
        $(__RUNTIME_LIBS) -i=$(LIBDIRNAME) $(CFLAGS)
 WXJPEG_OBJECTS =  &
        $(OBJS)\wxjpeg_jcomapi.obj &


@@ -2532,7 +2562,7 @@ WXJPEG_OBJECTS =  &
        $(OBJS)\wxjpeg_jquant1.obj &
        $(OBJS)\wxjpeg_jquant2.obj &
        $(OBJS)\wxjpeg_jdmerge.obj
        $(OBJS)\wxjpeg_jquant1.obj &
        $(OBJS)\wxjpeg_jquant2.obj &
        $(OBJS)\wxjpeg_jdmerge.obj

-WXPNG_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+WXPNG_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -i=..\src\zlib $(CFLAGS)
 WXPNG_OBJECTS =  &
        $(OBJS)\wxpng_png.obj &
        $(__RUNTIME_LIBS) -i=..\src\zlib $(CFLAGS)
 WXPNG_OBJECTS =  &
        $(OBJS)\wxpng_png.obj &


@@ -2552,14 +2582,14 @@ WXPNG_OBJECTS =  &
        $(OBJS)\wxpng_pngwrite.obj &
        $(OBJS)\wxpng_pngwtran.obj &
        $(OBJS)\wxpng_pngwutil.obj
        $(OBJS)\wxpng_pngwrite.obj &
        $(OBJS)\wxpng_pngwtran.obj &
        $(OBJS)\wxpng_pngwutil.obj

-WXREGEX_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+WXREGEX_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) $(CFLAGS)
 WXREGEX_OBJECTS =  &
        $(OBJS)\wxregex_regcomp.obj &
        $(OBJS)\wxregex_regexec.obj &
        $(OBJS)\wxregex_regerror.obj &
        $(OBJS)\wxregex_regfree.obj
        $(__RUNTIME_LIBS) $(CFLAGS)
 WXREGEX_OBJECTS =  &
        $(OBJS)\wxregex_regcomp.obj &
        $(OBJS)\wxregex_regexec.obj &
        $(OBJS)\wxregex_regerror.obj &
        $(OBJS)\wxregex_regfree.obj

-WXTIFF_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+WXTIFF_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) $(CFLAGS)
 WXTIFF_OBJECTS =  &
        $(OBJS)\wxtiff_tif_win32.obj &
        $(__RUNTIME_LIBS) $(CFLAGS)
 WXTIFF_OBJECTS =  &
        $(OBJS)\wxtiff_tif_win32.obj &


@@ -2595,7 +2625,7 @@ WXTIFF_OBJECTS =  &
        $(OBJS)\wxtiff_tif_warning.obj &
        $(OBJS)\wxtiff_tif_write.obj &
        $(OBJS)\wxtiff_tif_zip.obj
        $(OBJS)\wxtiff_tif_warning.obj &
        $(OBJS)\wxtiff_tif_write.obj &
        $(OBJS)\wxtiff_tif_zip.obj

-WXZLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+WXZLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) $(CFLAGS)
 WXZLIB_OBJECTS =  &
        $(OBJS)\wxzlib_adler32.obj &
        $(__RUNTIME_LIBS) $(CFLAGS)
 WXZLIB_OBJECTS =  &
        $(OBJS)\wxzlib_adler32.obj &


@@ -2612,7 +2642,7 @@ WXZLIB_OBJECTS =  &
        $(OBJS)\wxzlib_infcodes.obj &
        $(OBJS)\wxzlib_infutil.obj &
        $(OBJS)\wxzlib_inffast.obj
        $(OBJS)\wxzlib_infcodes.obj &
        $(OBJS)\wxzlib_infutil.obj &
        $(OBJS)\wxzlib_inffast.obj

-XMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+XMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -2621,7 +2651,7 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
 XMLDLL_OBJECTS =  &
        $(OBJS)\xmldll_dummy.obj &
        $(OBJS)\xmldll_xml.obj
 XMLDLL_OBJECTS =  &
        $(OBJS)\xmldll_dummy.obj &
        $(OBJS)\xmldll_xml.obj

-XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG) -bm &
+XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &

        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff &
        -i=..\src\jpeg -i=..\src\png -i=..\src\zlib -i=..\src\regex &


@@ -9400,7 +9430,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll :  $(B
        @%append $(OBJS)\basedll.lbc option quiet
        @%append $(OBJS)\basedll.lbc name $^@
        @%append $(OBJS)\basedll.lbc option incremental
        @%append $(OBJS)\basedll.lbc option quiet
        @%append $(OBJS)\basedll.lbc name $^@
        @%append $(OBJS)\basedll.lbc option incremental

-       @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_7)  libpath $(LIBDIRNAME)

        @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\basedll.lbc library %i
        @%append $(OBJS)\basedll.lbc
        @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\basedll.lbc library %i
        @%append $(OBJS)\basedll.lbc


@@ -9460,7 +9490,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_w
        @%append $(OBJS)\coredll.lbc option quiet
        @%append $(OBJS)\coredll.lbc name $^@
        @%append $(OBJS)\coredll.lbc option incremental
        @%append $(OBJS)\coredll.lbc option quiet
        @%append $(OBJS)\coredll.lbc name $^@
        @%append $(OBJS)\coredll.lbc option incremental

-       @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_7)  libpath $(LIBDIRNAME)

        @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i
        @%append $(OBJS)\coredll.lbc
        @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i
        @%append $(OBJS)\coredll.lbc


@@ -9490,7 +9520,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat
        @%append $(OBJS)\gldll.lbc option quiet
        @%append $(OBJS)\gldll.lbc name $^@
        @%append $(OBJS)\gldll.lbc option incremental
        @%append $(OBJS)\gldll.lbc option quiet
        @%append $(OBJS)\gldll.lbc name $^@
        @%append $(OBJS)\gldll.lbc option incremental

-       @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_7)  libpath $(LIBDIRNAME)

        @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i
        @%append $(OBJS)\gldll.lbc
        @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i
        @%append $(OBJS)\gldll.lbc


@@ -9520,7 +9550,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_w
        @%append $(OBJS)\htmldll.lbc option quiet
        @%append $(OBJS)\htmldll.lbc name $^@
        @%append $(OBJS)\htmldll.lbc option incremental
        @%append $(OBJS)\htmldll.lbc option quiet
        @%append $(OBJS)\htmldll.lbc name $^@
        @%append $(OBJS)\htmldll.lbc option incremental

-       @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_7)  libpath $(LIBDIRNAME)

        @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\htmldll.lbc library %i
        @%append $(OBJS)\htmldll.lbc
        @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\htmldll.lbc library %i
        @%append $(OBJS)\htmldll.lbc


@@ -9555,7 +9585,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(V
        @%append $(OBJS)\monodll.lbc option quiet
        @%append $(OBJS)\monodll.lbc name $^@
        @%append $(OBJS)\monodll.lbc option incremental
        @%append $(OBJS)\monodll.lbc option quiet
        @%append $(OBJS)\monodll.lbc name $^@
        @%append $(OBJS)\monodll.lbc option incremental

-       @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_7)  libpath $(LIBDIRNAME)

        @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  ) do @%append $(OBJS)\monodll.lbc library %i
        @%append $(OBJS)\monodll.lbc
        @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib  ) do @%append $(OBJS)\monodll.lbc library %i
        @%append $(OBJS)\monodll.lbc


@@ -9584,7 +9614,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll :
        @%append $(OBJS)\netdll.lbc option quiet
        @%append $(OBJS)\netdll.lbc name $^@
        @%append $(OBJS)\netdll.lbc option incremental
        @%append $(OBJS)\netdll.lbc option quiet
        @%append $(OBJS)\netdll.lbc name $^@
        @%append $(OBJS)\netdll.lbc option incremental

-       @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_7)  libpath $(LIBDIRNAME)

        @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i
        @%append $(OBJS)\netdll.lbc
        @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i
        @%append $(OBJS)\netdll.lbc


@@ -9651,7 +9681,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll :
        @%append $(OBJS)\xmldll.lbc option quiet
        @%append $(OBJS)\xmldll.lbc name $^@
        @%append $(OBJS)\xmldll.lbc option incremental
        @%append $(OBJS)\xmldll.lbc option quiet
        @%append $(OBJS)\xmldll.lbc name $^@
        @%append $(OBJS)\xmldll.lbc option incremental

-       @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGFLAG_7)  libpath $(LIBDIRNAME)
+       @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_7)  libpath $(LIBDIRNAME)

        @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i
        @%append $(OBJS)\xmldll.lbc
        @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i
        @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i
        @%append $(OBJS)\xmldll.lbc

diff --git a/build/wx_basedll.dsp b/build/wx_basedll.dsp
index c843097ce5cbab1258ff900ccf861b62274a46e9..62b585018eed3a4ad028ad8d7d8a722825aa9f0e 100644 (file)
--- a/build/wx_basedll.dsp
+++ b/build/wx_basedll.dsp
@@ -47,12 +47,12 @@ RSC=rc.exe
 # PROP Output_Dir "..\lib\vc_mswuddll\"
 # PROP Intermediate_Dir "vc_mswuddll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswuddll\"
 # PROP Intermediate_Dir "vc_mswuddll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -72,12 +72,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -97,12 +97,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -122,12 +122,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivudll\"
 # PROP Intermediate_Dir "vc_mswunivudll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivudll\"
 # PROP Intermediate_Dir "vc_mswunivudll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -147,12 +147,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -172,12 +172,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -197,12 +197,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -222,12 +222,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/build/wx_baselib.dsp b/build/wx_baselib.dsp
index 9b3a9a1034e209f477cf23a6fd92d546923fc6c9..4a3f1e379f6390c4e579274d08da5bb0c5237fd0 100644 (file)
--- a/build/wx_baselib.dsp
+++ b/build/wx_baselib.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "..\lib\vc_mswu\"
 # PROP Intermediate_Dir "vc_mswu\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswu\"
 # PROP Intermediate_Dir "vc_mswu\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivu\"
 # PROP Intermediate_Dir "vc_mswunivu\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivu\"
 # PROP Intermediate_Dir "vc_mswunivu\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -92,8 +92,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_msw\"
 # PROP Intermediate_Dir "vc_msw\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_msw\"
 # PROP Intermediate_Dir "vc_msw\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -115,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswud\"
 # PROP Intermediate_Dir "vc_mswud\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswud\"
 # PROP Intermediate_Dir "vc_mswud\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -138,8 +138,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -161,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswuniv\"
 # PROP Intermediate_Dir "vc_mswuniv\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswuniv\"
 # PROP Intermediate_Dir "vc_mswuniv\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -184,8 +184,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswd\"
 # PROP Intermediate_Dir "vc_mswd\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswd\"
 # PROP Intermediate_Dir "vc_mswd\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -207,8 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivud\"
 # PROP Intermediate_Dir "vc_mswunivud\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivud\"
 # PROP Intermediate_Dir "vc_mswunivud\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe

diff --git a/build/wx_coredll.dsp b/build/wx_coredll.dsp
index 6736425e6d7f0d537017acad231f6a7116505f59..b8342a44370bb0b54642c27d9b707c6ae076eeab 100644 (file)
--- a/build/wx_coredll.dsp
+++ b/build/wx_coredll.dsp
@@ -47,12 +47,12 @@ RSC=rc.exe
 # PROP Output_Dir "..\lib\vc_mswuddll\"
 # PROP Intermediate_Dir "vc_mswuddll\coredll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswuddll\"
 # PROP Intermediate_Dir "vc_mswuddll\coredll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -72,12 +72,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\coredll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\coredll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\lib\vc_mswdll\wxmsw250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\lib\vc_mswdll\wxmsw250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\lib\vc_mswdll\wxmsw250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\lib\vc_mswdll\wxmsw250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -97,12 +97,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\coredll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\coredll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -122,12 +122,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivudll\"
 # PROP Intermediate_Dir "vc_mswunivudll\coredll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivudll\"
 # PROP Intermediate_Dir "vc_mswunivudll\coredll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -147,12 +147,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\coredll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\coredll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -172,12 +172,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\coredll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\coredll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -197,12 +197,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\coredll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\coredll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -222,12 +222,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\coredll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\coredll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_core_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/build/wx_corelib.dsp b/build/wx_corelib.dsp
index 3f9d7eecb009d514a123102ef421898c915445b8..90c4eb0879d82ea5ee24d094128ea0037d37a3dc 100644 (file)
--- a/build/wx_corelib.dsp
+++ b/build/wx_corelib.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "..\lib\vc_mswu\"
 # PROP Intermediate_Dir "vc_mswu\corelib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswu\"
 # PROP Intermediate_Dir "vc_mswu\corelib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivu\"
 # PROP Intermediate_Dir "vc_mswunivu\corelib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivu\"
 # PROP Intermediate_Dir "vc_mswunivu\corelib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -92,8 +92,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_msw\"
 # PROP Intermediate_Dir "vc_msw\corelib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_msw\"
 # PROP Intermediate_Dir "vc_msw\corelib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_BASE=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -115,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswud\"
 # PROP Intermediate_Dir "vc_mswud\corelib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswud\"
 # PROP Intermediate_Dir "vc_mswud\corelib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -138,8 +138,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\corelib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\corelib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -161,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswuniv\"
 # PROP Intermediate_Dir "vc_mswuniv\corelib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswuniv\"
 # PROP Intermediate_Dir "vc_mswuniv\corelib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -184,8 +184,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswd\"
 # PROP Intermediate_Dir "vc_mswd\corelib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswd\"
 # PROP Intermediate_Dir "vc_mswd\corelib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -207,8 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivud\"
 # PROP Intermediate_Dir "vc_mswunivud\corelib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivud\"
 # PROP Intermediate_Dir "vc_mswunivud\corelib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe

diff --git a/build/wx_gldll.dsp b/build/wx_gldll.dsp
index a542348f85a7c0282577f5b40394c161110b6f61..edca5a091585f009b93745ae9b7685110fb70afa 100644 (file)
--- a/build/wx_gldll.dsp
+++ b/build/wx_gldll.dsp
@@ -47,12 +47,12 @@ RSC=rc.exe
 # PROP Output_Dir "..\lib\vc_mswuddll\"
 # PROP Intermediate_Dir "vc_mswuddll\gldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswuddll\"
 # PROP Intermediate_Dir "vc_mswuddll\gldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -72,12 +72,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\gldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\gldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_gldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -97,12 +97,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\gldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\gldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -122,12 +122,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivudll\"
 # PROP Intermediate_Dir "vc_mswunivudll\gldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivudll\"
 # PROP Intermediate_Dir "vc_mswunivudll\gldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -147,12 +147,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\gldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\gldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -172,12 +172,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\gldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\gldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_gldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -197,12 +197,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\gldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\gldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_gldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -222,12 +222,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\gldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\gldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_gl_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/build/wx_gllib.dsp b/build/wx_gllib.dsp
index 8d6e3797bc90d4a36fd03ced6604cd3305c190a6..1fa015d287dc968cf01afc174da185ad86a72e1a 100644 (file)
--- a/build/wx_gllib.dsp
+++ b/build/wx_gllib.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "..\lib\vc_mswu\"
 # PROP Intermediate_Dir "vc_mswu\gllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswu\"
 # PROP Intermediate_Dir "vc_mswu\gllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivu\"
 # PROP Intermediate_Dir "vc_mswunivu\gllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivu\"
 # PROP Intermediate_Dir "vc_mswunivu\gllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -92,8 +92,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_msw\"
 # PROP Intermediate_Dir "vc_msw\gllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_msw\"
 # PROP Intermediate_Dir "vc_msw\gllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -115,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswud\"
 # PROP Intermediate_Dir "vc_mswud\gllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswud\"
 # PROP Intermediate_Dir "vc_mswud\gllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -138,8 +138,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\gllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\gllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -161,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswuniv\"
 # PROP Intermediate_Dir "vc_mswuniv\gllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswuniv\"
 # PROP Intermediate_Dir "vc_mswuniv\gllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -184,8 +184,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswd\"
 # PROP Intermediate_Dir "vc_mswd\gllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswd\"
 # PROP Intermediate_Dir "vc_mswd\gllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -207,8 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivud\"
 # PROP Intermediate_Dir "vc_mswunivud\gllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivud\"
 # PROP Intermediate_Dir "vc_mswunivud\gllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_gl.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_gllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe

diff --git a/build/wx_htmldll.dsp b/build/wx_htmldll.dsp
index d58d8f156ce4a7d8009e295a39712a5f61bc2194..5c7f48aced8688e0138d4f4c3506909edd3e7e43 100644 (file)
--- a/build/wx_htmldll.dsp
+++ b/build/wx_htmldll.dsp
@@ -47,12 +47,12 @@ RSC=rc.exe
 # PROP Output_Dir "..\lib\vc_mswuddll\"
 # PROP Intermediate_Dir "vc_mswuddll\htmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswuddll\"
 # PROP Intermediate_Dir "vc_mswuddll\htmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxmsw250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -72,12 +72,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\htmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\htmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswdll\wxmsw250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -97,12 +97,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\htmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\htmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxmswuniv250ud_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -122,12 +122,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivudll\"
 # PROP Intermediate_Dir "vc_mswunivudll\htmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivudll\"
 # PROP Intermediate_Dir "vc_mswunivudll\htmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivudll\wxmswuniv250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -147,12 +147,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\htmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\htmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxmsw250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -172,12 +172,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\htmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\htmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_htmldll.pch" /Fd..\lib\vc_mswunivdll\wxmswuniv250_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -197,12 +197,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\htmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\htmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_htmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxmswuniv250d_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -222,12 +222,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\htmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\htmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Fd..\lib\vc_mswudll\wxmsw250u_html_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/build/wx_htmllib.dsp b/build/wx_htmllib.dsp
index cd255f24518b82314cfa34e49fc771e09dcf7498..fdff0bcbf0fd60e3fd5c12089e2c3361924606bf 100644 (file)
--- a/build/wx_htmllib.dsp
+++ b/build/wx_htmllib.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "..\lib\vc_mswu\"
 # PROP Intermediate_Dir "vc_mswu\htmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswu\"
 # PROP Intermediate_Dir "vc_mswu\htmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxmsw25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivu\"
 # PROP Intermediate_Dir "vc_mswunivu\htmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivu\"
 # PROP Intermediate_Dir "vc_mswunivu\htmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxmswuniv25u_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -92,8 +92,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_msw\"
 # PROP Intermediate_Dir "vc_msw\htmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_msw\"
 # PROP Intermediate_Dir "vc_msw\htmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxmsw25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -115,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswud\"
 # PROP Intermediate_Dir "vc_mswud\htmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswud\"
 # PROP Intermediate_Dir "vc_mswud\htmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxmsw25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -138,8 +138,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\htmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\htmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxmswuniv25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -161,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswuniv\"
 # PROP Intermediate_Dir "vc_mswuniv\htmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswuniv\"
 # PROP Intermediate_Dir "vc_mswuniv\htmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxmswuniv25_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -184,8 +184,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswd\"
 # PROP Intermediate_Dir "vc_mswd\htmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswd\"
 # PROP Intermediate_Dir "vc_mswd\htmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxmsw25d_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -207,8 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivud\"
 # PROP Intermediate_Dir "vc_mswunivud\htmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivud\"
 # PROP Intermediate_Dir "vc_mswunivud\htmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxmswuniv25ud_html.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_htmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe

diff --git a/build/wx_netdll.dsp b/build/wx_netdll.dsp
index 2c64826d51f9fb6f9f1053f0739017da4415e531..cb07c081d43f6ee187ea8005b6d7d4500ff559f6 100644 (file)
--- a/build/wx_netdll.dsp
+++ b/build/wx_netdll.dsp
@@ -47,12 +47,12 @@ RSC=rc.exe
 # PROP Output_Dir "..\lib\vc_mswuddll\"
 # PROP Intermediate_Dir "vc_mswuddll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswuddll\"
 # PROP Intermediate_Dir "vc_mswuddll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -72,12 +72,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -97,12 +97,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -122,12 +122,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivudll\"
 # PROP Intermediate_Dir "vc_mswunivudll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivudll\"
 # PROP Intermediate_Dir "vc_mswunivudll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -147,12 +147,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -172,12 +172,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -197,12 +197,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -222,12 +222,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/build/wx_netlib.dsp b/build/wx_netlib.dsp
index 03dabe368d2c88dd4c8af4034548384ac5fea994..307cde7d9e2b4b8b221e89314b7ef9df5a857783 100644 (file)
--- a/build/wx_netlib.dsp
+++ b/build/wx_netlib.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "..\lib\vc_mswu\"
 # PROP Intermediate_Dir "vc_mswu\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswu\"
 # PROP Intermediate_Dir "vc_mswu\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivu\"
 # PROP Intermediate_Dir "vc_mswunivu\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivu\"
 # PROP Intermediate_Dir "vc_mswunivu\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -92,8 +92,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_msw\"
 # PROP Intermediate_Dir "vc_msw\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_msw\"
 # PROP Intermediate_Dir "vc_msw\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -115,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswud\"
 # PROP Intermediate_Dir "vc_mswud\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswud\"
 # PROP Intermediate_Dir "vc_mswud\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -138,8 +138,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -161,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswuniv\"
 # PROP Intermediate_Dir "vc_mswuniv\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswuniv\"
 # PROP Intermediate_Dir "vc_mswuniv\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -184,8 +184,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswd\"
 # PROP Intermediate_Dir "vc_mswd\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswd\"
 # PROP Intermediate_Dir "vc_mswd\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -207,8 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivud\"
 # PROP Intermediate_Dir "vc_mswunivud\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivud\"
 # PROP Intermediate_Dir "vc_mswunivud\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe

diff --git a/build/wx_xmldll.dsp b/build/wx_xmldll.dsp
index d71cbff1abe9eb03ab49339def4e9c0904c72398..b84598de93e3e9d92778aa1d46f9bc9e63680e40 100644 (file)
--- a/build/wx_xmldll.dsp
+++ b/build/wx_xmldll.dsp
@@ -47,12 +47,12 @@ RSC=rc.exe
 # PROP Output_Dir "..\lib\vc_mswuddll\"
 # PROP Intermediate_Dir "vc_mswuddll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswuddll\"
 # PROP Intermediate_Dir "vc_mswuddll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -72,12 +72,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /i "..\include" /i "..\lib\vc_mswdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -97,12 +97,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivuddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivuddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -122,12 +122,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivudll\"
 # PROP Intermediate_Dir "vc_mswunivudll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivudll\"
 # PROP Intermediate_Dir "vc_mswunivudll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswunivudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -147,12 +147,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -172,12 +172,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivdll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\include" /i "..\lib\vc_mswunivdll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -197,12 +197,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "_DEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivddll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\include" /i "..\lib\vc_mswunivddll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -222,12 +222,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "NDEBUG" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswudll" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "NDEBUG" /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\include" /i "..\lib\vc_mswudll" /i "..\src\tiff" /i "..\src\jpeg" /i "..\src\png" /i "..\src\zlib" /i "..\src\regex" /i "..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/build/wx_xmllib.dsp b/build/wx_xmllib.dsp
index d52ce493dd6b7627aebb43143f175ddd4a40fa34..15a75f2f7eea52b909e6c9afc88cae2fd9a91fff 100644 (file)
--- a/build/wx_xmllib.dsp
+++ b/build/wx_xmllib.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "..\lib\vc_mswu\"
 # PROP Intermediate_Dir "vc_mswu\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswu\"
 # PROP Intermediate_Dir "vc_mswu\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivu\"
 # PROP Intermediate_Dir "vc_mswunivu\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivu\"
 # PROP Intermediate_Dir "vc_mswunivu\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswunivu" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswunivu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -92,8 +92,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_msw\"
 # PROP Intermediate_Dir "vc_msw\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_msw\"
 # PROP Intermediate_Dir "vc_msw\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_msw" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_msw\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -115,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswud\"
 # PROP Intermediate_Dir "vc_mswud\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswud\"
 # PROP Intermediate_Dir "vc_mswud\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -138,8 +138,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -161,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswuniv\"
 # PROP Intermediate_Dir "vc_mswuniv\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswuniv\"
 # PROP Intermediate_Dir "vc_mswuniv\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /MD /O1 /I "..\include" /I "..\lib\vc_mswuniv" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Fd..\lib\vc_mswuniv\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -184,8 +184,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswd\"
 # PROP Intermediate_Dir "vc_mswd\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswd\"
 # PROP Intermediate_Dir "vc_mswd\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXDEBUG__" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswd" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -207,8 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivud\"
 # PROP Intermediate_Dir "vc_mswunivud\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\lib\vc_mswunivud\"
 # PROP Intermediate_Dir "vc_mswunivud\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /MDd /Od /I "..\include" /I "..\lib\vc_mswunivud" /I "..\src\tiff" /I "..\src\jpeg" /I "..\src\png" /I "..\src\zlib" /I "..\src\regex" /I "..\src\expat\lib" /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe