Updating with Vadim's API changes.

[wxWidgets.git] / tests / makefile.bcc

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 0ce0217ae33fa55f1dc314d1500bd9e48ec9abfd..1d4452d3cd94f9e55efa388d8f5066bd5d668430 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -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.1 (http://bakefile.sourceforge.net)

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


@@ -21,27 +21,83 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+WX_RELEASE_NODOT = 28

 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

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

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

-TEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -I. \
-       $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+TEST_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\include -I. $(__DLLFLAG_p) \
+       -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) -Hu -H=$(OBJS)\testprec_test.csm $(CPPFLAGS) \
+       $(CXXFLAGS)

 TEST_OBJECTS =  \
 TEST_OBJECTS =  \

+       $(OBJS)\test_dummy.obj \

        $(OBJS)\test_test.obj \
        $(OBJS)\test_test.obj \

-       $(OBJS)\test_main.obj \
-       $(OBJS)\test_formatconverter.obj \
-       $(OBJS)\test_regex.obj \
-       $(OBJS)\test_filesys.obj \
+       $(OBJS)\test_archivetest.obj \
+       $(OBJS)\test_ziptest.obj \
+       $(OBJS)\test_tartest.obj \

        $(OBJS)\test_arrays.obj \
        $(OBJS)\test_arrays.obj \

-       $(OBJS)\test_longlong.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_formatconvertertest.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_scopeguardtest.obj \
+       $(OBJS)\test_strings.obj \
+       $(OBJS)\test_stdstrings.obj \
+       $(OBJS)\test_tokenizer.obj \
+       $(OBJS)\test_unicode.obj \
+       $(OBJS)\test_crt.obj \
+       $(OBJS)\test_vsnprintf.obj \

        $(OBJS)\test_bstream.obj \
        $(OBJS)\test_bstream.obj \

+       $(OBJS)\test_datastreamtest.obj \

        $(OBJS)\test_ffilestream.obj \
        $(OBJS)\test_ffilestream.obj \

+       $(OBJS)\test_fileback.obj \

        $(OBJS)\test_filestream.obj \
        $(OBJS)\test_filestream.obj \

+       $(OBJS)\test_largefile.obj \

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

-       $(OBJS)\test_zlibstream.obj
+       $(OBJS)\test_sstream.obj \
+       $(OBJS)\test_tempfile.obj \
+       $(OBJS)\test_textstreamtest.obj \
+       $(OBJS)\test_zlibstream.obj \
+       $(OBJS)\test_textfiletest.obj \
+       $(OBJS)\test_uris.obj
+TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\samples -DNOPCH $(CPPUNIT_CFLAGS) -Hu \
+       -H=$(OBJS)\testprec_test_gui.csm $(CPPFLAGS) $(CXXFLAGS)
+TEST_GUI_OBJECTS =  \
+       $(OBJS)\test_gui_dummy.obj \
+       $(OBJS)\test_gui_test.obj \
+       $(OBJS)\test_gui_rect.obj \
+       $(OBJS)\test_gui_size.obj \
+       $(OBJS)\test_gui_point.obj
+PRINTFBENCH_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\include -I. $(__DLLFLAG_p) \
+       -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) -Hu -H=$(OBJS)\testprec_printfbench.csm \
+       $(CPPFLAGS) $(CXXFLAGS)
+PRINTFBENCH_OBJECTS =  \
+       $(OBJS)\printfbench_dummy.obj \
+       $(OBJS)\printfbench_printfbench.obj

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -66,23 +122,97 @@ WXUNIVNAME = univ
 !if "$(SHARED)" == "1"
 WXDLLFLAG = dll
 !endif
 !if "$(SHARED)" == "1"
 WXDLLFLAG = dll
 !endif

+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_NET_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+!if "$(USE_GUI)" == "1"
+__test_gui___depname = $(OBJS)\test_gui.exe
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_3 = -d__WXUNIVERSAL__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p_3 = -d__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p_3 = -d__WXDEBUG__
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_3 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_3 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_3 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_3 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_3 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_3 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_3 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif

 !if "$(BUILD)" == "debug"
 !if "$(BUILD)" == "debug"

