Added workaround for wxGTK tab traversal problem

[wxWidgets.git] / tests / makefile.gcc

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 226b5656bfe72ee0688689912301b5ba7798d557..578390a05cc55840ac0ab4a1ff53f83491eb9f35 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.4 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -12,11 +12,12 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-CPPDEPS = -MT$@ -MF$@.d -MD
+CPPDEPS = -MT$@ -MF$@.d -MD -MP

 WX_RELEASE_NODOT = 29
 WX_RELEASE_NODOT = 29

+COMPILER_PREFIX = gcc

 OBJS = \
 OBJS = \

-       gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \


@@ -33,21 +34,28 @@ TEST_OBJECTS =  \
        $(OBJS)\test_ziptest.o \
        $(OBJS)\test_tartest.o \
        $(OBJS)\test_arrays.o \
        $(OBJS)\test_ziptest.o \
        $(OBJS)\test_tartest.o \
        $(OBJS)\test_arrays.o \

+       $(OBJS)\test_base64.o \
+       $(OBJS)\test_cmdlinetest.o \
+       $(OBJS)\test_fileconf.o \

        $(OBJS)\test_datetimetest.o \
        $(OBJS)\test_datetimetest.o \

-       $(OBJS)\test_fileconftest.o \

        $(OBJS)\test_filekind.o \
        $(OBJS)\test_filenametest.o \
        $(OBJS)\test_filesystest.o \
        $(OBJS)\test_fontmaptest.o \
        $(OBJS)\test_formatconvertertest.o \
        $(OBJS)\test_hashes.o \
        $(OBJS)\test_filekind.o \
        $(OBJS)\test_filenametest.o \
        $(OBJS)\test_filesystest.o \
        $(OBJS)\test_fontmaptest.o \
        $(OBJS)\test_formatconvertertest.o \
        $(OBJS)\test_hashes.o \

+       $(OBJS)\test_intltest.o \

        $(OBJS)\test_lists.o \
        $(OBJS)\test_longlongtest.o \
        $(OBJS)\test_convautotest.o \
        $(OBJS)\test_mbconvtest.o \
        $(OBJS)\test_lists.o \
        $(OBJS)\test_longlongtest.o \
        $(OBJS)\test_convautotest.o \
        $(OBJS)\test_mbconvtest.o \

+       $(OBJS)\test_misctests.o \
+       $(OBJS)\test_ipc.o \
+       $(OBJS)\test_socket.o \

        $(OBJS)\test_regextest.o \
        $(OBJS)\test_wxregextest.o \
        $(OBJS)\test_scopeguardtest.o \
        $(OBJS)\test_regextest.o \
        $(OBJS)\test_wxregextest.o \
        $(OBJS)\test_scopeguardtest.o \

+       $(OBJS)\test_iostream.o \

        $(OBJS)\test_strings.o \
        $(OBJS)\test_stdstrings.o \
        $(OBJS)\test_tokenizer.o \
        $(OBJS)\test_strings.o \
        $(OBJS)\test_stdstrings.o \
        $(OBJS)\test_tokenizer.o \


@@ -61,14 +69,24 @@ TEST_OBJECTS =  \
        $(OBJS)\test_ffilestream.o \
        $(OBJS)\test_fileback.o \
        $(OBJS)\test_filestream.o \
        $(OBJS)\test_ffilestream.o \
        $(OBJS)\test_fileback.o \
        $(OBJS)\test_filestream.o \

+       $(OBJS)\test_iostreams.o \

        $(OBJS)\test_largefile.o \
        $(OBJS)\test_memstream.o \
        $(OBJS)\test_largefile.o \
        $(OBJS)\test_memstream.o \

+       $(OBJS)\test_socketstream.o \

        $(OBJS)\test_sstream.o \
        $(OBJS)\test_tempfile.o \
        $(OBJS)\test_textstreamtest.o \
        $(OBJS)\test_zlibstream.o \
        $(OBJS)\test_textfiletest.o \
        $(OBJS)\test_sstream.o \
        $(OBJS)\test_tempfile.o \
        $(OBJS)\test_textstreamtest.o \
        $(OBJS)\test_zlibstream.o \
        $(OBJS)\test_textfiletest.o \

-       $(OBJS)\test_uris.o
+       $(OBJS)\test_atomic.o \
+       $(OBJS)\test_queue.o \
+       $(OBJS)\test_tls.o \
+       $(OBJS)\test_uris.o \
+       $(OBJS)\test_vectors.o \
+       $(OBJS)\test_evtconnection.o \
+       $(OBJS)\test_weakref.o \
+       $(OBJS)\test_xlocale.o \
+       $(OBJS)\test_xmltest.o

 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \


@@ -82,7 +100,17 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_test.o \
        $(OBJS)\test_gui_rect.o \
        $(OBJS)\test_gui_size.o \
        $(OBJS)\test_gui_test.o \
        $(OBJS)\test_gui_rect.o \
        $(OBJS)\test_gui_size.o \

