Don't use a destroy event handler to disconnect the native control's delegate as...

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

diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc
index 1f5022bd4b2b6cce5e7918ccb6a150f20e33dc57..be28a5d22ca4d11e096b217b97e8a7c242877380 100644 (file)
--- a/tests/benchmarks/makefile.gcc
+++ b/tests/benchmarks/makefile.gcc
@@ -24,9 +24,10 @@ BENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
        $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \\r
-       $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__GFXCTX_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
 BENCH_OBJECTS =  \\r
        $(OBJS)\bench_bench.o \\r
        $(OBJS)\bench_htmlpars.o \\r
@@ -117,6 +118,9 @@ endif
 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
 ifeq ($(SHARED),1)\r
 __DLLFLAG_p = -DWXUSINGDLL\r
 endif\r
@@ -138,6 +142,12 @@ endif
 ifeq ($(USE_GDIPLUS),1)\r
 __GDIPLUS_LIB_p = -lgdiplus\r
 endif\r
+ifeq ($(USE_CAIRO),1)\r
+__CAIRO_LIB_p = -lcairo\r
+endif\r
+ifeq ($(USE_CAIRO),1)\r
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib\r
+endif\r
 ifeq ($(BUILD),debug)\r
 ifeq ($(DEBUG_INFO),default)\r
 __DEBUGINFO = -g\r
@@ -176,7 +186,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)  $(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) -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) -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
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r