diff --git a/tests/Makefile.in b/tests/Makefile.in index 17edff417e..bd622d2a1e 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -11,14 +11,18 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ +SHARED_LD_MODULE_CXX = @SHARED_LD_MODULE_CXX@ +SO_SUFFIX_MODULE = @SO_SUFFIX_MODULE@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ SETFILE = @SETFILE@ +PIC_FLAG = @PIC_FLAG@ ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@ BK_DEPS = @BK_DEPS@ BK_MAKE_PCH = @BK_MAKE_PCH@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +DLLPREFIX_MODULE = @DLLPREFIX_MODULE@ LIBS = @LIBS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ @@ -138,6 +142,23 @@ TEST_OBJECTS = \ test_xlocale.o \ test_xmltest.o TEST_ODEP = $(_____pch_testprec_test_testprec_h_gch___depname) +TEST_DRAWING_CXXFLAGS = $(__test_drawing_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \ + -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) +TEST_DRAWING_OBJECTS = \ + test_drawing_test.o \ + test_drawing_drawing.o \ + test_drawing_plugindriver.o \ + test_drawing_basictest.o +TEST_DRAWING_ODEP = \ + $(_____pch_testprec_test_drawing_testprec_h_gch___depname) +TEST_DRAWINGPLUGIN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__DLLFLAG_p) $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \ + $(CXXFLAGS) +TEST_DRAWINGPLUGIN_OBJECTS = \ + test_drawingplugin_pluginsample.o TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) \ @@ -260,16 +281,27 @@ TEST_GUI_ODEP = $(_____pch_testprec_test_gui_testprec_h_gch___depname) @COND_USE_PCH_1@_____pch_testprec_test_testprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/testprec_test/testprec.h.gch @COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) +@COND_PLATFORM_MAC_0@__test_drawing___mac_setfilecmd = @true +@COND_PLATFORM_MAC_1@__test_drawing___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test_drawing$(EXEEXT) +@COND_GCC_PCH_1@__test_drawing_PCH_INC = -I./.pch/testprec_test_drawing +@COND_ICC_PCH_1@__test_drawing_PCH_INC = \ +@COND_ICC_PCH_1@ $(ICC_PCH_USE_SWITCH) \ +@COND_ICC_PCH_1@ ./.pch/testprec_test_drawing/testprec.h.gch +@COND_USE_PCH_1@_____pch_testprec_test_drawing_testprec_h_gch___depname \ +@COND_USE_PCH_1@ = ./.pch/testprec_test_drawing/testprec.h.gch +@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p) +@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p_2 = $(__LIB_PNG_p) @COND_USE_GUI_1@__test_gui___depname = test_gui$(EXEEXT) @COND_PLATFORM_MAC_0@__test_gui___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__test_gui___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test_gui$(EXEEXT) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_5 = --define __WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_5 = --define wxDEBUG_LEVEL=0 -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_5 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p_5 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p_5 = --define wxNO_THREADS -@COND_SHARED_1@__DLLFLAG_p_5 = --define WXUSINGDLL +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_9 = --define __WXUNIVERSAL__ +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_9 = --define wxDEBUG_LEVEL=0 +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_9 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p_9 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p_9 = --define wxNO_THREADS +@COND_SHARED_1@__DLLFLAG_p_9 = --define WXUSINGDLL @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__test_gui___win32rc = test_gui_sample_rc.o @@ -312,9 +344,6 @@ COND_MONOLITHIC_0___WXLIB_ADV_p = \ COND_MONOLITHIC_0___WXLIB_HTML_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p) -COND_MONOLITHIC_0___WXLIB_CORE_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \ @COND_MONOLITHIC_1_USE_STC_1@ = \ @COND_MONOLITHIC_1_USE_STC_1@ -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @@ -324,18 +353,21 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \ @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \ @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_XML_p = \ + -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p) +COND_MONOLITHIC_0___WXLIB_NET_p = \ + -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -COND_MONOLITHIC_0___WXLIB_NET_p = \ - -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p) -COND_MONOLITHIC_0___WXLIB_XML_p = \ - -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p) +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) @@ -355,7 +387,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ ### Targets: ### -all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data data-images fr +all: test$(EXEEXT) test_drawing$(EXEEXT) $(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE) $(__test_gui___depname) $(__test_gui_bundle___depname) data data-images fr install: @@ -367,6 +399,8 @@ clean: rm -rf ./.deps ./.pch rm -f ./*.o rm -f test$(EXEEXT) + rm -f test_drawing$(EXEEXT) + rm -f $(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE) rm -f test_gui$(EXEEXT) rm -rf test_gui.app @@ -381,6 +415,17 @@ test$(EXEEXT): $(TEST_OBJECTS) @COND_USE_PCH_1@./.pch/testprec_test/testprec.h.gch: @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS) +test_drawing$(EXEEXT): $(TEST_DRAWING_OBJECTS) + $(CXX) -o $@ $(TEST_DRAWING_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + + $(__test_drawing___mac_setfilecmd) + +@COND_USE_PCH_1@./.pch/testprec_test_drawing/testprec.h.gch: +@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test_drawing/testprec.h.gch testprec.h $(CXX) $(TEST_DRAWING_CXXFLAGS) + +$(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE): $(TEST_DRAWINGPLUGIN_OBJECTS) + $(SHARED_LD_MODULE_CXX) $@ $(TEST_DRAWINGPLUGIN_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_2) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + @COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc) @COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) @COND_USE_GUI_1@ @@ -699,8 +744,23 @@ test_xlocale.o: $(srcdir)/xlocale/xlocale.cpp $(TEST_ODEP) test_xmltest.o: $(srcdir)/xml/xmltest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/xml/xmltest.cpp +test_drawing_test.o: $(srcdir)/test.cpp $(TEST_DRAWING_ODEP) + $(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/test.cpp + +test_drawing_drawing.o: $(srcdir)/drawing/drawing.cpp $(TEST_DRAWING_ODEP) + $(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/drawing/drawing.cpp + +test_drawing_plugindriver.o: $(srcdir)/drawing/plugindriver.cpp $(TEST_DRAWING_ODEP) + $(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/drawing/plugindriver.cpp + +test_drawing_basictest.o: $(srcdir)/drawing/basictest.cpp $(TEST_DRAWING_ODEP) + $(CXXC) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(srcdir)/drawing/basictest.cpp + +test_drawingplugin_pluginsample.o: $(srcdir)/drawing/pluginsample.cpp + $(CXXC) -c -o $@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $(srcdir)/drawing/pluginsample.cpp + test_gui_sample_rc.o: $(srcdir)/../samples/sample.rc $(TEST_GUI_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5) $(__DEBUG_DEFINE_p_5) $(__EXCEPTIONS_DEFINE_p_5) $(__RTTI_DEFINE_p_5) $(__THREAD_DEFINE_p_5) --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(srcdir) $(__DLLFLAG_p_9) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include test_gui_asserthelper.o: $(srcdir)/asserthelper.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/asserthelper.cpp diff --git a/tests/drawing/basictest.cpp b/tests/drawing/basictest.cpp new file mode 100644 index 0000000000..ac75dc8eac --- /dev/null +++ b/tests/drawing/basictest.cpp @@ -0,0 +1,49 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/drawing/basictest.cpp +// Purpose: Basic tests for wxGraphicsContext +// Author: Armel Asselin +// Created: 2014-02-28 +// Copyright: (c) 2014 Ellié Computing +/////////////////////////////////////////////////////////////////////////////// + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#include "testprec.h" +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/font.h" + #include "wx/window.h" +#endif // WX_PRECOMP + +#define _WX_CURSOR_H_BASE_ + + +#include "drawing.h" + +#if wxUSE_TEST_GC_DRAWING + +const GraphicsContextDrawingTestCase::DrawingTestCase +GraphicsContextDrawingTestCase::ms_drawingBasicTc = { + 1, &GraphicsContextDrawingTestCase::DoBasicDrawings, 800, 600, 72., true +}; + +void GraphicsContextDrawingTestCase::DoBasicDrawings (wxGraphicsContext *gc) +{ + // this test is expected to be portable, on any platform, in order to keep + // that property, it should contain only axis aligned/integer drawings so + // that the anti-aliasing method does not cause troubles. + + wxGraphicsBrush gbBackground = + gc->CreateBrush (wxBrush (wxColour (255, 255, 255))); + + gc->SetBrush (gbBackground); + gc->DrawRectangle (0, 0, 800, 600); +} + +#endif // wxUSE_TEST_GC_DRAWING diff --git a/tests/drawing/drawing.cpp b/tests/drawing/drawing.cpp new file mode 100644 index 0000000000..c033f8f586 --- /dev/null +++ b/tests/drawing/drawing.cpp @@ -0,0 +1,270 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/graphics/drawing.cpp +// Purpose: Tests for wxGraphicsContent general drawing +// Author: Armel Asselin +// Created: 2014-02-21 +// Copyright: (c) 2014 Ellié Computing +/////////////////////////////////////////////////////////////////////////////// + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#include "testprec.h" +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/font.h" + #include "wx/window.h" +#endif // WX_PRECOMP + +#include "drawing.h" + +#if wxUSE_TEST_GC_DRAWING + +#include "wx/image.h" +#include "wx/wfstream.h" +#include "wx/stdpaths.h" +#include "testimagefile.h" + +#include + +// ---------------------------------------------------------------------------- +// test class +// ---------------------------------------------------------------------------- + +//// ORGANIZATION ///////////////////////////////////////////////////////////// + +// This test suite is organized around two axes: +// - drawing test cases +// - drawing contexts life cycle +// => each drawing test case represent a serie of drawing primitives to execute +// for whichever context +// => each drawing context life cycle represent a particular class of +// wxGraphicsContext and a way to create, dispose of and save it so that it is +// possible to compare it with a reference file + +// A plugin system is implemented to let developers of contributed libraries +// test their library without the need to impact the test system and its +// dependencies. See RunPluginsDrawingCase. + +// The crossing of drawing case and life cycles is implemented by +// RunIndividualDrawingCase + +// The CPPUNIT test case class present a test per drawing case per life cycle +// so that it is easy to run a particular test + +// The test requires reference files and must produce them when an +// implementation changed and new good references are known to be produced. +// Environment variables control where reference files are located and when to +// produce them: +// - WX_TEST_SUITE_BUILD_REFERENCE must be "1" to request production of +// reference files (by default only testing is done) +// - WX_TEST_SUITE_REFERENCE_DIR must be a path to a directory containing the +// sub-directory "gcdrawing-references" (by default the parent directory +// of the directory of the test program is used) + +//// WRITING NEW TEST CASES + +// - add a new function to realize the drawing in the "cases functions" section +// - add a case structure declaration for it in the "test cases" section +// - use drawingbasic.cpp as a sample to add your own test case implementation + +//// WRITING NEW FACTORIES + +// - if the wxGraphicsContext is a class built-in wxWidgets, add a +// DrawingTestGCFactory derived sub-class in drawing.h header +// together with a declaration for it and its implementation +// can be placed in drawing.cpp +// Once this is done duplicate all the CPP UNIT test functions +// and entries "DrawToImage_YYY" to your new GC "DrawTo_YYYY" +// +// - if it is not built-in (contributed library/wxCode...), make a plugin for it +// test.bkl contains a sample "test_drawingplugin" target, you can use +// drawingplgsample.cpp as a start, see RunPluginsDrawingCase declaration +// for information about how to run the tests + +wxString GraphicsContextDrawingTestCase::ms_referenceDirectory; +bool GraphicsContextDrawingTestCase::ms_buildReference; +bool GraphicsContextDrawingTestCase::ms_buildReferenceDetermined; +GraphicsContextDrawingTestCase::ImageGraphicsContextLifeCycle + GraphicsContextDrawingTestCase::ms_imageLifeCycle; + +#if wxUSE_SVG + GraphicsContextDrawingTestCase::SvgGraphicsContextLifeCycle + GraphicsContextDrawingTestCase::ms_svgLifeCycle; +#endif // wxUSE_SVG + +// register in the unnamed registry so that these tests are run by default +CPPUNIT_TEST_SUITE_REGISTRATION( GraphicsContextDrawingTestCase ); + +// also include in its own registry so that these tests can be run alone +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GraphicsContextDrawingTestCase, + "GraphicsContextDrawingTestCase" ); + +// ---------------------------------------------------------------------------- +// tests themselves +// ---------------------------------------------------------------------------- + +void GraphicsContextDrawingTestCase::RunIndividualDrawingCase ( + DrawingTestGCFactory& gcFactory, + const DrawingTestCase & testCase) +{ + wxFileName fileName, refFileName; + wxString testsOutputDirectory = wxStandardPaths::Get().GetTempDir(); + wxString refOutputDirectory = GetTestsReferenceDirectory(); + + wxString platformTag; + if (!testCase.platformIndependent && !gcFactory.PlatformIndependent()) + platformTag = wxString::Format("_%s", GetPlatformTag()); + + fileName.Assign (testsOutputDirectory, + wxString::Format("image_test_%s%s_%d", gcFactory.GetIdForFileName(), + platformTag, testCase.caseNumber), + gcFactory.GetExtensionForFileName()); + + refFileName.Assign (refOutputDirectory, + wxString::Format("image_test_%s%s_%d_ref", gcFactory.GetIdForFileName(), + platformTag, testCase.caseNumber), + gcFactory.GetExtensionForFileName()); + + { + wxGraphicsContext *gc = NULL; + + wxON_BLOCK_EXIT_OBJ1(gcFactory, DrawingTestGCFactory::CleanUp, gc); + + gc = gcFactory.BuildNewContext( + wxSize(testCase.width, testCase.height), + testCase.pointsPerInch, fileName); + + (this->*testCase.m_drawingF)(gc); + + gcFactory.SaveBuiltContext(gc); + } + + if (GetBuildReference()) + { + CPPUNIT_ASSERT(wxCopyFile (fileName.GetFullPath(), + refFileName.GetFullPath(), true)); + } + else if (gcFactory.UseImageComparison()) + { + WX_ASSERT_SAME_AS_IMAGE_FILE(fileName.GetFullPath(), + refFileName.GetFullPath()); + } + else + { + WX_ASSERT_SAME_AS_FILE(fileName.GetFullPath(), + refFileName.GetFullPath()); + } +} + + +bool GraphicsContextDrawingTestCase::GetBuildReference() const +{ + if (!ms_buildReferenceDetermined) + { + wxString value; + if (wxGetEnv("WX_TEST_SUITE_BUILD_REFERENCE", &value)) + ms_buildReference = value == "1"; + } + return ms_buildReference; +} + +wxString GraphicsContextDrawingTestCase::GetTestsReferenceDirectory() const +{ + if (ms_referenceDirectory.empty()) + { + wxFileName refDir; + + if ( !wxGetEnv("WX_TEST_SUITE_REFERENCE_DIR", + &ms_referenceDirectory) ) + { + refDir = wxFileName(wxStandardPaths::Get().GetExecutablePath()); + refDir.RemoveLastDir(); + } + else + { + refDir = wxFileName(ms_referenceDirectory, wxT("")); + } + refDir.AppendDir ("drawing"); + refDir.AppendDir ("references"); + ms_referenceDirectory = refDir.GetPath(); + } + return ms_referenceDirectory; +} + +wxString GraphicsContextDrawingTestCase::GetPlatformTag() const +{ + return wxPlatformInfo::Get().GetOperatingSystemFamilyName().Lower(); +} + +/////////////////////////////////////////////////////////////////////////////// +// BUILT-IN FACTORIES //////////////////////////////////////////////////////// + +wxGraphicsContext * +GraphicsContextDrawingTestCase::ImageGraphicsContextLifeCycle:: + BuildNewContext (wxSize expectedSize, double WXUNUSED(pointsPerInch), + const wxFileName &targetFileName) +{ + m_image = new wxImage (expectedSize); + m_image->InitAlpha(); + + m_targetFileName = targetFileName.GetFullPath(); + + // we should probably pass the number of points per inches somewhere... + // but I don't see where yet... + return wxGraphicsContext::Create(*m_image); +} + +void +GraphicsContextDrawingTestCase::ImageGraphicsContextLifeCycle:: + SaveBuiltContext (wxGraphicsContext *&gc) +{ + wxDELETE(gc); + + m_image->SaveFile (m_targetFileName); +} + +void +GraphicsContextDrawingTestCase::ImageGraphicsContextLifeCycle:: + CleanUp (wxGraphicsContext *gc) +{ + delete gc; + m_targetFileName.clear(); + wxDELETE(m_image); +} + +#if wxUSE_SVG +wxGraphicsContext * +GraphicsContextDrawingTestCase::SvgGraphicsContextLifeCycle:: + BuildNewContext (wxSize WXUNUSED(expectedSize), + double WXUNUSED(pointsPerInch), + const wxFileName &WXUNUSED(targetFileName)) +{ + m_svgFileDc = NULL; + //m_svg_file_dc = new wxSVGFileDC (target_file_name.GetFullPath(), + // expected_size.GetWidth(), expected_size.GetHeight(), points_per_inch); + + // unfortunately cannot make GC over a DC yet :( + throw std::runtime_error("SVG as no wxGC interface yet"); +} + +void +GraphicsContextDrawingTestCase::SvgGraphicsContextLifeCycle:: + SaveBuiltContext (wxGraphicsContext *&WXUNUSED(gc)) +{ +} + +void +GraphicsContextDrawingTestCase::SvgGraphicsContextLifeCycle:: + CleanUp (wxGraphicsContext *WXUNUSED(gc)) +{ + wxDELETE (m_svgFileDc); +} +#endif // wxUSE_SVG + +#endif // wxUSE_TEST_GC_DRAWING diff --git a/tests/drawing/drawing.h b/tests/drawing/drawing.h new file mode 100644 index 0000000000..6719cbe899 --- /dev/null +++ b/tests/drawing/drawing.h @@ -0,0 +1,159 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/drawing/drawing.h +// Purpose: Drawing test case header +// Author: Armel Asselin +// Created: 2014-02-26 +// Copyright: (c) 2014 Ellié Computing +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_TESTS_DRAWING_H_ +#define _WX_TESTS_DRAWING_H_ + +#include "gcfactory.h" + +#if wxUSE_TEST_GC_DRAWING + +#if wxUSE_SVG +#include "wx/dcsvg.h" +#endif + +class WXDLLIMPEXP_FWD_BASE wxDynamicLibrary; + +class GraphicsContextDrawingTestCase : public CppUnit::TestCase +{ +public: + GraphicsContextDrawingTestCase() + : m_drawingPluginsLoaded(false) + { + wxImage::AddHandler (new wxPNGHandler()); + wxImage::AddHandler (new wxBMPHandler()); + } + ~GraphicsContextDrawingTestCase() { + ms_referenceDirectory.clear(); + } + +private: + + // NB: individual test cases launchers are copied/pasted so that the CppUnit + // test case selection can be used + + CPPUNIT_TEST_SUITE( GraphicsContextDrawingTestCase ); + CPPUNIT_TEST( DrawToImage_Basics ); +#if wxUSE_SVG +// CPPUNIT_TEST( DrawToSVG_Basics ); +#endif + CPPUNIT_TEST( DrawToPlugins_Basics ); + CPPUNIT_TEST_SUITE_END(); + + class ImageGraphicsContextLifeCycle: public DrawingTestGCFactory + { + public: + virtual ~ImageGraphicsContextLifeCycle() {} + virtual wxString GetIdForFileName () const { return "image"; } + virtual wxString GetExtensionForFileName () const { return "png"; } + virtual bool UseImageComparison() const { return true; } + virtual bool PlatformIndependent() const { return false; } + virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize, + double pointsPerInch, const wxFileName &targetFileName); + virtual void SaveBuiltContext (wxGraphicsContext *&gc); + virtual void CleanUp (wxGraphicsContext *gc); + private: + wxImage *m_image; + wxString m_targetFileName; + }; + + static ImageGraphicsContextLifeCycle ms_imageLifeCycle; + +#if wxUSE_SVG + class SvgGraphicsContextLifeCycle: public DrawingTestGCFactory + { + public: + virtual wxString GetIdForFileName () const { return "svg"; } + virtual wxString GetExtensionForFileName () const { return "svg"; } + virtual bool UseImageComparison() const { return false; } + virtual bool PlatformIndependent() const { return true; } + virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize, + double pointsPerInch, const wxFileName &targetFileName); + virtual void SaveBuiltContext (wxGraphicsContext *&gc); + virtual void CleanUp (wxGraphicsContext *gc); + + private: + wxSVGFileDC *m_svgFileDc; + }; + + static SvgGraphicsContextLifeCycle ms_svgLifeCycle; +#endif // wxUSE_SVG + + struct DrawingTestCase { + unsigned caseNumber; + void (GraphicsContextDrawingTestCase::*m_drawingF) ( + wxGraphicsContext *gc); + unsigned width, height; + double pointsPerInch; + + // if true, it means that this test case is "simple" enough to be + // platform independent even for targets that normally are dependent + // on the platform + bool platformIndependent; + }; + + // test cases + static const DrawingTestCase ms_drawingBasicTc; + + // cases functions + void DoBasicDrawings (wxGraphicsContext *gc); + + void RunIndividualDrawingCase ( + DrawingTestGCFactory& gcFactory, + const DrawingTestCase & testCase); + + // enumerates the dll names as specified in WX_TEST_SUITE_GC_DRAWING_PLUGINS + // (coma separated list of DLL to load and test) + // each DLL should have these procedures: + // - DrawingTestGCFactory* CreateDrawingTestLifeCycle(), + // to create the life cycle object + // - DestroyDrawingTestLifeCycle(DrawingTestGCFactory *), + // to destroy the life cycle object + void RunPluginsDrawingCase (const DrawingTestCase & testCase); + + void DrawToImage_Basics() { + RunIndividualDrawingCase (ms_imageLifeCycle, ms_drawingBasicTc); + } +#if wxUSE_SVG + void DrawToSVG_Basics() { + RunIndividualDrawingCase (ms_svgLifeCycle, ms_drawingBasicTc); + } +#endif + void DrawToPlugins_Basics() { + RunPluginsDrawingCase (ms_drawingBasicTc); + } + + bool GetBuildReference() const; + + wxString GetTestsReferenceDirectory() const; + + wxString GetPlatformTag() const; + + static wxString ms_referenceDirectory; + static bool ms_buildReference, ms_buildReferenceDetermined; + bool m_drawingPluginsLoaded; + + struct PluginInfo { + PluginInfo(); + ~PluginInfo(); + + wxDynamicLibrary* library; + + DrawingTestGCFactory *gcFactory; + DestroyDrawingTestLifeCycleFunction destroy; + }; + + wxVector m_drawingPlugins; + + DECLARE_NO_COPY_CLASS(GraphicsContextDrawingTestCase) +}; + + +#endif // wxUSE_TEST_GC_DRAWING + +#endif // _WX_TESTS_DRAWING_H_ diff --git a/tests/drawing/gcfactory.h b/tests/drawing/gcfactory.h new file mode 100644 index 0000000000..a1ef871f71 --- /dev/null +++ b/tests/drawing/gcfactory.h @@ -0,0 +1,71 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/drawing/gcfactory.h +// Purpose: Interface of a factory to create and destroy a wxGraphicsContext +// and finally save the result of a rendering test +// Author: Armel Asselin +// Created: 2014-02-26 +// Copyright: (c) 2014 Ellié Computing +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_TESTS_GCFACTORY_H_ +#define _WX_TESTS_GCFACTORY_H_ + +// wxCairoRenderer::CreateMeasuringContext() is not implement for wxX11 +#if wxUSE_GRAPHICS_CONTEXT && !defined(__WXX11__) + #include "wx/graphics.h" + #define wxUSE_TEST_GC_DRAWING 1 +#else + #define wxUSE_TEST_GC_DRAWING 0 +#endif + +#if wxUSE_TEST_GC_DRAWING + +#include "wx/filename.h" + +class WXDLLIMPEXP_FWD_CORE wxGraphicsContext; + +// Implement a class derived from this one to let the drawing test create +// graphics context, save them and destroy them. +class DrawingTestGCFactory +{ +public: + virtual ~DrawingTestGCFactory() {} + + // This identifier is used in the test and reference files to distinguish + // results produced by wxGraphicsContext generated by this factory + // use only lower case latin letters, '_' and '-' + virtual wxString GetIdForFileName () const = 0; + + // This is the extension used when saving test and reference files + virtual wxString GetExtensionForFileName () const = 0; + + // Returns true if a pixel per pixel comparison of rendered image should + // be used rather than a byte by byte comparison of files + virtual bool UseImageComparison() const = 0; + + // Returns true this target is platform independent, rendering exactly + // the same result for whichever platform + virtual bool PlatformIndependent() const = 0; + + // Builds a new context of @c expected_size, expecting to save it as + // @c target_file_name + // NB: only one context is created as a time, so that the implementer + // can keep internal state if necessary + virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize, + double pointsPerInch, const wxFileName &targetFileName) = 0; + + // Let's the opportunity to actually save the context and associated data + // If saving requires deleting the wxGraphicsContext object the + // implementer is free to do it but @c gc must then be nulled + virtual void SaveBuiltContext (wxGraphicsContext *&gc) = 0; + + // Cleans @c gc and internal data if any + virtual void CleanUp (wxGraphicsContext *gc) = 0; +}; + +typedef DrawingTestGCFactory * (*CreateDrawingTestLifeCycleFunction)(); +typedef void (*DestroyDrawingTestLifeCycleFunction) (DrawingTestGCFactory* lc); + +#endif // wxUSE_TEST_GC_DRAWING + +#endif // #ifndef _WX_TESTS_GCFACTORY_H_ diff --git a/tests/drawing/plugin.h b/tests/drawing/plugin.h new file mode 100644 index 0000000000..95cfa4eba5 --- /dev/null +++ b/tests/drawing/plugin.h @@ -0,0 +1,21 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/drawing/plugin.h +// Purpose: Defines the functions needed to implement a drawing test plugin +// Author: Armel Asselin +// Created: 2014-02-2 +// Copyright: (c) 2014 Ell8ié Computing +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_TESTS_DRAWINGPLG_H_ +#define _WX_TESTS_DRAWINGPLG_H_ + +#include "gcfactory.h" + +#if wxUSE_TEST_GC_DRAWING + +extern "C" WXEXPORT DrawingTestGCFactory * CreateDrawingTestLifeCycle(); +extern "C" WXEXPORT void DestroyDrawingTestLifeCycle (DrawingTestGCFactory* lc); + +#endif // wxUSE_TEST_GC_DRAWING + +#endif // #ifndef _WX_TESTS_DRAWINGPLG_H_ diff --git a/tests/drawing/plugindriver.cpp b/tests/drawing/plugindriver.cpp new file mode 100644 index 0000000000..0cda928b64 --- /dev/null +++ b/tests/drawing/plugindriver.cpp @@ -0,0 +1,104 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/drawing/plugindriver.cpp +// Purpose: Plugin management for the drawing tests +// Author: Armel Asselin +// Created: 2014-02-28 +// Copyright: (c) 2014 Ellié Computing +/////////////////////////////////////////////////////////////////////////////// + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#include "testprec.h" +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/font.h" + #include "wx/window.h" +#endif // WX_PRECOMP + +#define _WX_CURSOR_H_BASE_ + + +#include "drawing.h" + +#if wxUSE_TEST_GC_DRAWING +#include + +void GraphicsContextDrawingTestCase::RunPluginsDrawingCase ( + const DrawingTestCase & testCase) +{ + if (!m_drawingPluginsLoaded) + { + m_drawingPluginsLoaded = true; + + wxString pluginsListStr; + if (!wxGetEnv ("WX_TEST_SUITE_GC_DRAWING_PLUGINS", &pluginsListStr)) + return; // no plugins + + wxArrayString pluginsNameArray = wxSplit (pluginsListStr, ',', '\0'); + m_drawingPlugins.resize (pluginsNameArray.size()); + + for (size_t idx=0; idxLoad (pluginsNameArray[idx])) + { + wxLogFatalError("could not load drawing plugin %s", + pluginsNameArray[idx]); + return; + } + + wxDYNLIB_FUNCTION(CreateDrawingTestLifeCycleFunction, + CreateDrawingTestLifeCycle, *pluginBeingLoaded.library); + wxDYNLIB_FUNCTION(DestroyDrawingTestLifeCycleFunction, + DestroyDrawingTestLifeCycle, *pluginBeingLoaded.library); + + if (!pfnCreateDrawingTestLifeCycle || + !pfnDestroyDrawingTestLifeCycle) + { + wxLogFatalError("could not find function" + " CreateDrawingTestLifeCycle or " + "DestroyDrawingTestLifeCycle in %s", pluginsNameArray[idx]); + return; + } + + pluginBeingLoaded.destroy = pfnDestroyDrawingTestLifeCycle; + pluginBeingLoaded.gcFactory = (*pfnCreateDrawingTestLifeCycle)(); + if (!pluginBeingLoaded.gcFactory) + { + wxLogFatalError("failed to create life-cycle object in %s", + pluginsNameArray[idx]); + return; + } + } + } + + // now execute the test case for each plugin + for (size_t idxp=0; idxp +/////////////////////////////////////////////////////////////////////////////// + +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#include "plugin.h" + +#if wxUSE_TEST_GC_DRAWING + +// ---------------------------------------------------------------------------- +// plugin implementation +// ---------------------------------------------------------------------------- + +class SampleDrawingTestGCFactory: public DrawingTestGCFactory { +public: + SampleDrawingTestGCFactory() { + wxImage::AddHandler (new wxBMPHandler()); + } + + virtual ~SampleDrawingTestGCFactory() { + } + virtual wxString GetIdForFileName () const { return "sample-plg"; } + virtual wxString GetExtensionForFileName () const { return "bmp"; } + + // Bitmaps are handled by wx code they should be binarily equal + virtual bool UseImageComparison() const { return false; } + + // We use wxGraphicsContext, its implementation is not platform independent + // and returns may slightly vary + virtual bool PlatformIndependent() const { return false; } + + virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize, + double WXUNUSED(pointsPerInch), const wxFileName &targetFileName) { + m_image = new wxImage (expectedSize); + m_image->InitAlpha(); + + m_targetFileName = targetFileName.GetFullPath(); + + // we should probably pass the number of points per inches somewhere... + // but I don't see where yet... + return wxGraphicsContext::Create(*m_image); + } + + // Let's the opportunity to actually save the context and associated data + // If saving requires deleting the wxGraphicsContext object the + // implementer is free to do it but @c gc must then be nulled + virtual void SaveBuiltContext (wxGraphicsContext *&gc) { + wxDELETE(gc); + + m_image->SaveFile (m_targetFileName); + } + + // Cleans @c gc and internal data if any + virtual void CleanUp (wxGraphicsContext *gc) { + delete gc; + m_targetFileName.Empty(); + wxDELETE(m_image); + } + + wxImage *m_image; + wxString m_targetFileName; +}; + +extern "C" WXEXPORT DrawingTestGCFactory * CreateDrawingTestLifeCycle() +{ + return new SampleDrawingTestGCFactory; +} + +extern "C" WXEXPORT void DestroyDrawingTestLifeCycle (DrawingTestGCFactory* lc) +{ + delete lc; +} + +#endif // wxUSE_TEST_GC_DRAWING diff --git a/tests/drawing/readme.txt b/tests/drawing/readme.txt new file mode 100644 index 0000000000..cfc98ae9f5 --- /dev/null +++ b/tests/drawing/readme.txt @@ -0,0 +1,4 @@ +Drawing Test +############ + +If you need directions, please read the top of drawing.cpp file, and the test.bkl file with the comments about test_drawing and test_drawingplugin items. diff --git a/tests/drawing/references/readme.txt b/tests/drawing/references/readme.txt new file mode 100644 index 0000000000..98c066b318 --- /dev/null +++ b/tests/drawing/references/readme.txt @@ -0,0 +1 @@ +This directory is expected to contain reference files and images produced by graphics/drawing.cpp test. diff --git a/tests/drawing/testimagefile.h b/tests/drawing/testimagefile.h new file mode 100644 index 0000000000..b2d6aeeeaf --- /dev/null +++ b/tests/drawing/testimagefile.h @@ -0,0 +1,97 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: tests/drawing/testimagefile.h +// Purpose: Functions to test whether the content of files or images files +// are equal +// Author: Armel Asselin +// Created: 2014-02-28 +// Copyright: (c) 2014 Ellié Computing +/////////////////////////////////////////////////////////////////////////////// + + +#ifndef _WX_TESTS_TESTIMAGEFILE_H_ +#define _WX_TESTS_TESTIMAGEFILE_H_ + +bool AreFilesContentsEqual(const wxString &filename, const wxString &refFilename) +{ + wxFileInputStream input(filename); + wxFileInputStream refInput(refFilename); + + wxFileOffset refLength = refInput.GetLength(); + if (refLength != input.GetLength()) + return false; + + wxUint8 buffer[1024], refBuffer[sizeof(buffer)]; + + wxFileOffset remainingLength = refLength; + while (remainingLength != 0) + { + input.Read (buffer, wxMin(remainingLength, sizeof(buffer))); + refInput.Read(refBuffer, wxMin(remainingLength, sizeof(refBuffer))); + + size_t refLastRead = refInput.LastRead(); + if (input.LastRead() != refLastRead) + return false; + + if (memcmp (buffer, refBuffer, refLastRead) != 0) + return false; + + remainingLength -= refLastRead; + } + + return true; +} + +#define WX_ASSERT_SAME_AS_FILE(filename1, filename2) \ + WX_ASSERT_MESSAGE(\ + ("Files \"%s\" and \"%s\" differ.",\ + filename1, filename2),\ + AreImagesFilesContentsEqual(filename1, filename2)) + +bool AreImagesFilesContentsEqual(const wxString &filename, + const wxString &refFilename) +{ + wxImage input(filename); + wxImage refInput(refFilename); + + // assertion_traits could do part of the job or maybe the contrary + // there should probably be somethin common at least + + if (!input.Ok() || !refInput.Ok()) + return false; + if (input.GetSize() != refInput.GetSize()) + return false; + if (input.HasAlpha() != refInput.HasAlpha()) + return false; + if (input.HasMask() != refInput.HasMask()) + return false; + + long pixelsCount = input.GetSize().GetWidth() * input.GetSize().GetHeight(); + const unsigned char *data = input.GetData(); + const unsigned char *refData = refInput.GetData(); + if (memcmp (data, refData, pixelsCount*3) != 0) + return false; + + if (input.HasAlpha()) + { + const unsigned char *alpha = input.GetAlpha(); + const unsigned char *refAlpha = refInput.GetAlpha(); + if (memcmp (alpha, refAlpha, pixelsCount) != 0) + return false; + } + + if (input.HasMask() && + (input.GetMaskRed() != refInput.GetMaskRed() || + input.GetMaskGreen() != refInput.GetMaskGreen() || + input.GetMaskBlue() != refInput.GetMaskBlue())) + return false; + + return true; +} + +#define WX_ASSERT_SAME_AS_IMAGE_FILE(filename1, filename2) \ + WX_ASSERT_MESSAGE(\ + ("Image files \"%s\" and \"%s\" differ.",\ + filename1, filename2),\ + AreImagesFilesContentsEqual(filename1, filename2)) + +#endif // _WX_TESTS_TESTIMAGEFILE_H_ diff --git a/tests/makefile.bcc b/tests/makefile.bcc index 6b1703b651..4cc595d943 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -30,7 +30,7 @@ LIBDIRNAME = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) TEST_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \ @@ -122,8 +122,30 @@ TEST_OBJECTS = \ $(OBJS)\test_weakref.obj \ $(OBJS)\test_xlocale.obj \ $(OBJS)\test_xmltest.obj +TEST_DRAWING_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \ + $(____CAIRO_INCLUDEDIR_FILENAMES) -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \ + $(CPPUNIT_CFLAGS) -Hu -H=$(OBJS)\testprec_test_drawing.csm $(CPPFLAGS) \ + $(CXXFLAGS) +TEST_DRAWING_OBJECTS = \ + $(OBJS)\test_drawing_dummy.obj \ + $(OBJS)\test_drawing_test.obj \ + $(OBJS)\test_drawing_drawing.obj \ + $(OBJS)\test_drawing_plugindriver.obj \ + $(OBJS)\test_drawing_basictest.obj +TEST_DRAWINGPLUGIN_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \ + $(____CAIRO_INCLUDEDIR_FILENAMES) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) +TEST_DRAWINGPLUGIN_OBJECTS = \ + $(OBJS)\test_drawingplugin_pluginsample.obj TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \ @@ -258,41 +280,47 @@ EXTRALIBS_FOR_BASE = !if "$(MONOLITHIC)" == "1" __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) !endif +!if "$(MONOLITHIC)" == "1" +__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p) +!endif +!if "$(MONOLITHIC)" == "1" +__LIB_PNG_IF_MONO_p_2 = $(__LIB_PNG_p) +!endif !if "$(USE_GUI)" == "1" __test_gui___depname = $(OBJS)\test_gui.exe !endif !if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_3 = -d__WXUNIVERSAL__ +__WXUNIV_DEFINE_p_7 = -d__WXUNIVERSAL__ !endif !if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_3 = -dwxDEBUG_LEVEL=0 +__DEBUG_DEFINE_p_7 = -dwxDEBUG_LEVEL=0 !endif !if "$(BUILD)" == "release" -__NDEBUG_DEFINE_p_3 = -dNDEBUG +__NDEBUG_DEFINE_p_7 = -dNDEBUG !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_3 = -dwxNO_EXCEPTIONS +__EXCEPTIONS_DEFINE_p_7 = -dwxNO_EXCEPTIONS !endif !if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_3 = -dwxNO_RTTI +__RTTI_DEFINE_p_7 = -dwxNO_RTTI !endif !if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_3 = -dwxNO_THREADS +__THREAD_DEFINE_p_7 = -dwxNO_THREADS !endif !if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_3 = -dwxUSE_UNICODE=0 +__UNICODE_DEFINE_p_7 = -dwxUSE_UNICODE=0 !endif !if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_3 = -d_UNICODE +__UNICODE_DEFINE_p_7 = -d_UNICODE !endif !if "$(MSLU)" == "1" -__MSLU_DEFINE_p_3 = -dwxUSE_UNICODE_MSLU=1 +__MSLU_DEFINE_p_7 = -dwxUSE_UNICODE_MSLU=1 !endif !if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_3_p = -i$(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_7_p = -i$(CAIRO_ROOT)\include\cairo !endif !if "$(SHARED)" == "1" -__DLLFLAG_p_3 = -dWXUSINGDLL +__DLLFLAG_p_7 = -dWXUSINGDLL !endif !if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1" __WXLIB_WEBVIEW_p = \ @@ -318,10 +346,6 @@ __WXLIB_ADV_p = \ __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 "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif @@ -331,6 +355,14 @@ __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib !if "$(USE_GUI)" == "1" __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib !endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_NET_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = -Od !endif @@ -344,10 +376,10 @@ __THREADSFLAG = __THREADSFLAG = mt !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG_0 = +__THREADSFLAG_2 = !endif !if "$(USE_THREADS)" == "1" -__THREADSFLAG_0 = -tWM +__THREADSFLAG_2 = -tWM !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS = -tWR @@ -356,10 +388,10 @@ __RUNTIME_LIBS = -tWR __RUNTIME_LIBS = !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_0 = i +__RUNTIME_LIBS_2 = i !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_0 = +__RUNTIME_LIBS_2 = !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -395,12 +427,8 @@ ____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo __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 +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = \ @@ -442,7 +470,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\test.exe $(__test_gui___depname) data data-images fr +all: $(OBJS)\test.exe $(OBJS)\test_drawing.exe $(OBJS)\test_drawingplugin.dll $(__test_gui___depname) data data-images fr clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -454,6 +482,18 @@ clean: -if exist $(OBJS)\test.ild del $(OBJS)\test.ild -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf -if exist $(OBJS)\test.ils del $(OBJS)\test.ils + -if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.exe + -if exist $(OBJS)\test_drawing.tds del $(OBJS)\test_drawing.tds + -if exist $(OBJS)\test_drawing.ilc del $(OBJS)\test_drawing.ilc + -if exist $(OBJS)\test_drawing.ild del $(OBJS)\test_drawing.ild + -if exist $(OBJS)\test_drawing.ilf del $(OBJS)\test_drawing.ilf + -if exist $(OBJS)\test_drawing.ils del $(OBJS)\test_drawing.ils + -if exist $(OBJS)\test_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll + -if exist $(OBJS)\test_drawingplugin.tds del $(OBJS)\test_drawingplugin.tds + -if exist $(OBJS)\test_drawingplugin.ilc del $(OBJS)\test_drawingplugin.ilc + -if exist $(OBJS)\test_drawingplugin.ild del $(OBJS)\test_drawingplugin.ild + -if exist $(OBJS)\test_drawingplugin.ilf del $(OBJS)\test_drawingplugin.ilf + -if exist $(OBJS)\test_drawingplugin.ils del $(OBJS)\test_drawingplugin.ils -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe -if exist $(OBJS)\test_gui.tds del $(OBJS)\test_gui.tds -if exist $(OBJS)\test_gui.ilc del $(OBJS)\test_gui.ilc @@ -463,13 +503,23 @@ clean: $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, + c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, +| + +$(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj $(TEST_DRAWING_OBJECTS) + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| + c0x32.obj $(TEST_DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, +| + +$(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS) + ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| + c0d32.obj $(TEST_DRAWINGPLUGIN_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_2) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).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 -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__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_SCINTILLA_IF_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\test_gui_sample.res + c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__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_SCINTILLA_IF_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\test_gui_sample.res | !endif @@ -740,8 +790,26 @@ $(OBJS)\test_xlocale.obj: .\xlocale\xlocale.cpp $(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp +$(OBJS)\test_drawing_dummy.obj: .\dummy.cpp + $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) -H .\dummy.cpp + +$(OBJS)\test_drawing_test.obj: .\test.cpp + $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\test.cpp + +$(OBJS)\test_drawing_drawing.obj: .\drawing\drawing.cpp + $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\drawing.cpp + +$(OBJS)\test_drawing_plugindriver.obj: .\drawing\plugindriver.cpp + $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\plugindriver.cpp + +$(OBJS)\test_drawing_basictest.obj: .\drawing\basictest.cpp + $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\basictest.cpp + +$(OBJS)\test_drawingplugin_pluginsample.obj: .\drawing\pluginsample.cpp + $(CXX) -q -c -P -o$@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) .\drawing\pluginsample.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) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) -i. $(__DLLFLAG_p_3) -i.\..\samples -dNOPCH .\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_7) $(__DEBUG_DEFINE_p_7) $(__NDEBUG_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) $(__UNICODE_DEFINE_p_7) $(__MSLU_DEFINE_p_7) -i$(SETUPHDIR) -i.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_7_p) -i. $(__DLLFLAG_p_7) -i.\..\samples -dNOPCH .\..\samples\sample.rc $(OBJS)\test_gui_dummy.obj: .\dummy.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H .\dummy.cpp diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 514c232607..3e2fa34168 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -114,6 +114,29 @@ TEST_OBJECTS = \ $(OBJS)\test_weakref.o \ $(OBJS)\test_xlocale.o \ $(OBJS)\test_xmltest.o +TEST_DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \ + $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \ + $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) +TEST_DRAWING_OBJECTS = \ + $(OBJS)\test_drawing_dummy.o \ + $(OBJS)\test_drawing_test.o \ + $(OBJS)\test_drawing_drawing.o \ + $(OBJS)\test_drawing_plugindriver.o \ + $(OBJS)\test_drawing_basictest.o +TEST_DRAWINGPLUGIN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ + $(__THREADSFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \ + $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall $(__DLLFLAG_p) $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) +TEST_DRAWINGPLUGIN_OBJECTS = \ + $(OBJS)\test_drawingplugin_pluginsample.o TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -254,41 +277,47 @@ endif ifeq ($(MONOLITHIC),1) __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) endif +ifeq ($(MONOLITHIC),1) +__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p) +endif +ifeq ($(MONOLITHIC),1) +__LIB_PNG_IF_MONO_p_2 = $(__LIB_PNG_p) +endif ifeq ($(USE_GUI),1) __test_gui___depname = $(OBJS)\test_gui.exe endif ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_3 = --define __WXUNIVERSAL__ +__WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__ endif ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p_3 = --define wxDEBUG_LEVEL=0 +__DEBUG_DEFINE_p_6 = --define wxDEBUG_LEVEL=0 endif ifeq ($(BUILD),release) -__NDEBUG_DEFINE_p_3 = --define NDEBUG +__NDEBUG_DEFINE_p_6 = --define NDEBUG endif ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_3 = --define wxNO_EXCEPTIONS +__EXCEPTIONS_DEFINE_p_6 = --define wxNO_EXCEPTIONS endif ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_3 = --define wxNO_RTTI +__RTTI_DEFINE_p_6 = --define wxNO_RTTI endif ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_3 = --define wxNO_THREADS +__THREAD_DEFINE_p_6 = --define wxNO_THREADS endif ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p_3 = --define wxUSE_UNICODE=0 +__UNICODE_DEFINE_p_6 = --define wxUSE_UNICODE=0 endif ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_3 = --define _UNICODE +__UNICODE_DEFINE_p_6 = --define _UNICODE endif ifeq ($(MSLU),1) -__MSLU_DEFINE_p_3 = --define wxUSE_UNICODE_MSLU=1 +__MSLU_DEFINE_p_6 = --define wxUSE_UNICODE_MSLU=1 endif ifeq ($(USE_CAIRO),1) -__CAIRO_INCLUDEDIR_p_1 = --include-dir $(CAIRO_ROOT)/include/cairo +__CAIRO_INCLUDEDIR_p_2 = --include-dir $(CAIRO_ROOT)/include/cairo endif ifeq ($(SHARED),1) -__DLLFLAG_p_3 = --define WXUSINGDLL +__DLLFLAG_p_6 = --define WXUSINGDLL endif ifeq ($(MONOLITHIC),0) ifeq ($(USE_WEBVIEW),1) @@ -318,10 +347,6 @@ ifeq ($(MONOLITHIC),0) __WXLIB_HTML_p = \ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html endif -ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -endif ifeq ($(MONOLITHIC),1) ifeq ($(USE_STC),1) __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG) @@ -333,6 +358,14 @@ endif ifeq ($(USE_GUI),1) __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) endif +ifeq ($(MONOLITHIC),0) +__WXLIB_XML_p = \ + -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_NET_p = \ + -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net +endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG = -O0 endif @@ -385,12 +418,8 @@ ifeq ($(SHARED),1) __DLLFLAG_p = -DWXUSINGDLL endif ifeq ($(MONOLITHIC),0) -__WXLIB_NET_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_XML_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core endif ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = \ @@ -442,17 +471,25 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\test.exe $(__test_gui___depname) data data-images fr +all: $(OBJS)\test.exe $(OBJS)\test_drawing.exe $(OBJS)\test_drawingplugin.dll $(__test_gui___depname) data data-images fr clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\test.exe del $(OBJS)\test.exe + -if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.exe + -if exist $(OBJS)\test_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe $(OBJS)\test.exe: $(TEST_OBJECTS) $(CXX) -o $@ $(TEST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +$(OBJS)\test_drawing.exe: $(TEST_DRAWING_OBJECTS) + $(CXX) -o $@ $(TEST_DRAWING_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet + +$(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS) + $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(TEST_DRAWINGPLUGIN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_2) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet + ifeq ($(USE_GUI),1) $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__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_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet @@ -725,8 +762,26 @@ $(OBJS)\test_xlocale.o: ./xlocale/xlocale.cpp $(OBJS)\test_xmltest.o: ./xml/xmltest.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\test_drawing_dummy.o: ./dummy.cpp + $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\test_drawing_test.o: ./test.cpp + $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\test_drawing_drawing.o: ./drawing/drawing.cpp + $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\test_drawing_plugindriver.o: ./drawing/plugindriver.cpp + $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\test_drawing_basictest.o: ./drawing/basictest.cpp + $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\test_drawingplugin_pluginsample.o: ./drawing/pluginsample.cpp + $(CXX) -c -o $@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\test_gui_sample_rc.o: ./../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p_1) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../samples --define NOPCH + $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6) $(__NDEBUG_DEFINE_p_6) $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6) $(__UNICODE_DEFINE_p_6) $(__MSLU_DEFINE_p_6) --include-dir $(SETUPHDIR) --include-dir ./../include $(__CAIRO_INCLUDEDIR_p_2) --include-dir . $(__DLLFLAG_p_6) --include-dir ./../samples --define NOPCH $(OBJS)\test_gui_dummy.o: ./dummy.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< diff --git a/tests/makefile.vc b/tests/makefile.vc index 13ee7c63e9..d6d958c09b 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -116,7 +116,35 @@ TEST_OBJECTS = \ $(OBJS)\test_weakref.obj \ $(OBJS)\test_xlocale.obj \ $(OBJS)\test_xmltest.obj -TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \ +TEST_DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\test_drawing.pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ + /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + /I$(SETUPHDIR) /I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. \ + $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_drawing.pch" \ + $(CPPFLAGS) $(CXXFLAGS) +TEST_DRAWING_OBJECTS = \ + $(OBJS)\test_drawing_dummy.obj \ + $(OBJS)\test_drawing_test.obj \ + $(OBJS)\test_drawing_drawing.obj \ + $(OBJS)\test_drawing_plugindriver.obj \ + $(OBJS)\test_drawing_basictest.obj +TEST_DRAWINGPLUGIN_CXXFLAGS = /M$(__RUNTIME_LIBS_45)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\test_drawingplugin.pdb $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ + /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + /I$(SETUPHDIR) /I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ + $(__DLLFLAG_p) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +TEST_DRAWINGPLUGIN_OBJECTS = \ + $(OBJS)\test_drawingplugin_pluginsample.obj +TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_59)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \ $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ @@ -294,7 +322,7 @@ EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE = !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_0) +__DEBUGINFO_2 = $(__DEBUGRUNTIME_2) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_2 = @@ -303,7 +331,7 @@ __DEBUGINFO_2 = __DEBUGINFO_2 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2 = $(__DEBUGRUNTIME_0) +__DEBUGINFO_2 = $(__DEBUGRUNTIME_2) !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_10 = D @@ -314,80 +342,122 @@ __RUNTIME_LIBS_10 = $(__THREADSFLAG) !if "$(MONOLITHIC)" == "1" __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_19 = $(__DEBUGRUNTIME_2) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_19 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_19 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_19 = $(__DEBUGRUNTIME_2) +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_27 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_27 = $(__THREADSFLAG) +!endif +!if "$(MONOLITHIC)" == "1" +__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_37 = $(__DEBUGRUNTIME_2) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_37 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_37 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_37 = $(__DEBUGRUNTIME_2) +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_45 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_45 = $(__THREADSFLAG) +!endif +!if "$(MONOLITHIC)" == "1" +__LIB_PNG_IF_MONO_p_2 = $(__LIB_PNG_p) +!endif !if "$(USE_GUI)" == "1" __test_gui___depname = $(OBJS)\test_gui.exe !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_19 = $(__DEBUGRUNTIME_0) +__DEBUGINFO_51 = $(__DEBUGRUNTIME_2) !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_19 = +__DEBUGINFO_51 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_19 = +__DEBUGINFO_51 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_19 = $(__DEBUGRUNTIME_0) +__DEBUGINFO_51 = $(__DEBUGRUNTIME_2) !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_20_p_1 = /d _DEBUG +____DEBUGRUNTIME_52_p_1 = /d _DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_20_p_1 = +____DEBUGRUNTIME_52_p_1 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_20_p_1 = +____DEBUGRUNTIME_52_p_1 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_20_p_1 = /d _DEBUG +____DEBUGRUNTIME_52_p_1 = /d _DEBUG !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_27 = D +__RUNTIME_LIBS_59 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_27 = $(__THREADSFLAG) +__RUNTIME_LIBS_59 = $(__THREADSFLAG) !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__ +__NO_VC_CRTDBG_p_7 = /d __NO_VC_CRTDBG__ !endif !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__ +__NO_VC_CRTDBG_p_7 = /d __NO_VC_CRTDBG__ !endif !if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_3 = /d __WXUNIVERSAL__ +__WXUNIV_DEFINE_p_7 = /d __WXUNIVERSAL__ !endif !if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_3 = /d wxDEBUG_LEVEL=0 +__DEBUG_DEFINE_p_7 = /d wxDEBUG_LEVEL=0 !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__NDEBUG_DEFINE_p_3 = /d NDEBUG +__NDEBUG_DEFINE_p_7 = /d NDEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__NDEBUG_DEFINE_p_3 = /d NDEBUG +__NDEBUG_DEFINE_p_7 = /d NDEBUG !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_3 = /d wxNO_EXCEPTIONS +__EXCEPTIONS_DEFINE_p_7 = /d wxNO_EXCEPTIONS !endif !if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_3 = /d wxNO_RTTI +__RTTI_DEFINE_p_7 = /d wxNO_RTTI !endif !if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_3 = /d wxNO_THREADS +__THREAD_DEFINE_p_7 = /d wxNO_THREADS !endif !if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_3 = /d wxUSE_UNICODE=0 +__UNICODE_DEFINE_p_7 = /d wxUSE_UNICODE=0 !endif !if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_3 = /d _UNICODE +__UNICODE_DEFINE_p_7 = /d _UNICODE !endif !if "$(MSLU)" == "1" -__MSLU_DEFINE_p_3 = /d wxUSE_UNICODE_MSLU=1 +__MSLU_DEFINE_p_7 = /d wxUSE_UNICODE_MSLU=1 !endif !if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_3_p = /i $(CAIRO_ROOT)\include\cairo +____CAIRO_INCLUDEDIR_FILENAMES_7_p = /i $(CAIRO_ROOT)\include\cairo !endif !if "$(SHARED)" == "1" -__DLLFLAG_p_3 = /d WXUSINGDLL +__DLLFLAG_p_7 = /d WXUSINGDLL !endif !if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1" __WXLIB_WEBVIEW_p = \ @@ -413,10 +483,6 @@ __WXLIB_ADV_p = \ __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 "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1" __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib !endif @@ -426,6 +492,14 @@ __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib !if "$(USE_GUI)" == "1" __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib !endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_NET_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" __DEBUGINFO = /Zi !endif @@ -439,16 +513,16 @@ __DEBUGINFO = __DEBUGINFO = /Zi !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG +__DEBUGINFO_4 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = +__DEBUGINFO_4 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = +__DEBUGINFO_4 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG +__DEBUGINFO_4 = /DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" ____DEBUGRUNTIME = /D_DEBUG @@ -475,16 +549,16 @@ __DEBUGRUNTIME = __DEBUGRUNTIME = d !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_0 = +__DEBUGRUNTIME_2 = !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_0 = /opt:ref /opt:icf +__DEBUGRUNTIME_2 = /opt:ref /opt:icf !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_0 = /opt:ref /opt:icf +__DEBUGRUNTIME_2 = /opt:ref /opt:icf !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_0 = +__DEBUGRUNTIME_2 = !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od @@ -553,12 +627,8 @@ ____CAIRO_INCLUDEDIR_FILENAMES = /I$(CAIRO_ROOT)\include\cairo __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 +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = \ @@ -588,7 +658,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\test.exe $(__test_gui___depname) data data-images fr +all: $(OBJS)\test.exe $(OBJS)\test_drawing.exe $(OBJS)\test_drawingplugin.dll $(__test_gui___depname) data data-images fr clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -597,18 +667,34 @@ clean: -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_drawing.exe del $(OBJS)\test_drawing.exe + -if exist $(OBJS)\test_drawing.ilk del $(OBJS)\test_drawing.ilk + -if exist $(OBJS)\test_drawing.pdb del $(OBJS)\test_drawing.pdb + -if exist $(OBJS)\test_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll + -if exist $(OBJS)\test_drawingplugin.ilk del $(OBJS)\test_drawingplugin.ilk + -if exist $(OBJS)\test_drawingplugin.pdb del $(OBJS)\test_drawingplugin.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: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< $(TEST_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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 << +$(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj $(TEST_DRAWING_OBJECTS) + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawing.pdb" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + $(TEST_DRAWING_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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 +<< + +$(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS) + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_drawingplugin.pdb" $(__DEBUGINFO_37) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + $(TEST_DRAWINGPLUGIN_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_2) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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" $(__DEBUGINFO_19) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_51) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< $(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES) $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__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_SCINTILLA_IF_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) $(__CAIRO_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 @@ -880,11 +966,29 @@ $(OBJS)\test_xlocale.obj: .\xlocale\xlocale.cpp $(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp +$(OBJS)\test_drawing_dummy.obj: .\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) /Yctestprec.h .\dummy.cpp + +$(OBJS)\test_drawing_test.obj: .\test.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\test.cpp + +$(OBJS)\test_drawing_drawing.obj: .\drawing\drawing.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\drawing.cpp + +$(OBJS)\test_drawing_plugindriver.obj: .\drawing\plugindriver.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\plugindriver.cpp + +$(OBJS)\test_drawing_basictest.obj: .\drawing\basictest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\basictest.cpp + +$(OBJS)\test_drawingplugin_pluginsample.obj: .\drawing\pluginsample.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) .\drawing\pluginsample.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_20_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_3) /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) /i . $(__DLLFLAG_p_3) /i .\..\samples /d NOPCH /d _CONSOLE .\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_52_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_7) /d __WXMSW__ $(__WXUNIV_DEFINE_p_7) $(__DEBUG_DEFINE_p_7) $(__NDEBUG_DEFINE_p_7) $(__EXCEPTIONS_DEFINE_p_7) $(__RTTI_DEFINE_p_7) $(__THREAD_DEFINE_p_7) $(__UNICODE_DEFINE_p_7) $(__MSLU_DEFINE_p_7) /i $(SETUPHDIR) /i .\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_7_p) /i . $(__DLLFLAG_p_7) /i .\..\samples /d NOPCH /d _CONSOLE .\..\samples\sample.rc $(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp diff --git a/tests/makefile.wat b/tests/makefile.wat index b2577cb366..dfc2bdcdc6 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -76,6 +76,14 @@ __LIB_PNG_IF_MONO_p = !ifeq MONOLITHIC 1 __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) !endif +__LIB_PNG_IF_MONO_p_1 = +!ifeq MONOLITHIC 1 +__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p) +!endif +__LIB_PNG_IF_MONO_p_2 = +!ifeq MONOLITHIC 1 +__LIB_PNG_IF_MONO_p_2 = $(__LIB_PNG_p) +!endif __test_gui___depname = !ifeq USE_GUI 1 __test_gui___depname = $(OBJS)\test_gui.exe @@ -114,11 +122,6 @@ __WXLIB_HTML_p = __WXLIB_HTML_p = & wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib !endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif __LIB_SCINTILLA_IF_MONO_p = !ifeq MONOLITHIC 1 !ifeq USE_STC 1 @@ -133,6 +136,16 @@ __LIB_JPEG_p = !ifeq USE_GUI 1 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib !endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +__WXLIB_NET_p = +!ifeq MONOLITHIC 0 +__WXLIB_NET_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif __DEBUGINFO = !ifeq BUILD debug !ifeq DEBUG_INFO default @@ -150,22 +163,22 @@ __DEBUGINFO = -d0 !ifeq DEBUG_INFO 1 __DEBUGINFO = -d2 !endif -__DEBUGINFO_1 = +__DEBUGINFO_3 = !ifeq BUILD debug !ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all +__DEBUGINFO_3 = debug all !endif !endif !ifeq BUILD release !ifeq DEBUG_INFO default -__DEBUGINFO_1 = +__DEBUGINFO_3 = !endif !endif !ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = +__DEBUGINFO_3 = !endif !ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all +__DEBUGINFO_3 = debug all !endif __OPTIMIZEFLAG = !ifeq BUILD debug @@ -202,15 +215,10 @@ __EXCEPTIONSFLAG = !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG = -xs !endif -__WXLIB_NET_p = +__WXLIB_CORE_p = !ifeq MONOLITHIC 0 -__WXLIB_NET_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -__WXLIB_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif __WXLIB_BASE_p = !ifeq MONOLITHIC 0 @@ -378,6 +386,29 @@ TEST_OBJECTS = & $(OBJS)\test_weakref.obj & $(OBJS)\test_xlocale.obj & $(OBJS)\test_xmltest.obj +TEST_DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include & + $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -dwxUSE_GUI=0 $(CPPUNIT_CFLAGS) & + /fh=$(OBJS)\testprec_test_drawing.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & + $(CPPFLAGS) $(CXXFLAGS) +TEST_DRAWING_OBJECTS = & + $(OBJS)\test_drawing_dummy.obj & + $(OBJS)\test_drawing_test.obj & + $(OBJS)\test_drawing_drawing.obj & + $(OBJS)\test_drawing_plugindriver.obj & + $(OBJS)\test_drawing_basictest.obj +TEST_DRAWINGPLUGIN_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) & + $(__THREADSFLAG) $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) & + $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 $(__DLLFLAG_p) $(__RTTIFLAG) & + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +TEST_DRAWINGPLUGIN_OBJECTS = & + $(OBJS)\test_drawingplugin_pluginsample.obj TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & @@ -483,7 +514,7 @@ $(OBJS) : ### Targets: ### -all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data data-images fr +all : .SYMBOLIC $(OBJS)\test.exe $(OBJS)\test_drawing.exe $(OBJS)\test_drawingplugin.dll $(__test_gui___depname) data data-images fr clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -492,6 +523,8 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\test.exe del $(OBJS)\test.exe + -if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.exe + -if exist $(OBJS)\test_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe $(OBJS)\test.exe : $(TEST_OBJECTS) @@ -499,20 +532,44 @@ $(OBJS)\test.exe : $(TEST_OBJECTS) @%append $(OBJS)\test.lbc option quiet @%append $(OBJS)\test.lbc name $^@ @%append $(OBJS)\test.lbc option caseexact - @%append $(OBJS)\test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\test.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_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) do @%append $(OBJS)\test.lbc library %i @%append $(OBJS)\test.lbc @for %i in () do @%append $(OBJS)\test.lbc option stack=%i wlink @$(OBJS)\test.lbc +$(OBJS)\test_drawing.exe : $(TEST_DRAWING_OBJECTS) + @%create $(OBJS)\test_drawing.lbc + @%append $(OBJS)\test_drawing.lbc option quiet + @%append $(OBJS)\test_drawing.lbc name $^@ + @%append $(OBJS)\test_drawing.lbc option caseexact + @%append $(OBJS)\test_drawing.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @for %i in ($(TEST_DRAWING_OBJECTS)) do @%append $(OBJS)\test_drawing.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_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) do @%append $(OBJS)\test_drawing.lbc library %i + @%append $(OBJS)\test_drawing.lbc + @for %i in () do @%append $(OBJS)\test_drawing.lbc option stack=%i + wlink @$(OBJS)\test_drawing.lbc + +$(OBJS)\test_drawingplugin.dll : $(TEST_DRAWINGPLUGIN_OBJECTS) + @%create $(OBJS)\test_drawingplugin.lbc + @%append $(OBJS)\test_drawingplugin.lbc option quiet + @%append $(OBJS)\test_drawingplugin.lbc name $^@ + @%append $(OBJS)\test_drawingplugin.lbc option caseexact + @%append $(OBJS)\test_drawingplugin.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @for %i in ($(TEST_DRAWINGPLUGIN_OBJECTS)) do @%append $(OBJS)\test_drawingplugin.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_2) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_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) do @%append $(OBJS)\test_drawingplugin.lbc library %i + @%append $(OBJS)\test_drawingplugin.lbc + @%append $(OBJS)\test_drawingplugin.lbc system nt_dll + wlink @$(OBJS)\test_drawingplugin.lbc + !ifeq USE_GUI 1 $(OBJS)\test_gui.exe : $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res @%create $(OBJS)\test_gui.lbc @%append $(OBJS)\test_gui.lbc option quiet @%append $(OBJS)\test_gui.lbc name $^@ @%append $(OBJS)\test_gui.lbc option caseexact - @%append $(OBJS)\test_gui.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) + @%append $(OBJS)\test_gui.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i @for %i in ( $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__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_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_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) do @%append $(OBJS)\test_gui.lbc library %i @%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res @@ -787,6 +844,24 @@ $(OBJS)\test_xlocale.obj : .AUTODEPEND .\xlocale\xlocale.cpp $(OBJS)\test_xmltest.obj : .AUTODEPEND .\xml\xmltest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< +$(OBJS)\test_drawing_dummy.obj : .AUTODEPEND .\dummy.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $< + +$(OBJS)\test_drawing_test.obj : .AUTODEPEND .\test.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $< + +$(OBJS)\test_drawing_drawing.obj : .AUTODEPEND .\drawing\drawing.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $< + +$(OBJS)\test_drawing_plugindriver.obj : .AUTODEPEND .\drawing\plugindriver.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $< + +$(OBJS)\test_drawing_basictest.obj : .AUTODEPEND .\drawing\basictest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $< + +$(OBJS)\test_drawingplugin_pluginsample.obj : .AUTODEPEND .\drawing\pluginsample.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $< + $(OBJS)\test_gui_sample.res : .AUTODEPEND .\..\samples\sample.rc wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $< diff --git a/tests/test.bkl b/tests/test.bkl index 4830927954..6bcca6a7d9 100644 --- a/tests/test.bkl +++ b/tests/test.bkl @@ -117,6 +117,44 @@ base + + + + test.cpp + drawing/drawing.cpp + drawing/plugindriver.cpp + drawing/basictest.cpp + + core + net + base + + + + + $(DLLFLAG) + + drawing/pluginsample.cpp + + core + base + +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=test_drawing - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "test_test_drawing.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "test_test_drawing.mak" CFG="test_drawing - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "test_drawing - Win32 DLL Release" (based on "Win32 (x86) Console Application") +!MESSAGE "test_drawing - Win32 DLL Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "test_drawing - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "test_drawing - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "test_drawing - Win32 DLL Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswudll" +# PROP BASE Intermediate_Dir "vc_mswudll\test_drawing" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswudll" +# PROP Intermediate_Dir "vc_mswudll\test_drawing" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_drawing.pch" /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_drawing.pch" /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswudll\test_drawing.exe" /debug /pdb:"vc_mswudll\test_drawing.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswudll\test_drawing.exe" /debug /pdb:"vc_mswudll\test_drawing.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console + +!ELSEIF "$(CFG)" == "test_drawing - Win32 DLL Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswuddll" +# PROP BASE Intermediate_Dir "vc_mswuddll\test_drawing" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswuddll" +# PROP Intermediate_Dir "vc_mswuddll\test_drawing" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\test_drawing.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswuddll\testprec_test_drawing.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\test_drawing.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswuddll\testprec_test_drawing.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswud" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswuddll\test_drawing.exe" /debug /pdb:"vc_mswuddll\test_drawing.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console +# ADD LINK32 wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswuddll\test_drawing.exe" /debug /pdb:"vc_mswuddll\test_drawing.pdb" /libpath:".\..\lib\vc_dll" /subsystem:console + +!ELSEIF "$(CFG)" == "test_drawing - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswu" +# PROP BASE Intermediate_Dir "vc_mswu\test_drawing" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswu" +# PROP Intermediate_Dir "vc_mswu\test_drawing" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test_drawing.pch" /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test_drawing.pch" /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswu\test_drawing.exe" /debug /pdb:"vc_mswu\test_drawing.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxmsw31u_core.lib wxbase31u_net.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswu\test_drawing.exe" /debug /pdb:"vc_mswu\test_drawing.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console + +!ELSEIF "$(CFG)" == "test_drawing - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswud" +# PROP BASE Intermediate_Dir "vc_mswud\test_drawing" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswud" +# PROP Intermediate_Dir "vc_mswud\test_drawing" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\test_drawing.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswud\testprec_test_drawing.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\test_drawing.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswud" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswud\testprec_test_drawing.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswud" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswud\test_drawing.exe" /debug /pdb:"vc_mswud\test_drawing.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console +# ADD LINK32 wxmsw31ud_core.lib wxbase31ud_net.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswud\test_drawing.exe" /debug /pdb:"vc_mswud\test_drawing.pdb" /libpath:".\..\lib\vc_lib" /subsystem:console + +!ENDIF + +# Begin Target + +# Name "test_drawing - Win32 DLL Release" +# Name "test_drawing - Win32 DLL Debug" +# Name "test_drawing - Win32 Release" +# Name "test_drawing - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\drawing\basictest.cpp +# End Source File +# Begin Source File + +SOURCE=.\drawing\drawing.cpp +# End Source File +# Begin Source File + +SOURCE=.\dummy.cpp +# ADD BASE CPP /Yc"testprec.h" +# ADD CPP /Yc"testprec.h" +# End Source File +# Begin Source File + +SOURCE=.\drawing\plugindriver.cpp +# End Source File +# Begin Source File + +SOURCE=.\test.cpp +# End Source File +# End Group +# End Target +# End Project diff --git a/tests/test_test_drawingplugin.dsp b/tests/test_test_drawingplugin.dsp new file mode 100644 index 0000000000..8cb6c2409d --- /dev/null +++ b/tests/test_test_drawingplugin.dsp @@ -0,0 +1,151 @@ +# Microsoft Developer Studio Project File - Name="test_test_drawingplugin" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=test_drawingplugin - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "test_test_drawingplugin.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "test_test_drawingplugin.mak" CFG="test_drawingplugin - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "test_drawingplugin - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "test_drawingplugin - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "test_drawingplugin - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "test_drawingplugin - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "test_drawingplugin - Win32 DLL Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswudll" +# PROP BASE Intermediate_Dir "vc_mswudll\test_drawingplugin" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswudll" +# PROP Intermediate_Dir "vc_mswudll\test_drawingplugin" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_drawingplugin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_drawingplugin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /d WXUSINGDLL +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /d WXUSINGDLL +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw31u_core.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"vc_mswudll\test_drawingplugin.dll" /debug /pdb:"vc_mswudll\test_drawingplugin.pdb" /libpath:".\..\lib\vc_dll" +# ADD LINK32 wxmsw31u_core.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"vc_mswudll\test_drawingplugin.dll" /debug /pdb:"vc_mswudll\test_drawingplugin.pdb" /libpath:".\..\lib\vc_dll" + +!ELSEIF "$(CFG)" == "test_drawingplugin - Win32 DLL Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswuddll" +# PROP BASE Intermediate_Dir "vc_mswuddll\test_drawingplugin" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswuddll" +# PROP Intermediate_Dir "vc_mswuddll\test_drawingplugin" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\test_drawingplugin.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswud" /I ".\..\include" /W4 /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c +# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\test_drawingplugin.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_dll\mswud" /I ".\..\include" /W4 /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswud" /i ".\..\include" /d WXUSINGDLL +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswud" /i ".\..\include" /d WXUSINGDLL +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw31ud_core.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"vc_mswuddll\test_drawingplugin.dll" /debug /pdb:"vc_mswuddll\test_drawingplugin.pdb" /libpath:".\..\lib\vc_dll" +# ADD LINK32 wxmsw31ud_core.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"vc_mswuddll\test_drawingplugin.dll" /debug /pdb:"vc_mswuddll\test_drawingplugin.pdb" /libpath:".\..\lib\vc_dll" + +!ELSEIF "$(CFG)" == "test_drawingplugin - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswu" +# PROP BASE Intermediate_Dir "vc_mswu\test_drawingplugin" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswu" +# PROP Intermediate_Dir "vc_mswu\test_drawingplugin" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_drawingplugin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_drawingplugin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i .\..\include +# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i .\..\include +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw31u_core.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"vc_mswu\test_drawingplugin.dll" /debug /pdb:"vc_mswu\test_drawingplugin.pdb" /libpath:".\..\lib\vc_lib" +# ADD LINK32 wxmsw31u_core.lib wxbase31u.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 /nologo /dll /machine:i386 /out:"vc_mswu\test_drawingplugin.dll" /debug /pdb:"vc_mswu\test_drawingplugin.pdb" /libpath:".\..\lib\vc_lib" + +!ELSEIF "$(CFG)" == "test_drawingplugin - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswud" +# PROP BASE Intermediate_Dir "vc_mswud\test_drawingplugin" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswud" +# PROP Intermediate_Dir "vc_mswud\test_drawingplugin" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\test_drawingplugin.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswud" /I ".\..\include" /W4 /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c +# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\test_drawingplugin.pdb /Od /Gm /GR /EHsc /I ".\..\lib\vc_lib\mswud" /I ".\..\include" /W4 /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswud" /i .\..\include +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswud" /i .\..\include +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw31ud_core.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"vc_mswud\test_drawingplugin.dll" /debug /pdb:"vc_mswud\test_drawingplugin.pdb" /libpath:".\..\lib\vc_lib" +# ADD LINK32 wxmsw31ud_core.lib wxbase31ud.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 /nologo /dll /machine:i386 /out:"vc_mswud\test_drawingplugin.dll" /debug /pdb:"vc_mswud\test_drawingplugin.pdb" /libpath:".\..\lib\vc_lib" + +!ENDIF + +# Begin Target + +# Name "test_drawingplugin - Win32 DLL Release" +# Name "test_drawingplugin - Win32 DLL Debug" +# Name "test_drawingplugin - Win32 Release" +# Name "test_drawingplugin - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\drawing\pluginsample.cpp +# End Source File +# End Group +# End Target +# End Project diff --git a/tests/test_vc7_test_drawing.vcproj b/tests/test_vc7_test_drawing.vcproj new file mode 100644 index 0000000000..2bc79541ea --- /dev/null +++ b/tests/test_vc7_test_drawing.vcproj @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/test_vc7_test_drawingplugin.vcproj b/tests/test_vc7_test_drawingplugin.vcproj new file mode 100644 index 0000000000..39f069df97 --- /dev/null +++ b/tests/test_vc7_test_drawingplugin.vcproj @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/test_vc8_test_drawing.vcproj b/tests/test_vc8_test_drawing.vcproj new file mode 100644 index 0000000000..b21ff2e6c7 --- /dev/null +++ b/tests/test_vc8_test_drawing.vcproj @@ -0,0 +1,490 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/test_vc8_test_drawingplugin.vcproj b/tests/test_vc8_test_drawingplugin.vcproj new file mode 100644 index 0000000000..ca312077fc --- /dev/null +++ b/tests/test_vc8_test_drawingplugin.vcproj @@ -0,0 +1,402 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/test_vc9_test_drawing.vcproj b/tests/test_vc9_test_drawing.vcproj new file mode 100644 index 0000000000..e009b434a0 --- /dev/null +++ b/tests/test_vc9_test_drawing.vcproj @@ -0,0 +1,476 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/test_vc9_test_drawingplugin.vcproj b/tests/test_vc9_test_drawingplugin.vcproj new file mode 100644 index 0000000000..9738284f54 --- /dev/null +++ b/tests/test_vc9_test_drawingplugin.vcproj @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +