Skip EVT_RIGHT_UP event in wxHtmlWindow if it wasn't handled.

[wxWidgets.git] / samples / mediaplayer / makefile.wat

diff --git a/samples/mediaplayer/makefile.wat b/samples/mediaplayer/makefile.wat
index 6f737fb85da2bf32abdf71f2626b9c573cc37d27..7e76c909839901f61197307190c20820239cfa5b 100644 (file)
--- a/samples/mediaplayer/makefile.wat
+++ b/samples/mediaplayer/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.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


@@ -66,7 +66,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


@@ -171,9 +171,13 @@ __LIB_PNG_p =
 !ifeq USE_GUI 1\r
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
 !endif\r
 !ifeq USE_GUI 1\r
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
 !endif\r

-__GDIPLUS_LIB_p =\r
-!ifeq USE_GDIPLUS 1\r
-__GDIPLUS_LIB_p = gdiplus.lib\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
 __WXUNIV_DEFINE_p =\r
 !ifeq WXUNIV 1\r
 !endif\r
 __WXUNIV_DEFINE_p =\r
 !ifeq WXUNIV 1\r


@@ -183,6 +187,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


@@ -202,9 +210,9 @@ __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
+____CAIRO_INCLUDEDIR_FILENAMES =\r
+!ifeq USE_CAIRO 1\r
+____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo\r

 !endif\r
 __DLLFLAG_p =\r
 !ifeq SHARED 1\r
 !endif\r
 __DLLFLAG_p =\r
 !ifeq SHARED 1\r


@@ -222,11 +230,11 @@ SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 MEDIAPLAYER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &\r
        $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 MEDIAPLAYER_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
-       -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &\r
-       -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &\r
-       $(CXXFLAGS)\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) -wx -wcd=549 -wcd=656 &\r
+       -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &\r
+       $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r

 MEDIAPLAYER_OBJECTS =  &\r
        $(OBJS)\mediaplayer_mediaplayer.obj\r
 \r
 MEDIAPLAYER_OBJECTS =  &\r
        $(OBJS)\mediaplayer_mediaplayer.obj\r
 \r


@@ -252,15 +260,15 @@ $(OBJS)\mediaplayer.exe :  $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res
        @%append $(OBJS)\mediaplayer.lbc option quiet\r
        @%append $(OBJS)\mediaplayer.lbc name $^@\r
        @%append $(OBJS)\mediaplayer.lbc option caseexact\r
        @%append $(OBJS)\mediaplayer.lbc option quiet\r
        @%append $(OBJS)\mediaplayer.lbc name $^@\r
        @%append $(OBJS)\mediaplayer.lbc option caseexact\r

-       @%append $(OBJS)\mediaplayer.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)\r
+       @%append $(OBJS)\mediaplayer.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r

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

-       @for %i in ( $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_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)\mediaplayer.lbc library %i\r
+       @for %i in ( $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_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)\mediaplayer.lbc library %i\r

        @%append $(OBJS)\mediaplayer.lbc option resource=$(OBJS)\mediaplayer_sample.res\r
        @for %i in () do @%append $(OBJS)\mediaplayer.lbc option stack=%i\r
        wlink @$(OBJS)\mediaplayer.lbc\r
 \r
 $(OBJS)\mediaplayer_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r
        @%append $(OBJS)\mediaplayer.lbc option resource=$(OBJS)\mediaplayer_sample.res\r
        @for %i in () do @%append $(OBJS)\mediaplayer.lbc option stack=%i\r
        wlink @$(OBJS)\mediaplayer.lbc\r
 \r
 $(OBJS)\mediaplayer_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc\r

-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__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) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r

 \r
 $(OBJS)\mediaplayer_mediaplayer.obj :  .AUTODEPEND .\mediaplayer.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MEDIAPLAYER_CXXFLAGS) $<\r
 \r
 $(OBJS)\mediaplayer_mediaplayer.obj :  .AUTODEPEND .\mediaplayer.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MEDIAPLAYER_CXXFLAGS) $<\r