X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e0fbb3dbf4501b4113f2d5fe775850b7dabc477..9083e7fb1aa2ade4fea7376fd059613b66929535:/build/msw/makefile.vc

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 8603955e9f..a4a99aae7a 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -379,6 +379,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_wfstream.obj \
 	$(OBJS)\monodll_wxcrt.obj \
 	$(OBJS)\monodll_wxprintf.obj \
+	$(OBJS)\monodll_xlocale.obj \
 	$(OBJS)\monodll_xti.obj \
 	$(OBJS)\monodll_xtistrm.obj \
 	$(OBJS)\monodll_zipstrm.obj \
@@ -521,6 +522,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_wfstream.obj \
 	$(OBJS)\monolib_wxcrt.obj \
 	$(OBJS)\monolib_wxprintf.obj \
+	$(OBJS)\monolib_xlocale.obj \
 	$(OBJS)\monolib_xti.obj \
 	$(OBJS)\monolib_xtistrm.obj \
 	$(OBJS)\monolib_zipstrm.obj \
@@ -661,6 +663,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_wfstream.obj \
 	$(OBJS)\basedll_wxcrt.obj \
 	$(OBJS)\basedll_wxprintf.obj \
+	$(OBJS)\basedll_xlocale.obj \
 	$(OBJS)\basedll_xti.obj \
 	$(OBJS)\basedll_xtistrm.obj \
 	$(OBJS)\basedll_zipstrm.obj \
@@ -784,6 +787,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_wfstream.obj \
 	$(OBJS)\baselib_wxcrt.obj \
 	$(OBJS)\baselib_wxprintf.obj \
+	$(OBJS)\baselib_xlocale.obj \
 	$(OBJS)\baselib_xti.obj \
 	$(OBJS)\baselib_xtistrm.obj \
 	$(OBJS)\baselib_zipstrm.obj \
@@ -1712,7 +1716,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimag.obj \
 	$(OBJS)\monodll_filedlg.obj \
 	$(OBJS)\monodll_frame.obj \
-	$(OBJS)\monodll_gauge95.obj \
+	$(OBJS)\monodll_gauge.obj \
 	$(OBJS)\monodll_iniconf.obj \
 	$(OBJS)\monodll_listbox.obj \
 	$(OBJS)\monodll_listctrl.obj \
@@ -1722,22 +1726,23 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_metafile.obj \
 	$(OBJS)\monodll_msgdlg.obj \
 	$(OBJS)\monodll_nativdlg.obj \
+	$(OBJS)\monodll_nativewin.obj \
 	$(OBJS)\monodll_notebook.obj \
 	$(OBJS)\monodll_access.obj \
 	$(OBJS)\monodll_ownerdrw.obj \
 	$(OBJS)\monodll_radiobox.obj \
 	$(OBJS)\monodll_radiobut.obj \
 	$(OBJS)\monodll_scrolbar.obj \
-	$(OBJS)\monodll_slider95.obj \
+	$(OBJS)\monodll_slider.obj \
 	$(OBJS)\monodll_spinbutt.obj \
 	$(OBJS)\monodll_spinctrl.obj \
 	$(OBJS)\monodll_statbmp.obj \
 	$(OBJS)\monodll_statbox.obj \
-	$(OBJS)\monodll_statbr95.obj \
+	$(OBJS)\monodll_statusbar.obj \
 	$(OBJS)\monodll_statline.obj \
 	$(OBJS)\monodll_stattext.obj \
 	$(OBJS)\monodll_tabctrl.obj \
-	$(OBJS)\monodll_tbar95.obj \
+	$(OBJS)\monodll_toolbar.obj \
 	$(OBJS)\monodll_textctrl.obj \
 	$(OBJS)\monodll_textentry.obj \
 	$(OBJS)\monodll_tglbtn.obj \
@@ -2361,7 +2366,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_dragimag.obj \
 	$(OBJS)\monolib_filedlg.obj \
 	$(OBJS)\monolib_frame.obj \
