X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0912690b65b3c58c0e12870fb971675ca5572ae6..03c6117e8f6c958c1bc2602132ded643fc703cbf:/tests/makefile.bcc

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index ab60059c57..59b63dfb2c 100644
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -21,15 +21,18 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
 OBJS = \
-	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\lib\bcc_$(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 = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
+	$(__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 =  \
@@ -37,37 +40,65 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_test.obj \
 	$(OBJS)\test_archivetest.obj \
 	$(OBJS)\test_ziptest.obj \
+	$(OBJS)\test_tartest.obj \
 	$(OBJS)\test_arrays.obj \
+	$(OBJS)\test_base64.obj \
+	$(OBJS)\test_cmdlinetest.obj \
+	$(OBJS)\test_fileconf.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_intltest.obj \
 	$(OBJS)\test_lists.obj \
 	$(OBJS)\test_longlongtest.obj \
+	$(OBJS)\test_convautotest.obj \
 	$(OBJS)\test_mbconvtest.obj \
+	$(OBJS)\test_misctests.obj \
+	$(OBJS)\test_ipc.obj \
 	$(OBJS)\test_regextest.obj \
 	$(OBJS)\test_wxregextest.obj \
+	$(OBJS)\test_scopeguardtest.obj \
+	$(OBJS)\test_iostream.obj \
 	$(OBJS)\test_strings.obj \
 	$(OBJS)\test_stdstrings.obj \
+	$(OBJS)\test_tokenizer.obj \
+	$(OBJS)\test_unichar.obj \
 	$(OBJS)\test_unicode.obj \
+	$(OBJS)\test_vararg.obj \
 	$(OBJS)\test_crt.obj \
+	$(OBJS)\test_vsnprintf.obj \
 	$(OBJS)\test_bstream.obj \
 	$(OBJS)\test_datastreamtest.obj \
 	$(OBJS)\test_ffilestream.obj \
+	$(OBJS)\test_fileback.obj \
 	$(OBJS)\test_filestream.obj \
+	$(OBJS)\test_iostreams.obj \
 	$(OBJS)\test_largefile.obj \
 	$(OBJS)\test_memstream.obj \
+	$(OBJS)\test_socketstream.obj \
 	$(OBJS)\test_sstream.obj \
+	$(OBJS)\test_tempfile.obj \
 	$(OBJS)\test_textstreamtest.obj \
 	$(OBJS)\test_zlibstream.obj \
-	$(OBJS)\test_uris.obj
+	$(OBJS)\test_textfiletest.obj \
+	$(OBJS)\test_atomic.obj \
+	$(OBJS)\test_queue.obj \
+	$(OBJS)\test_tls.obj \
+	$(OBJS)\test_uris.obj \
+	$(OBJS)\test_vectors.obj \
+	$(OBJS)\test_evtconnection.obj \
+	$(OBJS)\test_weakref.obj \
+	$(OBJS)\test_xlocale.obj \
+	$(OBJS)\test_xmltest.obj
 TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
+	$(__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 =  \
@@ -75,7 +106,26 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_test.obj \
 	$(OBJS)\test_gui_rect.obj \
 	$(OBJS)\test_gui_size.obj \
-	$(OBJS)\test_gui_point.obj
+	$(OBJS)\test_gui_point.obj \
+	$(OBJS)\test_gui_config.obj \
+	$(OBJS)\test_gui_comboboxtest.obj \
+	$(OBJS)\test_gui_textctrltest.obj \
+	$(OBJS)\test_gui_textentrytest.obj \
+	$(OBJS)\test_gui_rawbmp.obj \
+	$(OBJS)\test_gui_guifuncs.obj \
+	$(OBJS)\test_gui_selstoretest.obj \
+	$(OBJS)\test_gui_clientsize.obj \
+	$(OBJS)\test_gui_setsize.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: ###
 
@@ -116,6 +166,10 @@ EXTRALIBS_FOR_BASE =
 __WXLIB_NET_p = \
 	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
 !endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XML_p = \
+	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
 !if "$(USE_GUI)" == "1"
 __test_gui___depname = $(OBJS)\test_gui.exe
 !endif
@@ -128,9 +182,27 @@ __DEBUG_DEFINE_p_3 = -d__WXDEBUG__
 !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)" == "0"
+__UNICODE_DEFINE_p_3 = -dwxUSE_UNICODE=0
+!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
@@ -138,12 +210,33 @@ __DLLFLAG_p_3 = -dWXUSINGDLL
 __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"
 __OPTIMIZEFLAG = -Od
 !endif
 !if "$(BUILD)" == "release"
 __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"
 __RUNTIME_LIBS = -tWR
 !endif
@@ -151,10 +244,10 @@ __RUNTIME_LIBS = -tWR
 __RUNTIME_LIBS = 
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_0 = i
+__RUNTIME_LIBS_1 = i
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_0 = 
+__RUNTIME_LIBS_1 = 
 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -165,9 +258,27 @@ __DEBUG_DEFINE_p = -D__WXDEBUG__
 !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)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!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
@@ -179,18 +290,12 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).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 "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
 !endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO = -v
 !endif
