Fix bug in Unix wxFileSystemWatcher implementation when watch is deleted.

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

diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat
index 8da0e5fffff1405464b7c79915d0b63845f00a57..50445390e169767767389034b214191041bba564 100644 (file)
--- a/tests/benchmarks/makefile.wat
+++ b/tests/benchmarks/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\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
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r


@@ -38,6 +38,10 @@ PORTNAME = base
 !ifeq USE_GUI 1\r
 PORTNAME = msw\r
 !endif\r
 !ifeq USE_GUI 1\r
 PORTNAME = msw\r
 !endif\r

+COMPILER_VERSION =
+!ifeq OFFICIAL_BUILD 1
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif

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


@@ -66,7 +70,7 @@ EXTRALIBS_FOR_BASE =
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !ifeq MONOLITHIC 1\r

-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r

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


@@ -145,6 +149,10 @@ __DEBUG_DEFINE_p =
 !ifeq DEBUG_FLAG 0\r
 __DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
 !endif\r
 !ifeq DEBUG_FLAG 0\r
 __DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0\r
 !endif\r

+__NDEBUG_DEFINE_p =\r
+!ifeq BUILD release\r
+__NDEBUG_DEFINE_p = -dNDEBUG\r
+!endif\r

 __EXCEPTIONS_DEFINE_p =\r
 !ifeq USE_EXCEPTIONS 0\r
 __EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r
 __EXCEPTIONS_DEFINE_p =\r
 !ifeq USE_EXCEPTIONS 0\r
 __EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS\r


@@ -164,10 +172,6 @@ __UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
 !ifeq UNICODE 1\r
 __UNICODE_DEFINE_p = -d_UNICODE\r
 !endif\r
 !ifeq UNICODE 1\r
 __UNICODE_DEFINE_p = -d_UNICODE\r
 !endif\r

-__GFXCTX_DEFINE_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r

 ____CAIRO_INCLUDEDIR_FILENAMES_p =\r
 !ifeq USE_CAIRO 1\r
 ____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo\r
 ____CAIRO_INCLUDEDIR_FILENAMES_p =\r
 !ifeq USE_CAIRO 1\r
 ____CAIRO_INCLUDEDIR_FILENAMES_p = -i=$(CAIRO_ROOT)\include\cairo\r


@@ -191,9 +195,13 @@ __WXLIB_MONO_p =
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
 __WXLIB_MONO_p = &\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r

-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
+__LIB_PNG_IF_MONO_p =\r
+!ifeq MONOLITHIC 1\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+!endif\r
+__LIB_PNG_p =\r
+!ifeq USE_GUI 1\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r

 !endif\r
 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r
 !endif\r
 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r


@@ -209,22 +217,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
        $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\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

-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &\r
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &\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
 BENCH_OBJECTS =  &\r
        $(OBJS)\bench_bench.obj &\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
 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_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


@@ -254,7 +265,7 @@ $(OBJS)\bench.exe :  $(BENCH_OBJECTS)
        @%append $(OBJS)\bench.lbc option caseexact\r
        @%append $(OBJS)\bench.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(BENCH_OBJECTS)) do @%append $(OBJS)\bench.lbc file %i\r
        @%append $(OBJS)\bench.lbc option caseexact\r
        @%append $(OBJS)\bench.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(BENCH_OBJECTS)) do @%append $(OBJS)\bench.lbc file %i\r

-       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\bench.lbc library %i\r
+       @for %i in ( $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\bench.lbc library %i\r

        @%append $(OBJS)\bench.lbc\r
        @for %i in () do @%append $(OBJS)\bench.lbc option stack=%i\r
        wlink @$(OBJS)\bench.lbc\r
        @%append $(OBJS)\bench.lbc\r
        @for %i in () do @%append $(OBJS)\bench.lbc option stack=%i\r
        wlink @$(OBJS)\bench.lbc\r


@@ -266,6 +277,9 @@ data : .SYMBOLIC
 $(OBJS)\bench_bench.obj :  .AUTODEPEND .\bench.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r
 $(OBJS)\bench_bench.obj :  .AUTODEPEND .\bench.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $<\r
 \r

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

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


@@ -275,6 +289,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