X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/506e9b7ed2bee097fd3674061f6962e54bdea7bf..7e3204b45cf8e1bb882b314d456e75f2a22850d7:/tests/makefile.vc diff --git a/tests/makefile.vc b/tests/makefile.vc index 61c38538ed..d3353c0e78 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.5 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -39,6 +39,9 @@ TEST_OBJECTS = \ $(OBJS)\test_cmdlinetest.obj \ $(OBJS)\test_fileconf.obj \ $(OBJS)\test_datetimetest.obj \ + $(OBJS)\test_evthandler.obj \ + $(OBJS)\test_timertest.obj \ + $(OBJS)\test_exec.obj \ $(OBJS)\test_filekind.obj \ $(OBJS)\test_filenametest.obj \ $(OBJS)\test_filesystest.obj \ @@ -75,6 +78,7 @@ TEST_OBJECTS = \ $(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 \ @@ -83,6 +87,7 @@ TEST_OBJECTS = \ $(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 \ @@ -104,28 +109,27 @@ TEST_GUI_OBJECTS = \ $(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 -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: ### @@ -192,14 +196,6 @@ __RUNTIME_LIBS_8 = D !if "$(RUNTIME_LIBS)" == "static" __RUNTIME_LIBS_8 = $(__THREADSFLAG) !endif -!if "$(MONOLITHIC)" == "0" -__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 @@ -260,6 +256,18 @@ __GFXCTX_DEFINE_p_3 = /d wxUSE_GRAPHICS_CONTEXT=1 !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 @@ -277,12 +285,6 @@ __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib !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 @@ -296,16 +298,16 @@ __DEBUGINFO = __DEBUGINFO = /Zi !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = /DEBUG +__DEBUGINFO_1 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = +__DEBUGINFO_1 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_2 = +__DEBUGINFO_1 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2 = /DEBUG +__DEBUGINFO_1 = /DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" ____DEBUGRUNTIME = /D_DEBUG @@ -395,6 +397,14 @@ __GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 __DLLFLAG_p = /DWXUSINGDLL !endif !if "$(MONOLITHIC)" == "0" +__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 @@ -416,7 +426,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\test.exe $(__test_gui___depname) data fr $(OBJS)\printfbench.exe +all: $(OBJS)\test.exe $(__test_gui___depname) data fr clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -428,35 +438,27 @@ 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:$@ $(__DEBUGINFO_2) /pdb:"$(OBJS)\test.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(LDFLAGS) @<< - $(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) 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 + 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_2) /pdb:"$(OBJS)\test_gui.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< - $(TEST_GUI_OBJECTS) $(__WXLIB_HTML_p) $(__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 + 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)\printfbench.exe: $(OBJS)\printfbench_dummy.obj $(PRINTFBENCH_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_2) /pdb:"$(OBJS)\printfbench.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(LDFLAGS) @<< - $(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 .\dummy.cpp @@ -487,6 +489,15 @@ $(OBJS)\test_fileconf.obj: .\config\fileconf.cpp $(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp +$(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_filekind.obj: .\filekind\filekind.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\filekind\filekind.cpp @@ -595,6 +606,9 @@ $(OBJS)\test_socketstream.obj: .\streams\socketstream.cpp $(OBJS)\test_sstream.obj: .\streams\sstream.cpp $(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 @@ -619,6 +633,9 @@ $(OBJS)\test_tls.obj: .\thread\tls.cpp $(OBJS)\test_uris.obj: .\uris\uris.cpp $(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 @@ -652,18 +669,42 @@ $(OBJS)\test_gui_size.obj: .\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 @@ -676,15 +717,18 @@ $(OBJS)\test_gui_guifuncs.obj: .\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 -$(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 -