Convert wxFSW_EVENT_{WARNING,ERROR} to string correctly.

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

diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc
index c670e76da41e9d1caa8e7a6bb7a0a6a8f107fa96..b4d1d502616122b8f07a60eb1637ad0502ffba19 100644 (file)
--- a/tests/benchmarks/makefile.bcc
+++ b/tests/benchmarks/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================\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
@@ -24,8 +24,9 @@ BCCDIR = $(MAKEDIR)\..
 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
@@ -37,9 +38,11 @@ BENCH_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(CPPFLAGS) $(CXXFLAGS)\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_log.obj \\r
        $(OBJS)\bench_mbconv.obj \\r
        $(OBJS)\bench_strings.obj \\r
        $(OBJS)\bench_tls.obj \\r
@@ -53,6 +56,9 @@ PORTNAME = base
 !if "$(USE_GUI)" == "1"\r
 PORTNAME = msw\r
 !endif\r
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
 !if "$(BUILD)" == "debug"\r
 WXDEBUGFLAG = d\r
 !endif\r
@@ -75,7 +81,7 @@ LIBTYPE_SUFFIX = dll
 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
@@ -152,6 +158,12 @@ __WXLIB_BASE_p = \
 __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
@@ -196,7 +208,7 @@ clean:
 \r
 $(OBJS)\bench.exe: $(BENCH_OBJECTS)\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) 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
+       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
@@ -206,6 +218,9 @@ data:
 $(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
@@ -215,6 +230,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_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