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

[wxWidgets.git] / tests / benchmarks / makefile.bcc

diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc
index fe720b4d816ab4ca6704c2dc36dd563a9a428e25..3f056b06ac43ec6c6d1ee955b27c3c3fa64fac98 100644 (file)
--- a/tests/benchmarks/makefile.bcc
+++ b/tests/benchmarks/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\r
 #     This makefile was generated by\r

-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r

 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r


@@ -24,21 +24,25 @@ BCCDIR = $(MAKEDIR)\..
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = bcc\r
 OBJS = \\r
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = bcc\r
 OBJS = \\r

-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 BENCH_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 BENCH_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r

-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \\r
-       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
+       $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r

 BENCH_OBJECTS =  \\r
        $(OBJS)\bench_bench.obj \\r
 BENCH_OBJECTS =  \\r
        $(OBJS)\bench_bench.obj \\r

+       $(OBJS)\bench_datetime.obj \\r

        $(OBJS)\bench_htmlpars.obj \\r
        $(OBJS)\bench_htmltag.obj \\r
        $(OBJS)\bench_ipcclient.obj \\r
        $(OBJS)\bench_htmlpars.obj \\r
        $(OBJS)\bench_htmltag.obj \\r
        $(OBJS)\bench_ipcclient.obj \\r

+       $(OBJS)\bench_log.obj \\r

        $(OBJS)\bench_mbconv.obj \\r
        $(OBJS)\bench_strings.obj \\r
        $(OBJS)\bench_tls.obj \\r
        $(OBJS)\bench_mbconv.obj \\r
        $(OBJS)\bench_strings.obj \\r
        $(OBJS)\bench_tls.obj \\r


@@ -46,11 +50,23 @@ BENCH_OBJECTS =  \
 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r

+!if "$(TOOLKIT)" == "GTK"
+WIN32_TOOLKIT_LOWERCASE = gtk
+!endif
+!if "$(TOOLKIT)" == "MSW"
+WIN32_TOOLKIT_LOWERCASE = msw
+!endif

 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

-PORTNAME = msw\r
+PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+!endif
+!if "$(TOOLKIT)" == "MAC"
+WXBASEPORT = _carbon
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD

 !endif\r
 !if "$(BUILD)" == "debug"\r
 WXDEBUGFLAG = d\r
 !endif\r
 !if "$(BUILD)" == "debug"\r
 WXDEBUGFLAG = d\r


@@ -74,7 +90,7 @@ LIBTYPE_SUFFIX = dll
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r

-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r

 !endif\r
 !if "$(BUILD)" == "debug"\r
 __OPTIMIZEFLAG_2 = -Od\r
 !endif\r
 !if "$(BUILD)" == "debug"\r
 __OPTIMIZEFLAG_2 = -Od\r


@@ -112,6 +128,9 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !if "$(DEBUG_FLAG)" == "0"\r
 __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
 !endif\r
 !if "$(DEBUG_FLAG)" == "0"\r
 __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
 !endif\r

+!if "$(BUILD)" == "release"\r
+__NDEBUG_DEFINE_p = -DNDEBUG\r
+!endif\r

 !if "$(USE_EXCEPTIONS)" == "0"\r
 __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
 !endif\r
 !if "$(USE_EXCEPTIONS)" == "0"\r
 __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
 !endif\r


@@ -130,29 +149,38 @@ __UNICODE_DEFINE_p = -D_UNICODE
 !if "$(MSLU)" == "1"\r
 __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
 !endif\r
 !if "$(MSLU)" == "1"\r
 __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
 !endif\r

-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo\r

 !endif\r
 !if "$(SHARED)" == "1"\r
 __DLLFLAG_p = -DWXUSINGDLL\r
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r
 __WXLIB_NET_p = \\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 __DLLFLAG_p = -DWXUSINGDLL\r
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r
 __WXLIB_NET_p = \\r

-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib

 !endif\r
 !if "$(MONOLITHIC)" == "0"\r
 __WXLIB_BASE_p = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r
 __WXLIB_BASE_p = \\r

-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r

+!if "$(MONOLITHIC)" == "1"\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r

 !if "$(MSLU)" == "1"\r
 __UNICOWS_LIB_p = unicows.lib\r
 !endif\r
 !if "$(MSLU)" == "1"\r
 __UNICOWS_LIB_p = unicows.lib\r
 !endif\r

-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
+!if "$(USE_CAIRO)" == "1"\r
+__CAIRO_LIB_p = cairo.lib\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib\r

 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 __DEBUGINFO = -v\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 __DEBUGINFO = -v\r


@@ -188,8 +216,8 @@ clean:
        -if exist $(OBJS)\bench.ils del $(OBJS)\bench.ils\r
 \r
 $(OBJS)\bench.exe: $(BENCH_OBJECTS)\r
        -if exist $(OBJS)\bench.ils del $(OBJS)\bench.ils\r
 \r
 $(OBJS)\bench.exe: $(BENCH_OBJECTS)\r

-       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(LDFLAGS) @&&|\r
-       c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,\r
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r
+       c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_NET_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_5)$(__RUNTIME_LIBS_8).lib,,\r

 |\r
 \r
 data: \r
 |\r
 \r
 data: \r


@@ -199,6 +227,9 @@ data:
 $(OBJS)\bench_bench.obj: .\bench.cpp\r
        $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\bench.cpp\r
 \r
 $(OBJS)\bench_bench.obj: .\bench.cpp\r
        $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\bench.cpp\r
 \r

+$(OBJS)\bench_datetime.obj: .\datetime.cpp\r
+       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\datetime.cpp\r
+\r

 $(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp\r
        $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp\r
 \r
 $(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp\r
        $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp\r
 \r


@@ -208,6 +239,9 @@ $(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp
 $(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp\r
        $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp\r
 \r
 $(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp\r
        $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp\r
 \r

+$(OBJS)\bench_log.obj: .\log.cpp\r
+       $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\log.cpp\r
+\r

 $(OBJS)\bench_mbconv.obj: .\mbconv.cpp\r
        $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\mbconv.cpp\r
 \r
 $(OBJS)\bench_mbconv.obj: .\mbconv.cpp\r
        $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\mbconv.cpp\r
 \r