-       $(OBJS)\test_gui_point.o
+       $(OBJS)\test_gui_point.o \
+       $(OBJS)\test_gui_config.o \
+       $(OBJS)\test_gui_comboboxtest.o \
+       $(OBJS)\test_gui_textctrltest.o \
+       $(OBJS)\test_gui_textentrytest.o \
+       $(OBJS)\test_gui_rawbmp.o \
+       $(OBJS)\test_gui_htmlwindow.o \
+       $(OBJS)\test_gui_guifuncs.o \
+       $(OBJS)\test_gui_selstoretest.o \
+       $(OBJS)\test_gui_clientsize.o \
+       $(OBJS)\test_gui_setsize.o

 PRINTFBENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 PRINTFBENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \


@@ -138,6 +166,10 @@ ifeq ($(MONOLITHIC),0)
 __WXLIB_NET_p = \
        -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
 endif
 __WXLIB_NET_p = \
        -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
 endif

+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif

 ifeq ($(USE_GUI),1)
 __test_gui___depname = $(OBJS)\test_gui.exe
 endif
 ifeq ($(USE_GUI),1)
 __test_gui___depname = $(OBJS)\test_gui.exe
 endif


@@ -161,6 +193,9 @@ endif
 ifeq ($(USE_THREADS),0)
 __THREAD_DEFINE_p_3 = --define wxNO_THREADS
 endif
 ifeq ($(USE_THREADS),0)
 __THREAD_DEFINE_p_3 = --define wxNO_THREADS
 endif

+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_3 = --define wxUSE_UNICODE=0
+endif

 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_3 = --define _UNICODE
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_3 = --define _UNICODE
 endif


@@ -174,6 +209,10 @@ ifeq ($(SHARED),1)
 __DLLFLAG_p_3 = --define WXUSINGDLL
 endif
 ifeq ($(MONOLITHIC),0)
 __DLLFLAG_p_3 = --define WXUSINGDLL
 endif
 ifeq ($(MONOLITHIC),0)

+__WXLIB_HTML_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
+endif
+ifeq ($(MONOLITHIC),0)

 __WXLIB_CORE_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
 endif
 __WXLIB_CORE_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
 endif


@@ -224,6 +263,9 @@ endif
 ifeq ($(USE_THREADS),0)
 __THREAD_DEFINE_p = -DwxNO_THREADS
 endif
 ifeq ($(USE_THREADS),0)
 __THREAD_DEFINE_p = -DwxNO_THREADS
 endif

+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif

 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif


@@ -280,7 +322,7 @@ $(OBJS):
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: $(OBJS)\test.exe $(__test_gui___depname) data $(OBJS)\printfbench.exe
+all: $(OBJS)\test.exe $(__test_gui___depname) data fr $(OBJS)\printfbench.exe

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o


@@ -290,19 +332,23 @@ clean:
        -if exist $(OBJS)\printfbench.exe del $(OBJS)\printfbench.exe
 
 $(OBJS)\test.exe: $(TEST_OBJECTS)
        -if exist $(OBJS)\printfbench.exe del $(OBJS)\printfbench.exe
 
 $(OBJS)\test.exe: $(TEST_OBJECTS)

