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 6dab7dababb4beef5f68bb98a77974cca8f08397..b4d1d502616122b8f07a60eb1637ad0502ffba19 100644 (file)
--- a/tests/benchmarks/makefile.bcc
+++ b/tests/benchmarks/makefile.bcc
@@ -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
@@ -41,6 +42,7 @@ BENCH_OBJECTS =  \
        $(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
@@ -54,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
@@ -76,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
@@ -225,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