Don't reset bullet number and outline number when applying style sheet.

[wxWidgets.git] / tests / makefile.wat

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 16451a3a0e5efe486f0e1c7a18863a066816f64f..ed945c5b81bdb2611c61f51bfdd834b5e3851353 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -200,9 +200,13 @@ __WXLIB_MONO_p =
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
+__CAIRO_LIB_p =\r
+!ifeq USE_CAIRO 1\r
+__CAIRO_LIB_p = cairo.lib\r
+!endif\r
+____CAIRO_LIBDIR_FILENAMES =\r
+!ifeq USE_CAIRO 1\r
+____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib\r
 !endif\r
 __WXUNIV_DEFINE_p =\r
 !ifeq WXUNIV 1\r
@@ -212,6 +216,10 @@ __DEBUG_DEFINE_p =
 !ifeq DEBUG_FLAG 0\r
 __DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
 !endif\r
+__NDEBUG_DEFINE_p =\r
+!ifeq BUILD release\r
+__NDEBUG_DEFINE_p = -dNDEBUG\r
+!endif\r
 __EXCEPTIONS_DEFINE_p =\r
 !ifeq USE_EXCEPTIONS 0\r
 __EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
@@ -231,9 +239,9 @@ __UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
 !ifeq UNICODE 1\r
 __UNICODE_DEFINE_p = -d_UNICODE\r
 !endif\r
-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
+____CAIRO_INCLUDEDIR_FILENAMES =\r
+!ifeq USE_CAIRO 1\r
+____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo\r
 !endif\r
 __DLLFLAG_p =\r
 !ifeq SHARED 1\r
@@ -251,11 +259,12 @@ SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include &\r
-       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 &\r
-       $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test.pch $(__RTTIFLAG) &\r
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include &\r
+       $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
+       $(__DLLFLAG_p) -dwxUSE_GUI=0 $(CPPUNIT_CFLAGS) &\r
+       /fh=$(OBJS)\testprec_test.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &\r
+       $(CXXFLAGS)\r
 TEST_OBJECTS =  &\r
        $(OBJS)\test_dummy.obj &\r
        $(OBJS)\test_test.obj &\r
@@ -267,11 +276,15 @@ TEST_OBJECTS =  &
        $(OBJS)\test_base64.obj &\r
        $(OBJS)\test_cmdlinetest.obj &\r
        $(OBJS)\test_fileconf.obj &\r
+       $(OBJS)\test_regconf.obj &\r
        $(OBJS)\test_datetimetest.obj &\r
        $(OBJS)\test_evthandler.obj &\r
        $(OBJS)\test_evtsource.obj &\r
+       $(OBJS)\test_stopwatch.obj &\r
        $(OBJS)\test_timertest.obj &\r
        $(OBJS)\test_exec.obj &\r
+       $(OBJS)\test_dir.obj &\r
+       $(OBJS)\test_filefn.obj &\r
        $(OBJS)\test_filetest.obj &\r
        $(OBJS)\test_filekind.obj &\r
        $(OBJS)\test_filenametest.obj &\r
@@ -280,13 +293,21 @@ TEST_OBJECTS =  &
        $(OBJS)\test_formatconvertertest.obj &\r
        $(OBJS)\test_fswatchertest.obj &\r
        $(OBJS)\test_hashes.obj &\r
+       $(OBJS)\test_output.obj &\r
+       $(OBJS)\test_input.obj &\r
        $(OBJS)\test_intltest.obj &\r
        $(OBJS)\test_lists.obj &\r
        $(OBJS)\test_logtest.obj &\r
        $(OBJS)\test_longlongtest.obj &\r
        $(OBJS)\test_convautotest.obj &\r
        $(OBJS)\test_mbconvtest.obj &\r
+       $(OBJS)\test_dynamiclib.obj &\r
+       $(OBJS)\test_environ.obj &\r
+       $(OBJS)\test_metatest.obj &\r
        $(OBJS)\test_misctests.obj &\r
+       $(OBJS)\test_module.obj &\r
+       $(OBJS)\test_pathlist.obj &\r
+       $(OBJS)\test_typeinfotest.obj &\r
        $(OBJS)\test_ipc.obj &\r
        $(OBJS)\test_socket.obj &\r
        $(OBJS)\test_regextest.obj &\r
@@ -317,8 +338,10 @@ TEST_OBJECTS =  &
        $(OBJS)\test_zlibstream.obj &\r
        $(OBJS)\test_textfiletest.obj &\r
        $(OBJS)\test_atomic.obj &\r