-__OPTIMIZEFLAG_2 = -Od
+__OPTIMIZEFLAG = -Od

 !endif
 !if "$(BUILD)" == "release"
 !endif
 !if "$(BUILD)" == "release"

-__OPTIMIZEFLAG_2 = -O2
+__OPTIMIZEFLAG = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_1 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_1 = -tWM

 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_6 = -tWR
+__RUNTIME_LIBS = -tWR

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_6 = 
+__RUNTIME_LIBS = 

 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_7 = i
+__RUNTIME_LIBS_1 = i

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_7 = 
+__RUNTIME_LIBS_1 = 

 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__


@@ -93,36 +223,40 @@ __DEBUG_DEFINE_p = -D__WXDEBUG__
 !if "$(DEBUG_FLAG)" == "1"
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif
 !if "$(DEBUG_FLAG)" == "1"
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif

+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif

 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -D_UNICODE
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -D_UNICODE
 !endif

+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif

 !if "$(SHARED)" == "1"
 __DLLFLAG_p = -DWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
 !if "$(SHARED)" == "1"
 __DLLFLAG_p = -DWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"

-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
 !endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \

-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
 !endif
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
 !endif

-!if "$(SHARED)" == "0"
-LIBDIRNAME = .\..\lib\bcc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = .\..\lib\bcc_dll$(CFG)
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib

 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO = -v
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO = -v


@@ -144,55 +278,193 @@ $(OBJS):
 
 ### Targets: ###
 
 
 ### Targets: ###
 

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

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

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

        -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
        -if exist $(OBJS)\test.tds del $(OBJS)\test.tds
        -if exist $(OBJS)\test.ilc del $(OBJS)\test.ilc
        -if exist $(OBJS)\test.ild del $(OBJS)\test.ild
        -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf
        -if exist $(OBJS)\test.ils del $(OBJS)\test.ils
        -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
        -if exist $(OBJS)\test.tds del $(OBJS)\test.tds
        -if exist $(OBJS)\test.ilc del $(OBJS)\test.ilc
        -if exist $(OBJS)\test.ild del $(OBJS)\test.ild
        -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf
        -if exist $(OBJS)\test.ils del $(OBJS)\test.ils

+       -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
+       -if exist $(OBJS)\test_gui.tds del $(OBJS)\test_gui.tds
+       -if exist $(OBJS)\test_gui.ilc del $(OBJS)\test_gui.ilc
+       -if exist $(OBJS)\test_gui.ild del $(OBJS)\test_gui.ild
+       -if exist $(OBJS)\test_gui.ilf del $(OBJS)\test_gui.ilf
+       -if exist $(OBJS)\test_gui.ils del $(OBJS)\test_gui.ils
+       -if exist $(OBJS)\printfbench.exe del $(OBJS)\printfbench.exe
+       -if exist $(OBJS)\printfbench.tds del $(OBJS)\printfbench.tds
+       -if exist $(OBJS)\printfbench.ilc del $(OBJS)\printfbench.ilc
+       -if exist $(OBJS)\printfbench.ild del $(OBJS)\printfbench.ild
+       -if exist $(OBJS)\printfbench.ilf del $(OBJS)\printfbench.ilf
+       -if exist $(OBJS)\printfbench.ils del $(OBJS)\printfbench.ils

 
 

-$(OBJS)\test.exe: $(TEST_OBJECTS)
+$(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)

        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&|
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&|

-       c0x32.obj $(TEST_OBJECTS),$@,, $(__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  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,,
+|
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS)  $(OBJS)\test_gui_sample.res
+       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(CPPUNIT_LIBS) -ap @&&|
+       c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__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) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\test_gui_sample.res

 |
 |

+!endif
+
+data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+
+$(OBJS)\printfbench.exe: $(OBJS)\printfbench_dummy.obj  $(PRINTFBENCH_OBJECTS)
+       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&|
+       c0x32.obj $(PRINTFBENCH_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,,
+|
+
+$(OBJS)\test_dummy.obj: .\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) -H $**

 
 $(OBJS)\test_test.obj: .\test.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
 
 $(OBJS)\test_test.obj: .\test.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 

