X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c7447463444c6a6bd910d2706f27c4cd1e4ec1..76e36b9452b483cf2ec99386ac1e7046ff47b06f:/tests/benchmarks/makefile.gcc diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc index 71e83e157c..96957c480f 100644 --- a/tests/benchmarks/makefile.gcc +++ b/tests/benchmarks/makefile.gcc @@ -16,8 +16,9 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 29 COMPILER_PREFIX = gcc OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) + $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) BENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ @@ -30,9 +31,11 @@ BENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ $(CXXFLAGS) BENCH_OBJECTS = \ $(OBJS)\bench_bench.o \ + $(OBJS)\bench_datetime.o \ $(OBJS)\bench_htmlpars.o \ $(OBJS)\bench_htmltag.o \ $(OBJS)\bench_ipcclient.o \ + $(OBJS)\bench_log.o \ $(OBJS)\bench_mbconv.o \ $(OBJS)\bench_strings.o \ $(OBJS)\bench_tls.o \ @@ -49,6 +52,9 @@ endif ifeq ($(USE_GUI),1) PORTNAME = msw endif +ifeq ($(OFFICIAL_BUILD),1) +COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD +endif ifeq ($(BUILD),debug) WXDEBUGFLAG = d endif @@ -71,7 +77,7 @@ ifeq ($(MONOLITHIC),0) EXTRALIBS_FOR_BASE = endif ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG_2 = -O0 @@ -198,6 +204,9 @@ data: $(OBJS)\bench_bench.o: ./bench.cpp $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\bench_datetime.o: ./datetime.cpp + $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\bench_htmlpars.o: ./htmlparser/htmlpars.cpp $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $< @@ -207,6 +216,9 @@ $(OBJS)\bench_htmltag.o: ./htmlparser/htmltag.cpp $(OBJS)\bench_ipcclient.o: ./ipcclient.cpp $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\bench_log.o: ./log.cpp + $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\bench_mbconv.o: ./mbconv.cpp $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<