<ldflags>$(CPPUNIT_LIBS)</ldflags>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
- <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
+ <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
<sources>dummy.cpp</sources>
<precomp-headers-gen>dummy.cpp</precomp-headers-gen>
</if>
regex/wxregextest.cpp
scopeguard/scopeguardtest.cpp
strings/iostream.cpp
+ strings/numformatter.cpp
strings/strings.cpp
strings/stdstrings.cpp
strings/tokenizer.cpp
geometry/rect.cpp
geometry/size.cpp
geometry/point.cpp
+ geometry/region.cpp
graphics/bitmap.cpp
graphics/colour.cpp
graphics/ellipsization.cpp
graphics/measuring.cpp
+ graphics/affinematrix.cpp
config/config.cpp
controls/bitmapcomboboxtest.cpp
controls/bitmaptogglebuttontest.cpp
controls/choicebooktest.cpp
controls/choicetest.cpp
controls/comboboxtest.cpp
+ controls/dataviewctrltest.cpp
+ controls/datepickerctrltest.cpp
controls/frametest.cpp
controls/gaugetest.cpp
controls/gridtest.cpp
controls/listboxtest.cpp
controls/listctrltest.cpp
controls/listviewtest.cpp
+ controls/markuptest.cpp
controls/notebooktest.cpp
controls/ownerdrawncomboboxtest.cpp
controls/pickerbasetest.cpp
controls/radiobuttontest.cpp
controls/rearrangelisttest.cpp
controls/richtextctrltest.cpp
+ controls/searchctrltest.cpp
controls/slidertest.cpp
controls/spinctrldbltest.cpp
controls/spinctrltest.cpp
controls/toolbooktest.cpp
controls/treebooktest.cpp
controls/treectrltest.cpp
+ controls/treelistctrltest.cpp
controls/virtlistctrltest.cpp
+ controls/webtest.cpp
controls/windowtest.cpp
+ controls/dialogtest.cpp
events/clone.cpp
events/propagation.cpp
events/keyboard.cpp
-->
net/socket.cpp
sizers/boxsizer.cpp
+ sizers/wrapsizer.cpp
+ toplevel/toplevel.cpp
+ validators/valnum.cpp
window/clientsize.cpp
window/setsize.cpp
xml/xrctest.cpp
</sources>
+ <!--
+ Can't use <wx-lib> here as it doesn't work with conditionally
+ defined variables, so fall back <sys-lib> as we must not link with
+ inexisting webview library to be able to run tests even if
+ wxWebView is not available.
+ -->
+ <sys-lib>$(WXLIB_WEBVIEW)</sys-lib>
<wx-lib>richtext</wx-lib>
<wx-lib>media</wx-lib>
<wx-lib>xrc</wx-lib>
horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm</files>
</wx-data>
+ <wx-data id="data-images">
+ <srcdir>$(SRCDIR)/image</srcdir>
+ <dstdir>image</dstdir>
+ <files>horse_grey.bmp horse_grey_flipped.bmp
+ horse_rle4.bmp horse_rle4_flipped.bmp
+ horse_rle8.bmp horse_rle8_flipped.bmp</files>
+ </wx-data>
+
<template id="catalog">
<dstdir>$(BUILDDIR)/intl/$(id)</dstdir>
<srcdir>$(SRCDIR)/intl/$(id)</srcdir>
# warnings don't matter when we expect compilation to fail anyhow so we can
# use this variable to enable the compilation of code which is supposed to
# fail
-failtest:
+failtest: failtest_combobox failtest_evthandler
+
+failtest_combobox:
+ @$(RM) test_gui_comboboxtest.o
+ if $(MAKE) CXXWARNINGS=-DTEST_INVALID_COMBOBOX_ISEMPTY test_gui_comboboxtest.o 2>/dev/null; then \
+ echo "*** Compilation with TEST_INVALID_COMBOBOX_ISEMPTY unexpectedly succeeded.">&2; \
+ exit 1; \
+ fi; \
+ exit 0
+
+failtest_evthandler:
@$(RM) test_evthandler.o
@for d in GLOBAL STATIC METHOD FUNCTOR NO_HANDLER DERIVED WRONG_CLASS; do \
if $(MAKE) CXXWARNINGS=-DTEST_INVALID_BIND_$$d test_evthandler.o 2>/dev/null; then \