Re-enable wxAny<double>::GetAs<wxString>() test.

[wxWidgets.git] / tests / benchmarks / Makefile.in

diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in
index 0f16402cc637176b9c09e693b9919aa017f34080..faeb014d262a16dee0595073284e8b03aeb6d8aa 100644 (file)
--- a/tests/benchmarks/Makefile.in
+++ b/tests/benchmarks/Makefile.in
@@ -26,6 +26,7 @@ TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_XML = @EXTRALIBS_XML@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -43,9 +44,11 @@ BENCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(CXXFLAGS)
 BENCH_OBJECTS =  \
        bench_bench.o \
+       bench_datetime.o \
        bench_htmlpars.o \
        bench_htmltag.o \
        bench_ipcclient.o \
+       bench_log.o \
        bench_mbconv.o \
        bench_strings.o \
        bench_tls.o \
@@ -62,7 +65,8 @@ BENCH_OBJECTS =  \
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
-@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+@COND_MONOLITHIC_1@    $(EXTRALIBS_XML) $(EXTRALIBS_GUI)
 @COND_PLATFORM_MAC_0@__bench___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__bench___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL bench$(EXEEXT)
@@ -81,6 +85,10 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
 @COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
@@ -108,7 +116,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 bench$(EXEEXT): $(BENCH_OBJECTS)
-       $(CXX) -o $@ $(BENCH_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(BENCH_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
        
        $(__bench___mac_setfilecmd)
 
@@ -127,6 +135,9 @@ data:
 bench_bench.o: $(srcdir)/bench.cpp
        $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/bench.cpp
 
+bench_datetime.o: $(srcdir)/datetime.cpp
+       $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/datetime.cpp
+
 bench_htmlpars.o: $(srcdir)/htmlparser/htmlpars.cpp
        $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/htmlparser/htmlpars.cpp
 
@@ -136,6 +147,9 @@ bench_htmltag.o: $(srcdir)/htmlparser/htmltag.cpp
 bench_ipcclient.o: $(srcdir)/ipcclient.cpp
        $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/ipcclient.cpp
 
+bench_log.o: $(srcdir)/log.cpp
+       $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/log.cpp
+
 bench_mbconv.o: $(srcdir)/mbconv.cpp
        $(CXXC) -c -o $@ $(BENCH_CXXFLAGS) $(srcdir)/mbconv.cpp