some more operator?! tests

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

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index c3ef908b327d3e48e1649021a7e45b940c0636be..7f22f62a94392f977ea4ae2f37c0716d5ebc86dc 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -192,6 +192,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_arcall.o \
        $(OBJS)\monodll_arcfind.o \
        $(OBJS)\monodll_archive.o \
+       $(OBJS)\monodll_arrstr.o \
        $(OBJS)\monodll_clntdata.o \
        $(OBJS)\monodll_cmdline.o \
        $(OBJS)\monodll_config.o \
@@ -239,6 +240,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_strconv.o \
        $(OBJS)\monodll_stream.o \
        $(OBJS)\monodll_string.o \
+       $(OBJS)\monodll_stringimpl.o \
        $(OBJS)\monodll_strvararg.o \
        $(OBJS)\monodll_sysopt.o \
        $(OBJS)\monodll_tarstrm.o \
@@ -315,6 +317,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_arcall.o \
        $(OBJS)\monolib_arcfind.o \
        $(OBJS)\monolib_archive.o \
+       $(OBJS)\monolib_arrstr.o \
        $(OBJS)\monolib_clntdata.o \
        $(OBJS)\monolib_cmdline.o \
        $(OBJS)\monolib_config.o \
@@ -362,6 +365,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_strconv.o \
        $(OBJS)\monolib_stream.o \
        $(OBJS)\monolib_string.o \
+       $(OBJS)\monolib_stringimpl.o \
        $(OBJS)\monolib_strvararg.o \
        $(OBJS)\monolib_sysopt.o \
        $(OBJS)\monolib_tarstrm.o \
@@ -440,6 +444,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_arcall.o \
        $(OBJS)\basedll_arcfind.o \
        $(OBJS)\basedll_archive.o \
+       $(OBJS)\basedll_arrstr.o \
        $(OBJS)\basedll_clntdata.o \
        $(OBJS)\basedll_cmdline.o \
        $(OBJS)\basedll_config.o \
@@ -487,6 +492,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_strconv.o \
        $(OBJS)\basedll_stream.o \
        $(OBJS)\basedll_string.o \
+       $(OBJS)\basedll_stringimpl.o \
        $(OBJS)\basedll_strvararg.o \
        $(OBJS)\basedll_sysopt.o \
        $(OBJS)\basedll_tarstrm.o \
@@ -548,6 +554,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_arcall.o \
        $(OBJS)\baselib_arcfind.o \
        $(OBJS)\baselib_archive.o \
+       $(OBJS)\baselib_arrstr.o \
        $(OBJS)\baselib_clntdata.o \
        $(OBJS)\baselib_cmdline.o \
        $(OBJS)\baselib_config.o \
@@ -595,6 +602,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_strconv.o \
        $(OBJS)\baselib_stream.o \
        $(OBJS)\baselib_string.o \
+       $(OBJS)\baselib_stringimpl.o \
        $(OBJS)\baselib_strvararg.o \
        $(OBJS)\baselib_sysopt.o \
        $(OBJS)\baselib_tarstrm.o \
@@ -1517,6 +1525,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_sizer.o \
        $(OBJS)\monodll_srchcmn.o \
        $(OBJS)\monodll_statbar.o \
+       $(OBJS)\monodll_stattextcmn.o \
        $(OBJS)\monodll_stockitem.o \
        $(OBJS)\monodll_tbarbase.o \
        $(OBJS)\monodll_textcmn.o \
@@ -1746,6 +1755,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_sizer.o \
        $(OBJS)\monodll_srchcmn.o \
        $(OBJS)\monodll_statbar.o \
+       $(OBJS)\monodll_stattextcmn.o \
        $(OBJS)\monodll_stockitem.o \
        $(OBJS)\monodll_tbarbase.o \
        $(OBJS)\monodll_textcmn.o \
@@ -2145,6 +2155,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_sizer.o \
        $(OBJS)\monolib_srchcmn.o \
        $(OBJS)\monolib_statbar.o \
+       $(OBJS)\monolib_stattextcmn.o \
        $(OBJS)\monolib_stockitem.o \
        $(OBJS)\monolib_tbarbase.o \
        $(OBJS)\monolib_textcmn.o \