-	$(OBJS)\monolib_gauge95.obj \
+	$(OBJS)\monolib_gauge.obj \
 	$(OBJS)\monolib_iniconf.obj \
 	$(OBJS)\monolib_listbox.obj \
 	$(OBJS)\monolib_listctrl.obj \
@@ -2371,22 +2376,23 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_metafile.obj \
 	$(OBJS)\monolib_msgdlg.obj \
 	$(OBJS)\monolib_nativdlg.obj \
+	$(OBJS)\monolib_nativewin.obj \
 	$(OBJS)\monolib_notebook.obj \
 	$(OBJS)\monolib_access.obj \
 	$(OBJS)\monolib_ownerdrw.obj \
 	$(OBJS)\monolib_radiobox.obj \
 	$(OBJS)\monolib_radiobut.obj \
 	$(OBJS)\monolib_scrolbar.obj \
-	$(OBJS)\monolib_slider95.obj \
+	$(OBJS)\monolib_slider.obj \
 	$(OBJS)\monolib_spinbutt.obj \
 	$(OBJS)\monolib_spinctrl.obj \
 	$(OBJS)\monolib_statbmp.obj \
 	$(OBJS)\monolib_statbox.obj \
-	$(OBJS)\monolib_statbr95.obj \
+	$(OBJS)\monolib_statusbar.obj \
 	$(OBJS)\monolib_statline.obj \
 	$(OBJS)\monolib_stattext.obj \
 	$(OBJS)\monolib_tabctrl.obj \
-	$(OBJS)\monolib_tbar95.obj \
+	$(OBJS)\monolib_toolbar.obj \
 	$(OBJS)\monolib_textctrl.obj \
 	$(OBJS)\monolib_textentry.obj \
 	$(OBJS)\monolib_tglbtn.obj \
@@ -2949,7 +2955,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_dragimag.obj \
 	$(OBJS)\coredll_filedlg.obj \
 	$(OBJS)\coredll_frame.obj \
-	$(OBJS)\coredll_gauge95.obj \
+	$(OBJS)\coredll_gauge.obj \
 	$(OBJS)\coredll_iniconf.obj \
 	$(OBJS)\coredll_listbox.obj \
 	$(OBJS)\coredll_listctrl.obj \
@@ -2959,22 +2965,23 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_metafile.obj \
 	$(OBJS)\coredll_msgdlg.obj \
 	$(OBJS)\coredll_nativdlg.obj \
+	$(OBJS)\coredll_nativewin.obj \
 	$(OBJS)\coredll_notebook.obj \
 	$(OBJS)\coredll_access.obj \
 	$(OBJS)\coredll_ownerdrw.obj \
 	$(OBJS)\coredll_radiobox.obj \
 	$(OBJS)\coredll_radiobut.obj \
 	$(OBJS)\coredll_scrolbar.obj \
-	$(OBJS)\coredll_slider95.obj \
+	$(OBJS)\coredll_slider.obj \
 	$(OBJS)\coredll_spinbutt.obj \
 	$(OBJS)\coredll_spinctrl.obj \
 	$(OBJS)\coredll_statbmp.obj \
 	$(OBJS)\coredll_statbox.obj \
-	$(OBJS)\coredll_statbr95.obj \
+	$(OBJS)\coredll_statusbar.obj \
 	$(OBJS)\coredll_statline.obj \
 	$(OBJS)\coredll_stattext.obj \
 	$(OBJS)\coredll_tabctrl.obj \
-	$(OBJS)\coredll_tbar95.obj \
+	$(OBJS)\coredll_toolbar.obj \
 	$(OBJS)\coredll_textctrl.obj \
 	$(OBJS)\coredll_textentry.obj \
 	$(OBJS)\coredll_tglbtn.obj \
@@ -3419,7 +3426,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_dragimag.obj \
 	$(OBJS)\corelib_filedlg.obj \
 	$(OBJS)\corelib_frame.obj \
