X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/113e181a8a9e3ed226615c1b14954e8684ddc9a6..3c3ead1d1513a5eb79091a604f4e42b45d1bdf5d:/tests/makefile.vc

diff --git a/tests/makefile.vc b/tests/makefile.vc
index c9795925d4..92c2b269a2 100644
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,42 +12,126 @@
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
 OBJS = \
-	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+	.\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
-	$(__DEBUGINFO_0) /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME_2_p) \
-	$(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-	$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\include /I$(SETUPHDIR) /W4 \
-	/I. $(__DLLFLAG_p) /D_CONSOLE $(CPPUNIT_CFLAGS) $(__EXCEPTIONSFLAG_8) \
-	$(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS)
+TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+	/Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \
+	$(__NO_VC_CRTDBG_p) /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 /W4 /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 \
+	$(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"testprec.h" \
+	/Fp"$(OBJS)\testprec_test.pch" $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
+	$(OBJS)\test_dummy.obj \
 	$(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_evthandler.obj \
+	$(OBJS)\test_timertest.obj \
+	$(OBJS)\test_exec.obj \
+	$(OBJS)\test_filetest.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_logtest.obj \
 	$(OBJS)\test_longlongtest.obj \
+	$(OBJS)\test_convautotest.obj \
 	$(OBJS)\test_mbconvtest.obj \
+	$(OBJS)\test_misctests.obj \
+	$(OBJS)\test_ipc.obj \
+	$(OBJS)\test_socket.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_stdstream.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_url.obj \
+	$(OBJS)\test_vectors.obj \
+	$(OBJS)\test_evtconnection.obj \
+	$(OBJS)\test_weakref.obj \
+	$(OBJS)\test_xlocale.obj \
+	$(OBJS)\test_xmltest.obj
+TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_23)$(__DEBUGRUNTIME) /DWIN32 \
+	$(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \
+	$(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /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 /W4 /I. $(__DLLFLAG_p) \
+	/I.\..\samples /DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE $(__RTTIFLAG) \
+	$(__EXCEPTIONSFLAG) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_gui.pch" \
+	$(CPPFLAGS) $(CXXFLAGS)
+TEST_GUI_OBJECTS =  \
+	$(OBJS)\test_gui_dummy.obj \
+	$(OBJS)\test_gui_sample.res \
+	$(OBJS)\test_gui_test.obj \
+	$(OBJS)\test_gui_rect.obj \
+	$(OBJS)\test_gui_size.obj \
+	$(OBJS)\test_gui_point.obj \
+	$(OBJS)\test_gui_measuring.obj \
+	$(OBJS)\test_gui_config.obj \
+	$(OBJS)\test_gui_comboboxtest.obj \
+	$(OBJS)\test_gui_headerctrltest.obj \
+	$(OBJS)\test_gui_listctrltest.obj \
+	$(OBJS)\test_gui_textctrltest.obj \
+	$(OBJS)\test_gui_textentrytest.obj \
+	$(OBJS)\test_gui_treectrltest.obj \
+	$(OBJS)\test_gui_clone.obj \
+	$(OBJS)\test_gui_propagation.obj \
+	$(OBJS)\test_gui_fonttest.obj \
+	$(OBJS)\test_gui_image.obj \
+	$(OBJS)\test_gui_rawbmp.obj \
+	$(OBJS)\test_gui_htmlwindow.obj \
+	$(OBJS)\test_gui_guifuncs.obj \
+	$(OBJS)\test_gui_selstoretest.obj \
+	$(OBJS)\test_gui_garbage.obj \
+	$(OBJS)\test_gui_settings.obj \
+	$(OBJS)\test_gui_socket.obj \
+	$(OBJS)\test_gui_clientsize.obj \
+	$(OBJS)\test_gui_setsize.obj
 
 ### Conditionally set variables: ###
 
@@ -57,10 +141,10 @@ PORTNAME = base
 !if "$(USE_GUI)" == "1"
 PORTNAME = msw
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
 WXDEBUGFLAG = d
 !endif
-!if "$(DEBUG_FLAG)" == "1"
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(UNICODE)" == "1"
@@ -69,26 +153,148 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
 !if "$(SHARED)" == "1"
 WXDLLFLAG = dll
 !endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:AMD64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
 !if "$(MONOLITHIC)" == "0"
 EXTRALIBS_FOR_BASE = 
 !endif
 !if "$(MONOLITHIC)" == "1"
 EXTRALIBS_FOR_BASE =  
 !endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = $(__THREADSFLAG)
+!endif
+!if "$(USE_GUI)" == "1"
+__test_gui___depname = $(OBJS)\test_gui.exe
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_17_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_17_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_17_p_1 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_17_p_1 = /d _DEBUG
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_23 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_23 = $(__THREADSFLAG)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_3 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_3 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_3 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_3 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_3 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_3 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_3 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_3 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_3 = /d wxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_3 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1"
+__WXLIB_MEDIA_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_XRC_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+!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" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = /Zi
+__DEBUGINFO = /Zi
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_0 = 
+__DEBUGINFO = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_0 = 
+__DEBUGINFO = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_0 = /Zi
+__DEBUGINFO = /Zi
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_1 = /DEBUG
@@ -102,71 +308,53 @@ __DEBUGINFO_1 =
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_1 = /DEBUG
 !endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = 
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_2_p = /D_DEBUG
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO_2_p = 
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = /D_DEBUG
 !endif
-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO_2_p = /D_DEBUG
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_3 = 
+____DEBUGRUNTIME = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_3 = d
-!endif
-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = $(__DEBUGINFO_3)
+____DEBUGRUNTIME = /D_DEBUG
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3 = d
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = d
 !endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3 = 
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME = 
 !endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_3 = 
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME = 
 !endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_3 = d
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME = d
 !endif
 !if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_4 = /Od
+__OPTIMIZEFLAG = /Od
 !endif
 !if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_4 = /O2
+__OPTIMIZEFLAG = /O2
 !endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = D
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG = L
 !endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = T
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG = T
 !endif
-!if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_8 = 
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG = 
 !endif
-!if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_8 = /GR
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG = /GR
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONSFLAG_9 = 
+__EXCEPTIONSFLAG = 
 !endif
 !if "$(USE_EXCEPTIONS)" == "1"
-__EXCEPTIONSFLAG_9 = /GX
+__EXCEPTIONSFLAG = /EHsc
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
 __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
@@ -177,15 +365,30 @@ __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!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 "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
+!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
@@ -194,6 +397,10 @@ __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 "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = \
 	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
@@ -201,23 +408,11 @@ __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 "$(SHARED)" == "0"
-LIBDIRNAME = .\..\lib\vc_lib$(CFG)
-!endif
-!if "$(SHARED)" == "1"
-LIBDIRNAME = .\..\lib\vc_dll$(CFG)
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
 !endif
 
 
@@ -227,92 +422,315 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\test.exe data
+all: $(OBJS)\test.exe $(__test_gui___depname) data fr
 
 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 	-if exist $(OBJS)\*.res del $(OBJS)\*.res
+	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
 	-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
 	-if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk
 	-if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb
+	-if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
+	-if exist $(OBJS)\test_gui.ilk del $(OBJS)\test_gui.ilk
+	-if exist $(OBJS)\test_gui.pdb del $(OBJS)\test_gui.pdb
 
-$(OBJS)\test.exe: $(TEST_OBJECTS)
-	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<<
-	$(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) 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 oleacc.lib odbc32.lib
+$(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
+	link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(LDFLAGS) @<<
+	$(TEST_OBJECTS)  $(__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) $(__UNICOWS_LIB_p) $(__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
 <<
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
+	link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\test_gui.pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<<
+	$(TEST_GUI_OBJECTS)  $(__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) $(__UNICOWS_LIB_p) $(__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
+<<
+!endif
+
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) 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)\test_dummy.obj: .\dummy.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) /Yctestprec.h .\dummy.cpp
 
 $(OBJS)\test_test.obj: .\test.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\test.cpp
+
+$(OBJS)\test_archivetest.obj: .\archive\archivetest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\archive\archivetest.cpp
+
+$(OBJS)\test_ziptest.obj: .\archive\ziptest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\archive\ziptest.cpp
+
+$(OBJS)\test_tartest.obj: .\archive\tartest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\archive\tartest.cpp
 
 $(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\arrays\arrays.cpp
+
+$(OBJS)\test_base64.obj: .\base64\base64.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\base64\base64.cpp
+
+$(OBJS)\test_cmdlinetest.obj: .\cmdline\cmdlinetest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\cmdline\cmdlinetest.cpp
+
+$(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\config\fileconf.cpp
 
 $(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp
 
-$(OBJS)\test_fileconftest.obj: .\fileconf\fileconftest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+$(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evthandler.cpp
+
+$(OBJS)\test_timertest.obj: .\events\timertest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\timertest.cpp
+
+$(OBJS)\test_exec.obj: .\exec\exec.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\exec\exec.cpp
+
+$(OBJS)\test_filetest.obj: .\file\filetest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\file\filetest.cpp
+
+$(OBJS)\test_filekind.obj: .\filekind\filekind.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\filekind\filekind.cpp
 
 $(OBJS)\test_filenametest.obj: .\filename\filenametest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\filename\filenametest.cpp
 
 $(OBJS)\test_filesystest.obj: .\filesys\filesystest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\filesys\filesystest.cpp
 
 $(OBJS)\test_fontmaptest.obj: .\fontmap\fontmaptest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\fontmap\fontmaptest.cpp
 
 $(OBJS)\test_formatconvertertest.obj: .\formatconverter\formatconvertertest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\formatconverter\formatconvertertest.cpp
 
 $(OBJS)\test_hashes.obj: .\hashes\hashes.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\hashes\hashes.cpp
+
+$(OBJS)\test_intltest.obj: .\intl\intltest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\intl\intltest.cpp
+
+$(OBJS)\test_lists.obj: .\lists\lists.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\lists\lists.cpp
+
+$(OBJS)\test_logtest.obj: .\log\logtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\log\logtest.cpp
 
 $(OBJS)\test_longlongtest.obj: .\longlong\longlongtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\longlong\longlongtest.cpp
+
+$(OBJS)\test_convautotest.obj: .\mbconv\convautotest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\mbconv\convautotest.cpp
 
 $(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\mbconv\mbconvtest.cpp
+
+$(OBJS)\test_misctests.obj: .\misc\misctests.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\misc\misctests.cpp
+
+$(OBJS)\test_ipc.obj: .\net\ipc.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\net\ipc.cpp
+
+$(OBJS)\test_socket.obj: .\net\socket.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\net\socket.cpp
 
 $(OBJS)\test_regextest.obj: .\regex\regextest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\regex\regextest.cpp
 
 $(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\regex\wxregextest.cpp
+
+$(OBJS)\test_scopeguardtest.obj: .\scopeguard\scopeguardtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\scopeguard\scopeguardtest.cpp
+
+$(OBJS)\test_iostream.obj: .\strings\iostream.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\iostream.cpp
 
 $(OBJS)\test_strings.obj: .\strings\strings.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\strings.cpp
 
 $(OBJS)\test_stdstrings.obj: .\strings\stdstrings.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\stdstrings.cpp
+
+$(OBJS)\test_tokenizer.obj: .\strings\tokenizer.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\tokenizer.cpp
+
+$(OBJS)\test_unichar.obj: .\strings\unichar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\unichar.cpp
 
 $(OBJS)\test_unicode.obj: .\strings\unicode.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\unicode.cpp
+
+$(OBJS)\test_vararg.obj: .\strings\vararg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\vararg.cpp
 
 $(OBJS)\test_crt.obj: .\strings\crt.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\crt.cpp
+
+$(OBJS)\test_vsnprintf.obj: .\strings\vsnprintf.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\strings\vsnprintf.cpp
 
 $(OBJS)\test_bstream.obj: .\streams\bstream.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\bstream.cpp
+
+$(OBJS)\test_datastreamtest.obj: .\streams\datastreamtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\datastreamtest.cpp
 
 $(OBJS)\test_ffilestream.obj: .\streams\ffilestream.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\ffilestream.cpp
+
+$(OBJS)\test_fileback.obj: .\streams\fileback.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\fileback.cpp
 
 $(OBJS)\test_filestream.obj: .\streams\filestream.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\filestream.cpp
+
+$(OBJS)\test_iostreams.obj: .\streams\iostreams.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\iostreams.cpp
+
+$(OBJS)\test_largefile.obj: .\streams\largefile.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\largefile.cpp
 
 $(OBJS)\test_memstream.obj: .\streams\memstream.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\memstream.cpp
+
+$(OBJS)\test_socketstream.obj: .\streams\socketstream.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\socketstream.cpp
 
 $(OBJS)\test_sstream.obj: .\streams\sstream.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\sstream.cpp
+
+$(OBJS)\test_stdstream.obj: .\streams\stdstream.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\stdstream.cpp
+
+$(OBJS)\test_tempfile.obj: .\streams\tempfile.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\tempfile.cpp
+
+$(OBJS)\test_textstreamtest.obj: .\streams\textstreamtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\textstreamtest.cpp
 
 $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\zlibstream.cpp
+
+$(OBJS)\test_textfiletest.obj: .\textfile\textfiletest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\textfile\textfiletest.cpp
+
+$(OBJS)\test_atomic.obj: .\thread\atomic.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\atomic.cpp
+
+$(OBJS)\test_queue.obj: .\thread\queue.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\queue.cpp
+
+$(OBJS)\test_tls.obj: .\thread\tls.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\thread\tls.cpp
 
 $(OBJS)\test_uris.obj: .\uris\uris.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\uris\uris.cpp
+
+$(OBJS)\test_url.obj: .\uris\url.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\uris\url.cpp
+
+$(OBJS)\test_vectors.obj: .\vectors\vectors.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\vectors\vectors.cpp
+
+$(OBJS)\test_evtconnection.obj: .\weakref\evtconnection.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\weakref\evtconnection.cpp
+
+$(OBJS)\test_weakref.obj: .\weakref\weakref.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\weakref\weakref.cpp
+
+$(OBJS)\test_xlocale.obj: .\xlocale\xlocale.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\xlocale\xlocale.cpp
+
+$(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp
+
+$(OBJS)\test_gui_dummy.obj: .\dummy.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h .\dummy.cpp
+
+$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_17_p_1) $(__NO_VC_CRTDBG_p_3)  /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 /d NOPCH /d _CONSOLE .\..\samples\sample.rc
+
+$(OBJS)\test_gui_test.obj: .\test.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\test.cpp
+
+$(OBJS)\test_gui_rect.obj: .\geometry\rect.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\rect.cpp
+
+$(OBJS)\test_gui_size.obj: .\geometry\size.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\size.cpp
+
+$(OBJS)\test_gui_point.obj: .\geometry\point.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\point.cpp
+
+$(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp
+
+$(OBJS)\test_gui_config.obj: .\config\config.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
+
+$(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp
+
+$(OBJS)\test_gui_headerctrltest.obj: .\controls\headerctrltest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\headerctrltest.cpp
+
+$(OBJS)\test_gui_listctrltest.obj: .\controls\listctrltest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listctrltest.cpp
+
+$(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
+
+$(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\textentrytest.cpp
+
+$(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp
+
+$(OBJS)\test_gui_clone.obj: .\events\clone.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\clone.cpp
+
+$(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
+
+$(OBJS)\test_gui_fonttest.obj: .\font\fonttest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\font\fonttest.cpp
+
+$(OBJS)\test_gui_image.obj: .\image\image.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\image.cpp
+
+$(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
+
+$(OBJS)\test_gui_htmlwindow.obj: .\html\htmlwindow.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\html\htmlwindow.cpp
+
+$(OBJS)\test_gui_guifuncs.obj: .\misc\guifuncs.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\guifuncs.cpp
+
+$(OBJS)\test_gui_selstoretest.obj: .\misc\selstoretest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\selstoretest.cpp
+
+$(OBJS)\test_gui_garbage.obj: .\misc\garbage.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\garbage.cpp
+
+$(OBJS)\test_gui_settings.obj: .\misc\settings.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\settings.cpp
+
+$(OBJS)\test_gui_socket.obj: .\net\socket.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp
+
+$(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp
+
+$(OBJS)\test_gui_setsize.obj: .\window\setsize.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\setsize.cpp
+