Added Set/GetQuickBestSize

[wxWidgets.git] / tests / makefile.wat

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 7ca23cfd6299b9f9888493807dd56e5a9cd06438..79504daa50af0bb76b6588f7fcec002b106a921d 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)

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


@@ -55,6 +55,13 @@ WXDLLFLAG =
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif

+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif

 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
 EXTRALIBS_FOR_BASE = 
 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
 EXTRALIBS_FOR_BASE = 


@@ -117,6 +124,13 @@ __OPTIMIZEFLAG = -od
 !ifeq BUILD release
 __OPTIMIZEFLAG = -ot -ox
 !endif
 !ifeq BUILD release
 __OPTIMIZEFLAG = -ot -ox
 !endif

+__THREADSFLAG =
+!ifeq USE_THREADS 0
+__THREADSFLAG = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG = -bm
+!endif

 __RUNTIME_LIBS =
 !ifeq RUNTIME_LIBS dynamic
 __RUNTIME_LIBS = -br
 __RUNTIME_LIBS =
 !ifeq RUNTIME_LIBS dynamic
 __RUNTIME_LIBS = -br


@@ -124,6 +138,13 @@ __RUNTIME_LIBS = -br
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS = 
 !endif
 !ifeq RUNTIME_LIBS static
 __RUNTIME_LIBS = 
 !endif

+__RTTIFLAG =
+!ifeq USE_RTTI 0
+__RTTIFLAG = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG = -xr
+!endif

 __EXCEPTIONSFLAG =
 !ifeq USE_EXCEPTIONS 0
 __EXCEPTIONSFLAG = 
 __EXCEPTIONSFLAG =
 !ifeq USE_EXCEPTIONS 0
 __EXCEPTIONSFLAG = 


@@ -131,13 +152,6 @@ __EXCEPTIONSFLAG =
 !ifeq USE_EXCEPTIONS 1
 __EXCEPTIONSFLAG = -xs
 !endif
 !ifeq USE_EXCEPTIONS 1
 __EXCEPTIONSFLAG = -xs
 !endif

-LIBDIRNAME =
-!ifeq SHARED 0
-LIBDIRNAME = .\..\lib\wat_lib$(CFG)
-!endif
-!ifeq SHARED 1
-LIBDIRNAME = .\..\lib\wat_dll$(CFG)
-!endif

 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_BASE_p = &
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_BASE_p = &


@@ -173,6 +187,18 @@ __DEBUG_DEFINE_p = -d__WXDEBUG__
 !ifeq DEBUG_FLAG 1
 __DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif
 !ifeq DEBUG_FLAG 1
 __DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif

+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif

 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE


@@ -184,23 +210,28 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 27

 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

+LIBDIRNAME = .\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

-TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
-       -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
-       -i=.\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
-       $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test.pch &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include -wx -wcd=549 -wcd=656 &
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 $(CPPUNIT_CFLAGS) &
+       /fh=$(OBJS)\testprec_test.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+       $(CXXFLAGS)

 TEST_OBJECTS =  &
        $(OBJS)\test_dummy.obj &
        $(OBJS)\test_test.obj &
        $(OBJS)\test_archivetest.obj &
 TEST_OBJECTS =  &
        $(OBJS)\test_dummy.obj &
        $(OBJS)\test_test.obj &
        $(OBJS)\test_archivetest.obj &

+       $(OBJS)\test_ziptest.obj &

        $(OBJS)\test_arrays.obj &
        $(OBJS)\test_datetimetest.obj &
        $(OBJS)\test_fileconftest.obj &
        $(OBJS)\test_arrays.obj &
        $(OBJS)\test_datetimetest.obj &
        $(OBJS)\test_fileconftest.obj &

+       $(OBJS)\test_filekind.obj &

        $(OBJS)\test_filenametest.obj &
        $(OBJS)\test_filesystest.obj &
        $(OBJS)\test_fontmaptest.obj &
        $(OBJS)\test_filenametest.obj &
        $(OBJS)\test_filesystest.obj &
        $(OBJS)\test_fontmaptest.obj &


