X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb32743940077aee862eeab6a53c3ecdf9e587e8..1cc7d13a08ae3ebf253c1543f45a3bfdd64ffe80:/tests/makefile.vc diff --git a/tests/makefile.vc b/tests/makefile.vc index 83cf2eacc2..3dc3d715ff 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.6 (http://bakefile.sourceforge.net) +# Bakefile 0.2.3 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,63 +12,105 @@ ### Variables: ### -WX_RELEASE_NODOT = 25 +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc OBJS = \ - vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\lib\vc_$(LIBTYPE_SUFFIX)$(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)$(__DEBUGRUNTIME_3) /DWIN32 $(__DEBUGINFO) \ - /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) \ +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) \ - $(__UNICODE_DEFINE_p) /I.\..\include /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) \ - /D_CONSOLE $(CPPUNIT_CFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ - /Yu"testprec.h" /Fp"$(OBJS)\testprec_test.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__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_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_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_largefile.obj \ $(OBJS)\test_memstream.obj \ $(OBJS)\test_sstream.obj \ + $(OBJS)\test_tempfile.obj \ $(OBJS)\test_textstreamtest.obj \ $(OBJS)\test_zlibstream.obj \ - $(OBJS)\test_uris.obj -TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_17) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME_16_p) \ + $(OBJS)\test_textfiletest.obj \ + $(OBJS)\test_atomic.obj \ + $(OBJS)\test_queue.obj \ + $(OBJS)\test_uris.obj \ + $(OBJS)\test_vectors.obj \ + $(OBJS)\test_evtconnection.obj \ + $(OBJS)\test_weakref.obj \ + $(OBJS)\test_xlocale.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) $(__UNICODE_DEFINE_p) /I.\..\include /I$(SETUPHDIR) /W4 \ - /I. $(__DLLFLAG_p) /I.\..\samples /DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE \ - $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"testprec.h" \ - /Fp"$(OBJS)\testprec_test_gui.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__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_sample.res \ $(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_point.obj \ + $(OBJS)\test_gui_config.obj \ + $(OBJS)\test_gui_clientsize.obj \ + $(OBJS)\test_gui_textctrltest.obj +PRINTFBENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_38)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\printfbench.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_printfbench.pch" $(CPPFLAGS) \ + $(CXXFLAGS) +PRINTFBENCH_OBJECTS = \ + $(OBJS)\printfbench_dummy.obj \ + $(OBJS)\printfbench_printfbench.obj ### Conditionally set variables: ### @@ -90,6 +132,18 @@ WXUNICODEFLAG = u !if "$(WXUNIV)" == "1" WXUNIVNAME = univ !endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif !if "$(SHARED)" == "1" WXDLLFLAG = dll !endif @@ -99,29 +153,29 @@ LIBTYPE_SUFFIX = lib !if "$(SHARED)" == "1" LIBTYPE_SUFFIX = dll !endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 !endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = $(____DEBUGINFO) +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_8 = D !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = $(__DEBUGINFO_2) +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_8 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" __WXLIB_NET_p = \ @@ -130,44 +184,23 @@ __WXLIB_NET_p = \ !if "$(USE_GUI)" == "1" __test_gui___depname = $(OBJS)\test_gui.exe !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_16_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_16_p = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_17_p_1 = /d _DEBUG !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_16_p = $(____DEBUGINFO) +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_17_p_1 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_16_p_1 = +____DEBUGRUNTIME_17_p_1 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_16_p_1 = /d _DEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_16_p_1 = $(____DEBUGINFO_16_p_1) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_16_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_16_p_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -____DEBUGINFO_16_p_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -____DEBUGINFO_16_p_1 = /d _DEBUG +____DEBUGRUNTIME_17_p_1 = /d _DEBUG !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_17 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_17 = d +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_23 = D !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_17 = $(__DEBUGINFO_2) +!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__ @@ -184,9 +217,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 = /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 @@ -194,6 +245,21 @@ __DLLFLAG_p_3 = /d WXUSINGDLL __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 "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_38 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_38 = $(__THREADSFLAG) +!endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" __DEBUGINFO = /Zi !endif @@ -207,40 +273,40 @@ __DEBUGINFO = __DEBUGINFO = /Zi !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG +__DEBUGINFO_2 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = +__DEBUGINFO_2 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = +__DEBUGINFO_2 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG +__DEBUGINFO_2 = /DEBUG !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO = /D_DEBUG +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME = /D_DEBUG !endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO = +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME = !endif -!if "$(DEBUG_INFO)" == "0" -____DEBUGINFO = +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME = !endif -!if "$(DEBUG_INFO)" == "1" -____DEBUGINFO = /D_DEBUG +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME = /D_DEBUG !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = d +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME = d !endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME = !endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_2 = +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME = !endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2 = d +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME = d !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od @@ -248,23 +314,23 @@ __OPTIMIZEFLAG = /Od !if "$(BUILD)" == "release" __OPTIMIZEFLAG = /O2 !endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS = D +!if "$(USE_THREADS)" == "0" +__THREADSFLAG = L !endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS = T +!if "$(USE_THREADS)" == "1" +__THREADSFLAG = T !endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG = +!if "$(USE_RTTI)" == "0" +__RTTIFLAG = !endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG = /GR +!if "$(USE_RTTI)" == "1" +__RTTIFLAG = /GR !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_0 = +__EXCEPTIONSFLAG = !endif !if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_0 = /GX +__EXCEPTIONSFLAG = /EHsc !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ @@ -281,9 +347,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 @@ -295,18 +379,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 all: $(OBJS) @@ -315,7 +393,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 @@ -327,16 +405,19 @@ clean: -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 + -if exist $(OBJS)\printfbench.exe del $(OBJS)\printfbench.exe + -if exist $(OBJS)\printfbench.ilk del $(OBJS)\printfbench.ilk + -if exist $(OBJS)\printfbench.pdb del $(OBJS)\printfbench.pdb $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(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 + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) /pdb:"$(OBJS)\test.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<< + $(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) 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 << !if "$(USE_GUI)" == "1" $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE @<< - $(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) 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 + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) /pdb:"$(OBJS)\test_gui.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE @<< + $(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) 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 << !endif @@ -344,111 +425,198 @@ 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) + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) /pdb:"$(OBJS)\printfbench.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<< + $(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) 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 +<< + $(OBJS)\test_dummy.obj: .\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) /Yctestprec.h $** + $(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) $** + $(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_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_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) $** + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\lists\lists.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_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) $** + $(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_largefile.obj: .\streams\largefile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + $(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_sstream.obj: .\streams\sstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\sstream.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) $** + $(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_uris.obj: .\uris\uris.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\uris\uris.cpp -$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_16_p_1) $(__NO_VC_CRTDBG_p_3) /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) /i .\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_3) /i .\..\samples $** +$(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_gui_dummy.obj: .\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h $** + $(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) $** + $(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) $** + $(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) $** + $(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) $** + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\geometry\point.cpp + +$(OBJS)\test_gui_config.obj: .\config\config.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp + +$(OBJS)\test_gui_clientsize.obj: .\controls\clientsize.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\clientsize.cpp + +$(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp + +$(OBJS)\printfbench_dummy.obj: .\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PRINTFBENCH_CXXFLAGS) /Yctestprec.h .\dummy.cpp + +$(OBJS)\printfbench_printfbench.obj: .\benchmarks\printfbench.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PRINTFBENCH_CXXFLAGS) .\benchmarks\printfbench.cpp