@@ -2374,6 +2385,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_sizer.o \
        $(OBJS)\monolib_srchcmn.o \
        $(OBJS)\monolib_statbar.o \
+       $(OBJS)\monolib_stattextcmn.o \
        $(OBJS)\monolib_stockitem.o \
        $(OBJS)\monolib_tbarbase.o \
        $(OBJS)\monolib_textcmn.o \
@@ -2489,6 +2501,12 @@ __baselib___depname = \
        $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
+ifeq ($(SHARED),1)
+____wxbase_namedll_DEP = $(__basedll___depname)
+endif
+ifeq ($(SHARED),0)
+____wxbase_namelib_DEP = $(__baselib___depname)
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 __netdll___depname = \
@@ -2501,6 +2519,12 @@ __netlib___depname = \
        $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a
 endif
 endif
+ifeq ($(SHARED),1)
+____wxnet_namedll_DEP = $(__netdll___depname)
+endif
+ifeq ($(SHARED),0)
+____wxnet_namelib_DEP = $(__netlib___depname)
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
@@ -2691,6 +2715,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_sizer.o \
        $(OBJS)\coredll_srchcmn.o \
        $(OBJS)\coredll_statbar.o \
+       $(OBJS)\coredll_stattextcmn.o \
        $(OBJS)\coredll_stockitem.o \
        $(OBJS)\coredll_tbarbase.o \
        $(OBJS)\coredll_textcmn.o \
@@ -2920,6 +2945,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_sizer.o \
        $(OBJS)\coredll_srchcmn.o \
        $(OBJS)\coredll_statbar.o \
+       $(OBJS)\coredll_stattextcmn.o \
        $(OBJS)\coredll_stockitem.o \
        $(OBJS)\coredll_tbarbase.o \
        $(OBJS)\coredll_textcmn.o \
@@ -3154,6 +3180,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_sizer.o \
        $(OBJS)\corelib_srchcmn.o \
        $(OBJS)\corelib_statbar.o \
+       $(OBJS)\corelib_stattextcmn.o \
        $(OBJS)\corelib_stockitem.o \
        $(OBJS)\corelib_tbarbase.o \
        $(OBJS)\corelib_textcmn.o \
@@ -3383,6 +3410,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_sizer.o \
        $(OBJS)\corelib_srchcmn.o \
        $(OBJS)\corelib_statbar.o \
+       $(OBJS)\corelib_stattextcmn.o \
        $(OBJS)\corelib_stockitem.o \
        $(OBJS)\corelib_tbarbase.o \
        $(OBJS)\corelib_textcmn.o \
@@ -3427,6 +3455,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_vscroll.o
 endif
 endif
+ifeq ($(SHARED),1)
+____wxcore_namedll_DEP = $(__coredll___depname)
+endif
+ifeq ($(SHARED),0)
+____wxcore_namelib_DEP = $(__corelib___depname)
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
@@ -3561,6 +3595,12 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_taskbar.o \
        $(OBJS)\advlib_joystick.o
 endif
+ifeq ($(SHARED),1)
+____wxadv_namedll_DEP = $(__advdll___depname)
+endif
+ifeq ($(SHARED),0)
+____wxadv_namelib_DEP = $(__advlib___depname)
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
@@ -3581,6 +3621,12 @@ endif
 endif
 endif
 endif
+ifeq ($(SHARED),1)
+____wxmedia_namedll_DEP = $(__mediadll___depname)
+endif
+ifeq ($(SHARED),0)
+____wxmedia_namelib_DEP = $(__medialib___depname)
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_ODBC),1)
@@ -3617,6 +3663,12 @@ endif
 endif
 endif
 endif
+ifeq ($(SHARED),1)
+____wxdbgrid_namedll_DEP = $(__dbgriddll___depname)
+endif
+ifeq ($(SHARED),0)
+____wxdbgrid_namelib_DEP = $(__dbgridlib___depname)
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
@@ -3637,6 +3689,12 @@ endif
 endif
 endif
 endif
