Remove USE_GDIPLUS setting from bakefiles.

[wxWidgets.git] / samples / html / about / makefile.wat

diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat
index 147234ec9c06f2d34a515e1d3644e38f52e8418d..b56a67e2b183d6eff574ba0dd9e77e3bb3ac1aca 100644 (file)
--- a/samples/html/about/makefile.wat
+++ b/samples/html/about/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


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

 __WXUNIV_DEFINE_p =\r
 !ifeq WXUNIV 1\r
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r
 __WXUNIV_DEFINE_p =\r
 !ifeq WXUNIV 1\r
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__\r


@@ -181,6 +189,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


@@ -204,6 +216,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 =\r
+!ifeq USE_CAIRO 1\r
+____CAIRO_INCLUDEDIR_FILENAMES = -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


@@ -220,11 +236,11 @@ SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 ABOUT_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
 ABOUT_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=. &\r
-       $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) &\r
-       $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) &\r
+       -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx &\r
+       -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples &\r
+       -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)\r

 ABOUT_OBJECTS =  &\r
        $(OBJS)\about_about.obj\r
 \r
 ABOUT_OBJECTS =  &\r
        $(OBJS)\about_about.obj\r
 \r


@@ -250,9 +266,9 @@ $(OBJS)\about.exe :  $(ABOUT_OBJECTS) $(OBJS)\about_about.res
        @%append $(OBJS)\about.lbc option quiet\r
        @%append $(OBJS)\about.lbc name $^@\r
        @%append $(OBJS)\about.lbc option caseexact\r
        @%append $(OBJS)\about.lbc option quiet\r
        @%append $(OBJS)\about.lbc name $^@\r
        @%append $(OBJS)\about.lbc option caseexact\r

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

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

-       @for %i in ( $(__WXLIB_HTML_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)\about.lbc library %i\r
+       @for %i in ( $(__WXLIB_HTML_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) $(__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)\about.lbc library %i\r

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


@@ -265,5 +281,5 @@ $(OBJS)\about_about.obj :  .AUTODEPEND .\about.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ABOUT_CXXFLAGS) $<\r
 \r
 $(OBJS)\about_about.res :  .AUTODEPEND .\about.rc\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ABOUT_CXXFLAGS) $<\r
 \r
 $(OBJS)\about_about.res :  .AUTODEPEND .\about.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $<\r

 \r
 \r