-       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(CPPUNIT_LIBS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+       $(CXX) -o $@ $(TEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(CPPUNIT_LIBS) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o

-       $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)   $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+       $(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS)  $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 endif
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
        for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 endif
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
        for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 

+fr: 
+       if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr
+       for %%f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%%f copy .\intl\fr\%%f $(OBJS)\intl\fr
+

 $(OBJS)\printfbench.exe: $(PRINTFBENCH_OBJECTS)
 $(OBJS)\printfbench.exe: $(PRINTFBENCH_OBJECTS)

-       $(CXX) -o $@ $(PRINTFBENCH_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(CPPUNIT_LIBS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+       $(CXX) -o $@ $(PRINTFBENCH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(CPPUNIT_LIBS) $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 $(OBJS)\test_dummy.o: ./dummy.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_dummy.o: ./dummy.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<


@@ -322,10 +368,16 @@ $(OBJS)\test_tartest.o: ./archive/tartest.cpp
 $(OBJS)\test_arrays.o: ./arrays/arrays.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_arrays.o: ./arrays/arrays.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 

-$(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp
+$(OBJS)\test_base64.o: ./base64/base64.cpp

        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 

-$(OBJS)\test_fileconftest.o: ./fileconf/fileconftest.cpp
+$(OBJS)\test_cmdlinetest.o: ./cmdline/cmdlinetest.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_fileconf.o: ./config/fileconf.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp

        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_filekind.o: ./filekind/filekind.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_filekind.o: ./filekind/filekind.cpp


@@ -346,6 +398,9 @@ $(OBJS)\test_formatconvertertest.o: ./formatconverter/formatconvertertest.cpp
 $(OBJS)\test_hashes.o: ./hashes/hashes.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_hashes.o: ./hashes/hashes.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 

+$(OBJS)\test_intltest.o: ./intl/intltest.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+

 $(OBJS)\test_lists.o: ./lists/lists.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_lists.o: ./lists/lists.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 


@@ -358,6 +413,15 @@ $(OBJS)\test_convautotest.o: ./mbconv/convautotest.cpp
 $(OBJS)\test_mbconvtest.o: ./mbconv/mbconvtest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_mbconvtest.o: ./mbconv/mbconvtest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 

+$(OBJS)\test_misctests.o: ./misc/misctests.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_ipc.o: ./net/ipc.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_socket.o: ./net/socket.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+

 $(OBJS)\test_regextest.o: ./regex/regextest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_regextest.o: ./regex/regextest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 


@@ -367,6 +431,9 @@ $(OBJS)\test_wxregextest.o: ./regex/wxregextest.cpp
 $(OBJS)\test_scopeguardtest.o: ./scopeguard/scopeguardtest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_scopeguardtest.o: ./scopeguard/scopeguardtest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 

+$(OBJS)\test_iostream.o: ./strings/iostream.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+

 $(OBJS)\test_strings.o: ./strings/strings.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_strings.o: ./strings/strings.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 


@@ -406,12 +473,18 @@ $(OBJS)\test_fileback.o: ./streams/fileback.cpp
 $(OBJS)\test_filestream.o: ./streams/filestream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_filestream.o: ./streams/filestream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 

+$(OBJS)\test_iostreams.o: ./streams/iostreams.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+

 $(OBJS)\test_largefile.o: ./streams/largefile.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_memstream.o: ./streams/memstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_largefile.o: ./streams/largefile.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_memstream.o: ./streams/memstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 

+$(OBJS)\test_socketstream.o: ./streams/socketstream.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+

 $(OBJS)\test_sstream.o: ./streams/sstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_sstream.o: ./streams/sstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 


@@ -427,9 +500,33 @@ $(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
 $(OBJS)\test_textfiletest.o: ./textfile/textfiletest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_textfiletest.o: ./textfile/textfiletest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 

+$(OBJS)\test_atomic.o: ./thread/atomic.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_queue.o: ./thread/queue.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_tls.o: ./thread/tls.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+

 $(OBJS)\test_uris.o: ./uris/uris.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_uris.o: ./uris/uris.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 

+$(OBJS)\test_vectors.o: ./vectors/vectors.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_evtconnection.o: ./weakref/evtconnection.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_weakref.o: ./weakref/weakref.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_xlocale.o: ./xlocale/xlocale.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_xmltest.o: ./xml/xmltest.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+

 $(OBJS)\test_gui_sample_rc.o: ./../samples/sample.rc
        windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../include --include-dir . $(__DLLFLAG_p_3) --include-dir ./../samples --define NOPCH
 
 $(OBJS)\test_gui_sample_rc.o: ./../samples/sample.rc
        windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../include --include-dir . $(__DLLFLAG_p_3) --include-dir ./../samples --define NOPCH
 


@@ -448,14 +545,46 @@ $(OBJS)\test_gui_size.o: ./geometry/size.cpp
 $(OBJS)\test_gui_point.o: ./geometry/point.cpp
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_gui_point.o: ./geometry/point.cpp
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 

+$(OBJS)\test_gui_config.o: ./config/config.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_comboboxtest.o: ./controls/comboboxtest.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_textctrltest.o: ./controls/textctrltest.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_textentrytest.o: ./controls/textentrytest.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_htmlwindow.o: ./html/htmlwindow.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_guifuncs.o: ./misc/guifuncs.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_selstoretest.o: ./misc/selstoretest.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_clientsize.o: ./window/clientsize.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_setsize.o: ./window/setsize.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+

 $(OBJS)\printfbench_dummy.o: ./dummy.cpp
        $(CXX) -c -o $@ $(PRINTFBENCH_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\printfbench_printfbench.o: ./benchmarks/printfbench.cpp
        $(CXX) -c -o $@ $(PRINTFBENCH_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\printfbench_dummy.o: ./dummy.cpp
        $(CXX) -c -o $@ $(PRINTFBENCH_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\printfbench_printfbench.o: ./benchmarks/printfbench.cpp
        $(CXX) -c -o $@ $(PRINTFBENCH_CXXFLAGS) $(CPPDEPS) $<
 

-.PHONY: all clean data
+.PHONY: all clean data fr
+

 
 

+SHELL := $(COMSPEC)

 
 # Dependencies tracking:
 -include $(OBJS)/*.d
 
 # Dependencies tracking:
 -include $(OBJS)/*.d