+ifeq ($(SHARED),1)
+____wxhtml_namedll_DEP = $(__htmldll___depname)
+endif
+ifeq ($(SHARED),0)
+____wxhtml_namelib_DEP = $(__htmllib___depname)
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
@@ -3657,6 +3715,12 @@ endif
 endif
 endif
 endif
+ifeq ($(SHARED),1)
+____wxqa_namedll_DEP = $(__qadll___depname)
+endif
+ifeq ($(SHARED),0)
+____wxqa_namelib_DEP = $(__qalib___depname)
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 __xmldll___depname = \
@@ -3669,6 +3733,12 @@ __xmllib___depname = \
        $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a
 endif
 endif
+ifeq ($(SHARED),1)
+____wxxml_namedll_DEP = $(__xmldll___depname)
+endif
+ifeq ($(SHARED),0)
+____wxxml_namelib_DEP = $(__xmllib___depname)
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_XRC),1)
@@ -3685,6 +3755,12 @@ __xrclib___depname = \
 endif
 endif
 endif
+ifeq ($(SHARED),1)
+____wxxrc_namedll_DEP = $(__xrcdll___depname)
+endif
+ifeq ($(SHARED),0)
+____wxxrc_namelib_DEP = $(__xrclib___depname)
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_AUI),1)
@@ -3701,6 +3777,12 @@ __auilib___depname = \
 endif
 endif
 endif
+ifeq ($(SHARED),1)
+____wxaui_namedll_DEP = $(__auidll___depname)
+endif
+ifeq ($(SHARED),0)
+____wxaui_namelib_DEP = $(__auilib___depname)
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_RICHTEXT),1)
@@ -3718,6 +3800,12 @@ endif
 endif
 endif
 ifeq ($(SHARED),1)
+____wxrichtext_namedll_DEP = $(__richtextdll___depname)
+endif
+ifeq ($(SHARED),0)
+____wxrichtext_namelib_DEP = $(__richtextlib___depname)
+endif
+ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_OPENGL),1)
 __gldll___depname = \
@@ -4019,6 +4107,10 @@ $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB
 endif
 endif
 
+ifeq ($(MONOLITHIC),0)
+wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
+endif
+
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\netdll_version_rc.o $(__basedll___depname)
@@ -4035,6 +4127,10 @@ $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB
 endif
 endif
 
+ifeq ($(MONOLITHIC),0)
+wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
+endif
+
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
@@ -4055,6 +4151,12 @@ endif
 endif
 endif
 
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_GUI),1)
+wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
+endif
+endif
+
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
@@ -4075,6 +4177,12 @@ endif
 endif
 endif
 
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_GUI),1)
+wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
+endif
+endif
+
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
@@ -4099,6 +4207,14 @@ endif
 endif
 endif
 
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_GUI),1)
+ifeq ($(USE_MEDIA),1)
+wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
+endif
+endif
+endif
+
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_ODBC),1)
@@ -4143,6 +4259,14 @@ endif
 endif
 endif
 
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_GUI),1)
+ifeq ($(USE_ODBC),1)
+wxdbgrid: $(____wxdbgrid_namedll_DEP) $(____wxdbgrid_namelib_DEP)
+endif
+endif
+endif
+
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
@@ -4167,6 +4291,12 @@ endif
 endif
 endif
 
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_HTML),1)
+wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
+endif
+endif
+
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
@@ -4191,6 +4321,12 @@ endif
 endif
 endif
 
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_QA),1)
+wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
+endif
+endif
+
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xmldll_version_rc.o $(__basedll___depname)
@@ -4207,6 +4343,10 @@ $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB
 endif
 endif
 
+ifeq ($(MONOLITHIC),0)
+wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
+endif
+
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_XRC),1)
@@ -4227,6 +4367,12 @@ endif
 endif
 endif
 
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_XRC),1)
+wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
+endif
+endif
+
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_AUI),1)
@@ -4247,6 +4393,12 @@ endif
 endif
 endif
 
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_AUI),1)
+wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
+endif
+endif
+
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_RICHTEXT),1)
@@ -4267,6 +4419,12 @@ endif
 endif
 endif
 
+ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_RICHTEXT),1)
+wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
+endif
+endif
+
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_OPENGL),1)
@@ -4713,6 +4871,9 @@ $(OBJS)\monodll_arcfind.o: ../../src/common/arcfind.cpp
 $(OBJS)\monodll_archive.o: ../../src/common/archive.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monodll_arrstr.o: ../../src/common/arrstr.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_clntdata.o: ../../src/common/clntdata.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -4854,6 +5015,9 @@ $(OBJS)\monodll_stream.o: ../../src/common/stream.cpp
 $(OBJS)\monodll_string.o: ../../src/common/string.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monodll_stringimpl.o: ../../src/common/stringimpl.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_strvararg.o: ../../src/common/strvararg.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -6479,6 +6643,11 @@ $(OBJS)\monodll_statbar.o: ../../src/common/statbar.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_stattextcmn.o: ../../src/common/stattextcmn.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_stockitem.o: ../../src/common/stockitem.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -6834,6 +7003,9 @@ $(OBJS)\monolib_arcfind.o: ../../src/common/arcfind.cpp
 $(OBJS)\monolib_archive.o: ../../src/common/archive.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monolib_arrstr.o: ../../src/common/arrstr.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_clntdata.o: ../../src/common/clntdata.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -6975,6 +7147,9 @@ $(OBJS)\monolib_stream.o: ../../src/common/stream.cpp
 $(OBJS)\monolib_string.o: ../../src/common/string.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monolib_stringimpl.o: ../../src/common/stringimpl.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_strvararg.o: ../../src/common/strvararg.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -8600,6 +8775,11 @@ $(OBJS)\monolib_statbar.o: ../../src/common/statbar.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_stattextcmn.o: ../../src/common/stattextcmn.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_stockitem.o: ../../src/common/stockitem.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -8958,6 +9138,9 @@ $(OBJS)\basedll_arcfind.o: ../../src/common/arcfind.cpp
 $(OBJS)\basedll_archive.o: ../../src/common/archive.cpp
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\basedll_arrstr.o: ../../src/common/arrstr.cpp
+       $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\basedll_clntdata.o: ../../src/common/clntdata.cpp
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9099,6 +9282,9 @@ $(OBJS)\basedll_stream.o: ../../src/common/stream.cpp
 $(OBJS)\basedll_string.o: ../../src/common/string.cpp
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\basedll_stringimpl.o: ../../src/common/stringimpl.cpp
+       $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\basedll_strvararg.o: ../../src/common/strvararg.cpp
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9234,6 +9420,9 @@ $(OBJS)\baselib_arcfind.o: ../../src/common/arcfind.cpp
 $(OBJS)\baselib_archive.o: ../../src/common/archive.cpp
        $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\baselib_arrstr.o: ../../src/common/arrstr.cpp
+       $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\baselib_clntdata.o: ../../src/common/clntdata.cpp
        $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9375,6 +9564,9 @@ $(OBJS)\baselib_stream.o: ../../src/common/stream.cpp
 $(OBJS)\baselib_string.o: ../../src/common/string.cpp
        $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\baselib_stringimpl.o: ../../src/common/stringimpl.cpp
+       $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\baselib_strvararg.o: ../../src/common/strvararg.cpp
        $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -10754,6 +10946,11 @@ $(OBJS)\coredll_statbar.o: ../../src/common/statbar.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_stattextcmn.o: ../../src/common/stattextcmn.cpp
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_stockitem.o: ../../src/common/stockitem.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -12139,6 +12336,11 @@ $(OBJS)\corelib_statbar.o: ../../src/common/statbar.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_stattextcmn.o: ../../src/common/stattextcmn.cpp
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_stockitem.o: ../../src/common/stockitem.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -13246,7 +13448,7 @@ $(OBJS)\gllib_dummy.o: ../../src/common/dummy.cpp
 $(OBJS)\gllib_glcanvas.o: ../../src/msw/glcanvas.cpp
        $(CXX) -c -o $@ $(GLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-.PHONY: all clean setup_h samples build_cfg_file
+.PHONY: all clean setup_h wxbase wxnet wxcore wxadv wxmedia wxdbgrid wxhtml wxqa wxxml wxxrc wxaui wxrichtext samples build_cfg_file
 
 
 # Dependencies tracking: