Revert "Split documentation of non-GUI wxEvent-related classes."

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

diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc
index ec149b15488106c93593adb7aaf8359cac95f679..96957c480f130cb3d1d8f84f6b88f2f9652d85aa 100644 (file)
--- a/tests/benchmarks/makefile.gcc
+++ b/tests/benchmarks/makefile.gcc
@@ -16,8 +16,9 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = gcc\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 = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
@@ -34,6 +35,7 @@ BENCH_OBJECTS =  \
        $(OBJS)\bench_htmlpars.o \\r
        $(OBJS)\bench_htmltag.o \\r
        $(OBJS)\bench_ipcclient.o \\r
+       $(OBJS)\bench_log.o \\r
        $(OBJS)\bench_mbconv.o \\r
        $(OBJS)\bench_strings.o \\r
        $(OBJS)\bench_tls.o \\r
@@ -50,6 +52,9 @@ endif
 ifeq ($(USE_GUI),1)\r
 PORTNAME = msw\r
 endif\r
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
 ifeq ($(BUILD),debug)\r
 WXDEBUGFLAG = d\r
 endif\r
@@ -211,6 +216,9 @@ $(OBJS)\bench_htmltag.o: ./htmlparser/htmltag.cpp
 $(OBJS)\bench_ipcclient.o: ./ipcclient.cpp\r
        $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\bench_log.o: ./log.cpp\r
+       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\bench_mbconv.o: ./mbconv.cpp\r
        $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
 \r