-	$(OBJS)\corelib_gauge95.obj \
+	$(OBJS)\corelib_gauge.obj \
 	$(OBJS)\corelib_iniconf.obj \
 	$(OBJS)\corelib_listbox.obj \
 	$(OBJS)\corelib_listctrl.obj \
@@ -3429,22 +3436,23 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_metafile.obj \
 	$(OBJS)\corelib_msgdlg.obj \
 	$(OBJS)\corelib_nativdlg.obj \
+	$(OBJS)\corelib_nativewin.obj \
 	$(OBJS)\corelib_notebook.obj \
 	$(OBJS)\corelib_access.obj \
 	$(OBJS)\corelib_ownerdrw.obj \
 	$(OBJS)\corelib_radiobox.obj \
 	$(OBJS)\corelib_radiobut.obj \
 	$(OBJS)\corelib_scrolbar.obj \
-	$(OBJS)\corelib_slider95.obj \
+	$(OBJS)\corelib_slider.obj \
 	$(OBJS)\corelib_spinbutt.obj \
 	$(OBJS)\corelib_spinctrl.obj \
 	$(OBJS)\corelib_statbmp.obj \
 	$(OBJS)\corelib_statbox.obj \
-	$(OBJS)\corelib_statbr95.obj \
+	$(OBJS)\corelib_statusbar.obj \
 	$(OBJS)\corelib_statline.obj \
 	$(OBJS)\corelib_stattext.obj \
 	$(OBJS)\corelib_tabctrl.obj \
-	$(OBJS)\corelib_tbar95.obj \
+	$(OBJS)\corelib_toolbar.obj \
 	$(OBJS)\corelib_textctrl.obj \
 	$(OBJS)\corelib_textentry.obj \
 	$(OBJS)\corelib_tglbtn.obj \
@@ -5719,6 +5727,9 @@ $(OBJS)\monodll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
 $(OBJS)\monodll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp
 
