fixes potential crash under gatekeeper

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

diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc
index 6df6965f22735b090de9e4040869e01752e455f1..8877100e384e38525542ee8e0e9ab1dcbf2d27b0 100644 (file)
--- a/tests/benchmarks/makefile.gcc
+++ b/tests/benchmarks/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r
@@ -16,23 +16,26 @@ 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
-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
-       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
+       $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
        $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \\r
-       $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \\r
-       $(CXXFLAGS)\r
+       $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \
+       $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS)
 BENCH_OBJECTS =  \\r
        $(OBJS)\bench_bench.o \\r
+       $(OBJS)\bench_datetime.o \\r
        $(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
@@ -40,6 +43,12 @@ BENCH_OBJECTS =  \
 \r
 ### Conditionally set variables: ###\r
 \r
+ifeq ($(TOOLKIT),GTK)
+WIN32_TOOLKIT_LOWERCASE = gtk
+endif
+ifeq ($(TOOLKIT),MSW)
+WIN32_TOOLKIT_LOWERCASE = msw
+endif
 ifeq ($(GCC_VERSION),2.95)\r
 GCCFLAGS = -fvtable-thunks\r
 endif\r
@@ -47,7 +56,13 @@ ifeq ($(USE_GUI),0)
 PORTNAME = base\r
 endif\r
 ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
+PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+endif
+ifeq ($(TOOLKIT),MAC)
+WXBASEPORT = _carbon
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
 endif\r
 ifeq ($(BUILD),debug)\r
 WXDEBUGFLAG = d\r
@@ -71,8 +86,11 @@ ifeq ($(MONOLITHIC),0)
 EXTRALIBS_FOR_BASE = \r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
 endif\r
+ifeq ($(TOOLKIT),GTK)
+CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
+endif
 ifeq ($(BUILD),debug)\r
 __OPTIMIZEFLAG_2 = -O0\r
 endif\r
@@ -118,9 +136,6 @@ endif
 ifeq ($(MSLU),1)\r
 __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
 endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-endif\r
 ifeq ($(USE_CAIRO),1)\r
 ____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo\r
 endif\r
@@ -129,22 +144,25 @@ __DLLFLAG_p = -DWXUSINGDLL
 endif\r
 ifeq ($(MONOLITHIC),0)\r
 __WXLIB_NET_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net\r
+       -lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net
 endif\r
 ifeq ($(MONOLITHIC),0)\r
 __WXLIB_BASE_p = \\r
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
+       -lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 endif\r
 ifeq ($(MONOLITHIC),1)\r
 __WXLIB_MONO_p = \\r
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
 endif\r
+ifeq ($(MONOLITHIC),1)\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+endif\r
+ifeq ($(USE_GUI),1)\r
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
+endif\r
 ifeq ($(MSLU),1)\r
 __UNICOWS_LIB_p = -lunicows\r
 endif\r
-ifeq ($(USE_GDIPLUS),1)\r
-__GDIPLUS_LIB_p = -lgdiplus\r
-endif\r
 ifeq ($(USE_CAIRO),1)\r
 __CAIRO_LIB_p = -lcairo\r
 endif\r
@@ -189,7 +207,7 @@ clean:
        -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe\r
 \r
 $(OBJS)\bench.exe: $(BENCH_OBJECTS)\r
-       $(CXX) -o $@ $(BENCH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
+       $(CXX) -o $@ $(BENCH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
@@ -198,6 +216,9 @@ data:
 $(OBJS)\bench_bench.o: ./bench.cpp\r
        $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\bench_datetime.o: ./datetime.cpp\r
+       $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\bench_htmlpars.o: ./htmlparser/htmlpars.cpp\r
        $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -207,6 +228,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