-$(OBJS)\test_main.obj: .\mbconv\main.cpp
+$(OBJS)\test_archivetest.obj: .\archive\archivetest.cpp

        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 

-$(OBJS)\test_formatconverter.obj: .\formatconverter\formatconverter.cpp
+$(OBJS)\test_ziptest.obj: .\archive\ziptest.cpp

        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 

-$(OBJS)\test_regex.obj: .\regex\regex.cpp
+$(OBJS)\test_tartest.obj: .\archive\tartest.cpp

        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 

-$(OBJS)\test_filesys.obj: .\filesys\filesys.cpp
+$(OBJS)\test_arrays.obj: .\arrays\arrays.cpp

        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 

-$(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
+$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_fileconftest.obj: .\fileconf\fileconftest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_filekind.obj: .\filekind\filekind.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_filenametest.obj: .\filename\filenametest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_filesystest.obj: .\filesys\filesystest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_fontmaptest.obj: .\fontmap\fontmaptest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_formatconvertertest.obj: .\formatconverter\formatconvertertest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_hashes.obj: .\hashes\hashes.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_lists.obj: .\lists\lists.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_longlongtest.obj: .\longlong\longlongtest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_convautotest.obj: .\mbconv\convautotest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_regextest.obj: .\regex\regextest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_scopeguardtest.obj: .\scopeguard\scopeguardtest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_strings.obj: .\strings\strings.cpp

        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 

-$(OBJS)\test_longlong.obj: .\longlong\longlong.cpp
+$(OBJS)\test_stdstrings.obj: .\strings\stdstrings.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_tokenizer.obj: .\strings\tokenizer.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_unicode.obj: .\strings\unicode.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_crt.obj: .\strings\crt.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_vsnprintf.obj: .\strings\vsnprintf.cpp

        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
 $(OBJS)\test_bstream.obj: .\streams\bstream.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
 $(OBJS)\test_bstream.obj: .\streams\bstream.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 

+$(OBJS)\test_datastreamtest.obj: .\streams\datastreamtest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+

 $(OBJS)\test_ffilestream.obj: .\streams\ffilestream.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
 $(OBJS)\test_ffilestream.obj: .\streams\ffilestream.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 

+$(OBJS)\test_fileback.obj: .\streams\fileback.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+

 $(OBJS)\test_filestream.obj: .\streams\filestream.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
 $(OBJS)\test_filestream.obj: .\streams\filestream.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 

+$(OBJS)\test_largefile.obj: .\streams\largefile.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+

 $(OBJS)\test_memstream.obj: .\streams\memstream.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
 $(OBJS)\test_memstream.obj: .\streams\memstream.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 

+$(OBJS)\test_sstream.obj: .\streams\sstream.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_tempfile.obj: .\streams\tempfile.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_textstreamtest.obj: .\streams\textstreamtest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+

 $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**

+
+$(OBJS)\test_textfiletest.obj: .\textfile\textfiletest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_uris.obj: .\uris\uris.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__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) -i$(SETUPHDIR) -i.\..\include -i. $(__DLLFLAG_p_3) -i.\..\samples $**
+
+$(OBJS)\test_gui_dummy.obj: .\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H $**
+
+$(OBJS)\test_gui_test.obj: .\test.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) $**
+
+$(OBJS)\test_gui_rect.obj: .\geometry\rect.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) $**
+
+$(OBJS)\test_gui_size.obj: .\geometry\size.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) $**
+
+$(OBJS)\test_gui_point.obj: .\geometry\point.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) $**
+
+$(OBJS)\printfbench_dummy.obj: .\dummy.cpp
+       $(CXX) -q -c -P -o$@ $(PRINTFBENCH_CXXFLAGS) -H $**
+
+$(OBJS)\printfbench_printfbench.obj: .\benchmarks\printfbench.cpp
+       $(CXX) -q -c -P -o$@ $(PRINTFBENCH_CXXFLAGS) $**
+