Disable some wxWebView tests that fail on the buildbot but not locally.

[wxWidgets.git] / samples / opengl / isosurf / makefile.wat

diff --git a/samples/opengl/isosurf/makefile.wat b/samples/opengl/isosurf/makefile.wat
index b3cb0a38d92f189185a595fac1188cce4b4166fd..36857227de0f5910e7df2707bff1f8ec2b03dde7 100644 (file)
--- a/samples/opengl/isosurf/makefile.wat
+++ b/samples/opengl/isosurf/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


@@ -168,10 +168,6 @@ __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
-!endif\r

 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r
 __CAIRO_LIB_p = cairo.lib\r
 __CAIRO_LIB_p =\r
 !ifeq USE_CAIRO 1\r
 __CAIRO_LIB_p = cairo.lib\r


@@ -188,6 +184,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


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


@@ -231,8 +227,8 @@ SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 ISOSURF_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
 ISOSURF_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) -wx -wcd=549 &\r
        -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH &\r
        $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
        -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 &\r
        -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH &\r
        $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r


@@ -264,7 +260,7 @@ $(OBJS)\isosurf.exe :  $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res
        @%append $(OBJS)\isosurf.lbc option caseexact\r
        @%append $(OBJS)\isosurf.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(ISOSURF_OBJECTS)) do @%append $(OBJS)\isosurf.lbc file %i\r
        @%append $(OBJS)\isosurf.lbc option caseexact\r
        @%append $(OBJS)\isosurf.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(ISOSURF_OBJECTS)) do @%append $(OBJS)\isosurf.lbc file %i\r

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__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) $(__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)\isosurf.lbc library %i\r
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__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)\isosurf.lbc library %i\r

        @%append $(OBJS)\isosurf.lbc option resource=$(OBJS)\isosurf_sample.res\r
        @for %i in () do @%append $(OBJS)\isosurf.lbc option stack=%i\r
        wlink @$(OBJS)\isosurf.lbc\r
        @%append $(OBJS)\isosurf.lbc option resource=$(OBJS)\isosurf_sample.res\r
        @for %i in () do @%append $(OBJS)\isosurf.lbc option stack=%i\r
        wlink @$(OBJS)\isosurf.lbc\r


@@ -275,7 +271,7 @@ data : .SYMBOLIC
        for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
 $(OBJS)\isosurf_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc\r
        for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
 $(OBJS)\isosurf_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 $(____CAIRO_INCLUDEDIR_FILENAMES) -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)\isosurf_isosurf.obj :  .AUTODEPEND .\isosurf.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ISOSURF_CXXFLAGS) $<\r
 \r
 $(OBJS)\isosurf_isosurf.obj :  .AUTODEPEND .\isosurf.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ISOSURF_CXXFLAGS) $<\r