Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't build the drawing test in GUI-less builds.

Browse Source 
This test requires GUI parts.

Closes #16145.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-04-01 22:49:04 +00:00
parent 0da8eb2786
commit ec7d7f6356
8 changed files with 796 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/Makefile.in
View File

@@ -281,6 +281,7 @@ 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___depname \
@COND_USE_PCH_1@ = ./.pch/testprec_test/testprec.h.gch @COND_USE_PCH_1@ = ./.pch/testprec_test/testprec.h.gch
@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) @COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
@COND_USE_GUI_1@__test_drawing___depname = test_drawing$(EXEEXT)
@COND_PLATFORM_MAC_0@__test_drawing___mac_setfilecmd = @true @COND_PLATFORM_MAC_0@__test_drawing___mac_setfilecmd = @true
@COND_PLATFORM_MAC_1@__test_drawing___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@__test_drawing___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test_drawing$(EXEEXT) @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test_drawing$(EXEEXT)
@@ -291,6 +292,8 @@ TEST_GUI_ODEP = $(_____pch_testprec_test_gui_testprec_h_gch___depname)
@COND_USE_PCH_1@_____pch_testprec_test_drawing_testprec_h_gch___depname \ @COND_USE_PCH_1@_____pch_testprec_test_drawing_testprec_h_gch___depname \
@COND_USE_PCH_1@ = ./.pch/testprec_test_drawing/testprec.h.gch @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_1 = $(__LIB_PNG_p)
@COND_USE_GUI_1@__test_drawingplugin___depname = \
@COND_USE_GUI_1@ $(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE)
@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p_2 = $(__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_USE_GUI_1@__test_gui___depname = test_gui$(EXEEXT)
@COND_PLATFORM_MAC_0@__test_gui___mac_setfilecmd = @true @COND_PLATFORM_MAC_0@__test_gui___mac_setfilecmd = @true
@@ -387,7 +390,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
### Targets: ### ### Targets: ###
all: test$(EXEEXT) test_drawing$(EXEEXT) $(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE) $(__test_gui___depname) $(__test_gui_bundle___depname) data data-images fr all: test$(EXEEXT) $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) $(__test_gui_bundle___depname) data data-images fr
install: install:
@@ -415,16 +418,16 @@ test$(EXEEXT): $(TEST_OBJECTS)
@COND_USE_PCH_1@./.pch/testprec_test/testprec.h.gch: @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) @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS)
test_drawing$(EXEEXT): $(TEST_DRAWING_OBJECTS) @COND_USE_GUI_1@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) @COND_USE_GUI_1@ $(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)
@COND_USE_GUI_1@
@COND_USE_GUI_1@ $(__test_drawing___mac_setfilecmd)
$(__test_drawing___mac_setfilecmd) @COND_USE_PCH_1@./.pch/testprec_test_drawing/testprec.h.gch:
@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) @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) @COND_USE_GUI_1@$(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@ $(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@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@ $(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)

208
tests/makefile.bcc
View File

@@ -30,7 +30,7 @@ LIBDIRNAME = \
SETUPHDIR = \ SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
TEST_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ TEST_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
@@ -122,30 +122,30 @@ TEST_OBJECTS = \
$(OBJS)\test_weakref.obj \ $(OBJS)\test_weakref.obj \
$(OBJS)\test_xlocale.obj \ $(OBJS)\test_xlocale.obj \
$(OBJS)\test_xmltest.obj $(OBJS)\test_xmltest.obj
TEST_DRAWING_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ TEST_DRAWING_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES) -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \ $(____CAIRO_INCLUDEDIR_FILENAMES) -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
$(CPPUNIT_CFLAGS) -Hu -H=$(OBJS)\testprec_test_drawing.csm $(CPPFLAGS) \ $(CPPUNIT_CFLAGS) -Hu -H=$(OBJS)\testprec_test_drawing.csm $(CPPFLAGS) \
$(CXXFLAGS) $(CXXFLAGS)
TEST_DRAWING_OBJECTS = \ TEST_DRAWING_OBJECTS = \
$(OBJS)\test_drawing_dummy.obj \ $(OBJS)\test_drawing_dummy.obj \
$(OBJS)\test_drawing_test.obj \ $(OBJS)\test_drawing_test.obj \
$(OBJS)\test_drawing_drawing.obj \ $(OBJS)\test_drawing_drawing.obj \
$(OBJS)\test_drawing_plugindriver.obj \ $(OBJS)\test_drawing_plugindriver.obj \
$(OBJS)\test_drawing_basictest.obj $(OBJS)\test_drawing_basictest.obj
TEST_DRAWINGPLUGIN_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ TEST_DRAWINGPLUGIN_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ \ $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \ $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS) $(____CAIRO_INCLUDEDIR_FILENAMES) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS)
TEST_DRAWINGPLUGIN_OBJECTS = \ TEST_DRAWINGPLUGIN_OBJECTS = \
$(OBJS)\test_drawingplugin_pluginsample.obj $(OBJS)\test_drawingplugin_pluginsample.obj
TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG_2) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
@@ -280,47 +280,53 @@ EXTRALIBS_FOR_BASE =
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(USE_GUI)" == "1"
__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p) __test_drawing___depname = $(OBJS)\test_drawing.exe
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__LIB_PNG_IF_MONO_p_2 = $(__LIB_PNG_p) __LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p)
!endif !endif
!if "$(USE_GUI)" == "1"
__test_drawingplugin___depname = $(OBJS)\test_drawingplugin.dll
!endif
!if "$(MONOLITHIC)" == "1"
__LIB_PNG_IF_MONO_p_2 = $(__LIB_PNG_p)
!endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
__test_gui___depname = $(OBJS)\test_gui.exe __test_gui___depname = $(OBJS)\test_gui.exe
!endif !endif
!if "$(WXUNIV)" == "1" !if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p_7 = -d__WXUNIVERSAL__ __WXUNIV_DEFINE_p_7 = -d__WXUNIVERSAL__
!endif !endif
!if "$(DEBUG_FLAG)" == "0" !if "$(DEBUG_FLAG)" == "0"
__DEBUG_DEFINE_p_7 = -dwxDEBUG_LEVEL=0 __DEBUG_DEFINE_p_7 = -dwxDEBUG_LEVEL=0
!endif !endif
!if "$(BUILD)" == "release" !if "$(BUILD)" == "release"
__NDEBUG_DEFINE_p_7 = -dNDEBUG __NDEBUG_DEFINE_p_7 = -dNDEBUG
!endif !endif
!if "$(USE_EXCEPTIONS)" == "0" !if "$(USE_EXCEPTIONS)" == "0"
__EXCEPTIONS_DEFINE_p_7 = -dwxNO_EXCEPTIONS __EXCEPTIONS_DEFINE_p_7 = -dwxNO_EXCEPTIONS
!endif !endif
!if "$(USE_RTTI)" == "0" !if "$(USE_RTTI)" == "0"
__RTTI_DEFINE_p_7 = -dwxNO_RTTI __RTTI_DEFINE_p_7 = -dwxNO_RTTI
!endif !endif
!if "$(USE_THREADS)" == "0" !if "$(USE_THREADS)" == "0"
__THREAD_DEFINE_p_7 = -dwxNO_THREADS __THREAD_DEFINE_p_7 = -dwxNO_THREADS
!endif !endif
!if "$(UNICODE)" == "0" !if "$(UNICODE)" == "0"
__UNICODE_DEFINE_p_7 = -dwxUSE_UNICODE=0 __UNICODE_DEFINE_p_7 = -dwxUSE_UNICODE=0
!endif !endif
!if "$(UNICODE)" == "1" !if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p_7 = -d_UNICODE __UNICODE_DEFINE_p_7 = -d_UNICODE
!endif !endif
!if "$(MSLU)" == "1" !if "$(MSLU)" == "1"
__MSLU_DEFINE_p_7 = -dwxUSE_UNICODE_MSLU=1 __MSLU_DEFINE_p_7 = -dwxUSE_UNICODE_MSLU=1
!endif !endif
!if "$(USE_CAIRO)" == "1" !if "$(USE_CAIRO)" == "1"
____CAIRO_INCLUDEDIR_FILENAMES_7_p = -i$(CAIRO_ROOT)\include\cairo ____CAIRO_INCLUDEDIR_FILENAMES_7_p = -i$(CAIRO_ROOT)\include\cairo
!endif !endif
!if "$(SHARED)" == "1" !if "$(SHARED)" == "1"
__DLLFLAG_p_7 = -dWXUSINGDLL __DLLFLAG_p_7 = -dWXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1" !if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
__WXLIB_WEBVIEW_p = \ __WXLIB_WEBVIEW_p = \
@@ -355,14 +361,14 @@ __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_XML_p = \ __WXLIB_XML_p = \
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_NET_p = \ __WXLIB_NET_p = \
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG = -Od __OPTIMIZEFLAG = -Od
!endif !endif
@@ -376,10 +382,10 @@ __THREADSFLAG =
__THREADSFLAG = mt __THREADSFLAG = mt
!endif !endif
!if "$(USE_THREADS)" == "0" !if "$(USE_THREADS)" == "0"
__THREADSFLAG_2 = __THREADSFLAG_2 =
!endif !endif
!if "$(USE_THREADS)" == "1" !if "$(USE_THREADS)" == "1"
__THREADSFLAG_2 = -tWM __THREADSFLAG_2 = -tWM
!endif !endif
!if "$(RUNTIME_LIBS)" == "dynamic" !if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS = -tWR __RUNTIME_LIBS = -tWR
@@ -388,10 +394,10 @@ __RUNTIME_LIBS = -tWR
__RUNTIME_LIBS = __RUNTIME_LIBS =
!endif !endif
!if "$(RUNTIME_LIBS)" == "dynamic" !if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_2 = i __RUNTIME_LIBS_2 = i
!endif !endif
!if "$(RUNTIME_LIBS)" == "static" !if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_2 = __RUNTIME_LIBS_2 =
!endif !endif
!if "$(WXUNIV)" == "1" !if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -427,8 +433,8 @@ ____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo
__DLLFLAG_p = -DWXUSINGDLL __DLLFLAG_p = -DWXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \ __WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
@@ -470,7 +476,7 @@ $(OBJS):
### Targets: ### ### Targets: ###
all: $(OBJS)\test.exe $(OBJS)\test_drawing.exe $(OBJS)\test_drawingplugin.dll $(__test_gui___depname) data data-images fr all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) data data-images fr
clean: clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -482,18 +488,18 @@ clean:
-if exist $(OBJS)\test.ild del $(OBJS)\test.ild -if exist $(OBJS)\test.ild del $(OBJS)\test.ild
-if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf
-if exist $(OBJS)\test.ils del $(OBJS)\test.ils -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.exe del $(OBJS)\test_drawing.exe
-if exist $(OBJS)\test_drawing.tds del $(OBJS)\test_drawing.tds -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.ilc del $(OBJS)\test_drawing.ilc
-if exist $(OBJS)\test_drawing.ild del $(OBJS)\test_drawing.ild -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.ilf del $(OBJS)\test_drawing.ilf
-if exist $(OBJS)\test_drawing.ils del $(OBJS)\test_drawing.ils -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.dll del $(OBJS)\test_drawingplugin.dll
-if exist $(OBJS)\test_drawingplugin.tds del $(OBJS)\test_drawingplugin.tds -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.ilc del $(OBJS)\test_drawingplugin.ilc
-if exist $(OBJS)\test_drawingplugin.ild del $(OBJS)\test_drawingplugin.ild -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.ilf del $(OBJS)\test_drawingplugin.ilf
-if exist $(OBJS)\test_drawingplugin.ils del $(OBJS)\test_drawingplugin.ils -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.exe del $(OBJS)\test_gui.exe
-if exist $(OBJS)\test_gui.tds del $(OBJS)\test_gui.tds -if exist $(OBJS)\test_gui.tds del $(OBJS)\test_gui.tds
-if exist $(OBJS)\test_gui.ilc del $(OBJS)\test_gui.ilc -if exist $(OBJS)\test_gui.ilc del $(OBJS)\test_gui.ilc
@@ -503,23 +509,27 @@ clean:
$(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) $(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) @&&| 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_2).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_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,,
|
!endif
!if "$(USE_GUI)" == "1"
$(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,,
|
!endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res $(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) @&&| 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_2).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 !endif
@@ -790,26 +800,26 @@ $(OBJS)\test_xlocale.obj: .\xlocale\xlocale.cpp
$(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp $(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp
$(OBJS)\test_drawing_dummy.obj: .\dummy.cpp $(OBJS)\test_drawing_dummy.obj: .\dummy.cpp
$(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) -H .\dummy.cpp $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) -H .\dummy.cpp
$(OBJS)\test_drawing_test.obj: .\test.cpp $(OBJS)\test_drawing_test.obj: .\test.cpp
$(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\test.cpp $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\test.cpp
$(OBJS)\test_drawing_drawing.obj: .\drawing\drawing.cpp $(OBJS)\test_drawing_drawing.obj: .\drawing\drawing.cpp
$(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\drawing.cpp $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\drawing.cpp
$(OBJS)\test_drawing_plugindriver.obj: .\drawing\plugindriver.cpp $(OBJS)\test_drawing_plugindriver.obj: .\drawing\plugindriver.cpp
$(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\plugindriver.cpp $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\plugindriver.cpp
$(OBJS)\test_drawing_basictest.obj: .\drawing\basictest.cpp $(OBJS)\test_drawing_basictest.obj: .\drawing\basictest.cpp
$(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\basictest.cpp $(CXX) -q -c -P -o$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\basictest.cpp
$(OBJS)\test_drawingplugin_pluginsample.obj: .\drawing\pluginsample.cpp $(OBJS)\test_drawingplugin_pluginsample.obj: .\drawing\pluginsample.cpp
$(CXX) -q -c -P -o$@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) .\drawing\pluginsample.cpp $(CXX) -q -c -P -o$@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) .\drawing\pluginsample.cpp
$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc $(OBJS)\test_gui_sample.res: .\..\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 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 $(OBJS)\test_gui_dummy.obj: .\dummy.cpp
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H .\dummy.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H .\dummy.cpp

166
tests/makefile.gcc
View File

@@ -114,29 +114,29 @@ TEST_OBJECTS = \
$(OBJS)\test_weakref.o \ $(OBJS)\test_weakref.o \
$(OBJS)\test_xlocale.o \ $(OBJS)\test_xlocale.o \
$(OBJS)\test_xmltest.o $(OBJS)\test_xmltest.o
TEST_DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ TEST_DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
$(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
$(CPPFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
TEST_DRAWING_OBJECTS = \ TEST_DRAWING_OBJECTS = \
$(OBJS)\test_drawing_dummy.o \ $(OBJS)\test_drawing_dummy.o \
$(OBJS)\test_drawing_test.o \ $(OBJS)\test_drawing_test.o \
$(OBJS)\test_drawing_drawing.o \ $(OBJS)\test_drawing_drawing.o \
$(OBJS)\test_drawing_plugindriver.o \ $(OBJS)\test_drawing_plugindriver.o \
$(OBJS)\test_drawing_basictest.o $(OBJS)\test_drawing_basictest.o
TEST_DRAWINGPLUGIN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ TEST_DRAWINGPLUGIN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
$(__THREADSFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ \ $(__THREADSFLAG) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \ $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include \
$(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall $(__DLLFLAG_p) $(__RTTIFLAG) \ $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall $(__DLLFLAG_p) $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
TEST_DRAWINGPLUGIN_OBJECTS = \ TEST_DRAWINGPLUGIN_OBJECTS = \
$(OBJS)\test_drawingplugin_pluginsample.o $(OBJS)\test_drawingplugin_pluginsample.o
TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -277,47 +277,53 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(USE_GUI),1)
__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p) __test_drawing___depname = $(OBJS)\test_drawing.exe
endif endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
__LIB_PNG_IF_MONO_p_2 = $(__LIB_PNG_p) __LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p)
endif endif
ifeq ($(USE_GUI),1)
__test_drawingplugin___depname = $(OBJS)\test_drawingplugin.dll
endif
ifeq ($(MONOLITHIC),1)
__LIB_PNG_IF_MONO_p_2 = $(__LIB_PNG_p)
endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
__test_gui___depname = $(OBJS)\test_gui.exe __test_gui___depname = $(OBJS)\test_gui.exe
endif endif
ifeq ($(WXUNIV),1) ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__ __WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__
endif endif
ifeq ($(DEBUG_FLAG),0) ifeq ($(DEBUG_FLAG),0)
__DEBUG_DEFINE_p_6 = --define wxDEBUG_LEVEL=0 __DEBUG_DEFINE_p_6 = --define wxDEBUG_LEVEL=0
endif endif
ifeq ($(BUILD),release) ifeq ($(BUILD),release)
__NDEBUG_DEFINE_p_6 = --define NDEBUG __NDEBUG_DEFINE_p_6 = --define NDEBUG
endif endif
ifeq ($(USE_EXCEPTIONS),0) ifeq ($(USE_EXCEPTIONS),0)
__EXCEPTIONS_DEFINE_p_6 = --define wxNO_EXCEPTIONS __EXCEPTIONS_DEFINE_p_6 = --define wxNO_EXCEPTIONS
endif endif
ifeq ($(USE_RTTI),0) ifeq ($(USE_RTTI),0)
__RTTI_DEFINE_p_6 = --define wxNO_RTTI __RTTI_DEFINE_p_6 = --define wxNO_RTTI
endif endif
ifeq ($(USE_THREADS),0) ifeq ($(USE_THREADS),0)
__THREAD_DEFINE_p_6 = --define wxNO_THREADS __THREAD_DEFINE_p_6 = --define wxNO_THREADS
endif endif
ifeq ($(UNICODE),0) ifeq ($(UNICODE),0)
__UNICODE_DEFINE_p_6 = --define wxUSE_UNICODE=0 __UNICODE_DEFINE_p_6 = --define wxUSE_UNICODE=0
endif endif
ifeq ($(UNICODE),1) ifeq ($(UNICODE),1)
__UNICODE_DEFINE_p_6 = --define _UNICODE __UNICODE_DEFINE_p_6 = --define _UNICODE
endif endif
ifeq ($(MSLU),1) ifeq ($(MSLU),1)
__MSLU_DEFINE_p_6 = --define wxUSE_UNICODE_MSLU=1 __MSLU_DEFINE_p_6 = --define wxUSE_UNICODE_MSLU=1
endif endif
ifeq ($(USE_CAIRO),1) ifeq ($(USE_CAIRO),1)
__CAIRO_INCLUDEDIR_p_2 = --include-dir $(CAIRO_ROOT)/include/cairo __CAIRO_INCLUDEDIR_p_2 = --include-dir $(CAIRO_ROOT)/include/cairo
endif endif
ifeq ($(SHARED),1) ifeq ($(SHARED),1)
__DLLFLAG_p_6 = --define WXUSINGDLL __DLLFLAG_p_6 = --define WXUSINGDLL
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
ifeq ($(USE_WEBVIEW),1) ifeq ($(USE_WEBVIEW),1)
@@ -358,14 +364,14 @@ endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_XML_p = \ __WXLIB_XML_p = \
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_NET_p = \ __WXLIB_NET_p = \
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
endif endif
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
__OPTIMIZEFLAG = -O0 __OPTIMIZEFLAG = -O0
endif endif
@@ -418,8 +424,8 @@ ifeq ($(SHARED),1)
__DLLFLAG_p = -DWXUSINGDLL __DLLFLAG_p = -DWXUSINGDLL
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_CORE_p = \ __WXLIB_CORE_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
@@ -471,25 +477,29 @@ $(OBJS):
### Targets: ### ### Targets: ###
all: $(OBJS)\test.exe $(OBJS)\test_drawing.exe $(OBJS)\test_drawingplugin.dll $(__test_gui___depname) data data-images fr all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) data data-images fr
clean: clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
-if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.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_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll
-if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
$(OBJS)\test.exe: $(TEST_OBJECTS) $(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 $(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) ifeq ($(USE_GUI),1)
$(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_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) endif
$(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_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
endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
$(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o $(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 $(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
@@ -762,26 +772,26 @@ $(OBJS)\test_xlocale.o: ./xlocale/xlocale.cpp
$(OBJS)\test_xmltest.o: ./xml/xmltest.cpp $(OBJS)\test_xmltest.o: ./xml/xmltest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_drawing_dummy.o: ./dummy.cpp $(OBJS)\test_drawing_dummy.o: ./dummy.cpp
$(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_drawing_test.o: ./test.cpp $(OBJS)\test_drawing_test.o: ./test.cpp
$(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_drawing_drawing.o: ./drawing/drawing.cpp $(OBJS)\test_drawing_drawing.o: ./drawing/drawing.cpp
$(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_drawing_plugindriver.o: ./drawing/plugindriver.cpp $(OBJS)\test_drawing_plugindriver.o: ./drawing/plugindriver.cpp
$(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_drawing_basictest.o: ./drawing/basictest.cpp $(OBJS)\test_drawing_basictest.o: ./drawing/basictest.cpp
$(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TEST_DRAWING_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_drawingplugin_pluginsample.o: ./drawing/pluginsample.cpp $(OBJS)\test_drawingplugin_pluginsample.o: ./drawing/pluginsample.cpp
$(CXX) -c -o $@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_gui_sample_rc.o: ./../samples/sample.rc $(OBJS)\test_gui_sample_rc.o: ./../samples/sample.rc
$(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 $(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 $(OBJS)\test_gui_dummy.o: ./dummy.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<

316
tests/makefile.vc
View File

@@ -116,35 +116,35 @@ TEST_OBJECTS = \
$(OBJS)\test_weakref.obj \ $(OBJS)\test_weakref.obj \
$(OBJS)\test_xlocale.obj \ $(OBJS)\test_xlocale.obj \
$(OBJS)\test_xmltest.obj $(OBJS)\test_xmltest.obj
TEST_DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \ TEST_DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) /Fd$(OBJS)\test_drawing.pdb $(____DEBUGRUNTIME) \ $(__DEBUGINFO) /Fd$(OBJS)\test_drawing.pdb $(____DEBUGRUNTIME) \
$(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=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) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
/I$(SETUPHDIR) /I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. \ /I$(SETUPHDIR) /I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 /I. \
$(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \ $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \
$(__EXCEPTIONSFLAG) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_drawing.pch" \ $(__EXCEPTIONSFLAG) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_drawing.pch" \
$(CPPFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
TEST_DRAWING_OBJECTS = \ TEST_DRAWING_OBJECTS = \
$(OBJS)\test_drawing_dummy.obj \ $(OBJS)\test_drawing_dummy.obj \
$(OBJS)\test_drawing_test.obj \ $(OBJS)\test_drawing_test.obj \
$(OBJS)\test_drawing_drawing.obj \ $(OBJS)\test_drawing_drawing.obj \
$(OBJS)\test_drawing_plugindriver.obj \ $(OBJS)\test_drawing_plugindriver.obj \
$(OBJS)\test_drawing_basictest.obj $(OBJS)\test_drawing_basictest.obj
TEST_DRAWINGPLUGIN_CXXFLAGS = /M$(__RUNTIME_LIBS_45)$(__DEBUGRUNTIME) /DWIN32 \ TEST_DRAWINGPLUGIN_CXXFLAGS = /M$(__RUNTIME_LIBS_45)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) /Fd$(OBJS)\test_drawingplugin.pdb $(____DEBUGRUNTIME) \ $(__DEBUGINFO) /Fd$(OBJS)\test_drawingplugin.pdb $(____DEBUGRUNTIME) \
$(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=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) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
/I$(SETUPHDIR) /I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ /I$(SETUPHDIR) /I.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \
$(__DLLFLAG_p) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) $(__DLLFLAG_p) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
TEST_DRAWINGPLUGIN_OBJECTS = \ TEST_DRAWINGPLUGIN_OBJECTS = \
$(OBJS)\test_drawingplugin_pluginsample.obj $(OBJS)\test_drawingplugin_pluginsample.obj
TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_59)$(__DEBUGRUNTIME) /DWIN32 \ TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_59)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \ $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \
$(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \
/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
@@ -322,7 +322,7 @@ EXTRALIBS_FOR_BASE =
EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE =
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 = $(__DEBUGRUNTIME_2) __DEBUGINFO_2 = $(__DEBUGRUNTIME_2)
!endif !endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_2 = __DEBUGINFO_2 =
@@ -331,7 +331,7 @@ __DEBUGINFO_2 =
__DEBUGINFO_2 = __DEBUGINFO_2 =
!endif !endif
!if "$(DEBUG_INFO)" == "1" !if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_2 = $(__DEBUGRUNTIME_2) __DEBUGINFO_2 = $(__DEBUGRUNTIME_2)
!endif !endif
!if "$(RUNTIME_LIBS)" == "dynamic" !if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_10 = D __RUNTIME_LIBS_10 = D
@@ -342,122 +342,128 @@ __RUNTIME_LIBS_10 = $(__THREADSFLAG)
!if "$(MONOLITHIC)" == "1" !if "$(MONOLITHIC)" == "1"
__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(USE_GUI)" == "1"
__DEBUGINFO_19 = $(__DEBUGRUNTIME_2) __test_drawing___depname = $(OBJS)\test_drawing.exe
!endif !endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_19 = __DEBUGINFO_19 = $(__DEBUGRUNTIME_2)
!endif !endif
!if "$(DEBUG_INFO)" == "0" !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_19 = __DEBUGINFO_19 =
!endif !endif
!if "$(DEBUG_INFO)" == "1" !if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_19 = $(__DEBUGRUNTIME_2) __DEBUGINFO_19 =
!endif !endif
!if "$(RUNTIME_LIBS)" == "dynamic" !if "$(DEBUG_INFO)" == "1"
__RUNTIME_LIBS_27 = D __DEBUGINFO_19 = $(__DEBUGRUNTIME_2)
!endif !endif
!if "$(RUNTIME_LIBS)" == "static" !if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_27 = $(__THREADSFLAG) __RUNTIME_LIBS_27 = D
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(RUNTIME_LIBS)" == "static"
__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p) __RUNTIME_LIBS_27 = $(__THREADSFLAG)
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(MONOLITHIC)" == "1"
__DEBUGINFO_37 = $(__DEBUGRUNTIME_2) __LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p)
!endif !endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" !if "$(USE_GUI)" == "1"
__DEBUGINFO_37 = __test_drawingplugin___depname = $(OBJS)\test_drawingplugin.dll
!endif !endif
!if "$(DEBUG_INFO)" == "0" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_37 = __DEBUGINFO_37 = $(__DEBUGRUNTIME_2)
!endif !endif
!if "$(DEBUG_INFO)" == "1" !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_37 = $(__DEBUGRUNTIME_2) __DEBUGINFO_37 =
!endif !endif
!if "$(RUNTIME_LIBS)" == "dynamic" !if "$(DEBUG_INFO)" == "0"
__RUNTIME_LIBS_45 = D __DEBUGINFO_37 =
!endif !endif
!if "$(RUNTIME_LIBS)" == "static" !if "$(DEBUG_INFO)" == "1"
__RUNTIME_LIBS_45 = $(__THREADSFLAG) __DEBUGINFO_37 = $(__DEBUGRUNTIME_2)
!endif !endif
!if "$(MONOLITHIC)" == "1" !if "$(RUNTIME_LIBS)" == "dynamic"
__LIB_PNG_IF_MONO_p_2 = $(__LIB_PNG_p) __RUNTIME_LIBS_45 = D
!endif !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" !if "$(USE_GUI)" == "1"
__test_gui___depname = $(OBJS)\test_gui.exe __test_gui___depname = $(OBJS)\test_gui.exe
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_51 = $(__DEBUGRUNTIME_2) __DEBUGINFO_51 = $(__DEBUGRUNTIME_2)
!endif !endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_51 = __DEBUGINFO_51 =
!endif !endif
!if "$(DEBUG_INFO)" == "0" !if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_51 = __DEBUGINFO_51 =
!endif !endif
!if "$(DEBUG_INFO)" == "1" !if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_51 = $(__DEBUGRUNTIME_2) __DEBUGINFO_51 = $(__DEBUGRUNTIME_2)
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_52_p_1 = /d _DEBUG ____DEBUGRUNTIME_52_p_1 = /d _DEBUG
!endif !endif
!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_52_p_1 = ____DEBUGRUNTIME_52_p_1 =
!endif !endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0" !if "$(DEBUG_RUNTIME_LIBS)" == "0"
____DEBUGRUNTIME_52_p_1 = ____DEBUGRUNTIME_52_p_1 =
!endif !endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1" !if "$(DEBUG_RUNTIME_LIBS)" == "1"
____DEBUGRUNTIME_52_p_1 = /d _DEBUG ____DEBUGRUNTIME_52_p_1 = /d _DEBUG
!endif !endif
!if "$(RUNTIME_LIBS)" == "dynamic" !if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_59 = D __RUNTIME_LIBS_59 = D
!endif !endif
!if "$(RUNTIME_LIBS)" == "static" !if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_59 = $(__THREADSFLAG) __RUNTIME_LIBS_59 = $(__THREADSFLAG)
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
__NO_VC_CRTDBG_p_7 = /d __NO_VC_CRTDBG__ __NO_VC_CRTDBG_p_7 = /d __NO_VC_CRTDBG__
!endif !endif
!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
__NO_VC_CRTDBG_p_7 = /d __NO_VC_CRTDBG__ __NO_VC_CRTDBG_p_7 = /d __NO_VC_CRTDBG__
!endif !endif
!if "$(WXUNIV)" == "1" !if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p_7 = /d __WXUNIVERSAL__ __WXUNIV_DEFINE_p_7 = /d __WXUNIVERSAL__
!endif !endif
!if "$(DEBUG_FLAG)" == "0" !if "$(DEBUG_FLAG)" == "0"
__DEBUG_DEFINE_p_7 = /d wxDEBUG_LEVEL=0 __DEBUG_DEFINE_p_7 = /d wxDEBUG_LEVEL=0
!endif !endif
!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
__NDEBUG_DEFINE_p_7 = /d NDEBUG __NDEBUG_DEFINE_p_7 = /d NDEBUG
!endif !endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0" !if "$(DEBUG_RUNTIME_LIBS)" == "0"
__NDEBUG_DEFINE_p_7 = /d NDEBUG __NDEBUG_DEFINE_p_7 = /d NDEBUG
!endif !endif
!if "$(USE_EXCEPTIONS)" == "0" !if "$(USE_EXCEPTIONS)" == "0"
__EXCEPTIONS_DEFINE_p_7 = /d wxNO_EXCEPTIONS __EXCEPTIONS_DEFINE_p_7 = /d wxNO_EXCEPTIONS
!endif !endif
!if "$(USE_RTTI)" == "0" !if "$(USE_RTTI)" == "0"
__RTTI_DEFINE_p_7 = /d wxNO_RTTI __RTTI_DEFINE_p_7 = /d wxNO_RTTI
!endif !endif
!if "$(USE_THREADS)" == "0" !if "$(USE_THREADS)" == "0"
__THREAD_DEFINE_p_7 = /d wxNO_THREADS __THREAD_DEFINE_p_7 = /d wxNO_THREADS
!endif !endif
!if "$(UNICODE)" == "0" !if "$(UNICODE)" == "0"
__UNICODE_DEFINE_p_7 = /d wxUSE_UNICODE=0 __UNICODE_DEFINE_p_7 = /d wxUSE_UNICODE=0
!endif !endif
!if "$(UNICODE)" == "1" !if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p_7 = /d _UNICODE __UNICODE_DEFINE_p_7 = /d _UNICODE
!endif !endif
!if "$(MSLU)" == "1" !if "$(MSLU)" == "1"
__MSLU_DEFINE_p_7 = /d wxUSE_UNICODE_MSLU=1 __MSLU_DEFINE_p_7 = /d wxUSE_UNICODE_MSLU=1
!endif !endif
!if "$(USE_CAIRO)" == "1" !if "$(USE_CAIRO)" == "1"
____CAIRO_INCLUDEDIR_FILENAMES_7_p = /i $(CAIRO_ROOT)\include\cairo ____CAIRO_INCLUDEDIR_FILENAMES_7_p = /i $(CAIRO_ROOT)\include\cairo
!endif !endif
!if "$(SHARED)" == "1" !if "$(SHARED)" == "1"
__DLLFLAG_p_7 = /d WXUSINGDLL __DLLFLAG_p_7 = /d WXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1" !if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1"
__WXLIB_WEBVIEW_p = \ __WXLIB_WEBVIEW_p = \
@@ -492,14 +498,14 @@ __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_XML_p = \ __WXLIB_XML_p = \
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_NET_p = \ __WXLIB_NET_p = \
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = /Zi __DEBUGINFO = /Zi
!endif !endif
@@ -513,16 +519,16 @@ __DEBUGINFO =
__DEBUGINFO = /Zi __DEBUGINFO = /Zi
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_4 = /DEBUG __DEBUGINFO_4 = /DEBUG
!endif !endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_4 = __DEBUGINFO_4 =
!endif !endif
!if "$(DEBUG_INFO)" == "0" !if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_4 = __DEBUGINFO_4 =
!endif !endif
!if "$(DEBUG_INFO)" == "1" !if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_4 = /DEBUG __DEBUGINFO_4 = /DEBUG
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME = /D_DEBUG ____DEBUGRUNTIME = /D_DEBUG
@@ -549,16 +555,16 @@ __DEBUGRUNTIME =
__DEBUGRUNTIME = d __DEBUGRUNTIME = d
!endif !endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_2 = __DEBUGRUNTIME_2 =
!endif !endif
!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
__DEBUGRUNTIME_2 = /opt:ref /opt:icf __DEBUGRUNTIME_2 = /opt:ref /opt:icf
!endif !endif
!if "$(DEBUG_RUNTIME_LIBS)" == "0" !if "$(DEBUG_RUNTIME_LIBS)" == "0"
__DEBUGRUNTIME_2 = /opt:ref /opt:icf __DEBUGRUNTIME_2 = /opt:ref /opt:icf
!endif !endif
!if "$(DEBUG_RUNTIME_LIBS)" == "1" !if "$(DEBUG_RUNTIME_LIBS)" == "1"
__DEBUGRUNTIME_2 = __DEBUGRUNTIME_2 =
!endif !endif
!if "$(BUILD)" == "debug" !if "$(BUILD)" == "debug"
__OPTIMIZEFLAG = /Od __OPTIMIZEFLAG = /Od
@@ -627,8 +633,8 @@ ____CAIRO_INCLUDEDIR_FILENAMES = /I$(CAIRO_ROOT)\include\cairo
__DLLFLAG_p = /DWXUSINGDLL __DLLFLAG_p = /DWXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \ __WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_BASE_p = \ __WXLIB_BASE_p = \
@@ -658,7 +664,7 @@ $(OBJS):
### Targets: ### ### Targets: ###
all: $(OBJS)\test.exe $(OBJS)\test_drawing.exe $(OBJS)\test_drawingplugin.dll $(__test_gui___depname) data data-images fr all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) data data-images fr
clean: clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -667,34 +673,38 @@ clean:
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
-if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk
-if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb -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.exe del $(OBJS)\test_drawing.exe
-if exist $(OBJS)\test_drawing.ilk del $(OBJS)\test_drawing.ilk -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_drawing.pdb del $(OBJS)\test_drawing.pdb
-if exist $(OBJS)\test_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll -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.ilk del $(OBJS)\test_drawingplugin.ilk
-if exist $(OBJS)\test_drawingplugin.pdb del $(OBJS)\test_drawingplugin.pdb -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.exe del $(OBJS)\test_gui.exe
-if exist $(OBJS)\test_gui.ilk del $(OBJS)\test_gui.ilk -if exist $(OBJS)\test_gui.ilk del $(OBJS)\test_gui.ilk
-if exist $(OBJS)\test_gui.pdb del $(OBJS)\test_gui.pdb -if exist $(OBJS)\test_gui.pdb del $(OBJS)\test_gui.pdb
$(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS)
link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /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 $(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) !if "$(USE_GUI)" == "1"
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) @<< $(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj $(TEST_DRAWING_OBJECTS)
$(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 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) !endif
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_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
<<
!endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
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) @<< 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 $(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 !endif
@@ -966,29 +976,29 @@ $(OBJS)\test_xlocale.obj: .\xlocale\xlocale.cpp
$(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp $(OBJS)\test_xmltest.obj: .\xml\xmltest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\xml\xmltest.cpp
$(OBJS)\test_drawing_dummy.obj: .\dummy.cpp $(OBJS)\test_drawing_dummy.obj: .\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) /Yctestprec.h .\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) /Yctestprec.h .\dummy.cpp
$(OBJS)\test_drawing_test.obj: .\test.cpp $(OBJS)\test_drawing_test.obj: .\test.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\test.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\test.cpp
$(OBJS)\test_drawing_drawing.obj: .\drawing\drawing.cpp $(OBJS)\test_drawing_drawing.obj: .\drawing\drawing.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\drawing.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\drawing.cpp
$(OBJS)\test_drawing_plugindriver.obj: .\drawing\plugindriver.cpp $(OBJS)\test_drawing_plugindriver.obj: .\drawing\plugindriver.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\plugindriver.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\plugindriver.cpp
$(OBJS)\test_drawing_basictest.obj: .\drawing\basictest.cpp $(OBJS)\test_drawing_basictest.obj: .\drawing\basictest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\basictest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWING_CXXFLAGS) .\drawing\basictest.cpp
$(OBJS)\test_drawingplugin_pluginsample.obj: .\drawing\pluginsample.cpp $(OBJS)\test_drawingplugin_pluginsample.obj: .\drawing\pluginsample.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) .\drawing\pluginsample.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) .\drawing\pluginsample.cpp
$(OBJS)\test_gui_dummy.obj: .\dummy.cpp $(OBJS)\test_gui_dummy.obj: .\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h .\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h .\dummy.cpp
$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc $(OBJS)\test_gui_sample.res: .\..\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 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 $(OBJS)\test_gui_asserthelper.obj: .\asserthelper.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\asserthelper.cpp

204
tests/makefile.wat
View File

@@ -76,14 +76,22 @@ __LIB_PNG_IF_MONO_p =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
!endif !endif
__LIB_PNG_IF_MONO_p_1 = __test_drawing___depname =
!ifeq MONOLITHIC 1 !ifeq USE_GUI 1
__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p) __test_drawing___depname = $(OBJS)\test_drawing.exe
!endif !endif
__LIB_PNG_IF_MONO_p_2 = __LIB_PNG_IF_MONO_p_1 =
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
__LIB_PNG_IF_MONO_p_2 = $(__LIB_PNG_p) __LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p)
!endif !endif
__test_drawingplugin___depname =
!ifeq USE_GUI 1
__test_drawingplugin___depname = $(OBJS)\test_drawingplugin.dll
!endif
__LIB_PNG_IF_MONO_p_2 =
!ifeq MONOLITHIC 1
__LIB_PNG_IF_MONO_p_2 = $(__LIB_PNG_p)
!endif
__test_gui___depname = __test_gui___depname =
!ifeq USE_GUI 1 !ifeq USE_GUI 1
__test_gui___depname = $(OBJS)\test_gui.exe __test_gui___depname = $(OBJS)\test_gui.exe
@@ -136,16 +144,16 @@ __LIB_JPEG_p =
!ifeq USE_GUI 1 !ifeq USE_GUI 1
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif !endif
__WXLIB_XML_p = __WXLIB_XML_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_XML_p = & __WXLIB_XML_p = &
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
!endif !endif
__WXLIB_NET_p = __WXLIB_NET_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_NET_p = & __WXLIB_NET_p = &
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
!endif !endif
__DEBUGINFO = __DEBUGINFO =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
@@ -163,22 +171,22 @@ __DEBUGINFO = -d0
!ifeq DEBUG_INFO 1 !ifeq DEBUG_INFO 1
__DEBUGINFO = -d2 __DEBUGINFO = -d2
!endif !endif
__DEBUGINFO_3 = __DEBUGINFO_3 =
!ifeq BUILD debug !ifeq BUILD debug
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
__DEBUGINFO_3 = debug all __DEBUGINFO_3 = debug all
!endif !endif
!endif !endif
!ifeq BUILD release !ifeq BUILD release
!ifeq DEBUG_INFO default !ifeq DEBUG_INFO default
__DEBUGINFO_3 = __DEBUGINFO_3 =
!endif !endif
!endif !endif
!ifeq DEBUG_INFO 0 !ifeq DEBUG_INFO 0
__DEBUGINFO_3 = __DEBUGINFO_3 =
!endif !endif
!ifeq DEBUG_INFO 1 !ifeq DEBUG_INFO 1
__DEBUGINFO_3 = debug all __DEBUGINFO_3 = debug all
!endif !endif
__OPTIMIZEFLAG = __OPTIMIZEFLAG =
!ifeq BUILD debug !ifeq BUILD debug
@@ -215,10 +223,10 @@ __EXCEPTIONSFLAG =
!ifeq USE_EXCEPTIONS 1 !ifeq USE_EXCEPTIONS 1
__EXCEPTIONSFLAG = -xs __EXCEPTIONSFLAG = -xs
!endif !endif
__WXLIB_CORE_p = __WXLIB_CORE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
__WXLIB_CORE_p = & __WXLIB_CORE_p = &
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
!endif !endif
__WXLIB_BASE_p = __WXLIB_BASE_p =
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
@@ -386,29 +394,29 @@ TEST_OBJECTS = &
$(OBJS)\test_weakref.obj & $(OBJS)\test_weakref.obj &
$(OBJS)\test_xlocale.obj & $(OBJS)\test_xlocale.obj &
$(OBJS)\test_xmltest.obj $(OBJS)\test_xmltest.obj
TEST_DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & TEST_DRAWING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include & $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include &
$(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
$(__DLLFLAG_p) -dwxUSE_GUI=0 $(CPPUNIT_CFLAGS) & $(__DLLFLAG_p) -dwxUSE_GUI=0 $(CPPUNIT_CFLAGS) &
/fh=$(OBJS)\testprec_test_drawing.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & /fh=$(OBJS)\testprec_test_drawing.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
$(CPPFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
TEST_DRAWING_OBJECTS = & TEST_DRAWING_OBJECTS = &
$(OBJS)\test_drawing_dummy.obj & $(OBJS)\test_drawing_dummy.obj &
$(OBJS)\test_drawing_test.obj & $(OBJS)\test_drawing_test.obj &
$(OBJS)\test_drawing_drawing.obj & $(OBJS)\test_drawing_drawing.obj &
$(OBJS)\test_drawing_plugindriver.obj & $(OBJS)\test_drawing_plugindriver.obj &
$(OBJS)\test_drawing_basictest.obj $(OBJS)\test_drawing_basictest.obj
TEST_DRAWINGPLUGIN_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) & TEST_DRAWINGPLUGIN_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
$(__THREADSFLAG) $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) & $(__THREADSFLAG) $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) &
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) & $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) & $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &
-i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx & -i=$(SETUPHDIR) -i=.\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &
-wcd=549 -wcd=656 -wcd=657 -wcd=667 $(__DLLFLAG_p) $(__RTTIFLAG) & -wcd=549 -wcd=656 -wcd=657 -wcd=667 $(__DLLFLAG_p) $(__RTTIFLAG) &
$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
TEST_DRAWINGPLUGIN_OBJECTS = & TEST_DRAWINGPLUGIN_OBJECTS = &
$(OBJS)\test_drawingplugin_pluginsample.obj $(OBJS)\test_drawingplugin_pluginsample.obj
TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
@@ -514,7 +522,7 @@ $(OBJS) :
### Targets: ### ### Targets: ###
all : .SYMBOLIC $(OBJS)\test.exe $(OBJS)\test_drawing.exe $(OBJS)\test_drawingplugin.dll $(__test_gui___depname) data data-images fr all : .SYMBOLIC $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) data data-images fr
clean : .SYMBOLIC clean : .SYMBOLIC
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -523,8 +531,8 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe -if exist $(OBJS)\test.exe del $(OBJS)\test.exe
-if exist $(OBJS)\test_drawing.exe del $(OBJS)\test_drawing.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_drawingplugin.dll del $(OBJS)\test_drawingplugin.dll
-if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
$(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test.exe : $(TEST_OBJECTS)
@@ -532,44 +540,48 @@ $(OBJS)\test.exe : $(TEST_OBJECTS)
@%append $(OBJS)\test.lbc option quiet @%append $(OBJS)\test.lbc option quiet
@%append $(OBJS)\test.lbc name $^@ @%append $(OBJS)\test.lbc name $^@
@%append $(OBJS)\test.lbc option caseexact @%append $(OBJS)\test.lbc option caseexact
@%append $(OBJS)\test.lbc $(__DEBUGINFO_3) 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 ($(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 @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 @%append $(OBJS)\test.lbc
@for %i in () do @%append $(OBJS)\test.lbc option stack=%i @for %i in () do @%append $(OBJS)\test.lbc option stack=%i
wlink @$(OBJS)\test.lbc wlink @$(OBJS)\test.lbc
$(OBJS)\test_drawing.exe : $(TEST_DRAWING_OBJECTS) !ifeq USE_GUI 1
@%create $(OBJS)\test_drawing.lbc $(OBJS)\test_drawing.exe : $(TEST_DRAWING_OBJECTS)
@%append $(OBJS)\test_drawing.lbc option quiet @%create $(OBJS)\test_drawing.lbc
@%append $(OBJS)\test_drawing.lbc name $^@ @%append $(OBJS)\test_drawing.lbc option quiet
@%append $(OBJS)\test_drawing.lbc option caseexact @%append $(OBJS)\test_drawing.lbc name $^@
@%append $(OBJS)\test_drawing.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @%append $(OBJS)\test_drawing.lbc option caseexact
@for %i in ($(TEST_DRAWING_OBJECTS)) do @%append $(OBJS)\test_drawing.lbc file %i @%append $(OBJS)\test_drawing.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)
@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 @for %i in ($(TEST_DRAWING_OBJECTS)) do @%append $(OBJS)\test_drawing.lbc file %i
@%append $(OBJS)\test_drawing.lbc @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
@for %i in () do @%append $(OBJS)\test_drawing.lbc option stack=%i @%append $(OBJS)\test_drawing.lbc
wlink @$(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) !endif
@%create $(OBJS)\test_drawingplugin.lbc
@%append $(OBJS)\test_drawingplugin.lbc option quiet !ifeq USE_GUI 1
@%append $(OBJS)\test_drawingplugin.lbc name $^@ $(OBJS)\test_drawingplugin.dll : $(TEST_DRAWINGPLUGIN_OBJECTS)
@%append $(OBJS)\test_drawingplugin.lbc option caseexact @%create $(OBJS)\test_drawingplugin.lbc
@%append $(OBJS)\test_drawingplugin.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @%append $(OBJS)\test_drawingplugin.lbc option quiet
@for %i in ($(TEST_DRAWINGPLUGIN_OBJECTS)) do @%append $(OBJS)\test_drawingplugin.lbc file %i @%append $(OBJS)\test_drawingplugin.lbc name $^@
@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 option caseexact
@%append $(OBJS)\test_drawingplugin.lbc @%append $(OBJS)\test_drawingplugin.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)
@%append $(OBJS)\test_drawingplugin.lbc system nt_dll @for %i in ($(TEST_DRAWINGPLUGIN_OBJECTS)) do @%append $(OBJS)\test_drawingplugin.lbc file %i
wlink @$(OBJS)\test_drawingplugin.lbc @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
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\test_gui.exe : $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res $(OBJS)\test_gui.exe : $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
@%create $(OBJS)\test_gui.lbc @%create $(OBJS)\test_gui.lbc
@%append $(OBJS)\test_gui.lbc option quiet @%append $(OBJS)\test_gui.lbc option quiet
@%append $(OBJS)\test_gui.lbc name $^@ @%append $(OBJS)\test_gui.lbc name $^@
@%append $(OBJS)\test_gui.lbc option caseexact @%append $(OBJS)\test_gui.lbc option caseexact
@%append $(OBJS)\test_gui.lbc $(__DEBUGINFO_3) 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 ($(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 @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 @%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res
@@ -844,24 +856,24 @@ $(OBJS)\test_xlocale.obj : .AUTODEPEND .\xlocale\xlocale.cpp
$(OBJS)\test_xmltest.obj : .AUTODEPEND .\xml\xmltest.cpp $(OBJS)\test_xmltest.obj : .AUTODEPEND .\xml\xmltest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_drawing_dummy.obj : .AUTODEPEND .\dummy.cpp $(OBJS)\test_drawing_dummy.obj : .AUTODEPEND .\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $<
$(OBJS)\test_drawing_test.obj : .AUTODEPEND .\test.cpp $(OBJS)\test_drawing_test.obj : .AUTODEPEND .\test.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $<
$(OBJS)\test_drawing_drawing.obj : .AUTODEPEND .\drawing\drawing.cpp $(OBJS)\test_drawing_drawing.obj : .AUTODEPEND .\drawing\drawing.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $<
$(OBJS)\test_drawing_plugindriver.obj : .AUTODEPEND .\drawing\plugindriver.cpp $(OBJS)\test_drawing_plugindriver.obj : .AUTODEPEND .\drawing\plugindriver.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $<
$(OBJS)\test_drawing_basictest.obj : .AUTODEPEND .\drawing\basictest.cpp $(OBJS)\test_drawing_basictest.obj : .AUTODEPEND .\drawing\basictest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWING_CXXFLAGS) $<
$(OBJS)\test_drawingplugin_pluginsample.obj : .AUTODEPEND .\drawing\pluginsample.cpp $(OBJS)\test_drawingplugin_pluginsample.obj : .AUTODEPEND .\drawing\pluginsample.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $<
$(OBJS)\test_gui_sample.res : .AUTODEPEND .\..\samples\sample.rc $(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 $< 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 $<

6
tests/test.bkl
View File

@@ -126,7 +126,8 @@
be ran in such configuration and doesn't require an X server connection. be ran in such configuration and doesn't require an X server connection.
--> -->
<exe id="test_drawing" template="wx_sample_console,wx_test" <exe id="test_drawing" template="wx_sample_console,wx_test"
template_append="wx_append_base"> template_append="wx_append_base"
cond="USE_GUI=='1'">
<sources> <sources>
test.cpp test.cpp
drawing/drawing.cpp drawing/drawing.cpp
@@ -147,7 +148,8 @@
wxGraphicsContext interface, building the appropriate DrawingTestGCFactory wxGraphicsContext interface, building the appropriate DrawingTestGCFactory
--> -->
<module id="test_drawingplugin" template="wx" <module id="test_drawingplugin" template="wx"
template_append="wx_append_base"> template_append="wx_append_base"
cond="USE_GUI=='1'">
<define>$(DLLFLAG)</define> <define>$(DLLFLAG)</define>
<sources> <sources>
drawing/pluginsample.cpp drawing/pluginsample.cpp

321
tests/test_test_drawing.dsp
View File

@@ -1,160 +1,161 @@
# Microsoft Developer Studio Project File - Name="test_test_drawing" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="test_test_drawing" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103 # TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=test_drawing - Win32 Debug CFG=test_drawing - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "test_test_drawing.mak". !MESSAGE NMAKE /f "test_test_drawing.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "test_test_drawing.mak" CFG="test_drawing - Win32 Debug" !MESSAGE NMAKE /f "test_test_drawing.mak" CFG="test_drawing - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "test_drawing - Win32 DLL Release" (based on "Win32 (x86) Console Application") !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 DLL Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "test_drawing - Win32 Release" (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 "test_drawing - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "" # PROP Scc_ProjName ""
# PROP Scc_LocalPath "" # PROP Scc_LocalPath ""
CPP=cl.exe CPP=cl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "test_drawing - Win32 DLL Release" !IF "$(CFG)" == "test_drawing - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "vc_mswudll" # PROP BASE Output_Dir "vc_mswudll"
# PROP BASE Intermediate_Dir "vc_mswudll\test_drawing" # PROP BASE Intermediate_Dir "vc_mswudll\test_drawing"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "vc_mswudll" # PROP Output_Dir "vc_mswudll"
# PROP Intermediate_Dir "vc_mswudll\test_drawing" # PROP Intermediate_Dir "vc_mswudll\test_drawing"
# PROP Target_Dir "" # 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 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 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 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 # 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 BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 # 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" !ELSEIF "$(CFG)" == "test_drawing - Win32 DLL Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "vc_mswuddll" # PROP BASE Output_Dir "vc_mswuddll"
# PROP BASE Intermediate_Dir "vc_mswuddll\test_drawing" # PROP BASE Intermediate_Dir "vc_mswuddll\test_drawing"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "vc_mswuddll" # PROP Output_Dir "vc_mswuddll"
# PROP Intermediate_Dir "vc_mswuddll\test_drawing" # PROP Intermediate_Dir "vc_mswuddll\test_drawing"
# PROP Target_Dir "" # 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 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 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 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 # 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 BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 # 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" !ELSEIF "$(CFG)" == "test_drawing - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "vc_mswu" # PROP BASE Output_Dir "vc_mswu"
# PROP BASE Intermediate_Dir "vc_mswu\test_drawing" # PROP BASE Intermediate_Dir "vc_mswu\test_drawing"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "vc_mswu" # PROP Output_Dir "vc_mswu"
# PROP Intermediate_Dir "vc_mswu\test_drawing" # PROP Intermediate_Dir "vc_mswu\test_drawing"
# PROP Target_Dir "" # 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 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 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 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 # 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 BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 # 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" !ELSEIF "$(CFG)" == "test_drawing - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "vc_mswud" # PROP BASE Output_Dir "vc_mswud"
# PROP BASE Intermediate_Dir "vc_mswud\test_drawing" # PROP BASE Intermediate_Dir "vc_mswud\test_drawing"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "vc_mswud" # PROP Output_Dir "vc_mswud"
# PROP Intermediate_Dir "vc_mswud\test_drawing" # PROP Intermediate_Dir "vc_mswud\test_drawing"
# PROP Target_Dir "" # 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 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 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 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 # 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 BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 # 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 !ENDIF
# Begin Target # Begin Target
# Name "test_drawing - Win32 DLL Release" # Name "test_drawing - Win32 DLL Release"
# Name "test_drawing - Win32 DLL Debug" # Name "test_drawing - Win32 DLL Debug"
# Name "test_drawing - Win32 Release" # Name "test_drawing - Win32 Release"
# Name "test_drawing - Win32 Debug" # Name "test_drawing - Win32 Debug"
# Begin Group "Source Files" # Begin Group "Source Files"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=.\drawing\basictest.cpp SOURCE=.\drawing\basictest.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\drawing\drawing.cpp SOURCE=.\drawing\drawing.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\dummy.cpp SOURCE=.\dummy.cpp
# ADD BASE CPP /Yc"testprec.h" # ADD BASE CPP /Yc"testprec.h"
# ADD CPP /Yc"testprec.h" # ADD CPP /Yc"testprec.h"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\drawing\plugindriver.cpp SOURCE=.\drawing\plugindriver.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\test.cpp SOURCE=.\test.cpp
# End Source File # End Source File
# End Group # End Group
# End Target # End Target
# End Project # End Project

303
tests/test_test_drawingplugin.dsp
View File

@@ -1,151 +1,152 @@
# Microsoft Developer Studio Project File - Name="test_test_drawingplugin" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="test_test_drawingplugin" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=test_drawingplugin - Win32 Debug CFG=test_drawingplugin - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "test_test_drawingplugin.mak". !MESSAGE NMAKE /f "test_test_drawingplugin.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "test_test_drawingplugin.mak" CFG="test_drawingplugin - Win32 Debug" !MESSAGE NMAKE /f "test_test_drawingplugin.mak" CFG="test_drawingplugin - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "test_drawingplugin - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library") !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 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 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "test_drawingplugin - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "test_drawingplugin - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "" # PROP Scc_ProjName ""
# PROP Scc_LocalPath "" # PROP Scc_LocalPath ""
CPP=cl.exe CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "test_drawingplugin - Win32 DLL Release" !IF "$(CFG)" == "test_drawingplugin - Win32 DLL Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "vc_mswudll" # PROP BASE Output_Dir "vc_mswudll"
# PROP BASE Intermediate_Dir "vc_mswudll\test_drawingplugin" # PROP BASE Intermediate_Dir "vc_mswudll\test_drawingplugin"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "vc_mswudll" # PROP Output_Dir "vc_mswudll"
# PROP Intermediate_Dir "vc_mswudll\test_drawingplugin" # PROP Intermediate_Dir "vc_mswudll\test_drawingplugin"
# PROP Target_Dir "" # 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 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 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 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 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 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 # ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /d WXUSINGDLL
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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" # 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" !ELSEIF "$(CFG)" == "test_drawingplugin - Win32 DLL Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "vc_mswuddll" # PROP BASE Output_Dir "vc_mswuddll"
# PROP BASE Intermediate_Dir "vc_mswuddll\test_drawingplugin" # PROP BASE Intermediate_Dir "vc_mswuddll\test_drawingplugin"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "vc_mswuddll" # PROP Output_Dir "vc_mswuddll"
# PROP Intermediate_Dir "vc_mswuddll\test_drawingplugin" # PROP Intermediate_Dir "vc_mswuddll\test_drawingplugin"
# PROP Target_Dir "" # 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 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 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 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 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 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 # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswud" /i ".\..\include" /d WXUSINGDLL
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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" # 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" !ELSEIF "$(CFG)" == "test_drawingplugin - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "vc_mswu" # PROP BASE Output_Dir "vc_mswu"
# PROP BASE Intermediate_Dir "vc_mswu\test_drawingplugin" # PROP BASE Intermediate_Dir "vc_mswu\test_drawingplugin"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "vc_mswu" # PROP Output_Dir "vc_mswu"
# PROP Intermediate_Dir "vc_mswu\test_drawingplugin" # PROP Intermediate_Dir "vc_mswu\test_drawingplugin"
# PROP Target_Dir "" # 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 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 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 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 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 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 # ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i .\..\include
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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" # 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" !ELSEIF "$(CFG)" == "test_drawingplugin - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "vc_mswud" # PROP BASE Output_Dir "vc_mswud"
# PROP BASE Intermediate_Dir "vc_mswud\test_drawingplugin" # PROP BASE Intermediate_Dir "vc_mswud\test_drawingplugin"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "vc_mswud" # PROP Output_Dir "vc_mswud"
# PROP Intermediate_Dir "vc_mswud\test_drawingplugin" # PROP Intermediate_Dir "vc_mswud\test_drawingplugin"
# PROP Target_Dir "" # 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 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 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 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 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 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 # ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswud" /i .\..\include
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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" # 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 !ENDIF
# Begin Target # Begin Target
# Name "test_drawingplugin - Win32 DLL Release" # Name "test_drawingplugin - Win32 DLL Release"
# Name "test_drawingplugin - Win32 DLL Debug" # Name "test_drawingplugin - Win32 DLL Debug"
# Name "test_drawingplugin - Win32 Release" # Name "test_drawingplugin - Win32 Release"
# Name "test_drawingplugin - Win32 Debug" # Name "test_drawingplugin - Win32 Debug"
# Begin Group "Source Files" # Begin Group "Source Files"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=.\drawing\pluginsample.cpp SOURCE=.\drawing\pluginsample.cpp
# End Source File # End Source File
# End Group # End Group
# End Target # End Target
# End Project # End Project