fixes potential crash under gatekeeper

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

diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat
index 8fef04aa727ebe11b052debf04a3f0beea12ba2f..ecadc668a3eefaf99fb340b3cceb5eeb359d3b67 100644 (file)
--- a/tests/benchmarks/makefile.wat
+++ b/tests/benchmarks/makefile.wat
@@ -31,12 +31,27 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r

+WIN32_TOOLKIT_LOWERCASE =
+!ifeq TOOLKIT GTK
+WIN32_TOOLKIT_LOWERCASE = gtk
+!endif
+!ifeq TOOLKIT MSW
+WIN32_TOOLKIT_LOWERCASE = msw
+!endif

 PORTNAME =\r
 !ifeq USE_GUI 0\r
 PORTNAME = base\r
 !endif\r
 !ifeq USE_GUI 1\r
 PORTNAME =\r
 !ifeq USE_GUI 0\r
 PORTNAME = base\r
 !endif\r
 !ifeq USE_GUI 1\r

-PORTNAME = msw\r
+PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+!endif
+WXBASEPORT =
+!ifeq TOOLKIT MAC
+WXBASEPORT = _carbon
+!endif
+COMPILER_VERSION =
+!ifeq OFFICIAL_BUILD 1
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD

 !endif\r
 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r
 !endif\r
 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r


@@ -179,12 +194,12 @@ __DLLFLAG_p = -dWXUSINGDLL
 __WXLIB_NET_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_NET_p = &\r
 __WXLIB_NET_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_NET_p = &\r

-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib

 !endif\r
 __WXLIB_BASE_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_BASE_p = &\r
 !endif\r
 __WXLIB_BASE_p =\r
 !ifeq MONOLITHIC 0\r
 __WXLIB_BASE_p = &\r

-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif\r
 __WXLIB_MONO_p =\r
 !ifeq MONOLITHIC 1\r
 !endif\r
 __WXLIB_MONO_p =\r
 !ifeq MONOLITHIC 1\r


@@ -213,23 +228,25 @@ ____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = wat\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_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 BENCH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r

-       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
-       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &\r
-       -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx -wcd=549 -wcd=656 &\r
-       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__RUNTIME_LIBS_6) -d__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) &
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &
+       -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -wx &
+       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 &
+       $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)

 BENCH_OBJECTS =  &\r
        $(OBJS)\bench_bench.obj &\r
        $(OBJS)\bench_datetime.obj &\r
        $(OBJS)\bench_htmlpars.obj &\r
        $(OBJS)\bench_htmltag.obj &\r
        $(OBJS)\bench_ipcclient.obj &\r
 BENCH_OBJECTS =  &\r
        $(OBJS)\bench_bench.obj &\r
        $(OBJS)\bench_datetime.obj &\r
        $(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
        $(OBJS)\bench_mbconv.obj &\r
        $(OBJS)\bench_strings.obj &\r
        $(OBJS)\bench_tls.obj &\r


@@ -283,6 +300,9 @@ $(OBJS)\bench_htmltag.obj :  .AUTODEPEND .\htmlparser\htmltag.cpp
 $(OBJS)\bench_ipcclient.obj :  .AUTODEPEND .\ipcclient.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r
 $(OBJS)\bench_ipcclient.obj :  .AUTODEPEND .\ipcclient.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r

+$(OBJS)\bench_log.obj :  .AUTODEPEND .\log.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
+\r

 $(OBJS)\bench_mbconv.obj :  .AUTODEPEND .\mbconv.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r
 $(OBJS)\bench_mbconv.obj :  .AUTODEPEND .\mbconv.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r