+       $(OBJS)\test_misc.obj &\r
        $(OBJS)\test_queue.obj &\r
        $(OBJS)\test_tls.obj &\r
+       $(OBJS)\test_ftp.obj &\r
        $(OBJS)\test_uris.obj &\r
        $(OBJS)\test_url.obj &\r
        $(OBJS)\test_vectors.obj &\r
@@ -328,22 +351,26 @@ TEST_OBJECTS =  &
        $(OBJS)\test_xmltest.obj\r
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include &\r
-       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\samples &\r
-       -dNOPCH $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test_gui.pch $(__RTTIFLAG) &\r
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include &\r
+       $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &\r
+       $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $(CPPUNIT_CFLAGS) &\r
+       /fh=$(OBJS)\testprec_test_gui.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &\r
+       $(CPPFLAGS) $(CXXFLAGS)\r
 TEST_GUI_OBJECTS =  &\r
        $(OBJS)\test_gui_dummy.obj &\r
        $(OBJS)\test_gui_test.obj &\r
        $(OBJS)\test_gui_rect.obj &\r
        $(OBJS)\test_gui_size.obj &\r
        $(OBJS)\test_gui_point.obj &\r
+       $(OBJS)\test_gui_bitmap.obj &\r
        $(OBJS)\test_gui_colour.obj &\r
+       $(OBJS)\test_gui_ellipsization.obj &\r
        $(OBJS)\test_gui_measuring.obj &\r
        $(OBJS)\test_gui_config.obj &\r
        $(OBJS)\test_gui_comboboxtest.obj &\r
        $(OBJS)\test_gui_headerctrltest.obj &\r
+       $(OBJS)\test_gui_label.obj &\r
        $(OBJS)\test_gui_listctrltest.obj &\r
        $(OBJS)\test_gui_textctrltest.obj &\r
        $(OBJS)\test_gui_textentrytest.obj &\r
@@ -359,6 +386,7 @@ TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_garbage.obj &\r
        $(OBJS)\test_gui_settings.obj &\r
        $(OBJS)\test_gui_socket.obj &\r
+       $(OBJS)\test_gui_boxsizer.obj &\r
        $(OBJS)\test_gui_clientsize.obj &\r
        $(OBJS)\test_gui_setsize.obj\r
 \r
@@ -385,9 +413,9 @@ $(OBJS)\test.exe :  $(TEST_OBJECTS)
        @%append $(OBJS)\test.lbc option quiet\r
        @%append $(OBJS)\test.lbc name $^@\r
        @%append $(OBJS)\test.lbc option caseexact\r
-       @%append $(OBJS)\test.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(LDFLAGS)\r
+       @%append $(OBJS)\test.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i\r
-       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) 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 wininet.lib) do @%append $(OBJS)\test.lbc library %i\r
+       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) 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 wininet.lib) do @%append $(OBJS)\test.lbc library %i\r
        @%append $(OBJS)\test.lbc\r
        @for %i in () do @%append $(OBJS)\test.lbc option stack=%i\r
        wlink @$(OBJS)\test.lbc\r
@@ -398,9 +426,9 @@ $(OBJS)\test_gui.exe :  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
        @%append $(OBJS)\test_gui.lbc option quiet\r
        @%append $(OBJS)\test_gui.lbc name $^@\r
        @%append $(OBJS)\test_gui.lbc option caseexact\r
-       @%append $(OBJS)\test_gui.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(LDFLAGS)\r
+       @%append $(OBJS)\test_gui.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)\r
        @for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i\r
-       @for %i in ( $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__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)  $(__GDIPLUS_LIB_p) 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 wininet.lib) do @%append $(OBJS)\test_gui.lbc library %i\r
+       @for %i in ( $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__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)  $(__CAIRO_LIB_p) 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 wininet.lib) do @%append $(OBJS)\test_gui.lbc library %i\r
        @%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res\r
        @for %i in () do @%append $(OBJS)\test_gui.lbc option stack=%i\r
        wlink @$(OBJS)\test_gui.lbc\r
@@ -444,6 +472,9 @@ $(OBJS)\test_cmdlinetest.obj :  .AUTODEPEND .\cmdline\cmdlinetest.cpp
 $(OBJS)\test_fileconf.obj :  .AUTODEPEND .\config\fileconf.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_regconf.obj :  .AUTODEPEND .\config\regconf.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_datetimetest.obj :  .AUTODEPEND .\datetime\datetimetest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