@@ -208,31 +239,41 @@ TEST_OBJECTS =  &
        $(OBJS)\test_hashes.obj &
        $(OBJS)\test_lists.obj &
        $(OBJS)\test_longlongtest.obj &
        $(OBJS)\test_hashes.obj &
        $(OBJS)\test_lists.obj &
        $(OBJS)\test_longlongtest.obj &

+       $(OBJS)\test_convautotest.obj &

        $(OBJS)\test_mbconvtest.obj &
        $(OBJS)\test_regextest.obj &
        $(OBJS)\test_wxregextest.obj &
        $(OBJS)\test_mbconvtest.obj &
        $(OBJS)\test_regextest.obj &
        $(OBJS)\test_wxregextest.obj &

+       $(OBJS)\test_scopeguardtest.obj &

        $(OBJS)\test_strings.obj &
        $(OBJS)\test_stdstrings.obj &
        $(OBJS)\test_strings.obj &
        $(OBJS)\test_stdstrings.obj &

+       $(OBJS)\test_tokenizer.obj &

        $(OBJS)\test_unicode.obj &
        $(OBJS)\test_crt.obj &
        $(OBJS)\test_bstream.obj &
        $(OBJS)\test_datastreamtest.obj &
        $(OBJS)\test_ffilestream.obj &
        $(OBJS)\test_filestream.obj &
        $(OBJS)\test_unicode.obj &
        $(OBJS)\test_crt.obj &
        $(OBJS)\test_bstream.obj &
        $(OBJS)\test_datastreamtest.obj &
        $(OBJS)\test_ffilestream.obj &
        $(OBJS)\test_filestream.obj &

+       $(OBJS)\test_largefile.obj &

        $(OBJS)\test_memstream.obj &
        $(OBJS)\test_sstream.obj &
        $(OBJS)\test_memstream.obj &
        $(OBJS)\test_sstream.obj &

+       $(OBJS)\test_tempfile.obj &

        $(OBJS)\test_textstreamtest.obj &
        $(OBJS)\test_zlibstream.obj &
        $(OBJS)\test_textstreamtest.obj &
        $(OBJS)\test_zlibstream.obj &

+       $(OBJS)\test_textfiletest.obj &

        $(OBJS)\test_uris.obj
        $(OBJS)\test_uris.obj

-TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
-       -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
-       -i=.\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
-       $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $(CPPUNIT_CFLAGS) &
-       /fh=$(OBJS)\testprec_test_gui.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-       $(CXXFLAGS)
+TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
+       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include -wx -wcd=549 -wcd=656 &
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH &
+       $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test_gui.pch $(__RTTIFLAG) &
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)

 TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_dummy.obj &
 TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_dummy.obj &

-       $(OBJS)\test_gui_test.obj
+       $(OBJS)\test_gui_test.obj &
+       $(OBJS)\test_gui_rect.obj &
+       $(OBJS)\test_gui_size.obj &
+       $(OBJS)\test_gui_point.obj

 
 
 all : $(OBJS)
 
 
 all : $(OBJS)


@@ -248,6 +289,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk

+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch

        -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
        -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
 
        -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
        -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
 


@@ -260,6 +302,7 @@ $(OBJS)\test.exe :  $(TEST_OBJECTS)
        @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i
        @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\test.lbc library %i
        @%append $(OBJS)\test.lbc
        @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i
        @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\test.lbc library %i
        @%append $(OBJS)\test.lbc

+       @for %i in () do @%append $(OBJS)\test.lbc option stack=%i

        wlink @$(OBJS)\test.lbc
 
 !ifeq USE_GUI 1
        wlink @$(OBJS)\test.lbc
 
 !ifeq USE_GUI 1


