X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec..32753ae949d861ddaf7c66f4c483bc57493c6c6c:/tests/benchmarks/makefile.bcc diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc index 6dab7dabab..b4d1d50261 100644 --- a/tests/benchmarks/makefile.bcc +++ b/tests/benchmarks/makefile.bcc @@ -24,8 +24,9 @@ BCCDIR = $(MAKEDIR)\.. WX_RELEASE_NODOT = 29 COMPILER_PREFIX = bcc 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 = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ @@ -41,6 +42,7 @@ BENCH_OBJECTS = \ $(OBJS)\bench_htmlpars.obj \ $(OBJS)\bench_htmltag.obj \ $(OBJS)\bench_ipcclient.obj \ + $(OBJS)\bench_log.obj \ $(OBJS)\bench_mbconv.obj \ $(OBJS)\bench_strings.obj \ $(OBJS)\bench_tls.obj \ @@ -54,6 +56,9 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif +!if "$(OFFICIAL_BUILD)" == "1" +COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD +!endif !if "$(BUILD)" == "debug" WXDEBUGFLAG = d !endif @@ -76,7 +81,7 @@ LIBTYPE_SUFFIX = dll EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_2 = -Od @@ -225,6 +230,9 @@ $(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp $(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp +$(OBJS)\bench_log.obj: .\log.cpp + $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\log.cpp + $(OBJS)\bench_mbconv.obj: .\mbconv.cpp $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\mbconv.cpp