@@ -453,12 +484,21 @@ $(OBJS)\test_evthandler.obj :  .AUTODEPEND .\events\evthandler.cpp
 $(OBJS)\test_evtsource.obj :  .AUTODEPEND .\events\evtsource.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_stopwatch.obj :  .AUTODEPEND .\events\stopwatch.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_timertest.obj :  .AUTODEPEND .\events\timertest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_exec.obj :  .AUTODEPEND .\exec\exec.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_dir.obj :  .AUTODEPEND .\file\dir.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_filefn.obj :  .AUTODEPEND .\file\filefn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_filetest.obj :  .AUTODEPEND .\file\filetest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
@@ -483,6 +523,12 @@ $(OBJS)\test_fswatchertest.obj :  .AUTODEPEND .\fswatcher\fswatchertest.cpp
 $(OBJS)\test_hashes.obj :  .AUTODEPEND .\hashes\hashes.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_output.obj :  .AUTODEPEND .\interactive\output.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_input.obj :  .AUTODEPEND .\interactive\input.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_intltest.obj :  .AUTODEPEND .\intl\intltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
@@ -501,9 +547,27 @@ $(OBJS)\test_convautotest.obj :  .AUTODEPEND .\mbconv\convautotest.cpp
 $(OBJS)\test_mbconvtest.obj :  .AUTODEPEND .\mbconv\mbconvtest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_dynamiclib.obj :  .AUTODEPEND .\misc\dynamiclib.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_environ.obj :  .AUTODEPEND .\misc\environ.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_metatest.obj :  .AUTODEPEND .\misc\metatest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_misctests.obj :  .AUTODEPEND .\misc\misctests.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_module.obj :  .AUTODEPEND .\misc\module.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_pathlist.obj :  .AUTODEPEND .\misc\pathlist.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_typeinfotest.obj :  .AUTODEPEND .\misc\typeinfotest.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_ipc.obj :  .AUTODEPEND .\net\ipc.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
@@ -594,12 +658,18 @@ $(OBJS)\test_textfiletest.obj :  .AUTODEPEND .\textfile\textfiletest.cpp
 $(OBJS)\test_atomic.obj :  .AUTODEPEND .\thread\atomic.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_misc.obj :  .AUTODEPEND .\thread\misc.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_queue.obj :  .AUTODEPEND .\thread\queue.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_tls.obj :  .AUTODEPEND .\thread\tls.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_ftp.obj :  .AUTODEPEND .\uris\ftp.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_uris.obj :  .AUTODEPEND .\uris\uris.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
@@ -622,7 +692,7 @@ $(OBJS)\test_xmltest.obj :  .AUTODEPEND .\xml\xmltest.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
 $(OBJS)\test_gui_sample.res :  .AUTODEPEND .\..\samples\sample.rc\r
-       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $<\r
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $<\r
 \r
 $(OBJS)\test_gui_dummy.obj :  .AUTODEPEND .\dummy.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
@@ -639,9 +709,15 @@ $(OBJS)\test_gui_size.obj :  .AUTODEPEND .\geometry\size.cpp
 $(OBJS)\test_gui_point.obj :  .AUTODEPEND .\geometry\point.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_gui_bitmap.obj :  .AUTODEPEND .\graphics\bitmap.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_gui_colour.obj :  .AUTODEPEND .\graphics\colour.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_gui_ellipsization.obj :  .AUTODEPEND .\graphics\ellipsization.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_gui_measuring.obj :  .AUTODEPEND .\graphics\measuring.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
@@ -654,6 +730,9 @@ $(OBJS)\test_gui_comboboxtest.obj :  .AUTODEPEND .\controls\comboboxtest.cpp
 $(OBJS)\test_gui_headerctrltest.obj :  .AUTODEPEND .\controls\headerctrltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_gui_label.obj :  .AUTODEPEND .\controls\label.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_gui_listctrltest.obj :  .AUTODEPEND .\controls\listctrltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
@@ -699,6 +778,9 @@ $(OBJS)\test_gui_settings.obj :  .AUTODEPEND .\misc\settings.cpp
 $(OBJS)\test_gui_socket.obj :  .AUTODEPEND .\net\socket.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_gui_boxsizer.obj :  .AUTODEPEND .\sizers\boxsizer.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_gui_clientsize.obj :  .AUTODEPEND .\window\clientsize.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r