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

[wxWidgets.git] / utils / execmon / makefile.wat

diff --git a/utils/execmon/makefile.wat b/utils/execmon/makefile.wat
index 90852b7f7c4eec7946054cdb02c2e5c94b8e6fcd..d37f0003decdc12a2cef044d4da458ad9ab5bbb2 100644 (file)
--- a/utils/execmon/makefile.wat
+++ b/utils/execmon/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\r
 #     This makefile was generated by\r

-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
+#     Bakefile 0.2.8 (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


@@ -172,6 +172,10 @@ __GFXCTX_DEFINE_p =
 !ifeq USE_GDIPLUS 1\r
 __GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1\r
 !endif\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
+!endif\r

 __DLLFLAG_p =\r
 !ifeq SHARED 1\r
 __DLLFLAG_p = -dWXUSINGDLL\r
 __DLLFLAG_p =\r
 !ifeq SHARED 1\r
 __DLLFLAG_p = -dWXUSINGDLL\r


@@ -190,6 +194,14 @@ __GDIPLUS_LIB_p =
 !ifeq USE_GDIPLUS 1\r
 __GDIPLUS_LIB_p = gdiplus.lib\r
 !endif\r
 !ifeq USE_GDIPLUS 1\r
 __GDIPLUS_LIB_p = gdiplus.lib\r
 !endif\r

+__CAIRO_LIB_p =\r
+!ifeq USE_CAIRO 1\r
+__CAIRO_LIB_p = cairo.lib\r
+!endif\r
+____CAIRO_LIBDIR_FILENAMES_p =\r
+!ifeq USE_CAIRO 1\r
+____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib\r
+!endif\r

 \r
 ### Variables: ###\r
 \r
 \r
 ### Variables: ###\r
 \r


@@ -204,8 +216,9 @@ EXECMON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
        $(__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
        $(__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

-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\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

 EXECMON_OBJECTS =  &\r
        $(OBJS)\execmon_execmon.obj\r
 \r
 EXECMON_OBJECTS =  &\r
        $(OBJS)\execmon_execmon.obj\r
 \r


@@ -232,9 +245,9 @@ $(OBJS)\execmon.exe :  $(EXECMON_OBJECTS)
        @%append $(OBJS)\execmon.lbc option quiet\r
        @%append $(OBJS)\execmon.lbc name $^@\r
        @%append $(OBJS)\execmon.lbc option caseexact\r
        @%append $(OBJS)\execmon.lbc option quiet\r
        @%append $(OBJS)\execmon.lbc name $^@\r
        @%append $(OBJS)\execmon.lbc option caseexact\r

-       @%append $(OBJS)\execmon.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS)\r
+       @%append $(OBJS)\execmon.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r

        @for %i in ($(EXECMON_OBJECTS)) do @%append $(OBJS)\execmon.lbc file %i\r
        @for %i in ($(EXECMON_OBJECTS)) do @%append $(OBJS)\execmon.lbc file %i\r

-       @for %i in ( $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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)\execmon.lbc library %i\r
+       @for %i in ( $(__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)\execmon.lbc library %i\r

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