@@ -268,10 +311,11 @@ $(OBJS)\test_gui.exe :  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
        @%append $(OBJS)\test_gui.lbc option quiet
        @%append $(OBJS)\test_gui.lbc name $^@
        @%append $(OBJS)\test_gui.lbc option caseexact
        @%append $(OBJS)\test_gui.lbc option quiet
        @%append $(OBJS)\test_gui.lbc name $^@
        @%append $(OBJS)\test_gui.lbc option caseexact

-       @%append $(OBJS)\test_gui.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(CPPUNIT_LIBS)
+       @%append $(OBJS)\test_gui.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_'

        @for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i
        @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\test_gui.lbc library %i
        @%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res
        @for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i
        @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\test_gui.lbc library %i
        @%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res

+       @for %i in () do @%append $(OBJS)\test_gui.lbc option stack=%i

        wlink @$(OBJS)\test_gui.lbc
 !endif
 
        wlink @$(OBJS)\test_gui.lbc
 !endif
 


@@ -280,97 +324,131 @@ data : .SYMBOLIC
        for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\test_dummy.obj :  .AUTODEPEND .\dummy.cpp
        for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\test_dummy.obj :  .AUTODEPEND .\dummy.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_test.obj :  .AUTODEPEND .\test.cpp
 
 $(OBJS)\test_test.obj :  .AUTODEPEND .\test.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_archivetest.obj :  .AUTODEPEND .\archive\archivetest.cpp
 
 $(OBJS)\test_archivetest.obj :  .AUTODEPEND .\archive\archivetest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_ziptest.obj :  .AUTODEPEND .\archive\ziptest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_arrays.obj :  .AUTODEPEND .\arrays\arrays.cpp
 
 $(OBJS)\test_arrays.obj :  .AUTODEPEND .\arrays\arrays.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_datetimetest.obj :  .AUTODEPEND .\datetime\datetimetest.cpp
 
 $(OBJS)\test_datetimetest.obj :  .AUTODEPEND .\datetime\datetimetest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_fileconftest.obj :  .AUTODEPEND .\fileconf\fileconftest.cpp
 
 $(OBJS)\test_fileconftest.obj :  .AUTODEPEND .\fileconf\fileconftest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_filekind.obj :  .AUTODEPEND .\filekind\filekind.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_filenametest.obj :  .AUTODEPEND .\filename\filenametest.cpp
 
 $(OBJS)\test_filenametest.obj :  .AUTODEPEND .\filename\filenametest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_filesystest.obj :  .AUTODEPEND .\filesys\filesystest.cpp
 
 $(OBJS)\test_filesystest.obj :  .AUTODEPEND .\filesys\filesystest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_fontmaptest.obj :  .AUTODEPEND .\fontmap\fontmaptest.cpp
 
 $(OBJS)\test_fontmaptest.obj :  .AUTODEPEND .\fontmap\fontmaptest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_formatconvertertest.obj :  .AUTODEPEND .\formatconverter\formatconvertertest.cpp
 
 $(OBJS)\test_formatconvertertest.obj :  .AUTODEPEND .\formatconverter\formatconvertertest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_hashes.obj :  .AUTODEPEND .\hashes\hashes.cpp
 
 $(OBJS)\test_hashes.obj :  .AUTODEPEND .\hashes\hashes.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_lists.obj :  .AUTODEPEND .\lists\lists.cpp
 
 $(OBJS)\test_lists.obj :  .AUTODEPEND .\lists\lists.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_longlongtest.obj :  .AUTODEPEND .\longlong\longlongtest.cpp
 
 $(OBJS)\test_longlongtest.obj :  .AUTODEPEND .\longlong\longlongtest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_convautotest.obj :  .AUTODEPEND .\mbconv\convautotest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_mbconvtest.obj :  .AUTODEPEND .\mbconv\mbconvtest.cpp
 
 $(OBJS)\test_mbconvtest.obj :  .AUTODEPEND .\mbconv\mbconvtest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_regextest.obj :  .AUTODEPEND .\regex\regextest.cpp
 
 $(OBJS)\test_regextest.obj :  .AUTODEPEND .\regex\regextest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_wxregextest.obj :  .AUTODEPEND .\regex\wxregextest.cpp
 
 $(OBJS)\test_wxregextest.obj :  .AUTODEPEND .\regex\wxregextest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_scopeguardtest.obj :  .AUTODEPEND .\scopeguard\scopeguardtest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_strings.obj :  .AUTODEPEND .\strings\strings.cpp
 
 $(OBJS)\test_strings.obj :  .AUTODEPEND .\strings\strings.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_stdstrings.obj :  .AUTODEPEND .\strings\stdstrings.cpp
 
 $(OBJS)\test_stdstrings.obj :  .AUTODEPEND .\strings\stdstrings.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_tokenizer.obj :  .AUTODEPEND .\strings\tokenizer.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_unicode.obj :  .AUTODEPEND .\strings\unicode.cpp
 
 $(OBJS)\test_unicode.obj :  .AUTODEPEND .\strings\unicode.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_crt.obj :  .AUTODEPEND .\strings\crt.cpp
 
 $(OBJS)\test_crt.obj :  .AUTODEPEND .\strings\crt.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_bstream.obj :  .AUTODEPEND .\streams\bstream.cpp
 
 $(OBJS)\test_bstream.obj :  .AUTODEPEND .\streams\bstream.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_datastreamtest.obj :  .AUTODEPEND .\streams\datastreamtest.cpp
 
 $(OBJS)\test_datastreamtest.obj :  .AUTODEPEND .\streams\datastreamtest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_ffilestream.obj :  .AUTODEPEND .\streams\ffilestream.cpp
 
 $(OBJS)\test_ffilestream.obj :  .AUTODEPEND .\streams\ffilestream.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_filestream.obj :  .AUTODEPEND .\streams\filestream.cpp
 
 $(OBJS)\test_filestream.obj :  .AUTODEPEND .\streams\filestream.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_largefile.obj :  .AUTODEPEND .\streams\largefile.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_memstream.obj :  .AUTODEPEND .\streams\memstream.cpp
 
 $(OBJS)\test_memstream.obj :  .AUTODEPEND .\streams\memstream.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_sstream.obj :  .AUTODEPEND .\streams\sstream.cpp
 
 $(OBJS)\test_sstream.obj :  .AUTODEPEND .\streams\sstream.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_tempfile.obj :  .AUTODEPEND .\streams\tempfile.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_textstreamtest.obj :  .AUTODEPEND .\streams\textstreamtest.cpp
 
 $(OBJS)\test_textstreamtest.obj :  .AUTODEPEND .\streams\textstreamtest.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_zlibstream.obj :  .AUTODEPEND .\streams\zlibstream.cpp
 
 $(OBJS)\test_zlibstream.obj :  .AUTODEPEND .\streams\zlibstream.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_textfiletest.obj :  .AUTODEPEND .\textfile\textfiletest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_uris.obj :  .AUTODEPEND .\uris\uris.cpp
 
 $(OBJS)\test_uris.obj :  .AUTODEPEND .\uris\uris.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 
 $(OBJS)\test_gui_sample.res :  .AUTODEPEND .\..\samples\sample.rc
 
 $(OBJS)\test_gui_sample.res :  .AUTODEPEND .\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\samples $<
+       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\include -i=. $(__DLLFLAG_p) -i=.\..\samples $<

 
 $(OBJS)\test_gui_dummy.obj :  .AUTODEPEND .\dummy.cpp
 
 $(OBJS)\test_gui_dummy.obj :  .AUTODEPEND .\dummy.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<

 
 $(OBJS)\test_gui_test.obj :  .AUTODEPEND .\test.cpp
 
 $(OBJS)\test_gui_test.obj :  .AUTODEPEND .\test.cpp

-       $(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_rect.obj :  .AUTODEPEND .\geometry\rect.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_size.obj :  .AUTODEPEND .\geometry\size.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_point.obj :  .AUTODEPEND .\geometry\point.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+