+$(OBJS)\monodll_xlocale.obj: ..\..\src\common\xlocale.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xlocale.cpp
+
 $(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xti.cpp
 
@@ -5863,9 +5874,6 @@ $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp
 $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp
 
-$(OBJS)\monodll_gauge95.obj: ..\..\src\msw\gauge95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
 $(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 
@@ -5884,27 +5892,24 @@ $(OBJS)\monodll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 $(OBJS)\monodll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
 
+$(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+
 $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
-$(OBJS)\monodll_slider95.obj: ..\..\src\msw\slider95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
 $(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 
-$(OBJS)\monodll_statbr95.obj: ..\..\src\msw\statbr95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 
 $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
 
-$(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
 $(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
 
@@ -5944,9 +5949,6 @@ $(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
 $(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
-$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
 $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
@@ -5959,18 +5961,12 @@ $(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
 $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
-$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
-
 $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 
 $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp
 
-$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
 $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
@@ -6668,6 +6664,16 @@ $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gauge.obj: ..\..\src\msw\gauge.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -6738,6 +6744,16 @@ $(OBJS)\monodll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_slider.obj: ..\..\src\msw\slider.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -6788,6 +6804,16 @@ $(OBJS)\monodll_stattext.obj: ..\..\src\univ\stattext.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_toolbar.obj: ..\..\src\msw\toolbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_textctrl.obj: ..\..\src\msw\textctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -7822,6 +7848,9 @@ $(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
 $(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp
 
+$(OBJS)\monolib_xlocale.obj: ..\..\src\common\xlocale.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xlocale.cpp
+
 $(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xti.cpp
 
@@ -7966,9 +7995,6 @@ $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp
 $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp
 
-$(OBJS)\monolib_gauge95.obj: ..\..\src\msw\gauge95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
 $(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 
@@ -7987,27 +8013,24 @@ $(OBJS)\monolib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 $(OBJS)\monolib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
 
+$(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+
 $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
-$(OBJS)\monolib_slider95.obj: ..\..\src\msw\slider95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
 $(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 
-$(OBJS)\monolib_statbr95.obj: ..\..\src\msw\statbr95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 
 $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
 
-$(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
 $(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
 
@@ -8047,9 +8070,6 @@ $(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
 $(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
-$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
 $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
@@ -8062,18 +8082,12 @@ $(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
 $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
-$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
-
 $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 
 $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp
 
-$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
 $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
@@ -8771,6 +8785,16 @@ $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gauge.obj: ..\..\src\msw\gauge.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -8841,6 +8865,16 @@ $(OBJS)\monolib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_slider.obj: ..\..\src\msw\slider.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -8891,6 +8925,16 @@ $(OBJS)\monolib_stattext.obj: ..\..\src\univ\stattext.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_toolbar.obj: ..\..\src\msw\toolbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_textctrl.obj: ..\..\src\msw\textctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -9925,6 +9969,9 @@ $(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp
 $(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp
 
+$(OBJS)\basedll_xlocale.obj: ..\..\src\common\xlocale.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xlocale.cpp
+
 $(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xti.cpp
 
@@ -10228,6 +10275,9 @@ $(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp
 $(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp
 
+$(OBJS)\baselib_xlocale.obj: ..\..\src\common\xlocale.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xlocale.cpp
+
 $(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xti.cpp
 
@@ -10450,9 +10500,6 @@ $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp
 $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp
 
-$(OBJS)\coredll_gauge95.obj: ..\..\src\msw\gauge95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
 $(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 
@@ -10471,27 +10518,24 @@ $(OBJS)\coredll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 $(OBJS)\coredll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
 
+$(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+
 $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
-$(OBJS)\coredll_slider95.obj: ..\..\src\msw\slider95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
 $(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 
-$(OBJS)\coredll_statbr95.obj: ..\..\src\msw\statbr95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 
 $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
 
-$(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
 $(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
 
@@ -10531,9 +10575,6 @@ $(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
 $(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
-$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
 $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
@@ -10546,18 +10587,12 @@ $(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
 $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
-$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
-
 $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 
 $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp
 
-$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
 $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
@@ -10931,6 +10966,16 @@ $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gauge.obj: ..\..\src\msw\gauge.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -11001,6 +11046,16 @@ $(OBJS)\coredll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_slider.obj: ..\..\src\msw\slider.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -11051,6 +11106,16 @@ $(OBJS)\coredll_stattext.obj: ..\..\src\univ\stattext.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_toolbar.obj: ..\..\src\msw\toolbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_textctrl.obj: ..\..\src\msw\textctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -11761,9 +11826,6 @@ $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp
 $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp
 
-$(OBJS)\corelib_gauge95.obj: ..\..\src\msw\gauge95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
 $(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 
@@ -11782,27 +11844,24 @@ $(OBJS)\corelib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 $(OBJS)\corelib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp
 
+$(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+
 $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
-$(OBJS)\corelib_slider95.obj: ..\..\src\msw\slider95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
 $(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 
-$(OBJS)\corelib_statbr95.obj: ..\..\src\msw\statbr95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 
 $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
 
-$(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
 $(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
 
@@ -11842,9 +11901,6 @@ $(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
 $(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
-$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
 $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
@@ -11857,18 +11913,12 @@ $(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
 $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
-$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
-
 $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
 
 $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp
 
-$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
 $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
@@ -12242,6 +12292,16 @@ $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gauge.obj: ..\..\src\msw\gauge.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -12312,6 +12372,16 @@ $(OBJS)\corelib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_slider.obj: ..\..\src\msw\slider.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -12362,6 +12432,16 @@ $(OBJS)\corelib_stattext.obj: ..\..\src\univ\stattext.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_toolbar.obj: ..\..\src\msw\toolbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_textctrl.obj: ..\..\src\msw\textctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp