X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0744a6b06587475603ac11b7deba10b9aa78e57..c6dcd973a599f50679ae3895a2745aee1b042b2d:/tests/makefile.vc diff --git a/tests/makefile.vc b/tests/makefile.vc index 895f6c7689..49694b7e94 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.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,24 +12,29 @@ ### Variables: ### -WX_RELEASE_NODOT = 25 +WX_RELEASE_NODOT = 26 OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\lib\vc_$(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) /I.\..\include /I$(SETUPHDIR) /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_arrays.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 \ @@ -40,6 +45,7 @@ TEST_OBJECTS = \ $(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_unicode.obj \ @@ -48,22 +54,28 @@ TEST_OBJECTS = \ $(OBJS)\test_datastreamtest.obj \ $(OBJS)\test_ffilestream.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) \ +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) /D_WINDOWS /I.\..\samples /DNOPCH $(CPPUNIT_CFLAGS) \ - $(__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) \ + /I.\..\include /I$(SETUPHDIR) /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_test.obj + $(OBJS)\test_gui_test.obj \ + $(OBJS)\test_gui_rect.obj \ + $(OBJS)\test_gui_size.obj \ + $(OBJS)\test_gui_point.obj ### Conditionally set variables: ### @@ -88,29 +100,23 @@ WXUNIVNAME = univ !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 "$(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) -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!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 = \ @@ -119,44 +125,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 +____DEBUGRUNTIME_17_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 -!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__ @@ -173,9 +158,21 @@ __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)" == "1" __UNICODE_DEFINE_p_3 = /d _UNICODE !endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_3 = /d wxUSE_UNICODE_MSLU=1 +!endif !if "$(SHARED)" == "1" __DLLFLAG_p_3 = /d WXUSINGDLL !endif @@ -207,29 +204,29 @@ __DEBUGINFO_1 = !if "$(DEBUG_INFO)" == "1" __DEBUGINFO_1 = /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 @@ -237,23 +234,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__ @@ -270,14 +267,20 @@ __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)" == "1" __UNICODE_DEFINE_p = /D_UNICODE !endif -!if "$(SHARED)" == "0" -LIBDIRNAME = .\..\lib\vc_lib$(CFG) -!endif -!if "$(SHARED)" == "1" -LIBDIRNAME = .\..\lib\vc_dll$(CFG) +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 !endif !if "$(SHARED)" == "1" __DLLFLAG_p = /DWXUSINGDLL @@ -315,6 +318,7 @@ all: $(OBJS)\test.exe $(__test_gui___depname) data 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 @@ -329,7 +333,7 @@ $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) !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) /SUBSYSTEM:WINDOWS $(CPPUNIT_LIBS) @<< + 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 << !endif @@ -347,6 +351,9 @@ $(OBJS)\test_test.obj: .\test.cpp $(OBJS)\test_archivetest.obj: .\archive\archivetest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** +$(OBJS)\test_ziptest.obj: .\archive\ziptest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + $(OBJS)\test_arrays.obj: .\arrays\arrays.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** @@ -356,6 +363,9 @@ $(OBJS)\test_datetimetest.obj: .\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) $** + $(OBJS)\test_filenametest.obj: .\filename\filenametest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** @@ -386,6 +396,9 @@ $(OBJS)\test_regextest.obj: .\regex\regextest.cpp $(OBJS)\test_wxregextest.obj: .\regex\wxregextest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** +$(OBJS)\test_scopeguardtest.obj: .\scopeguard\scopeguardtest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + $(OBJS)\test_strings.obj: .\strings\strings.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** @@ -410,12 +423,18 @@ $(OBJS)\test_ffilestream.obj: .\streams\ffilestream.cpp $(OBJS)\test_filestream.obj: .\streams\filestream.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** +$(OBJS)\test_largefile.obj: .\streams\largefile.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + $(OBJS)\test_memstream.obj: .\streams\memstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(OBJS)\test_sstream.obj: .\streams\sstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** +$(OBJS)\test_tempfile.obj: .\streams\tempfile.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + $(OBJS)\test_textstreamtest.obj: .\streams\textstreamtest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** @@ -426,10 +445,20 @@ $(OBJS)\test_uris.obj: .\uris\uris.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(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) /d _WINDOWS /i .\..\samples $** + 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) /i .\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_3) /i .\..\samples $** $(OBJS)\test_gui_dummy.obj: .\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h $** $(OBJS)\test_gui_test.obj: .\test.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) $** + +$(OBJS)\test_gui_rect.obj: .\geometry\rect.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) $** + +$(OBJS)\test_gui_size.obj: .\geometry\size.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) $** + +$(OBJS)\test_gui_point.obj: .\geometry\point.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) $** +