X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec..32753ae949d861ddaf7c66f4c483bc57493c6c6c:/tests/benchmarks/makefile.wat?ds=sidebyside diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat index 61ba44e23f..50445390e1 100644 --- a/tests/benchmarks/makefile.wat +++ b/tests/benchmarks/makefile.wat @@ -38,6 +38,10 @@ PORTNAME = base !ifeq USE_GUI 1 PORTNAME = msw !endif +COMPILER_VERSION = +!ifeq OFFICIAL_BUILD 1 +COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD +!endif WXDEBUGFLAG = !ifeq BUILD debug WXDEBUGFLAG = d @@ -66,7 +70,7 @@ EXTRALIBS_FOR_BASE = EXTRALIBS_FOR_BASE = !endif !ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif __DEBUGINFO_0 = !ifeq BUILD debug @@ -213,8 +217,9 @@ ____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib WX_RELEASE_NODOT = 29 COMPILER_PREFIX = wat 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_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & @@ -230,6 +235,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 & @@ -283,6 +289,9 @@ $(OBJS)\bench_htmltag.obj : .AUTODEPEND .\htmlparser\htmltag.cpp $(OBJS)\bench_ipcclient.obj : .AUTODEPEND .\ipcclient.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< +$(OBJS)\bench_log.obj : .AUTODEPEND .\log.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< + $(OBJS)\bench_mbconv.obj : .AUTODEPEND .\mbconv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<