@@ -211,7 +316,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\test.exe $(__test_gui___depname) data
+all: $(OBJS)\test.exe $(__test_gui___depname) data fr $(OBJS)\printfbench.exe
 
 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -229,16 +334,22 @@ clean:
 	-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: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
-	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&|
-	c0x32.obj $(TEST_OBJECTS),$@,, $(__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) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_0).lib,,
+	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(LDFLAGS) @&&|
+	c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_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 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) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_0).lib,, $(OBJS)\test_gui_sample.res
+	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(CPPUNIT_LIBS) -ap $(LDFLAGS) @&&|
+	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 import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\test_gui_sample.res
 |
 !endif
 
@@ -246,117 +357,237 @@ 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: $(OBJS)\printfbench_dummy.obj  $(PRINTFBENCH_OBJECTS)
+	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(LDFLAGS) @&&|
+	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 import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,,
+|
+
 $(OBJS)\test_dummy.obj: .\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) -H $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) -H .\dummy.cpp
 
 $(OBJS)\test_test.obj: .\test.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\test.cpp
 
 $(OBJS)\test_archivetest.obj: .\archive\archivetest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\archive\archivetest.cpp
 
 $(OBJS)\test_ziptest.obj: .\archive\ziptest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\archive\ziptest.cpp
+
+$(OBJS)\test_tartest.obj: .\archive\tartest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\archive\tartest.cpp
 
 $(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\arrays\arrays.cpp
 
-$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+$(OBJS)\test_base64.obj: .\base64\base64.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\base64\base64.cpp
+
+$(OBJS)\test_cmdlinetest.obj: .\cmdline\cmdlinetest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\cmdline\cmdlinetest.cpp
+
+$(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\config\fileconf.cpp
 
-$(OBJS)\test_fileconftest.obj: .\fileconf\fileconftest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp
 
 $(OBJS)\test_filekind.obj: .\filekind\filekind.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\filekind\filekind.cpp
 
 $(OBJS)\test_filenametest.obj: .\filename\filenametest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\filename\filenametest.cpp
 
 $(OBJS)\test_filesystest.obj: .\filesys\filesystest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\filesys\filesystest.cpp
 
 $(OBJS)\test_fontmaptest.obj: .\fontmap\fontmaptest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\fontmap\fontmaptest.cpp
 
 $(OBJS)\test_formatconvertertest.obj: .\formatconverter\formatconvertertest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\formatconverter\formatconvertertest.cpp
 
 $(OBJS)\test_hashes.obj: .\hashes\hashes.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\hashes\hashes.cpp
+
+$(OBJS)\test_intltest.obj: .\intl\intltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\intl\intltest.cpp
 
 $(OBJS)\test_lists.obj: .\lists\lists.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\lists\lists.cpp
 
 $(OBJS)\test_longlongtest.obj: .\longlong\longlongtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\longlong\longlongtest.cpp
+
+$(OBJS)\test_convautotest.obj: .\mbconv\convautotest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\mbconv\convautotest.cpp
 
 $(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\mbconv\mbconvtest.cpp
+
+$(OBJS)\test_misctests.obj: .\misc\misctests.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\misc\misctests.cpp
+
+$(OBJS)\test_ipc.obj: .\net\ipc.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\net\ipc.cpp
 
 $(OBJS)\test_regextest.obj: .\regex\regextest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\regex\regextest.cpp
 
 $(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\regex\wxregextest.cpp
+
+$(OBJS)\test_scopeguardtest.obj: .\scopeguard\scopeguardtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\scopeguard\scopeguardtest.cpp
+
+$(OBJS)\test_iostream.obj: .\strings\iostream.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\iostream.cpp
 
 $(OBJS)\test_strings.obj: .\strings\strings.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\strings.cpp
 
 $(OBJS)\test_stdstrings.obj: .\strings\stdstrings.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\stdstrings.cpp
+
+$(OBJS)\test_tokenizer.obj: .\strings\tokenizer.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\tokenizer.cpp
+
+$(OBJS)\test_unichar.obj: .\strings\unichar.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\unichar.cpp
 
 $(OBJS)\test_unicode.obj: .\strings\unicode.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\unicode.cpp
+
+$(OBJS)\test_vararg.obj: .\strings\vararg.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\vararg.cpp
 
 $(OBJS)\test_crt.obj: .\strings\crt.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\crt.cpp
+
+$(OBJS)\test_vsnprintf.obj: .\strings\vsnprintf.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\strings\vsnprintf.cpp
 
 $(OBJS)\test_bstream.obj: .\streams\bstream.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\bstream.cpp
 
 $(OBJS)\test_datastreamtest.obj: .\streams\datastreamtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\datastreamtest.cpp
 
 $(OBJS)\test_ffilestream.obj: .\streams\ffilestream.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\ffilestream.cpp
+
+$(OBJS)\test_fileback.obj: .\streams\fileback.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\fileback.cpp
 
 $(OBJS)\test_filestream.obj: .\streams\filestream.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\filestream.cpp
+
+$(OBJS)\test_iostreams.obj: .\streams\iostreams.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\iostreams.cpp
 
 $(OBJS)\test_largefile.obj: .\streams\largefile.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\largefile.cpp
 
 $(OBJS)\test_memstream.obj: .\streams\memstream.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\memstream.cpp
+
+$(OBJS)\test_socketstream.obj: .\streams\socketstream.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\socketstream.cpp
 
 $(OBJS)\test_sstream.obj: .\streams\sstream.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\sstream.cpp
+
+$(OBJS)\test_tempfile.obj: .\streams\tempfile.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\tempfile.cpp
 
 $(OBJS)\test_textstreamtest.obj: .\streams\textstreamtest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\textstreamtest.cpp
 
 $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\zlibstream.cpp
+
+$(OBJS)\test_textfiletest.obj: .\textfile\textfiletest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\textfile\textfiletest.cpp
+
+$(OBJS)\test_atomic.obj: .\thread\atomic.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\thread\atomic.cpp
+
+$(OBJS)\test_queue.obj: .\thread\queue.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\thread\queue.cpp
+
+$(OBJS)\test_tls.obj: .\thread\tls.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\thread\tls.cpp
 
 $(OBJS)\test_uris.obj: .\uris\uris.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\uris\uris.cpp
+
+$(OBJS)\test_vectors.obj: .\vectors\vectors.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\vectors\vectors.cpp
+
+$(OBJS)\test_evtconnection.obj: .\weakref\evtconnection.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\weakref\evtconnection.cpp
+
+$(OBJS)\test_weakref.obj: .\weakref\weakref.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\weakref\weakref.cpp
+
+$(OBJS)\test_xlocale.obj: .\xlocale\xlocale.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\xlocale\xlocale.cpp
+
+$(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp
 
 $(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) $(__UNICODE_DEFINE_p_3) -i.\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_3) -i.\..\samples $**
+	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 -dNOPCH .\..\samples\sample.rc
 
 $(OBJS)\test_gui_dummy.obj: .\dummy.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H $**
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H .\dummy.cpp
 
 $(OBJS)\test_gui_test.obj: .\test.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\test.cpp
 
 $(OBJS)\test_gui_rect.obj: .\geometry\rect.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\rect.cpp
 
 $(OBJS)\test_gui_size.obj: .\geometry\size.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\size.cpp
 
 $(OBJS)\test_gui_point.obj: .\geometry\point.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) $**
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\geometry\point.cpp
+
+$(OBJS)\test_gui_config.obj: .\config\config.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
+
+$(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp
+
+$(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
+
+$(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\textentrytest.cpp
+
+$(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
+
+$(OBJS)\test_gui_guifuncs.obj: .\misc\guifuncs.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\guifuncs.cpp
+
+$(OBJS)\test_gui_selstoretest.obj: .\misc\selstoretest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\selstoretest.cpp
+
+$(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp
+
+$(OBJS)\test_gui_setsize.obj: .\window\setsize.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\setsize.cpp
+
+$(OBJS)\printfbench_dummy.obj: .\dummy.cpp
+	$(CXX) -q -c -P -o$@ $(PRINTFBENCH_CXXFLAGS) -H .\dummy.cpp
+
+$(OBJS)\printfbench_printfbench.obj: .\benchmarks\printfbench.cpp
+	$(CXX) -q -c -P -o$@ $(PRINTFBENCH_CXXFLAGS) .\benchmarks\printfbench.cpp