diff --git a/Makefile.in b/Makefile.in index cb53fe1902..25d3327804 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.10 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -20,7 +20,6 @@ SO_SUFFIX_MODULE = @SO_SUFFIX_MODULE@ DLLIMP_SUFFIX = @DLLIMP_SUFFIX@ LN_S = @LN_S@ WINDRES = @WINDRES@ -REZ = @REZ@ PIC_FLAG = @PIC_FLAG@ SONAME_FLAG = @SONAME_FLAG@ STRIP = @STRIP@ @@ -52,11 +51,9 @@ LDFLAGS = @LDFLAGS@ VENDOR = @VENDOR@ WX_FLAVOUR = @WX_FLAVOUR@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ -DEREZ = @DEREZ@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_XML = @EXTRALIBS_XML@ @@ -13268,8 +13265,6 @@ COND_USE_WEBVIEW_WEBKIT2_1___webkit2_ext___depname = \ @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc @COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h -@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).1.r -@COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install @COND_SHARED_0@____SHARED = @COND_SHARED_1@____SHARED = $(PIC_FLAG) @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS = monodll_unix_apptraits.o @@ -13927,9 +13922,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ ### Targets: ### -all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname) $(__cocoa_res___depname) +all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname) -install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) +install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets @@ -14077,7 +14072,6 @@ clean: $(__clean_wxrc___depname) rm -f $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) rm -f $(DLLPREFIX_MODULE)webkit2_ext$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) -(cd samples && $(MAKE) clean) - rm -f lib/libwx_$(TOOLCHAIN_NAME).1.rsrc lib/libwx_$(TOOLCHAIN_NAME).1.r distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -14866,14 +14860,6 @@ locale_msw_uninstall: fi ; \ done -@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).1.r: -@COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).1.rsrc -@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).1.r - -@COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname) -@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.r $(libdir) -@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc $(libdir) - wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c $(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 1d3040530f..3a445f29d3 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -1,10 +1,10 @@ dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ### dnl dnl This macro was generated by -dnl Bakefile 0.2.9 (http://www.bakefile.org) +dnl Bakefile 0.2.11 (http://www.bakefile.org) dnl Do not modify, all changes will be overwritten! -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.11" dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../tests/test.bkl,wx.bkl] ### AC_BAKEFILE_PRECOMP_HEADERS @@ -422,13 +422,13 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[wx.bkl] ### COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) -dnl ### begin block 20_COND_PLATFORM_MAC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl] ### +dnl ### begin block 20_COND_PLATFORM_MAC_0[../../samples/controls/controls.bkl,../../samples/minimal-mariano/minimal.bkl] ### COND_PLATFORM_MAC_0="#" if test "x$PLATFORM_MAC" = "x0" ; then COND_PLATFORM_MAC_0="" fi AC_SUBST(COND_PLATFORM_MAC_0) -dnl ### begin block 20_COND_PLATFORM_MAC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl] ### +dnl ### begin block 20_COND_PLATFORM_MAC_1[../../samples/controls/controls.bkl,../../samples/minimal-mariano/minimal.bkl] ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then COND_PLATFORM_MAC_1="" diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4 index 68773b6c66..efa98ae0d0 100644 --- a/build/aclocal/bakefile.m4 +++ b/build/aclocal/bakefile.m4 @@ -598,16 +598,9 @@ AC_DEFUN([AC_BAKEFILE_RES_COMPILERS], dnl Check for win32 resources compiler: AC_CHECK_TOOL(WINDRES, windres) ;; - - *-*-darwin* | powerpc-apple-macos* ) - AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez) - AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile) - ;; esac AC_SUBST(WINDRES) - AC_SUBST(REZ) - AC_SUBST(SETFILE) ]) dnl --------------------------------------------------------------------------- @@ -752,7 +745,7 @@ AC_DEFUN([AC_BAKEFILE], AC_SUBST(OBJCXXFLAGS) - BAKEFILE_BAKEFILE_M4_VERSION="0.2.9" + BAKEFILE_BAKEFILE_M4_VERSION="0.2.11" dnl includes autoconf_inc.m4: $1 diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl index 69b3da61f9..174a3dbeab 100644 --- a/build/bakefiles/config.bkl +++ b/build/bakefiles/config.bkl @@ -397,7 +397,6 @@ to run the tests, include CppUnit library here. - diff --git a/build/msw/config.bcc b/build/msw/config.bcc index e28777ffc6..a3692fd67e 100644 --- a/build/msw/config.bcc +++ b/build/msw/config.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This configuration file was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Beware that all changes made to this file will be overwritten next # time you run Bakefile! # ========================================================================= diff --git a/build/msw/config.gcc b/build/msw/config.gcc index 96404cea6c..a04404e2d1 100644 --- a/build/msw/config.gcc +++ b/build/msw/config.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This configuration file was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Beware that all changes made to this file will be overwritten next # time you run Bakefile! # ========================================================================= diff --git a/build/msw/config.vc b/build/msw/config.vc index 0baf5c387d..d559d2fefc 100644 --- a/build/msw/config.vc +++ b/build/msw/config.vc @@ -1,6 +1,6 @@ # ========================================================================= # This configuration file was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Beware that all changes made to this file will be overwritten next # time you run Bakefile! # ========================================================================= diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 4893de4bc2..a9c7e0dba0 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index a600ff79d2..67978cce40 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 0e3e92bc5d..5f70539c5b 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj index dd991db016..d18aa6bf66 100644 --- a/build/msw/wx_vc7_adv.vcproj +++ b/build/msw/wx_vc7_adv.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_aui.vcproj b/build/msw/wx_vc7_aui.vcproj index a74b471e35..f2c6362d91 100644 --- a/build/msw/wx_vc7_aui.vcproj +++ b/build/msw/wx_vc7_aui.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj index 0be07702cf..74ad6540a3 100644 --- a/build/msw/wx_vc7_base.vcproj +++ b/build/msw/wx_vc7_base.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 40acebe351..ca89a9e57d 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_gl.vcproj b/build/msw/wx_vc7_gl.vcproj index 5cdb0d1d81..7dab844b25 100644 --- a/build/msw/wx_vc7_gl.vcproj +++ b/build/msw/wx_vc7_gl.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_html.vcproj b/build/msw/wx_vc7_html.vcproj index 918ae638fa..091874532c 100644 --- a/build/msw/wx_vc7_html.vcproj +++ b/build/msw/wx_vc7_html.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_media.vcproj b/build/msw/wx_vc7_media.vcproj index a146211e30..91991b70e6 100644 --- a/build/msw/wx_vc7_media.vcproj +++ b/build/msw/wx_vc7_media.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj index 7a4d7e21b9..347cae9379 100644 --- a/build/msw/wx_vc7_net.vcproj +++ b/build/msw/wx_vc7_net.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_propgrid.vcproj b/build/msw/wx_vc7_propgrid.vcproj index d81bb38dc7..e5a8babcc4 100644 --- a/build/msw/wx_vc7_propgrid.vcproj +++ b/build/msw/wx_vc7_propgrid.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_qa.vcproj b/build/msw/wx_vc7_qa.vcproj index f433836377..50a3636bfc 100644 --- a/build/msw/wx_vc7_qa.vcproj +++ b/build/msw/wx_vc7_qa.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_ribbon.vcproj b/build/msw/wx_vc7_ribbon.vcproj index 41b78095c4..2fc967c172 100644 --- a/build/msw/wx_vc7_ribbon.vcproj +++ b/build/msw/wx_vc7_ribbon.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_richtext.vcproj b/build/msw/wx_vc7_richtext.vcproj index af2ca2f962..d386cd9d5a 100644 --- a/build/msw/wx_vc7_richtext.vcproj +++ b/build/msw/wx_vc7_richtext.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_stc.vcproj b/build/msw/wx_vc7_stc.vcproj index 39859ecce6..5e70ccde01 100644 --- a/build/msw/wx_vc7_stc.vcproj +++ b/build/msw/wx_vc7_stc.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_webview.vcproj b/build/msw/wx_vc7_webview.vcproj index 46b2e2b7d1..f1e4a9b83b 100644 --- a/build/msw/wx_vc7_webview.vcproj +++ b/build/msw/wx_vc7_webview.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_wxexpat.vcproj b/build/msw/wx_vc7_wxexpat.vcproj index 6e6ab6ac64..c755da3ee1 100644 --- a/build/msw/wx_vc7_wxexpat.vcproj +++ b/build/msw/wx_vc7_wxexpat.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_wxjpeg.vcproj b/build/msw/wx_vc7_wxjpeg.vcproj index 6f615969c7..a47887ac7c 100644 --- a/build/msw/wx_vc7_wxjpeg.vcproj +++ b/build/msw/wx_vc7_wxjpeg.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_wxpng.vcproj b/build/msw/wx_vc7_wxpng.vcproj index 248027b55e..60b7e66256 100644 --- a/build/msw/wx_vc7_wxpng.vcproj +++ b/build/msw/wx_vc7_wxpng.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_wxregex.vcproj b/build/msw/wx_vc7_wxregex.vcproj index b9a186d266..1423401df9 100644 --- a/build/msw/wx_vc7_wxregex.vcproj +++ b/build/msw/wx_vc7_wxregex.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_wxscintilla.vcproj b/build/msw/wx_vc7_wxscintilla.vcproj index 529990a502..10c99993f1 100644 --- a/build/msw/wx_vc7_wxscintilla.vcproj +++ b/build/msw/wx_vc7_wxscintilla.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_wxtiff.vcproj b/build/msw/wx_vc7_wxtiff.vcproj index 15402165bd..24ff2fe8e7 100644 --- a/build/msw/wx_vc7_wxtiff.vcproj +++ b/build/msw/wx_vc7_wxtiff.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_wxzlib.vcproj b/build/msw/wx_vc7_wxzlib.vcproj index 6bd5e73dbf..e2d35d63b6 100644 --- a/build/msw/wx_vc7_wxzlib.vcproj +++ b/build/msw/wx_vc7_wxzlib.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_xml.vcproj b/build/msw/wx_vc7_xml.vcproj index 00a3149aac..ca6bd2fcb1 100644 --- a/build/msw/wx_vc7_xml.vcproj +++ b/build/msw/wx_vc7_xml.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj index 51479f4895..271d5db1d3 100644 --- a/build/msw/wx_vc7_xrc.vcproj +++ b/build/msw/wx_vc7_xrc.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj index cb88fe0edf..bc79aa7d7f 100644 --- a/build/msw/wx_vc8_adv.vcproj +++ b/build/msw/wx_vc8_adv.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_aui.vcproj b/build/msw/wx_vc8_aui.vcproj index f9cff31af8..fe71e75f07 100644 --- a/build/msw/wx_vc8_aui.vcproj +++ b/build/msw/wx_vc8_aui.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj index 614663f8a1..df9cd6e87a 100644 --- a/build/msw/wx_vc8_base.vcproj +++ b/build/msw/wx_vc8_base.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index d874619c11..acb1da0545 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_gl.vcproj b/build/msw/wx_vc8_gl.vcproj index 66e6345877..2f97a175f1 100644 --- a/build/msw/wx_vc8_gl.vcproj +++ b/build/msw/wx_vc8_gl.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj index bd4350ec4f..66f3b6e9b2 100644 --- a/build/msw/wx_vc8_html.vcproj +++ b/build/msw/wx_vc8_html.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_media.vcproj b/build/msw/wx_vc8_media.vcproj index 14ce33584e..b3e0953819 100644 --- a/build/msw/wx_vc8_media.vcproj +++ b/build/msw/wx_vc8_media.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj index 39b982c62b..a628f33858 100644 --- a/build/msw/wx_vc8_net.vcproj +++ b/build/msw/wx_vc8_net.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_propgrid.vcproj b/build/msw/wx_vc8_propgrid.vcproj index d9ac08d65e..5984c28a0f 100644 --- a/build/msw/wx_vc8_propgrid.vcproj +++ b/build/msw/wx_vc8_propgrid.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_qa.vcproj b/build/msw/wx_vc8_qa.vcproj index 1f19064973..3c4d78c235 100644 --- a/build/msw/wx_vc8_qa.vcproj +++ b/build/msw/wx_vc8_qa.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_ribbon.vcproj b/build/msw/wx_vc8_ribbon.vcproj index 9e7b07d18d..f444cfecfd 100644 --- a/build/msw/wx_vc8_ribbon.vcproj +++ b/build/msw/wx_vc8_ribbon.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj index f9c03cdfe8..e032e9a5f2 100644 --- a/build/msw/wx_vc8_richtext.vcproj +++ b/build/msw/wx_vc8_richtext.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj index a44e97c0b8..9a384d6d92 100644 --- a/build/msw/wx_vc8_stc.vcproj +++ b/build/msw/wx_vc8_stc.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_webview.vcproj b/build/msw/wx_vc8_webview.vcproj index e0900ede2e..b3554bcaf8 100644 --- a/build/msw/wx_vc8_webview.vcproj +++ b/build/msw/wx_vc8_webview.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_wxexpat.vcproj b/build/msw/wx_vc8_wxexpat.vcproj index 48f395201e..31442f0f4a 100644 --- a/build/msw/wx_vc8_wxexpat.vcproj +++ b/build/msw/wx_vc8_wxexpat.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_wxjpeg.vcproj b/build/msw/wx_vc8_wxjpeg.vcproj index ec1b08fd92..d497c5d77c 100644 --- a/build/msw/wx_vc8_wxjpeg.vcproj +++ b/build/msw/wx_vc8_wxjpeg.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_wxpng.vcproj b/build/msw/wx_vc8_wxpng.vcproj index a4b92e69be..cf71091aed 100644 --- a/build/msw/wx_vc8_wxpng.vcproj +++ b/build/msw/wx_vc8_wxpng.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_wxregex.vcproj b/build/msw/wx_vc8_wxregex.vcproj index 8e55df91d9..12166bd728 100644 --- a/build/msw/wx_vc8_wxregex.vcproj +++ b/build/msw/wx_vc8_wxregex.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_wxscintilla.vcproj b/build/msw/wx_vc8_wxscintilla.vcproj index eed2e3d69a..f61d6db04d 100644 --- a/build/msw/wx_vc8_wxscintilla.vcproj +++ b/build/msw/wx_vc8_wxscintilla.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_wxtiff.vcproj b/build/msw/wx_vc8_wxtiff.vcproj index e96839def3..a0dd040d57 100644 --- a/build/msw/wx_vc8_wxtiff.vcproj +++ b/build/msw/wx_vc8_wxtiff.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_wxzlib.vcproj b/build/msw/wx_vc8_wxzlib.vcproj index e72e9927f6..804116b8db 100644 --- a/build/msw/wx_vc8_wxzlib.vcproj +++ b/build/msw/wx_vc8_wxzlib.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_xml.vcproj b/build/msw/wx_vc8_xml.vcproj index a5f3e2b9ff..c170c65fdc 100644 --- a/build/msw/wx_vc8_xml.vcproj +++ b/build/msw/wx_vc8_xml.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj index 0c5387a41b..6fe310eae1 100644 --- a/build/msw/wx_vc8_xrc.vcproj +++ b/build/msw/wx_vc8_xrc.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj index 33b7aa2a53..b72576057c 100644 --- a/build/msw/wx_vc9_adv.vcproj +++ b/build/msw/wx_vc9_adv.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_aui.vcproj b/build/msw/wx_vc9_aui.vcproj index dd6e4dff14..2853e12ab9 100644 --- a/build/msw/wx_vc9_aui.vcproj +++ b/build/msw/wx_vc9_aui.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj index 7182c38856..febdb9e935 100644 --- a/build/msw/wx_vc9_base.vcproj +++ b/build/msw/wx_vc9_base.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 362cc6a67f..54a1e81fda 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_gl.vcproj b/build/msw/wx_vc9_gl.vcproj index 0328924c06..dbbb7e4664 100644 --- a/build/msw/wx_vc9_gl.vcproj +++ b/build/msw/wx_vc9_gl.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj index a5d64b97b0..6c6b11b761 100644 --- a/build/msw/wx_vc9_html.vcproj +++ b/build/msw/wx_vc9_html.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_media.vcproj b/build/msw/wx_vc9_media.vcproj index a65c31214e..965a238699 100644 --- a/build/msw/wx_vc9_media.vcproj +++ b/build/msw/wx_vc9_media.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj index cd9aa2b5dd..7867c9b85f 100644 --- a/build/msw/wx_vc9_net.vcproj +++ b/build/msw/wx_vc9_net.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_propgrid.vcproj b/build/msw/wx_vc9_propgrid.vcproj index 7c714cb7e5..4815afa378 100644 --- a/build/msw/wx_vc9_propgrid.vcproj +++ b/build/msw/wx_vc9_propgrid.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_qa.vcproj b/build/msw/wx_vc9_qa.vcproj index c6f1dd8c05..f31fb587c5 100644 --- a/build/msw/wx_vc9_qa.vcproj +++ b/build/msw/wx_vc9_qa.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_ribbon.vcproj b/build/msw/wx_vc9_ribbon.vcproj index 17f55f1587..134f252387 100644 --- a/build/msw/wx_vc9_ribbon.vcproj +++ b/build/msw/wx_vc9_ribbon.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_richtext.vcproj b/build/msw/wx_vc9_richtext.vcproj index 948f2119f4..fdcf00e415 100644 --- a/build/msw/wx_vc9_richtext.vcproj +++ b/build/msw/wx_vc9_richtext.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_stc.vcproj b/build/msw/wx_vc9_stc.vcproj index a34e5d796e..e68f9b923d 100644 --- a/build/msw/wx_vc9_stc.vcproj +++ b/build/msw/wx_vc9_stc.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_webview.vcproj b/build/msw/wx_vc9_webview.vcproj index fa7be9e8e5..51055c5735 100644 --- a/build/msw/wx_vc9_webview.vcproj +++ b/build/msw/wx_vc9_webview.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxexpat.vcproj b/build/msw/wx_vc9_wxexpat.vcproj index 5717b31ad3..f2e15caef8 100644 --- a/build/msw/wx_vc9_wxexpat.vcproj +++ b/build/msw/wx_vc9_wxexpat.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxjpeg.vcproj b/build/msw/wx_vc9_wxjpeg.vcproj index 2ca2583cc8..a809569534 100644 --- a/build/msw/wx_vc9_wxjpeg.vcproj +++ b/build/msw/wx_vc9_wxjpeg.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxpng.vcproj b/build/msw/wx_vc9_wxpng.vcproj index f8eaadd4ee..8bd7f3efcf 100644 --- a/build/msw/wx_vc9_wxpng.vcproj +++ b/build/msw/wx_vc9_wxpng.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxregex.vcproj b/build/msw/wx_vc9_wxregex.vcproj index 79890f1884..d81052d03f 100644 --- a/build/msw/wx_vc9_wxregex.vcproj +++ b/build/msw/wx_vc9_wxregex.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxscintilla.vcproj b/build/msw/wx_vc9_wxscintilla.vcproj index 401075582e..dfb2ce8c80 100644 --- a/build/msw/wx_vc9_wxscintilla.vcproj +++ b/build/msw/wx_vc9_wxscintilla.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxtiff.vcproj b/build/msw/wx_vc9_wxtiff.vcproj index 6b1ce908db..98b10bf9d5 100644 --- a/build/msw/wx_vc9_wxtiff.vcproj +++ b/build/msw/wx_vc9_wxtiff.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxzlib.vcproj b/build/msw/wx_vc9_wxzlib.vcproj index 054ccb4ba3..3fbcbe29a1 100644 --- a/build/msw/wx_vc9_wxzlib.vcproj +++ b/build/msw/wx_vc9_wxzlib.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_xml.vcproj b/build/msw/wx_vc9_xml.vcproj index 3853c5949f..b0ccbd9ea3 100644 --- a/build/msw/wx_vc9_xml.vcproj +++ b/build/msw/wx_vc9_xml.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj index 9a607be99e..3c6cbeb9b8 100644 --- a/build/msw/wx_vc9_xrc.vcproj +++ b/build/msw/wx_vc9_xrc.vcproj @@ -2,7 +2,7 @@ diff --git a/configure b/configure index 648d42cafb..93990f4c46 100755 --- a/configure +++ b/configure @@ -627,14 +627,9 @@ enable_option_checking=fatal ac_subst_vars='LTLIBOBJS LIBOBJS CPPUNIT_CONFIG +RESCOMP DLLTOOL GCC -MACSETFILE -POSTLINK_COMMAND -LIBWXMACRES -WX_RESOURCES_MACOSX_DATA -WX_RESOURCES_MACOSX_ASCII -RESCOMP WX_VERSION_TAG DMALLOC_LIBS OPENGL_LIBS @@ -664,7 +659,6 @@ USE_GUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_BASENAME_NOGUI SHARED -DEREZ COND_wxUSE_ZLIB_builtin COND_wxUSE_REGEX_builtin COND_wxUSE_LIBTIFF_builtin @@ -853,8 +847,6 @@ ICC_PCH_CREATE_SWITCH ICC_PCH GCC_PCH OBJCXXFLAGS -SETFILE -REZ WINDRES BK_DEPS DEPS_TRACKING @@ -37298,85 +37290,6 @@ else fi ;; - - *-*-darwin* | powerpc-apple-macos* ) - # Extract the first word of "Rez", so it can be a program name with args. -set dummy Rez; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_REZ+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$REZ"; then - ac_cv_prog_REZ="$REZ" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_REZ="Rez" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez" -fi -fi -REZ=$ac_cv_prog_REZ -if test -n "$REZ"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $REZ" >&5 -$as_echo "$REZ" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - # Extract the first word of "SetFile", so it can be a program name with args. -set dummy SetFile; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_SETFILE+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$SETFILE"; then - ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_SETFILE="SetFile" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile" -fi -fi -SETFILE=$ac_cv_prog_SETFILE -if test -n "$SETFILE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SETFILE" >&5 -$as_echo "$SETFILE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - ;; esac @@ -37385,12 +37298,10 @@ fi + BAKEFILE_BAKEFILE_M4_VERSION="0.2.11" - BAKEFILE_BAKEFILE_M4_VERSION="0.2.9" - - -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.11" @@ -38488,62 +38399,6 @@ if test "$wxUSE_MSW" = 1 ; then RESCOMP="$WINDRES" fi -if test "$wxUSE_MAC" = 1; then - WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r" - WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc" - - LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}" - - # Extract the first word of "DeRez", so it can be a program name with args. -set dummy DeRez; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DEREZ+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DEREZ"; then - ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DEREZ="DeRez" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez" -fi -fi -DEREZ=$ac_cv_prog_DEREZ -if test -n "$DEREZ"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEREZ" >&5 -$as_echo "$DEREZ" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - MACSETFILE="\$(SETFILE)" - - POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}" - RESCOMP="cat /dev/null \| $REZ" - WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII" - -else - MACSETFILE="@true" - POSTLINK_COMMAND="@true" -fi - fi @@ -38640,15 +38495,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - - - - - - - - - diff --git a/configure.in b/configure.in index dc964baae4..ca88fc6e42 100644 --- a/configure.in +++ b/configure.in @@ -8004,31 +8004,6 @@ if test "$wxUSE_MSW" = 1 ; then RESCOMP="$WINDRES" fi -if test "$wxUSE_MAC" = 1; then - dnl base name of the resource file for wxMac must be the same - dnl as library installation base name (-install_name) - WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r" - WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc" - - dnl add the resources target for wxMac - LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}" - - AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez) - - MACSETFILE="\$(SETFILE)" - - dnl resources are bundled both with shared library and applications - dnl since the carb resource *must* be included in the application - POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}" - RESCOMP="cat /dev/null \| $REZ" - WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII" - -else - dnl default value is to (silently) do nothing in the makefile - MACSETFILE="@true" - POSTLINK_COMMAND="@true" -fi - fi dnl wxUSE_GUI = 1 @@ -8179,22 +8154,11 @@ AC_SUBST(OPENGL_LIBS) AC_SUBST(DMALLOC_LIBS) AC_SUBST(WX_VERSION_TAG) -dnl additional resurces settings -AC_SUBST(RESCOMP) -AC_SUBST(WINDRES) -AC_SUBST(REZ) -AC_SUBST(WX_RESOURCES_MACOSX_ASCII) -AC_SUBST(WX_RESOURCES_MACOSX_DATA) - -dnl additional for Mac OS X -AC_SUBST(DEREZ) -AC_SUBST(LIBWXMACRES) -AC_SUBST(POSTLINK_COMMAND) -AC_SUBST(MACSETFILE) - dnl other tools AC_SUBST(GCC) AC_SUBST(DLLTOOL) +AC_SUBST(RESCOMP) +AC_SUBST(WINDRES) dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE diff --git a/demos/Makefile.in b/demos/Makefile.in index 40da70a3cf..7efca3779a 100644 --- a/demos/Makefile.in +++ b/demos/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 2b55213594..10baa08033 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ BOMBS_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__bombs___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__bombs___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL bombs$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd = $(NM) bombs$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep bombs$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__bombs___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__bombs_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = bombs.app/Contents/PkgInfo @@ -153,8 +149,6 @@ distclean: clean bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc) $(CXX) -o $@ $(BOMBS_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__bombs___mac_setfilecmd) $(__bombs___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -189,7 +183,7 @@ bombs_game.o: $(srcdir)/game.cpp $(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $(srcdir)/game.cpp bombs_bombs_rc.o: $(srcdir)/bombs.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/demos/bombs/bombs_vc7.vcproj b/demos/bombs/bombs_vc7.vcproj index 0f70ec670b..17d5881890 100644 --- a/demos/bombs/bombs_vc7.vcproj +++ b/demos/bombs/bombs_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/bombs/bombs_vc8.vcproj b/demos/bombs/bombs_vc8.vcproj index 8f92cfb2b1..26bfb66096 100644 --- a/demos/bombs/bombs_vc8.vcproj +++ b/demos/bombs/bombs_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/bombs/bombs_vc9.vcproj b/demos/bombs/bombs_vc9.vcproj index c66aa894e8..f744e6630b 100644 --- a/demos/bombs/bombs_vc9.vcproj +++ b/demos/bombs/bombs_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/bombs/makefile.bcc b/demos/bombs/makefile.bcc index 7b7c380abb..844f6c3038 100644 --- a/demos/bombs/makefile.bcc +++ b/demos/bombs/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/bombs/makefile.gcc b/demos/bombs/makefile.gcc index 757bae3dff..65c4ee8fe1 100644 --- a/demos/bombs/makefile.gcc +++ b/demos/bombs/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc index e1437d7016..248722a749 100644 --- a/demos/bombs/makefile.vc +++ b/demos/bombs/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index a5271a3991..7d3e2e358c 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -77,25 +76,22 @@ FORTY_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__forty___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__forty___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL forty$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___forty___os2_emxbindcmd = $(NM) forty$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep forty$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__forty___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___forty___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__forty_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = forty.app/Contents/PkgInfo @@ -170,8 +166,6 @@ distclean: clean forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc) $(CXX) -o $@ $(FORTY_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__forty___mac_setfilecmd) $(__forty___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -233,7 +227,7 @@ forty_scorefil.o: $(srcdir)/scorefil.cpp $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $(srcdir)/scorefil.cpp forty_forty_rc.o: $(srcdir)/forty.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/demos/forty/forty-icons.r b/demos/forty/forty-icons.r deleted file mode 100644 index 3bc385aa76..0000000000 --- a/demos/forty/forty-icons.r +++ /dev/null @@ -1,2742 +0,0 @@ -data 'icl8' (128, "Item Icon") { - $"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" /* .... */ - $"00FF 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 FF00 0000" /* ............... */ - $"FF00 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 00FF 8100" /* .............. */ - $"FF00 0000 0000 00FF FFFF 0000 0000 0000" /* ............ */ - $"0000 0000 0023 0000 0000 0000 00FF 8181" /* .....#....... */ - $"FF00 0000 0000 FFFF FFFF FF00 0000 0000" /* .......... */ - $"0000 0000 2323 2300 0000 0000 00FF 8181" /* ....###...... */ - $"FF00 0000 0000 FFFF FFFF FF00 0000 0000" /* .......... */ - $"0000 0000 2323 2300 0000 0000 00FF 8181" /* ....###...... */ - $"FF00 0000 0000 00FF FFFF 0000 0000 0000" /* ............ */ - $"0000 0023 2323 2323 0000 0000 00FF 8181" /* ...#####..... */ - $"FF00 0000 FFFF 0000 FF00 00FF FF00 0000" /* .......... */ - $"0000 2323 2323 2323 2300 0000 00FF 8181" /* ..#######.... */ - $"FF00 00FF FFFF FF00 FF00 FFFF FFFF 0000" /* ...... */ - $"0023 2323 2323 2323 2323 0000 00FF 8181" /* .#########... */ - $"FF00 00FF FFFF FFFF FFFF FFFF FFFF 0000" /* .... */ - $"0000 2323 2323 2323 2300 0000 00FF 8181" /* ..#######.... */ - $"FF00 00FF FFFF FF00 FF00 FFFF FFFF 0000" /* ...... */ - $"0000 0023 2323 2323 0000 0000 00FF 8181" /* ...#####..... */ - $"FF00 0000 FFFF 0000 FF00 00FF FF00 0000" /* .......... */ - $"0000 0000 2323 2300 0000 0000 00FF 8181" /* ....###...... */ - $"FF00 0000 0000 00FF FFFF 0000 0000 0000" /* ............ */ - $"0000 0000 2323 2300 0000 0000 00FF 8181" /* ....###...... */ - $"FF00 0000 00FF FFFF FFFF FFFF 0000 0000" /* ........ */ - $"0000 0000 0023 0000 0000 0000 00FF 8181" /* .....#....... */ - $"FF00 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 00FF 8181" /* ............. */ - $"FF00 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 00FF 8181" /* ............. */ - $"FF00 0000 0023 2300 0000 2323 0000 0000" /* ....##...##.... */ - $"0000 0000 00FF 0000 0000 0000 00FF 8181" /* ............ */ - $"FF00 0000 2323 2323 0023 2323 2300 0000" /* ...####.####... */ - $"0000 0000 FFFF FF00 0000 0000 00FF 8181" /* .......... */ - $"FF00 0023 2323 2323 2323 2323 2323 0000" /* ..###########.. */ - $"0000 00FF FFFF FFFF 0000 0000 00FF 8181" /* ........ */ - $"FF00 0023 2323 2323 2323 2323 2323 0000" /* ..###########.. */ - $"0000 FFFF FFFF FFFF FF00 0000 00FF 8181" /* ...... */ - $"FF00 0023 2323 2323 2323 2323 2323 0000" /* ..###########.. */ - $"00FF FFFF FFFF FFFF FFFF 0000 00FF 8181" /* .... */ - $"FF00 0023 2323 2323 2323 2323 2323 0000" /* ..###########.. */ - $"FFFF FFFF FFFF FFFF FFFF FF00 00FF 8181" /* .. */ - $"FF00 0000 2323 2323 2323 2323 2300 0000" /* ...#########... */ - $"FFFF FFFF FFFF FFFF FFFF FF00 00FF 8181" /* .. */ - $"FF00 0000 0023 2323 2323 2323 0000 0000" /* ....#######.... */ - $"FFFF FFFF 00FF 00FF FFFF FF00 00FF 8181" /* .... */ - $"FF00 0000 0000 2323 2323 2300 0000 0000" /* .....#####..... */ - $"00FF FF00 00FF 0000 FFFF 0000 00FF 8181" /* ........ */ - $"FF00 0000 0000 0023 2323 0000 0000 0000" /* ......###...... */ - $"0000 0000 FFFF FF00 0000 0000 00FF 8181" /* .......... */ - $"FF00 0000 0000 0000 2300 0000 0000 0000" /* .......#....... */ - $"0000 FFFF FFFF FFFF FF00 0000 00FF 8181" /* ...... */ - $"FF00 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 00FF 8181" /* ............. */ - $"00FF 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 FF81 8181" /* ............ */ - $"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF 8181 8181" /* */ - $"0000 0081 8181 8181 8181 8181 8181 8181" /* ... */ - $"8181 8181 8181 8181 8181 8181 8181 8100" /* . */ - $"0000 0000 8181 8181 8181 8181 8181 8181" /* .... */ - $"8181 8181 8181 8181 8181 8181 8181 0000" /* .. */ -}; - -data 'icl4' (128, "Item Icon") { - $"00FF FFFF FFFF FFFF FFFF FFFF FFFF 0000" /* ... */ - $"0F00 0000 0000 0000 0000 0000 0000 F000" /* ............... */ - $"F000 0000 0000 0000 0000 0000 0000 0FD0" /* .............. */ - $"F000 000F FF00 0000 0000 0300 0000 0FDD" /* ............. */ - $"F000 00FF FFF0 0000 0000 3330 0000 0FDD" /* ......30... */ - $"F000 00FF FFF0 0000 0000 3330 0000 0FDD" /* ......30... */ - $"F000 000F FF00 0000 0003 3333 0000 0FDD" /* ........33... */ - $"F000 FF00 F00F F000 0033 3333 3000 0FDD" /* .....3330.. */ - $"F00F FFF0 F0FF FF00 0333 3333 3300 0FDD" /* ...3333.. */ - $"F00F FFFF FFFF FF00 0033 3333 3000 0FDD" /* ...3330.. */ - $"F00F FFF0 F0FF FF00 0003 3333 0000 0FDD" /* ....33... */ - $"F000 FF00 F00F F000 0000 3330 0000 0FDD" /* ......30... */ - $"F000 000F FF00 0000 0000 3330 0000 0FDD" /* ........30... */ - $"F000 0FFF FFFF 0000 0000 0300 0000 0FDD" /* ........... */ - $"F000 0000 0000 0000 0000 0000 0000 0FDD" /* .............. */ - $"F000 0000 0000 0000 0000 0000 0000 0FDD" /* .............. */ - $"F000 0330 0033 0000 0000 0F00 0000 0FDD" /* ..0.3......... */ - $"F000 3333 0333 3000 0000 FFF0 0000 0FDD" /* .33.30...... */ - $"F003 3333 3333 3300 000F FFFF 0000 0FDD" /* .33333...... */ - $"F003 3333 3333 3300 00FF FFFF F000 0FDD" /* .33333.... */ - $"F003 3333 3333 3300 0FFF FFFF FF00 0FDD" /* .33333.... */ - $"F003 3333 3333 3300 FFFF FFFF FFF0 0FDD" /* .33333.. */ - $"F000 3333 3333 3000 FFFF FFFF FFF0 0FDD" /* .33330.. */ - $"F000 0333 3333 0000 FFFF 0F0F FFF0 0FDD" /* ..333..... */ - $"F000 0033 3330 0000 0FF0 0F00 FF00 0FDD" /* ..330....... */ - $"F000 0003 3300 0000 0000 FFF0 0000 0FDD" /* ...3........ */ - $"F000 0000 3000 0000 00FF FFFF F000 0FDD" /* ...0...... */ - $"F000 0000 0000 0000 0000 0000 0000 0FDD" /* .............. */ - $"0F00 0000 0000 0000 0000 0000 0000 FDDD" /* .............. */ - $"00FF FFFF FFFF FFFF FFFF FFFF FFFF DDDD" /* . */ - $"000D DDDD DDDD DDDD DDDD DDDD DDDD DDD0" /* .. */ - $"0000 DDDD DDDD DDDD DDDD DDDD DDDD DD00" /* ... */ -}; - -data 'ICN#' (128, "Item Icon") { - $"3FFF FFF0 7FFF FFF8 FFFF FFFE FFFF FFFF" /* ?. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"7FFF FFFF 3FFF FFFF 1FFF FFFE 0FFF FFFC" /* .?.. */ - $"3FFF FFF0 7FFF FFF8 FFFF FFFE FFFF FFFF" /* ?. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"7FFF FFFF 3FFF FFFF 1FFF FFFE 0FFF FFFC" /* .?.. */ -}; - -data 'ics8' (128, "Item Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0023 0000 0023 0000 0000 0023 0000 0000" /* .#...#.....#.... */ - $"0023 0000 2300 0000 0000 2323 2300 0000" /* .#..#.....###... */ - $"0023 0023 0000 0000 0023 2323 2323 0000" /* .#.#.....#####.. */ - $"0023 2300 0000 0000 2323 2323 2323 2300" /* .##.....#######. */ - $"0023 0023 0000 0000 0023 2323 2323 0000" /* .#.#.....#####.. */ - $"0023 0000 2300 0000 0000 2323 2300 0000" /* .#..#.....###... */ - $"0023 0000 0023 0000 0000 0023 0000 0000" /* .#...#.....#.... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ -}; - -data 'ics4' (128, "Item Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0300 0300 0003 0000" /* ................ */ - $"0300 3000 0033 3000 0303 0000 0333 3300" /* ..0..30......33. */ - $"0330 0000 3333 3330 0303 0000 0333 3300" /* .0..3330.....33. */ - $"0300 3000 0033 3000 0300 0300 0003 0000" /* ..0..30......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ -}; - -data 'ics#' (128, "Item Icon") { - $"0000 0000 0000 0000 0000 4410 4838 507C" /* ..........D.H8P| */ - $"60FE 507C 4838 4410 0000 0000 0000 0000" /* `P|H8D......... */ - $"0000 0000 0000 0000 0000 4410 4838 507C" /* ..........D.H8P| */ - $"60FE 507C 4838 4410 0000 0000 0000 0000" /* `P|H8D......... */ -}; - -data 'icm8' (128, "Item Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0023 0000 0023 0000 0000 0023 0000 0000" /* .#...#.....#.... */ - $"0023 0000 2300 0000 0000 2323 2300 0000" /* .#..#.....###... */ - $"0023 0023 0000 0000 0023 2323 2323 0000" /* .#.#.....#####.. */ - $"0023 2300 0000 0000 2323 2323 2323 2300" /* .##.....#######. */ - $"0023 0023 0000 0000 0023 2323 2323 0000" /* .#.#.....#####.. */ - $"0023 0000 2300 0000 0000 2323 2300 0000" /* .#..#.....###... */ - $"0023 0000 0023 0000 0000 0023 0000 0000" /* .#...#.....#.... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ -}; - -data 'icm4' (128, "Item Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0300 0300 0003 0000" /* ................ */ - $"0300 3000 0033 3000 0303 0000 0333 3300" /* ..0..30......33. */ - $"0330 0000 3333 3330 0303 0000 0333 3300" /* .0..3330.....33. */ - $"0300 3000 0033 3000 0300 0300 0003 0000" /* ..0..30......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ -}; - -data 'icm#' (128, "Item Icon") { - $"0000 0000 0000 4410 4838 507C 60FE 507C" /* ......D.H8P|`P| */ - $"4838 4410 0000 0000 0000 0000 0000 4410" /* H8D...........D. */ - $"4838 507C 60FE 507C 4838 4410 0000 0000" /* H8P|`P|H8D..... */ -}; - -data 'icns' (128, "Item Icon") { - $"6963 6E73 0000 9F63 4943 4E23 0000 0108" /* icns..cICN#.... */ - $"3FFF FFF0 7FFF FFF8 FFFF FFFE FFFF FFFF" /* ?. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"7FFF FFFF 3FFF FFFF 1FFF FFFE 0FFF FFFC" /* .?.. */ - $"3FFF FFF0 7FFF FFF8 FFFF FFFE FFFF FFFF" /* ?. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"7FFF FFFF 3FFF FFFF 1FFF FFFE 0FFF FFFC" /* .?.. */ - $"6963 6C34 0000 0208 00FF FFFF FFFF FFFF" /* icl4..... */ - $"FFFF FFFF FFFF 0000 0F00 0000 0000 0000" /* .......... */ - $"0000 0000 0000 F000 F000 0000 0000 0000" /* .............. */ - $"0000 0000 0000 0FD0 F000 000F FF00 0000" /* ............. */ - $"0000 0300 0000 0FDD F000 00FF FFF0 0000" /* ........... */ - $"0000 3330 0000 0FDD F000 00FF FFF0 0000" /* ..30....... */ - $"0000 3330 0000 0FDD F000 000F FF00 0000" /* ..30......... */ - $"0003 3333 0000 0FDD F000 FF00 F00F F000" /* ..33....... */ - $"0033 3333 3000 0FDD F00F FFF0 F0FF FF00" /* .3330.... */ - $"0333 3333 3300 0FDD F00F FFFF FFFF FF00" /* .3333.... */ - $"0033 3333 3000 0FDD F00F FFF0 F0FF FF00" /* .3330.... */ - $"0003 3333 0000 0FDD F000 FF00 F00F F000" /* ..33....... */ - $"0000 3330 0000 0FDD F000 000F FF00 0000" /* ..30......... */ - $"0000 3330 0000 0FDD F000 0FFF FFFF 0000" /* ..30....... */ - $"0000 0300 0000 0FDD F000 0000 0000 0000" /* .............. */ - $"0000 0000 0000 0FDD F000 0000 0000 0000" /* .............. */ - $"0000 0000 0000 0FDD F000 0330 0033 0000" /* .........0.3.. */ - $"0000 0F00 0000 0FDD F000 3333 0333 3000" /* ........33.30. */ - $"0000 FFF0 0000 0FDD F003 3333 3333 3300" /* ......33333. */ - $"000F FFFF 0000 0FDD F003 3333 3333 3300" /* ......33333. */ - $"00FF FFFF F000 0FDD F003 3333 3333 3300" /* ....33333. */ - $"0FFF FFFF FF00 0FDD F003 3333 3333 3300" /* ....33333. */ - $"FFFF FFFF FFF0 0FDD F000 3333 3333 3000" /* ..33330. */ - $"FFFF FFFF FFF0 0FDD F000 0333 3333 0000" /* ...333.. */ - $"FFFF 0F0F FFF0 0FDD F000 0033 3330 0000" /* .....330.. */ - $"0FF0 0F00 FF00 0FDD F000 0003 3300 0000" /* ........3... */ - $"0000 FFF0 0000 0FDD F000 0000 3000 0000" /* ........0... */ - $"00FF FFFF F000 0FDD F000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0FDD 0F00 0000 0000 0000" /* ............... */ - $"0000 0000 0000 FDDD 00FF FFFF FFFF FFFF" /* ....... */ - $"FFFF FFFF FFFF DDDD 000D DDDD DDDD DDDD" /* .. */ - $"DDDD DDDD DDDD DDD0 0000 DDDD DDDD DDDD" /* .. */ - $"DDDD DDDD DDDD DD00 6963 6C38 0000 0408" /* .icl8.... */ - $"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" /* .... */ - $"00FF 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 FF00 0000" /* ............... */ - $"FF00 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 00FF 8100" /* .............. */ - $"FF00 0000 0000 00FF FFFF 0000 0000 0000" /* ............ */ - $"0000 0000 0023 0000 0000 0000 00FF 8181" /* .....#....... */ - $"FF00 0000 0000 FFFF FFFF FF00 0000 0000" /* .......... */ - $"0000 0000 2323 2300 0000 0000 00FF 8181" /* ....###...... */ - $"FF00 0000 0000 FFFF FFFF FF00 0000 0000" /* .......... */ - $"0000 0000 2323 2300 0000 0000 00FF 8181" /* ....###...... */ - $"FF00 0000 0000 00FF FFFF 0000 0000 0000" /* ............ */ - $"0000 0023 2323 2323 0000 0000 00FF 8181" /* ...#####..... */ - $"FF00 0000 FFFF 0000 FF00 00FF FF00 0000" /* .......... */ - $"0000 2323 2323 2323 2300 0000 00FF 8181" /* ..#######.... */ - $"FF00 00FF FFFF FF00 FF00 FFFF FFFF 0000" /* ...... */ - $"0023 2323 2323 2323 2323 0000 00FF 8181" /* .#########... */ - $"FF00 00FF FFFF FFFF FFFF FFFF FFFF 0000" /* .... */ - $"0000 2323 2323 2323 2300 0000 00FF 8181" /* ..#######.... */ - $"FF00 00FF FFFF FF00 FF00 FFFF FFFF 0000" /* ...... */ - $"0000 0023 2323 2323 0000 0000 00FF 8181" /* ...#####..... */ - $"FF00 0000 FFFF 0000 FF00 00FF FF00 0000" /* .......... */ - $"0000 0000 2323 2300 0000 0000 00FF 8181" /* ....###...... */ - $"FF00 0000 0000 00FF FFFF 0000 0000 0000" /* ............ */ - $"0000 0000 2323 2300 0000 0000 00FF 8181" /* ....###...... */ - $"FF00 0000 00FF FFFF FFFF FFFF 0000 0000" /* ........ */ - $"0000 0000 0023 0000 0000 0000 00FF 8181" /* .....#....... */ - $"FF00 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 00FF 8181" /* ............. */ - $"FF00 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 00FF 8181" /* ............. */ - $"FF00 0000 0023 2300 0000 2323 0000 0000" /* ....##...##.... */ - $"0000 0000 00FF 0000 0000 0000 00FF 8181" /* ............ */ - $"FF00 0000 2323 2323 0023 2323 2300 0000" /* ...####.####... */ - $"0000 0000 FFFF FF00 0000 0000 00FF 8181" /* .......... */ - $"FF00 0023 2323 2323 2323 2323 2323 0000" /* ..###########.. */ - $"0000 00FF FFFF FFFF 0000 0000 00FF 8181" /* ........ */ - $"FF00 0023 2323 2323 2323 2323 2323 0000" /* ..###########.. */ - $"0000 FFFF FFFF FFFF FF00 0000 00FF 8181" /* ...... */ - $"FF00 0023 2323 2323 2323 2323 2323 0000" /* ..###########.. */ - $"00FF FFFF FFFF FFFF FFFF 0000 00FF 8181" /* .... */ - $"FF00 0023 2323 2323 2323 2323 2323 0000" /* ..###########.. */ - $"FFFF FFFF FFFF FFFF FFFF FF00 00FF 8181" /* .. */ - $"FF00 0000 2323 2323 2323 2323 2300 0000" /* ...#########... */ - $"FFFF FFFF FFFF FFFF FFFF FF00 00FF 8181" /* .. */ - $"FF00 0000 0023 2323 2323 2323 0000 0000" /* ....#######.... */ - $"FFFF FFFF 00FF 00FF FFFF FF00 00FF 8181" /* .... */ - $"FF00 0000 0000 2323 2323 2300 0000 0000" /* .....#####..... */ - $"00FF FF00 00FF 0000 FFFF 0000 00FF 8181" /* ........ */ - $"FF00 0000 0000 0023 2323 0000 0000 0000" /* ......###...... */ - $"0000 0000 FFFF FF00 0000 0000 00FF 8181" /* .......... */ - $"FF00 0000 0000 0000 2300 0000 0000 0000" /* .......#....... */ - $"0000 FFFF FFFF FFFF FF00 0000 00FF 8181" /* ...... */ - $"FF00 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 00FF 8181" /* ............. */ - $"00FF 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 FF81 8181" /* ............ */ - $"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF 8181 8181" /* */ - $"0000 0081 8181 8181 8181 8181 8181 8181" /* ... */ - $"8181 8181 8181 8181 8181 8181 8181 8100" /* . */ - $"0000 0000 8181 8181 8181 8181 8181 8181" /* .... */ - $"8181 8181 8181 8181 8181 8181 8181 0000" /* .. */ - $"696C 3332 0000 04CA 9F00 97FF 8200 99FF" /* il32...ʟ.. */ - $"0300 6D00 0083 FF80 0090 FF03 006D 6D00" /* ..m.....mm. */ - $"82FF 8200 8FFF 0300 6D6D 0082 FF82 008F" /* ...mm.. */ - $"FF03 006D 6D00 83FF 8000 90FF 0300 6D6D" /* ..mm....mm */ - $"0080 FF08 0000 FFFF 00FF FF00 008D FF05" /* ........ */ - $"006D 6D00 FFFF 8100 02FF 00FF 8100 8CFF" /* .mm..... */ - $"0500 6D6D 00FF FF88 008C FF05 006D 6D00" /* ..mm....mm. */ - $"FFFF 8100 02FF 00FF 8100 8CFF 0300 6D6D" /* ......mm */ - $"0080 FF08 0000 FFFF 00FF FF00 008D FF03" /* ........ */ - $"006D 6D00 83FF 8000 90FF 0300 6D6D 0081" /* .mm....mm. */ - $"FF84 008E FF03 006D 6D00 99FF 0300 6D6D" /* ...mm...mm */ - $"0099 FF03 006D 6D00 91FF 0000 84FF 0300" /* ...mm..... */ - $"6D6D 0090 FF80 0083 FF03 006D 6D00 8FFF" /* mm....mm. */ - $"8200 82FF 0300 6D6D 008E FF84 0081 FF03" /* ...mm... */ - $"006D 6D00 8DFF 8600 80FF 0300 6D6D 008C" /* .mm....mm. */ - $"FF88 0005 FFFF 006D 6D00 8CFF 8800 05FF" /* ...mm... */ - $"FF00 6D6D 008C FF81 0002 FF00 FF81 0005" /* .mm...... */ - $"FFFF 006D 6D00 8DFF 0800 00FF FF00 FFFF" /* .mm..... */ - $"0000 80FF 0300 6D6D 0090 FF80 0083 FF03" /* ....mm... */ - $"006D 6D00 8EFF 8400 81FF 0300 6D6D 0099" /* .mm....mm. */ - $"FF04 006D 6D00 0097 FF00 0080 6D99 0081" /* ..mm....m. */ - $"6D80 0099 6D82 0097 6D01 0000 9F00 97FF" /* m.m.m.... */ - $"8200 99FF 0300 6D00 0083 FF80 0088 FF00" /* ...m.... */ - $"0084 FF03 006D 6D00 82FF 8200 86FF 8000" /* ...mm... */ - $"83FF 0300 6D6D 0082 FF82 0086 FF80 0083" /* ..mm... */ - $"FF03 006D 6D00 83FF 8000 86FF 8200 82FF" /* ..mm... */ - $"0300 6D6D 0080 FF08 0000 FFFF 00FF FF00" /* ..mm...... */ - $"0082 FF84 0081 FF05 006D 6D00 FFFF 8100" /* ....mm.. */ - $"02FF 00FF 8100 80FF 8600 80FF 0500 6D6D" /* ......mm */ - $"00FF FF88 0081 FF84 0081 FF05 006D 6D00" /* .....mm. */ - $"FFFF 8100 02FF 00FF 8100 82FF 8200 82FF" /* ..... */ - $"0300 6D6D 0080 FF08 0000 FFFF 00FF FF00" /* ..mm...... */ - $"0084 FF80 0083 FF03 006D 6D00 83FF 8000" /* ....mm.. */ - $"87FF 8000 83FF 0300 6D6D 0081 FF84 0086" /* ...mm.. */ - $"FF00 0084 FF03 006D 6D00 99FF 0300 6D6D" /* ....mm...mm */ - $"0099 FF03 006D 6D00 81FF 0100 0080 FF01" /* ...mm..... */ - $"0000 86FF 0000 84FF 0300 6D6D 0080 FF81" /* ......mm. */ - $"0000 FF81 0084 FF80 0083 FF05 006D 6D00" /* ......mm. */ - $"FFFF 8800 82FF 8200 82FF 0500 6D6D 00FF" /* ....mm. */ - $"FF88 0081 FF84 0081 FF05 006D 6D00 FFFF" /* ....mm. */ - $"8800 80FF 8600 80FF 0500 6D6D 00FF FF88" /* ....mm. */ - $"0001 FFFF 8800 05FF FF00 6D6D 0080 FF86" /* .....mm. */ - $"0080 FF88 0005 FFFF 006D 6D00 81FF 8400" /* ....mm.. */ - $"81FF 8100 02FF 00FF 8100 05FF FF00 6D6D" /* ......mm */ - $"0082 FF82 0083 FF08 0000 FFFF 00FF FF00" /* ....... */ - $"0080 FF03 006D 6D00 83FF 8000 87FF 8000" /* ...mm... */ - $"83FF 0300 6D6D 0084 FF00 0086 FF84 0081" /* ..mm.... */ - $"FF03 006D 6D00 99FF 0400 6D6D 0000 97FF" /* ..mm...mm.. */ - $"0000 806D 9900 816D 8000 996D 8200 976D" /* ..m.m.m.m */ - $"0100 009F 0097 FF82 0099 FF03 006D 0000" /* .......m.. */ - $"83FF 8000 88FF 0000 84FF 0300 6D6D 0082" /* .....mm. */ - $"FF82 0086 FF80 0083 FF03 006D 6D00 82FF" /* ....mm. */ - $"8200 86FF 8000 83FF 0300 6D6D 0083 FF80" /* ....mm. */ - $"0086 FF82 0082 FF03 006D 6D00 80FF 0800" /* ....mm... */ - $"00FF FF00 FFFF 0000 82FF 8400 81FF 0500" /* ....... */ - $"6D6D 00FF FF81 0002 FF00 FF81 0080 FF86" /* mm..... */ - $"0080 FF05 006D 6D00 FFFF 8800 81FF 8400" /* ...mm... */ - $"81FF 0500 6D6D 00FF FF81 0002 FF00 FF81" /* ..mm.... */ - $"0082 FF82 0082 FF03 006D 6D00 80FF 0800" /* ....mm... */ - $"00FF FF00 FFFF 0000 84FF 8000 83FF 0300" /* ....... */ - $"6D6D 0083 FF80 0087 FF80 0083 FF03 006D" /* mm.....m */ - $"6D00 81FF 8400 86FF 0000 84FF 0300 6D6D" /* m......mm */ - $"0099 FF03 006D 6D00 99FF 0300 6D6D 0081" /* ...mm...mm. */ - $"FF01 0000 80FF 0100 0086 FF00 0084 FF03" /* ......... */ - $"006D 6D00 80FF 8100 00FF 8100 84FF 8000" /* .mm..... */ - $"83FF 0500 6D6D 00FF FF88 0082 FF82 0082" /* ..mm... */ - $"FF05 006D 6D00 FFFF 8800 81FF 8400 81FF" /* ..mm... */ - $"0500 6D6D 00FF FF88 0080 FF86 0080 FF05" /* ..mm.... */ - $"006D 6D00 FFFF 8800 01FF FF88 0005 FFFF" /* .mm..... */ - $"006D 6D00 80FF 8600 80FF 8800 05FF FF00" /* .mm..... */ - $"6D6D 0081 FF84 0081 FF81 0002 FF00 FF81" /* mm..... */ - $"0005 FFFF 006D 6D00 82FF 8200 83FF 0800" /* ...mm.... */ - $"00FF FF00 FFFF 0000 80FF 0300 6D6D 0083" /* ......mm. */ - $"FF80 0087 FF80 0083 FF03 006D 6D00 84FF" /* ....mm. */ - $"0000 86FF 8400 81FF 0300 6D6D 0099 FF04" /* .....mm.. */ - $"006D 6D00 0097 FF00 0080 6D99 0081 6D80" /* .mm....m.m */ - $"0099 6D82 0097 6D01 0000 6C38 6D6B 0000" /* .m.m...l8mk.. */ - $"0408 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000" /* .. */ - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" /* ... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" /* . */ - $"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* . */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 00FF FFFF FFFF FFFF FFFF FFFF FFFF" /* . */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 00FF FFFF FFFF FFFF FFFF FFFF" /* ... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 FFFF FFFF FFFF FFFF FFFF" /* ..... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"0000 6963 6823 0000 0248 0000 0000 0000" /* ..ich#...H...... */ - $"0000 0000 0000 0FFF FFFF FFF0 0FFF FFFF" /* ........ */ - $"FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF" /* ... */ - $"FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0" /* .. */ - $"0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF" /* ... */ - $"FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF" /* ... */ - $"FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0" /* .. */ - $"0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF" /* ... */ - $"FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF" /* ... */ - $"FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0" /* .. */ - $"0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF" /* ... */ - $"FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF" /* ... */ - $"FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0" /* .. */ - $"0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF" /* ... */ - $"FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF" /* ... */ - $"FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0" /* .. */ - $"0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF" /* ... */ - $"FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF" /* ... */ - $"FFFF FFF0 0000 0000 0000 0000 0000 0000" /* ............ */ - $"0000 0000 0000 0FFF FFFF FFF0 0FFF FFFF" /* ........ */ - $"FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF" /* ... */ - $"FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0" /* .. */ - $"0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF" /* ... */ - $"FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF" /* ... */ - $"FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0" /* .. */ - $"0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF" /* ... */ - $"FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF" /* ... */ - $"FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0" /* .. */ - $"0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF" /* ... */ - $"FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF" /* ... */ - $"FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0" /* .. */ - $"0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF" /* ... */ - $"FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF" /* ... */ - $"FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0" /* .. */ - $"0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF FFFF" /* ... */ - $"FFF0 0FFF FFFF FFF0 0FFF FFFF FFF0 0FFF" /* ... */ - $"FFFF FFF0 0000 0000 0000 6963 6834 0000" /* ......ich4.. */ - $"0488 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .... */ - $"FFFF FFFF FFFF FFFF 0000 0000 F000 F000" /* ...... */ - $"000F 3311 1131 1111 3300 0003 0000 000F" /* ..3..1..3....... */ - $"0000 0000 F00F DF00 0000 F331 1333 1113" /* ........1.3.. */ - $"3F00 0033 3000 000F 0000 0000 F0FC D0F0" /* ?..30....... */ - $"0000 0F33 3333 3333 F000 0033 3000 000F" /* ...33333..30... */ - $"0000 0000 F0FC D0F0 0000 0FFF FFFF FFFF" /* ....... */ - $"F000 0333 3300 000F 0000 0000 F0FC D0F0" /* ..33....... */ - $"0000 0FDF F0F0 00F0 F000 3333 3330 000F" /* .....3330.. */ - $"0000 0000 F0FC D0F0 0000 0FDF 0FF0 00FF" /* ......... */ - $"0F03 3333 3333 000F 0000 0000 F0FC D0F0" /* ..3333...... */ - $"0000 0FDF 0000 F000 0F00 3333 3330 000F" /* ........3330.. */ - $"0000 0000 F0FC D0F0 0000 0FDF 0000 0F00" /* ........... */ - $"0F00 0333 3300 000F 0000 0000 F0FC D0F0" /* ...33....... */ - $"0000 0FDF 0000 FF00 0F00 0033 3000 000F" /* .........30... */ - $"0000 0000 F0FC D0F0 00FF 0FDF F000 0000" /* ......... */ - $"0F00 0033 3000 000F 0000 0000 F0FC D0F0" /* ...30....... */ - $"00FF FFDF FF0F FFF0 FF00 0003 0000 000F" /* ......... */ - $"0000 0000 F0FC D0F0 000F DDDF DFF0 F0F0" /* ...... */ - $"FFF0 0000 0000 000F 0000 0000 F0FC D0F0" /* .......... */ - $"00FF FFFF FFFF FFFF FFFF F000 0000 000F" /* ...... */ - $"0000 0000 F0FC D0FF FFF1 F11F F333 333F" /* .....33? */ - $"F1FF FFFF 0000 000F 0000 0000 F0FC D0FF" /* ........ */ - $"1331 1F11 FF33 33FF 1FFF FFF3 FFFF 000F" /* .1..33... */ - $"0000 0000 FFFF FFFF F133 11F1 1FFF FFF1" /* ....3.. */ - $"FFFF F333 6000 FFFF 0000 0000 FF00 00FF" /* 3`....... */ - $"F613 311F 11FF FF11 FFF6 6333 6066 660F" /* .1...c3`ff. */ - $"0000 0000 FFFF FFF0 F613 3D11 F111 111F" /* .....=.... */ - $"F061 3633 6006 600F 0000 0000 FF00 00F0" /* a63`.`....... */ - $"F613 31D1 1F1F FF1F 0611 1163 6006 600F" /* .1......c`.`. */ - $"0000 0000 FFFF FFF0 F613 311D 11F1 13F0" /* .....1... */ - $"6663 6363 6600 006F 0000 0000 FF00 00F0" /* fcccf..o...... */ - $"F613 3D11 DF31 611F 1D66 6616 600F F00F" /* .=.1a..ff.`.. */ - $"0000 0000 FFFF FFFF 6616 6DD1 1F16 661F" /* ....f.m..f. */ - $"11D6 6166 FFFF FFFF 0000 0000 F00F F006" /* .af...... */ - $"6166 66DD 1F11 613F D113 316F 0F00 00FF" /* aff..a?.1o... */ - $"0000 0000 F600 0066 1636 366D D1F3 11F1" /* ......f.66m. */ - $"1D13 316F 0FFF FFFF 0000 0000 F006 6006" /* ..1o......`. */ - $"3611 1160 DF1F FF1F 11D3 316F 0F00 00FF" /* 6..`...1o... */ - $"0000 0000 F006 6006 3363 1600 FF11 1111" /* .....`.3c..... */ - $"F113 316F 0FFF FFFF 0000 0000 F066 6606" /* .1o.....ff. */ - $"3336 60FF F11F FFF1 1F13 316F FF00 00FF" /* 36`...1o.. */ - $"0000 0000 FFFF 0006 333F FFFF F1FF FFFF" /* ......3? */ - $"11F1 331F FFFF FFFF 0000 0000 F000 FFFF" /* .3...... */ - $"33FF FFFF 1FF3 333F F11F 1331 FF0D CF0F" /* 3.3?..1.. */ - $"0000 0000 F000 0000 FFFF FFF1 FF33 3333" /* .......333 */ - $"FF11 FFFF FF0D CF0F 0000 0000 F000 0000" /* .......... */ - $"000F FFFF FFFF FFFF FFFF FF00 0F0D CF0F" /* ...... */ - $"0000 0000 F000 0000 0000 0FFF 0F0F 0FFD" /* ............. */ - $"FDDD F000 0F0D CF0F 0000 0000 F000 0003" /* ........... */ - $"0000 00FF 0FFF F0FF FDFF FF00 0F0D CF0F" /* ........ */ - $"0000 0000 F000 0033 3000 00F0 0000 000F" /* ......30...... */ - $"FDF0 FF00 0F0D CF0F 0000 0000 F000 0033" /* ..........3 */ - $"3000 00F0 00FF 0000 FDF0 0000 0F0D CF0F" /* 0.......... */ - $"0000 0000 F000 0333 3300 00F0 00F0 0000" /* ......33..... */ - $"FDF0 0000 0F0D CF0F 0000 0000 F000 3333" /* ..........33 */ - $"3330 00F0 000F 0000 FDF0 0000 0F0D CF0F" /* 30.......... */ - $"0000 0000 F003 3333 3333 00F0 FF00 0FF0" /* .....3333... */ - $"FDF0 0000 0F0D CF0F 0000 0000 F000 3333" /* ..........33 */ - $"3330 000F 0F00 0F00 FDF0 0000 0F0D CF0F" /* 30........... */ - $"0000 0000 F000 0333 3300 000F FFFF FFFF" /* ......33... */ - $"FFF0 0000 0F0D CF0F 0000 0000 F000 0033" /* ...........3 */ - $"3000 000F 3333 3333 33F0 0000 0F0D CF0F" /* 0...33333..... */ - $"0000 0000 F000 0033 3000 00F3 3111 3331" /* ......30..1.31 */ - $"133F 0000 00FD F00F 0000 0000 F000 0003" /* .?........... */ - $"0000 0F33 1111 1311 1133 F000 000F 000F" /* ...3.....3..... */ - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .... */ - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" /* ........ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 6963 6838 0000 0908 0000 0000 0000" /* ..ich8......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 FFFF" /* .............. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 FF00" /* ......... */ - $"0000 FF00 0000 0000 00FF 2323 0505 0505" /* ........##.... */ - $"2305 0505 0505 2323 0000 0000 0023 0000" /* #.....##.....#.. */ - $"0000 0000 00FF 0000 0000 0000 0000 FF00" /* .............. */ - $"00FF 81FF 0000 0000 0000 FF23 2305 0523" /* .......##..# */ - $"2323 0505 0523 23FF 0000 0000 2323 2300" /* ##...##....###. */ - $"0000 0000 00FF 0000 0000 0000 0000 FF00" /* .............. */ - $"FFF7 8100 FF00 0000 0000 00FF 2323 2323" /* .......#### */ - $"2323 2323 2323 FF00 0000 0000 2323 2300" /* ######.....###. */ - $"0000 0000 00FF 0000 0000 0000 0000 FF00" /* .............. */ - $"FFF7 8100 FF00 0000 0000 00FF FFFF FFFF" /* ....... */ - $"FFFF FFFF FFFF FF00 0000 0023 2323 2323" /* ....##### */ - $"0000 0000 00FF 0000 0000 0000 0000 FF00" /* .............. */ - $"FFF7 8100 FF00 0000 0000 00FF 81FF FF00" /* ........ */ - $"FF00 0000 FF00 FF00 0000 2323 2323 2323" /* .......###### */ - $"2300 0000 00FF 0000 0000 0000 0000 FF00" /* #............. */ - $"FFF7 8100 FF00 0000 0000 00FF 81FF 00FF" /* ........ */ - $"FF00 0000 FFFF 00FF 0023 2323 2323 2323" /* .....####### */ - $"2323 0000 00FF 0000 0000 0000 0000 FF00" /* ##............ */ - $"FFF7 8100 FF00 0000 0000 00FF 81FF 0000" /* ......... */ - $"0000 FF00 0000 00FF 0000 2323 2323 2323" /* ........###### */ - $"2300 0000 00FF 0000 0000 0000 0000 FF00" /* #............. */ - $"FFF7 8100 FF00 0000 0000 00FF 81FF 0000" /* ......... */ - $"0000 00FF 0000 00FF 0000 0023 2323 2323" /* .........##### */ - $"0000 0000 00FF 0000 0000 0000 0000 FF00" /* .............. */ - $"FFF7 8100 FF00 0000 0000 00FF 81FF 0000" /* ......... */ - $"0000 FFFF 0000 00FF 0000 0000 2323 2300" /* .........###. */ - $"0000 0000 00FF 0000 0000 0000 0000 FF00" /* .............. */ - $"FFF7 8100 FF00 0000 FFFF 00FF 81FF FF00" /* ...... */ - $"0000 0000 0000 00FF 0000 0000 2323 2300" /* ...........###. */ - $"0000 0000 00FF 0000 0000 0000 0000 FF00" /* .............. */ - $"FFF7 8100 FF00 0000 FFFF FFFF 81FF FFFF" /* .... */ - $"00FF FFFF FF00 FFFF 0000 0000 0023 0000" /* .......#.. */ - $"0000 0000 00FF 0000 0000 0000 0000 FF00" /* .............. */ - $"FFF7 8100 FF00 0000 00FF 8181 81FF 81FF" /* ..... */ - $"FF00 FF00 FF00 FFFF FF00 0000 0000 0000" /* .......... */ - $"0000 0000 00FF 0000 0000 0000 0000 FF00" /* .............. */ - $"FFF7 8100 FF00 0000 FFFF FFFF FFFF FFFF" /* .... */ - $"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000" /* ..... */ - $"0000 0000 00FF 0000 0000 0000 0000 FF00" /* .............. */ - $"FFF7 8100 FFFF FFFF FF05 FF05 05FF FF23" /* ....# */ - $"2323 2323 23FF FF05 FFFF FFFF FFFF 0000" /* #####... */ - $"0000 0000 00FF 0000 0000 0000 0000 FF00" /* .............. */ - $"FFF7 8100 FFFF 0523 2305 05FF 0505 FFFF" /* ..##.... */ - $"2323 2323 FFFF 05FF FFFF FFFF FF23 FFFF" /* ####.# */ - $"FFFF 0000 00FF 0000 0000 0000 0000 FFFF" /* ........... */ - $"FFFF FFFF FFFF FF05 2323 0505 FF05 05FF" /* .##.... */ - $"FFFF FFFF FF05 FFFF FFFF FF23 2323 D200" /* .###. */ - $"0000 FFFF FFFF 0000 0000 0000 0000 FFFF" /* .......... */ - $"0000 0000 FFFF FFD2 0523 2305 05FF 0505" /* .....##.... */ - $"FFFF FFFF 0505 FFFF FFD2 D223 2323 D200" /* ..###. */ - $"D2D2 D2D2 00FF 0000 0000 0000 0000 FFFF" /* ......... */ - $"FFFF FFFF FF00 FFD2 0523 2381 0505 FF05" /* ..##... */ - $"0505 0505 05FF FF00 D205 23D2 2323 D200" /* .......###. */ - $"00D2 D200 00FF 0000 0000 0000 0000 FFFF" /* ........... */ - $"0000 0000 FF00 FFD2 0523 2305 8105 05FF" /* ......##... */ - $"05FF FFFF 05FF 00D2 0505 0505 D223 D200" /* .......#. */ - $"00D2 D200 00FF 0000 0000 0000 0000 FFFF" /* ........... */ - $"FFFF FFFF FF00 FFD2 0523 2305 0581 0505" /* ..##.... */ - $"FF05 0523 FF00 D2D2 D223 D223 D223 D2D2" /* ..#.### */ - $"0000 0000 D2FF 0000 0000 0000 0000 FFFF" /* ............ */ - $"0000 0000 FF00 FFD2 0523 2381 0505 81FF" /* ......##.. */ - $"2305 D205 05FF 0581 D2D2 D2D2 05D2 D200" /* #...... */ - $"00FF FF00 00FF 0000 0000 0000 0000 FFFF" /* ........... */ - $"FFFF FFFF FFFF D2D2 05D2 D281 8105 05FF" /* .ҁ.. */ - $"05D2 D2D2 05FF 0505 81D2 D205 D2D2 FFFF" /* ..... */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 FF00" /* ......... */ - $"00FF FF00 00D2 D205 D2D2 D2D2 8181 05FF" /* ....ҁ. */ - $"0505 D205 23FF 8105 0523 2305 D2FF 00FF" /* ...#..##.. */ - $"0000 0000 FFFF 0000 0000 0000 0000 FFD2" /* ............ */ - $"0000 0000 D2D2 05D2 23D2 23D2 D281 8105" /* .....##ҁ. */ - $"FF23 0505 FF05 0581 0523 2305 D2FF 00FF" /* #.....##.. */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 FF00" /* ......... */ - $"00D2 D200 00D2 23D2 0505 0505 D200 81FF" /* ...#..... */ - $"05FF FFFF 05FF 0505 8123 2305 D2FF 00FF" /* ....##.. */ - $"0000 0000 FFFF 0000 0000 0000 0000 FF00" /* ............. */ - $"00D2 D200 00D2 2323 D223 05D2 0000 FFFF" /* ...###... */ - $"0505 0505 0505 FF05 0523 2305 D2FF 00FF" /* ........##.. */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 FF00" /* ......... */ - $"D2D2 D2D2 00D2 2323 23D2 D200 FFFF FF05" /* .###.. */ - $"05FF FFFF FF05 05FF 0523 2305 D2FF FFFF" /* ....##. */ - $"0000 0000 FFFF 0000 0000 0000 0000 FFFF" /* ............ */ - $"FFFF 0000 00D2 2323 23FF FFFF FFFF FF05" /* ...###. */ - $"FFFF FFFF FFFF 0505 FF05 2323 05FF FFFF" /* ...##. */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 FF00" /* ......... */ - $"0000 FFFF FFFF 2323 FFFF FFFF FFFF 05FF" /* ..##. */ - $"FF23 2323 23FF FF05 05FF 0523 2305 FFFF" /* ####...##. */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 0000 0000 FFFF FFFF FFFF FF05 FFFF" /* ....... */ - $"2323 2323 2323 FFFF 0505 FFFF FFFF FFFF" /* ######.. */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 0000 0000 0000 00FF FFFF FFFF FFFF" /* ......... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 00FF" /* ... */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 0000 0000 0000 0000 00FF FFFF 00FF" /* ............ */ - $"00FF 00FF FF81 FF81 8181 FF00 0000 00FF" /* ...... */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 0000 0023 0000 0000 0000 FFFF 00FF" /* .....#....... */ - $"FFFF FF00 FFFF FF81 FFFF FFFF 0000 00FF" /* .... */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 0000 2323 2300 0000 0000 FF00 0000" /* ....###........ */ - $"0000 0000 00FF FF81 FF00 FFFF 0000 00FF" /* ......... */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 0000 2323 2300 0000 0000 FF00 0000" /* ....###........ */ - $"FFFF 0000 0000 FF81 FF00 0000 0000 00FF" /* .......... */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 0023 2323 2323 0000 0000 FF00 0000" /* ...#####....... */ - $"FF00 0000 0000 FF81 FF00 0000 0000 00FF" /* ........... */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 2323 2323 2323 2300 0000 FF00 0000" /* ..#######...... */ - $"00FF 0000 0000 FF81 FF00 0000 0000 00FF" /* ........... */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0023 2323 2323 2323 2323 0000 FF00 FFFF" /* .#########... */ - $"0000 00FF FF00 FF81 FF00 0000 0000 00FF" /* .......... */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 2323 2323 2323 2300 0000 00FF 00FF" /* ..#######..... */ - $"0000 00FF 0000 FF81 FF00 0000 0000 00FF" /* ........... */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 0023 2323 2323 0000 0000 00FF FFFF" /* ...#####..... */ - $"FFFF FFFF FFFF FFFF FF00 0000 0000 00FF" /* ...... */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 0000 2323 2300 0000 0000 00FF 2323" /* ....###......## */ - $"2323 2323 2323 2323 FF00 0000 0000 00FF" /* ########...... */ - $"0081 F7FF 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 0000 2323 2300 0000 0000 FF23 2305" /* ....###.....##. */ - $"0505 2323 2305 0523 23FF 0000 0000 0000" /* ..###..##...... */ - $"FF81 FF00 00FF 0000 0000 0000 0000 FF00" /* ........... */ - $"0000 0000 0023 0000 0000 00FF 2323 0505" /* .....#.....##.. */ - $"0505 0523 0505 0505 2323 FF00 0000 0000" /* ...#....##..... */ - $"00FF 0000 00FF 0000 0000 0000 0000 FFFF" /* ............ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 6968 3332 0000" /* ..........ih32.. */ - $"0CA3 FF00 9000 80FF 0000 83FF 0000 98FF" /* ....... */ - $"8700 04FF FF00 6D00 83FF 0000 89FF 0000" /* ...m..... */ - $"8AFF 8700 05FF 00B4 6DFF 0083 FF00 0087" /* ...m... */ - $"FF00 008B FF87 0005 FF00 B46D FF00 83FF" /* .....m. */ - $"8900 8BFF 8700 05FF 00B4 6DFF 0083 FF05" /* ....m.. */ - $"006D 0000 FF00 80FF 0200 FF00 8BFF 8700" /* .m....... */ - $"05FF 00B4 6DFF 0083 FF05 006D 00FF 0000" /* ..m...m... */ - $"80FF 0300 00FF 008A FF87 0005 FF00 B46D" /* .......m */ - $"FF00 83FF 0200 6D00 81FF 0000 81FF 0000" /* ...m..... */ - $"8AFF 8700 05FF 00B4 6DFF 0083 FF02 006D" /* ...m...m */ - $"0082 FF00 0080 FF00 008A FF87 0005 FF00" /* ........ */ - $"B46D FF00 83FF 0200 6D00 81FF 0100 0080" /* m...m.... */ - $"FF00 008A FF87 0005 FF00 B46D FF00 80FF" /* .....m. */ - $"0600 00FF 006D 0000 85FF 0000 8AFF 8700" /* ....m..... */ - $"05FF 00B4 6DFF 0080 FF81 0000 6D80 0000" /* ..m...m.. */ - $"FF81 0002 FF00 008A FF87 0005 FF00 B46D" /* .......m */ - $"FF00 81FF 0000 806D 0800 6D00 00FF 00FF" /* ...m..m... */ - $"00FF 8000 89FF 8700 05FF 00B4 6DFF 0080" /* .....m. */ - $"FF90 0087 FF87 0004 FF00 B46D FF82 0005" /* ....m.. */ - $"FF00 FFFF 0000 83FF 0200 00FF 8300 84FF" /* ....... */ - $"8700 06FF 00B4 6DFF 0000 82FF 0400 FFFF" /* ...m.... */ - $"0000 81FF 0200 00FF 8300 00FF 8100 80FF" /* ........ */ - $"8F00 82FF 0200 FFFF 8300 00FF 8200 80FF" /* ...... */ - $"0000 80FF 8B00 81FF 8100 82FF 0200 FFFF" /* ...... */ - $"8100 01FF FF82 0080 FF01 00FF 8100 00FF" /* ....... */ - $"8D00 02FF 0000 80FF 036D FFFF 0083 FF0F" /* .....m.. */ - $"0000 FF00 FFFF 00FF FF00 FFFF 0000 FFFF" /* ....... */ - $"8800 81FF 0300 FF00 0081 FF04 6DFF FF00" /* ......m. */ - $"FF80 0003 FF00 FF00 81FF 0800 FF00 FFFF" /* ....... */ - $"0000 FFFF 8D00 02FF 0000 82FF 036D FFFF" /* .......m */ - $"0080 FF01 00FF 8000 06FF 00FF 00FF 0000" /* ......... */ - $"81FF 8900 81FF 0300 FF00 0080 FF0C 6DFF" /* ......m */ - $"FF6D 00FF FF00 FFFF 00FF 6D81 0008 FF00" /* m...m... */ - $"00FF FF00 00FF FF90 0008 FF00 006D 6DFF" /* .......mm */ - $"FF00 FF80 0007 FF00 FFFF 6D00 00FF 9000" /* ....m... */ - $"08FF FF00 00FF FF00 00FF 8100 0A6D 6DFF" /* ......mm */ - $"00FF FF00 FFFF 006D 82FF 0300 00FF 0081" /* ...m.... */ - $"FF89 0081 FF0C 0000 FF00 FF00 FF00 006D" /* ........m */ - $"6DFF 0080 FF03 00FF FF6D 81FF 0200 00FF" /* m...m... */ - $"8D00 08FF FF00 00FF FF00 FF00 81FF 0400" /* ........ */ - $"FF6D 00FF 8000 04FF 00FF FF6D 80FF 0300" /* m....m.. */ - $"00FF 0081 FF88 0010 FFFF 0000 FFFF 00FF" /* ....... */ - $"FF00 FFFF 00FF FF00 0083 FF00 0082 FF02" /* ....... */ - $"0000 FF8D 0000 FF81 0001 FF00 80FF 0200" /* ......... */ - $"00FF 8000 01FF FF81 0002 FFFF 0081 FF81" /* ...... */ - $"0081 FF8B 0080 FF00 0080 FF83 0000 FF83" /* ...... */ - $"0002 FFFF 0081 FF8F 0080 FF81 0001 FFFF" /* ...... */ - $"8300 02FF 0000 81FF 0400 00FF FF00 81FF" /* ........ */ - $"0600 00FF 6DB4 00FF 8700 84FF 8400 02FF" /* ...m.... */ - $"0000 83FF 0300 00FF FF83 0004 FF6D B400" /* .......m. */ - $"FF87 0087 FF90 0080 FF05 00FF 6DB4 00FF" /* ....m. */ - $"8700 89FF 8000 08FF 00FF 00FF 0000 6D00" /* .......m. */ - $"806D 0000 81FF 0500 FF6D B400 FF87 008A" /* m....m.. */ - $"FF02 0000 FF81 0000 FF80 0000 6D81 0080" /* .......m. */ - $"FF05 00FF 6DB4 00FF 8700 8AFF 0000 85FF" /* ..m.... */ - $"0600 006D 00FF 0000 80FF 0500 FF6D B400" /* ...m.....m. */ - $"FF87 008A FF00 0080 FF01 0000 81FF 0200" /* ........ */ - $"6D00 83FF 0500 FF6D B400 FF87 008A FF00" /* m...m... */ - $"0080 FF00 0082 FF02 006D 0083 FF05 00FF" /* .....m... */ - $"6DB4 00FF 8700 8AFF 0000 81FF 0000 81FF" /* m...... */ - $"0200 6D00 83FF 0500 FF6D B400 FF87 008A" /* ..m...m.. */ - $"FF03 00FF 0000 80FF 0500 00FF 006D 0083" /* ........m. */ - $"FF05 00FF 6DB4 00FF 8700 8BFF 0200 FF00" /* ..m..... */ - $"80FF 0500 FFFF 006D 0083 FF05 00FF 6DB4" /* ...m...m */ - $"00FF 8700 8BFF 8900 83FF 0500 FF6D B400" /* .....m. */ - $"FF87 008B FF00 0087 FF00 0083 FF05 00FF" /* ....... */ - $"6DB4 00FF 8700 8AFF 0000 89FF 0000 83FF" /* m...... */ - $"0400 6D00 FFFF 8700 89FF 0000 8BFF 0000" /* ..m...... */ - $"83FF 0000 80FF E200 FF00 9000 80FF 0000" /* ....... */ - $"83FF 8000 81FF 0000 82FF 0100 0082 FF00" /* ....... */ - $"0084 FF87 0004 FFFF 006D 0083 FF80 0001" /* ....m... */ - $"FFFF 8000 80FF 8000 81FF 8000 83FF 8700" /* .... */ - $"05FF 00B4 6DFF 0083 FF89 0082 FF80 0083" /* ..m... */ - $"FF87 0005 FF00 B46D FF00 83FF 8900 81FF" /* ...m.. */ - $"8200 82FF 8700 05FF 00B4 6DFF 0083 FF05" /* ....m.. */ - $"006D 0000 FF00 80FF 0200 FF00 80FF 8400" /* .m....... */ - $"81FF 8700 05FF 00B4 6DFF 0083 FF05 006D" /* ...m...m */ - $"00FF 0000 80FF 0400 00FF 00FF 8600 80FF" /* ........ */ - $"8700 05FF 00B4 6DFF 0083 FF02 006D 0081" /* ...m...m. */ - $"FF00 0081 FF02 00FF FF84 0081 FF87 0005" /* ....... */ - $"FF00 B46D FF00 83FF 0200 6D00 82FF 0000" /* .m...m... */ - $"80FF 0000 80FF 8200 82FF 8700 05FF 00B4" /* ...... */ - $"6DFF 0083 FF02 006D 0081 FF01 0000 80FF" /* m...m.... */ - $"0000 81FF 8000 83FF 8700 05FF 00B4 6DFF" /* ......m */ - $"0080 FF06 0000 FF00 6D00 0085 FF00 0081" /* .....m.... */ - $"FF80 0083 FF87 0005 FF00 B46D FF00 80FF" /* ....m. */ - $"8100 006D 8000 00FF 8100 02FF 0000 82FF" /* ..m...... */ - $"0000 84FF 8700 05FF 00B4 6DFF 0081 FF00" /* .....m.. */ - $"0080 6D08 006D 0000 FF00 FF00 FF80 0089" /* .m..m..... */ - $"FF87 0005 FF00 B46D FF00 80FF 9000 87FF" /* ...m.. */ - $"8700 04FF 00B4 6DFF 8200 03FF 00FF FF87" /* ...m... */ - $"0000 FF83 0084 FF87 000E FF00 B46D FF00" /* ......m. */ - $"00FF 0000 FFFF 00FF FF85 0000 FF88 0080" /* ....... */ - $"FF8F 0007 FF00 00FF FF00 FFFF 8300 00FF" /* ....... */ - $"8600 80FF 8B00 81FF 8100 07FF 0000 FFFF" /* ...... */ - $"00FF FF81 0001 FFFF 8600 00FF 8100 00FF" /* ....... */ - $"8D00 09FF 0000 FF00 006D FFFF 0083 FF04" /* .....m.. */ - $"0000 FF00 FF82 0005 FFFF 0000 FFFF 8800" /* ........ */ - $"81FF 0C00 FF00 00FF 0000 FF6D FFFF 00FF" /* ......m. */ - $"8000 03FF 00FF 0081 FF80 0005 FFFF 0000" /* ........ */ - $"FFFF 8D00 10FF 0000 FF00 00FF FF6D FFFF" /* ......m */ - $"00FF FF00 00FF 8700 81FF 8900 81FF 1300" /* ....... */ - $"FF00 00FF 0000 6DFF FF6D 0000 FF00 FFFF" /* ....mm... */ - $"00FF 6D81 0008 FF00 00FF FF00 00FF FF90" /* .m...... */ - $"0008 FF00 006D 6DFF FF00 FF80 0007 FF00" /* ....mm.... */ - $"FFFF 6D00 00FF 9000 08FF FF00 00FF FF00" /* m....... */ - $"00FF 8100 136D 6DFF 00FF FF00 FF00 006D" /* ...mm....m */ - $"FFFF 0000 FF00 00FF 0081 FF89 0081 FF02" /* ....... */ - $"0000 FF83 0011 6D6D FF00 00FF FF00 FFFF" /* ....mm... */ - $"6DFF 0000 FF00 00FF 8D00 05FF FF00 00FF" /* m........ */ - $"FF80 0081 FF04 00FF 6D00 FF80 000B FF00" /* ...m.... */ - $"FFFF 6D00 00FF 0000 FF00 81FF 8800 05FF" /* m....... */ - $"FF00 00FF FF82 0005 FF00 FFFF 0000 83FF" /* ....... */ - $"0800 FFFF 0000 FF00 00FF 8D00 00FF 8100" /* ......... */ - $"00FF 8300 00FF 8000 01FF FF81 0006 FFFF" /* ....... */ - $"00FF 0000 FF81 0081 FF8B 0080 FF87 0000" /* ....... */ - $"FF83 0006 FFFF 00FF 0000 FF8F 0080 FF89" /* ...... */ - $"0000 FF85 000D FFFF 00FF 0000 FF00 00FF" /* ......... */ - $"6DB4 00FF 8700 84FF 8400 00FF 8700 01FF" /* m...... */ - $"FF83 0004 FF6D B400 FF87 0087 FF90 0080" /* ..m... */ - $"FF05 00FF 6DB4 00FF 8700 89FF 8000 08FF" /* ..m.... */ - $"00FF 00FF 0000 6D00 806D 0000 81FF 0500" /* ....m.m.... */ - $"FF6D B400 FF87 0083 FF00 0083 FF02 0000" /* m....... */ - $"FF81 0000 FF80 0000 6D81 0080 FF05 00FF" /* ....m... */ - $"6DB4 00FF 8700 82FF 8000 82FF 0000 85FF" /* m..... */ - $"0600 006D 00FF 0000 80FF 0500 FF6D B400" /* ...m.....m. */ - $"FF87 0082 FF80 0082 FF00 0080 FF01 0000" /* ....... */ - $"81FF 0200 6D00 83FF 0500 FF6D B400 FF87" /* ..m...m. */ - $"0081 FF82 0081 FF00 0080 FF00 0082 FF02" /* ....... */ - $"006D 0083 FF05 00FF 6DB4 00FF 8700 80FF" /* .m...m.. */ - $"8400 80FF 0000 81FF 0000 81FF 0200 6D00" /* .......m. */ - $"83FF 0500 FF6D B400 FF87 0001 FFFF 8600" /* ..m.... */ - $"05FF FF00 FF00 0080 FF05 0000 FF00 6D00" /* ........m. */ - $"83FF 0500 FF6D B400 FF87 0080 FF84 0081" /* ..m... */ - $"FF02 00FF 0080 FF05 00FF FF00 6D00 83FF" /* ......m. */ - $"0500 FF6D B400 FF87 0081 FF82 0082 FF89" /* ..m... */ - $"0083 FF05 00FF 6DB4 00FF 8700 82FF 8000" /* ...m... */ - $"83FF 8900 83FF 0500 FF6D B400 FF87 0082" /* ...m.. */ - $"FF80 0082 FF80 0080 FF80 0001 FFFF 8000" /* ..... */ - $"83FF 0400 6D00 FFFF 8700 83FF 0000 82FF" /* ..m.... */ - $"8000 82FF 0000 81FF 8000 83FF 0000 80FF" /* ...... */ - $"E200 FF00 9000 80FF 0000 83FF 8C00 82FF" /* ...... */ - $"0000 84FF 8700 04FF FF00 6D00 83FF 8B00" /* .....m.. */ - $"81FF 8000 83FF 8700 05FF 00B4 6DFF 0083" /* ....m. */ - $"FF89 0082 FF80 0083 FF87 0005 FF00 B46D" /* .....m */ - $"FF00 83FF 8900 81FF 8200 82FF 8700 05FF" /* ..... */ - $"00B4 6DFF 0083 FF05 006D 0000 FF00 80FF" /* .m...m... */ - $"0200 FF00 80FF 8400 81FF 8700 05FF 00B4" /* ....... */ - $"6DFF 0083 FF05 006D 00FF 0000 80FF 0400" /* m...m..... */ - $"00FF 00FF 8600 80FF 8700 05FF 00B4 6DFF" /* ......m */ - $"0083 FF02 006D 0081 FF00 0081 FF02 00FF" /* ...m..... */ - $"FF84 0081 FF87 0005 FF00 B46D FF00 83FF" /* ....m. */ - $"0200 6D00 82FF 0000 80FF 0000 80FF 8200" /* ..m...... */ - $"82FF 8700 05FF 00B4 6DFF 0083 FF02 006D" /* ...m...m */ - $"0081 FF01 0000 80FF 0000 81FF 8000 83FF" /* ....... */ - $"8700 05FF 00B4 6DFF 0080 FF06 0000 FF00" /* ...m..... */ - $"6D00 0085 FF00 0081 FF80 0083 FF87 0005" /* m....... */ - $"FF00 B46D FF00 80FF 8100 006D 8000 00FF" /* .m...m.. */ - $"8100 02FF 0000 82FF 0000 84FF 8700 05FF" /* ........ */ - $"00B4 6DFF 0081 FF00 0080 6D08 006D 0000" /* .m...m..m.. */ - $"FF00 FF00 FF80 0089 FF87 0005 FF00 B46D" /* ......m */ - $"FF00 80FF 9000 87FF 8700 04FF 00B4 6DFF" /* .....m */ - $"9700 84FF 8700 04FF 00B4 6DFF 9B00 80FF" /* ....m. */ - $"A600 81FF 8B00 81FF 8000 00FF 8E00 01FF" /* ...... */ - $"FF80 0084 FF8D 0002 FF00 FF80 0000 6D88" /* ......m */ - $"0006 FFFF 0000 FF00 0084 FF88 0081 FF03" /* ........ */ - $"00FF 00FF 8100 006D 8600 01FF FF81 0001" /* ....m.... */ - $"FF00 84FF 8D00 02FF 00FF 8200 006D 8400" /* ......m. */ - $"81FF 0400 FF00 FF00 84FF 8800 81FF 0300" /* ....... */ - $"FF00 FF80 0003 6D00 006D 8000 00FF 8100" /* ...m..m... */ - $"006D 81FF 0000 81FF 0300 00FF FF8E 0006" /* .m....... */ - $"FFFF 00FF FF6D 6D81 0080 FF81 0005 6DFF" /* .mm...m */ - $"FF00 FFFF 8E00 03FF FF00 0081 FF00 0081" /* ....... */ - $"FF01 6D6D 8100 00FF 8000 006D 8200 03FF" /* .mm....m.. */ - $"00FF 0081 FF88 0084 FF08 00FF 00FF 00FF" /* ....... */ - $"FF6D 6D85 0000 6D81 0002 FF00 FF8D 0084" /* mm..m.... */ - $"FF01 00FF 8100 02FF FF6D 8600 006D 8000" /* ....m..m. */ - $"03FF 00FF 0081 FF88 0084 FF04 0000 FF00" /* ........ */ - $"0080 FF8B 0002 FF00 FF8D 0084 FF80 0080" /* ...... */ - $"FF8D 0000 FF80 0081 FF8B 0081 FFA6 0080" /* ..... */ - $"FF9B 0004 FF6D B400 FF87 0084 FF97 0004" /* ..m.... */ - $"FF6D B400 FF87 0087 FF90 0080 FF05 00FF" /* m..... */ - $"6DB4 00FF 8700 89FF 8000 08FF 00FF 00FF" /* m...... */ - $"0000 6D00 806D 0000 81FF 0500 FF6D B400" /* ..m.m....m. */ - $"FF87 0083 FF00 0083 FF02 0000 FF81 0000" /* ........ */ - $"FF80 0000 6D81 0080 FF05 00FF 6DB4 00FF" /* ..m...m. */ - $"8700 82FF 8000 82FF 0000 85FF 0600 006D" /* .......m */ - $"00FF 0000 80FF 0500 FF6D B400 FF87 0082" /* .....m.. */ - $"FF80 0082 FF00 0080 FF01 0000 81FF 0200" /* ........ */ - $"6D00 83FF 0500 FF6D B400 FF87 0081 FF82" /* m...m.. */ - $"0081 FF00 0080 FF00 0082 FF02 006D 0083" /* .......m. */ - $"FF05 00FF 6DB4 00FF 8700 80FF 8400 80FF" /* ..m... */ - $"0000 81FF 0000 81FF 0200 6D00 83FF 0500" /* ......m... */ - $"FF6D B400 FF87 0001 FFFF 8600 05FF FF00" /* m...... */ - $"FF00 0080 FF05 0000 FF00 6D00 83FF 0500" /* ......m... */ - $"FF6D B400 FF87 0080 FF84 0081 FF02 00FF" /* m..... */ - $"0080 FF05 00FF FF00 6D00 83FF 0500 FF6D" /* ....m...m */ - $"B400 FF87 0081 FF82 0082 FF89 0083 FF05" /* ..... */ - $"00FF 6DB4 00FF 8700 82FF 8000 83FF 8900" /* .m.... */ - $"83FF 0500 FF6D B400 FF87 0082 FF80 0082" /* ..m... */ - $"FF8B 0083 FF04 006D 00FF FF87 0083 FF00" /* ...m... */ - $"0082 FF8D 0083 FF00 0080 FFE2 0068 386D" /* .....h8m */ - $"6B00 0009 0800 0000 0000 0000 0000 0000" /* k.............. */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 00FF FFFF FFFF FFFF" /* ......... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 00FF FFFF FFFF FFFF" /* ........ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 0000 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0069 6373 2300 0000 4800 0000" /* .....ics#...H... */ - $"0000 0000 0000 0044 1048 3850 7C60 FE50" /* .......D.H8P|`P */ - $"7C48 3844 1000 0000 0000 0000 0000 0000" /* |H8D............ */ - $"0000 0000 0000 0044 1048 3850 7C60 FE50" /* .......D.H8P|`P */ - $"7C48 3844 1000 0000 0000 0000 0069 6373" /* |H8D.........ics */ - $"3400 0000 8800 0000 0000 0000 0000 0000" /* 4.............. */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0003 0003" /* ................ */ - $"0000 0300 0003 0030 0000 3330 0003 0300" /* .......0..30.... */ - $"0003 3333 0003 3000 0033 3333 3003 0300" /* ..33..0..3330... */ - $"0003 3333 0003 0030 0000 3330 0003 0003" /* ..33...0..30.... */ - $"0000 0300 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0069 6373 3800 0001 0800 0000" /* .....ics8....... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 2300" /* ..............#. */ - $"0000 2300 0000 0000 2300 0000 0000 2300" /* ..#.....#.....#. */ - $"0023 0000 0000 0023 2323 0000 0000 2300" /* .#.....###....#. */ - $"2300 0000 0000 2323 2323 2300 0000 2323" /* #.....#####...## */ - $"0000 0000 0023 2323 2323 2323 0000 2300" /* .....#######..#. */ - $"2300 0000 0000 2323 2323 2300 0000 2300" /* #.....#####...#. */ - $"0023 0000 0000 0023 2323 0000 0000 2300" /* .#.....###....#. */ - $"0000 2300 0000 0000 2300 0000 0000 0000" /* ..#.....#....... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0069 7333" /* .............is3 */ - $"3200 0000 5DCE 0000 FF80 0000 FF82 0000" /* 2...]...... */ - $"FF82 0003 FF00 00FF 8200 80FF 8100 02FF" /* ....... */ - $"00FF 8200 82FF 8000 01FF FF82 0084 FF04" /* ...... */ - $"0000 FF00 FF82 0082 FF80 0003 FF00 00FF" /* ........ */ - $"8200 80FF 8100 00FF 8000 00FF 8200 00FF" /* ....... */ - $"C100 FF00 FB00 FF00 FB00 7338 6D6B 0000" /* .....s8mk.. */ - $"0108 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 00FF 0000 00FF 0000 0000 00FF 0000" /* ............. */ - $"0000 00FF 0000 FF00 0000 0000 FFFF FF00" /* ........... */ - $"0000 00FF 00FF 0000 0000 00FF FFFF FFFF" /* ......... */ - $"0000 00FF FF00 0000 0000 FFFF FFFF FFFF" /* ........ */ - $"FF00 00FF 00FF 0000 0000 00FF FFFF FFFF" /* ........ */ - $"0000 00FF 0000 FF00 0000 0000 FFFF FF00" /* ........... */ - $"0000 00FF 0000 00FF 0000 0000 00FF 0000" /* ............. */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 6963 6D23 0000 0038 0000 0000 0000" /* ..icm#...8...... */ - $"4410 4838 507C 60FE 507C 4838 4410 0000" /* D.H8P|`P|H8D... */ - $"0000 0000 0000 0000 4410 4838 507C 60FE" /* ........D.H8P|` */ - $"507C 4838 4410 0000 0000 6963 6D34 0000" /* P|H8D.....icm4.. */ - $"0068 0000 0000 0000 0000 0000 0000 0000" /* .h.............. */ - $"0000 0000 0000 0000 0000 0300 0300 0003" /* ................ */ - $"0000 0300 3000 0033 3000 0303 0000 0333" /* ....0..30......3 */ - $"3300 0330 0000 3333 3330 0303 0000 0333" /* 3..0..3330.....3 */ - $"3300 0300 3000 0033 3000 0300 0300 0003" /* 3...0..30....... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 6963 6D38 0000 00C8 0000 0000 0000" /* ..icm8......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0023 0000 0023" /* ...........#...# */ - $"0000 0000 0023 0000 0000 0023 0000 2300" /* .....#.....#..#. */ - $"0000 0000 2323 2300 0000 0023 0023 0000" /* ....###....#.#.. */ - $"0000 0023 2323 2323 0000 0023 2300 0000" /* ...#####...##... */ - $"0000 2323 2323 2323 2300 0023 0023 0000" /* ..#######..#.#.. */ - $"0000 0023 2323 2323 0000 0023 0000 2300" /* ...#####...#..#. */ - $"0000 0000 2323 2300 0000 0023 0000 0023" /* ....###....#...# */ - $"0000 0000 0023 0000 0000 0000 0000 0000" /* .....#.......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 6974 3332 0000" /* ..........it32.. */ - $"2541 0000 0000 FF00 FF00 FF00 FF00 FF00" /* %A......... */ - $"FF00 FF00 FF00 FF00 FF00 FF00 FF00 F500" /* ........ */ - $"A9FF 8500 A9FF 9C00 ABFF 8300 ABFF 9A00" /* .... */ - $"ADFF 8100 06FF FF00 FFFF 0000 83FF 0000" /* ....... */ - $"9FFF 9900 ADFF 8100 07FF FF00 FF00 FFFF" /* ..... */ - $"0081 FF80 009E FF99 00AD FF81 0007 FFFF" /* ..... */ - $"00FF 00FF FF00 80FF 8200 9DFF 9900 ADFF" /* ..... */ - $"8100 09FF FF00 FF00 FFFF 00FF FF84 009C" /* ..... */ - $"FF99 00AD FF81 0007 FFFF 00FF 00FF FF00" /* ...... */ - $"80FF 8200 9DFF 9900 ADFF 8100 07FF FF00" /* ..... */ - $"FF00 FFFF 0082 FF00 009F FF99 00AD FF81" /* ..... */ - $"0006 FFFF 00FF FF00 0082 FF80 009E FF99" /* ...... */ - $"00AD FF81 00AD FF99 00AD FF81 0088 FF00" /* ..... */ - $"0095 FF00 0088 FF99 0001 FFFF A900 01FF" /* ....... */ - $"FF81 0001 FFFF A900 01FF FF9B 00A9 FF85" /* ..... */ - $"00A9 FF9C 00AB FF83 00AB FF9A 0080 FF82" /* .... */ - $"0082 FF00 009F FF81 00AD FF99 0083 FF00" /* ...... */ - $"0082 FF80 009E FF81 00AD FF99 0083 FF00" /* ..... */ - $"0081 FF82 009D FF81 00AD FF99 0083 FF00" /* ..... */ - $"0080 FF84 009C FF81 00AD FF99 0083 FF00" /* ..... */ - $"0081 FF82 009D FF81 00AD FF99 0080 FF03" /* ..... */ - $"00FF FF00 83FF 0000 9FFF 8100 ADFF 9900" /* ...... */ - $"81FF 0100 0083 FF80 009E FF81 00AD FF99" /* ..... */ - $"00AD FF81 00AD FF99 00AD FF81 00AD FF99" /* .... */ - $"0001 FFFF A900 01FF FF81 0001 FFFF A900" /* ....... */ - $"01FF FF9B 00A9 FF85 00A9 FF9C 00AB FF83" /* .... */ - $"00AB FF9A 00AD FF81 00AD FF99 00AD FF81" /* .... */ - $"00AD FF99 00AD FF81 00AD FF99 00AD FF81" /* .... */ - $"00AD FF99 00AD FF81 00AD FF99 00AD FF81" /* .... */ - $"00AD FF99 00AD FF81 00AD FF99 00AD FF81" /* .... */ - $"00AD FF99 00AD FF81 00AD FF99 0001 FFFF" /* ..... */ - $"A900 01FF FF81 0001 FFFF A900 01FF FF9B" /* ...... */ - $"00A9 FF85 00A9 FF9C 00AB FF83 00AB FF9A" /* .... */ - $"0081 FF80 0083 FF00 009F FF81 00AD FF99" /* ..... */ - $"0080 FF00 0085 FF80 009E FF81 00AD FF99" /* ..... */ - $"0080 FF00 0084 FF04 00FF 00FF 009D FF81" /* ....... */ - $"00AD FF99 0080 FF81 0080 FF84 009C FF81" /* .... */ - $"00AD FF99 0080 FF00 0080 FF00 0080 FF04" /* ....... */ - $"00FF 00FF 009D FF81 00AD FF99 0080 FF00" /* ...... */ - $"0080 FF00 0082 FF00 009F FF81 00AD FF99" /* ...... */ - $"0081 FF80 0082 FF80 009E FF81 00AD FF99" /* .... */ - $"00AD FF81 00AD FF99 00AD FF81 00AD FF99" /* .... */ - $"0087 FF80 0093 FF80 0087 FF81 00AD FF99" /* .... */ - $"0086 FF82 0091 FF82 0086 FF81 0081 FFA5" /* .... */ - $"0081 FF99 0086 FF82 0091 FF82 0086 FF81" /* .... */ - $"0081 FF00 0080 FF00 0083 FF00 0098 FF00" /* ........ */ - $"0081 FF99 0087 FF80 0093 FF80 0087 FF81" /* .... */ - $"0081 FF05 00FF FF00 6D00 83FF 0000 89FF" /* ....m... */ - $"0000 8AFF 0000 81FF 9900 84FF 0800 00FF" /* ........ */ - $"FF00 FFFF 0000 8DFF 0800 00FF FF00 FFFF" /* ....... */ - $"0000 84FF 8100 81FF 0600 FF00 B46D FF00" /* ......m. */ - $"83FF 0000 87FF 0000 8BFF 0000 81FF 9900" /* ....... */ - $"83FF 8100 02FF 00FF 8100 8BFF 8100 02FF" /* ...... */ - $"00FF 8100 83FF 8100 81FF 0600 FF00 B46D" /* ......m */ - $"FF00 83FF 8900 8BFF 0000 81FF 9900 83FF" /* ..... */ - $"8800 8BFF 8800 83FF 8100 81FF 0600 FF00" /* ...... */ - $"B46D FF00 83FF 0500 6D00 00FF 0080 FF02" /* m...m.... */ - $"00FF 008B FF00 0081 FF99 0083 FF81 0002" /* ....... */ - $"FF00 FF81 008B FF81 0002 FF00 FF81 0083" /* ...... */ - $"FF81 0081 FF06 00FF 00B4 6DFF 0083 FF05" /* ....m.. */ - $"006D 00FF 0000 80FF 0300 00FF 008A FF00" /* .m........ */ - $"0081 FF99 0084 FF08 0000 FFFF 00FF FF00" /* ....... */ - $"008D FF08 0000 FFFF 00FF FF00 0084 FF81" /* ....... */ - $"0081 FF06 00FF 00B4 6DFF 0083 FF02 006D" /* ....m...m */ - $"0081 FF00 0081 FF00 008A FF00 0081 FF99" /* ....... */ - $"0087 FF80 0093 FF80 0087 FF81 0081 FF06" /* ..... */ - $"00FF 00B4 6DFF 0083 FF02 006D 0082 FF00" /* ..m...m.. */ - $"0080 FF00 008A FF00 0081 FF99 0085 FF84" /* ...... */ - $"008F FF84 0085 FF81 0081 FF06 00FF 00B4" /* ...... */ - $"6DFF 0083 FF02 006D 0081 FF01 0000 80FF" /* m...m.... */ - $"0000 8AFF 0000 81FF 9900 ADFF 8100 81FF" /* ...... */ - $"0600 FF00 B46D FF00 80FF 0600 00FF 006D" /* ...m.....m */ - $"0000 85FF 0000 8AFF 0000 81FF 9900 ADFF" /* ....... */ - $"8100 81FF 0600 FF00 B46D FF00 80FF 8100" /* ....m.. */ - $"006D 8000 00FF 8100 02FF 0000 8AFF 0000" /* .m........ */ - $"81FF 9900 ADFF 8100 81FF 0600 FF00 B46D" /* .....m */ - $"FF00 81FF 0000 806D 0800 6D00 00FF 00FF" /* ...m..m... */ - $"00FF 8000 89FF 0000 81FF 9900 ADFF 8100" /* ...... */ - $"81FF 0600 FF00 B46D FF00 80FF 9000 87FF" /* ...m.. */ - $"0000 81FF 9900 ADFF 8100 81FF 0500 FF00" /* ....... */ - $"B46D FF82 0005 FF00 FFFF 0000 83FF 0200" /* m....... */ - $"00FF 8300 84FF 0000 81FF 9900 ADFF 8100" /* ...... */ - $"81FF 0700 FF00 B46D FF00 0082 FF04 00FF" /* ...m.... */ - $"FF00 0081 FF02 0000 FF83 0000 FF81 0080" /* ........ */ - $"FF00 0081 FF99 00AD FF81 0081 FF86 0082" /* ..... */ - $"FF02 00FF FF83 0000 FF82 0080 FF00 0080" /* ....... */ - $"FF81 0081 FF99 0087 FF80 0093 FF80 0087" /* .... */ - $"FF81 0081 FF01 0000 81FF 8100 82FF 0200" /* ....... */ - $"FFFF 8100 01FF FF82 0080 FF01 00FF 8100" /* ...... */ - $"01FF 0081 FF99 0086 FF82 0091 FF82 0086" /* ..... */ - $"FF81 0081 FF84 0002 FF00 0080 FF03 6DFF" /* ......m */ - $"FF00 83FF 1000 00FF 00FF FF00 FFFF 00FF" /* ....... */ - $"FF00 00FF FF00 81FF 9900 86FF 8200 91FF" /* ..... */ - $"8200 86FF 8100 81FF 0100 0081 FF03 00FF" /* ....... */ - $"0000 81FF 046D FFFF 00FF 8000 03FF 00FF" /* ...m.... */ - $"0081 FF09 00FF 00FF FF00 00FF FF00 81FF" /* ...... */ - $"9900 87FF 8000 93FF 8000 87FF 8100 81FF" /* .... */ - $"8400 02FF 0000 82FF 036D FFFF 0080 FF01" /* .....m.. */ - $"00FF 8000 06FF 00FF 00FF 0000 81FF 0100" /* ......... */ - $"0081 FF99 0084 FF08 0000 FFFF 00FF FF00" /* ....... */ - $"008D FF08 0000 FFFF 00FF FF00 0084 FF81" /* ....... */ - $"0081 FF01 0000 81FF 0300 FF00 0080 FF0C" /* ......... */ - $"6DFF FF6D 00FF FF00 FFFF 00FF 6D81 0009" /* mm...m. */ - $"FF00 00FF FF00 00FF FF00 81FF 9900 83FF" /* ...... */ - $"8100 02FF 00FF 8100 8BFF 8100 02FF 00FF" /* ....... */ - $"8100 83FF 8100 81FF 8700 08FF 0000 6D6D" /* ......mm */ - $"FFFF 00FF 8000 07FF 00FF FF6D 0000 FF87" /* ....m.. */ - $"0081 FF99 0083 FF88 008B FF88 0083 FF81" /* .... */ - $"0081 FF09 00FF FF00 00FF FF00 00FF 8100" /* ....... */ - $"0A6D 6DFF 00FF FF00 FFFF 006D 82FF 0300" /* mm...m.. */ - $"00FF 0081 FF01 0000 81FF 9900 83FF 8100" /* ....... */ - $"02FF 00FF 8100 8BFF 8100 02FF 00FF 8100" /* ....... */ - $"83FF 8100 81FF 0100 0081 FF0C 0000 FF00" /* ........ */ - $"FF00 FF00 006D 6DFF 0080 FF03 00FF FF6D" /* ...mm...m */ - $"81FF 0200 00FF 8400 81FF 9900 84FF 0800" /* ....... */ - $"00FF FF00 FFFF 0000 8DFF 0800 00FF FF00" /* ........ */ - $"FFFF 0000 84FF 8100 81FF 0900 FFFF 0000" /* ...... */ - $"FFFF 00FF 0081 FF04 00FF 6D00 FF80 0004" /* ....m... */ - $"FF00 FFFF 6D80 FF03 0000 FF00 81FF 0100" /* .m...... */ - $"0081 FF99 0087 FF80 0093 FF80 0087 FF81" /* .... */ - $"0081 FF11 00FF FF00 00FF FF00 FFFF 00FF" /* ....... */ - $"FF00 FFFF 0000 83FF 0000 82FF 0200 00FF" /* ........ */ - $"8400 81FF 9900 85FF 8400 8FFF 8400 85FF" /* .... */ - $"8100 81FF 0100 FF81 0001 FF00 80FF 0200" /* ........ */ - $"00FF 8000 01FF FF81 0002 FFFF 0081 FF81" /* ...... */ - $"0081 FF01 0000 81FF 9900 ADFF 8100 81FF" /* ...... */ - $"8100 80FF 0000 80FF 8300 00FF 8300 02FF" /* ....... */ - $"FF00 81FF 8600 81FF 9900 ADFF 8100 81FF" /* .... */ - $"0000 80FF 8100 01FF FF83 0002 FF00 0081" /* ........ */ - $"FF04 0000 FFFF 0081 FF07 0000 FF6D B400" /* .......m. */ - $"FF00 81FF 9900 ADFF 8100 81FF 0000 84FF" /* ..... */ - $"8400 02FF 0000 83FF 0300 00FF FF83 0005" /* ......... */ - $"FF6D B400 FF00 81FF 9900 ADFF 8100 81FF" /* m.... */ - $"0000 87FF 9000 80FF 0600 FF6D B400 FF00" /* .....m.. */ - $"81FF 9900 ADFF 8100 81FF 0000 89FF 8000" /* ..... */ - $"08FF 00FF 00FF 0000 6D00 806D 0000 81FF" /* .....m.m.. */ - $"0600 FF6D B400 FF00 81FF 9900 ADFF 8100" /* ..m.... */ - $"81FF 0000 8AFF 0200 00FF 8100 00FF 8000" /* ........ */ - $"006D 8100 80FF 0600 FF6D B400 FF00 81FF" /* .m...m.. */ - $"9900 85FF 8400 8FFF 8400 85FF 8100 81FF" /* .... */ - $"0000 8AFF 0000 85FF 0600 006D 00FF 0000" /* .......m... */ - $"80FF 0600 FF6D B400 FF00 81FF 9900 87FF" /* ..m... */ - $"8000 93FF 8000 87FF 8100 81FF 0000 8AFF" /* ..... */ - $"0000 80FF 0100 0081 FF02 006D 0083 FF06" /* .......m.. */ - $"00FF 6DB4 00FF 0081 FF99 0084 FF08 0000" /* .m...... */ - $"FFFF 00FF FF00 008D FF08 0000 FFFF 00FF" /* ....... */ - $"FF00 0084 FF81 0081 FF00 008A FF00 0080" /* ....... */ - $"FF00 0082 FF02 006D 0083 FF06 00FF 6DB4" /* ....m...m */ - $"00FF 0081 FF99 0083 FF81 0002 FF00 FF81" /* ...... */ - $"008B FF81 0002 FF00 FF81 0083 FF81 0081" /* ...... */ - $"FF00 008A FF00 0081 FF00 0081 FF02 006D" /* ........m */ - $"0083 FF06 00FF 6DB4 00FF 0081 FF99 0083" /* ...m... */ - $"FF88 008B FF88 0083 FF81 0081 FF00 008A" /* ..... */ - $"FF03 00FF 0000 80FF 0500 00FF 006D 0083" /* ........m. */ - $"FF06 00FF 6DB4 00FF 0081 FF99 0083 FF81" /* ..m... */ - $"0002 FF00 FF81 008B FF81 0002 FF00 FF81" /* ....... */ - $"0083 FF81 0081 FF00 008B FF02 00FF 0080" /* ....... */ - $"FF05 00FF FF00 6D00 83FF 0600 FF6D B400" /* ...m...m. */ - $"FF00 81FF 9900 84FF 0800 00FF FF00 FFFF" /* ...... */ - $"0000 8DFF 0800 00FF FF00 FFFF 0000 84FF" /* ........ */ - $"8100 81FF 0000 8BFF 8900 83FF 0600 FF6D" /* ......m */ - $"B400 FF00 81FF 9900 87FF 8000 93FF 8000" /* ..... */ - $"87FF 8100 81FF 0000 8BFF 0000 87FF 0000" /* ....... */ - $"83FF 0600 FF6D B400 FF00 81FF 9900 86FF" /* ..m... */ - $"8200 91FF 8200 86FF 8100 81FF 0000 8AFF" /* ..... */ - $"0000 89FF 0000 83FF 0500 6D00 FFFF 0081" /* ......m.. */ - $"FF99 0086 FF82 0091 FF82 0086 FF81 0081" /* .... */ - $"FF00 0089 FF00 008B FF00 0083 FF00 0080" /* ........ */ - $"FF00 0081 FF99 0087 FF80 0093 FF80 0087" /* ..... */ - $"FF81 0081 FFA5 0081 FF99 00AD FF81 00AD" /* .... */ - $"FF99 00AD FF81 00AD FF99 009E FF80 0083" /* .... */ - $"FF80 0080 FF81 00AD FF99 009F FF00 0083" /* ..... */ - $"FF00 0080 FF02 00FF FF81 00AD FF99 009D" /* ...... */ - $"FF04 00FF 00FF 0081 FF00 0080 FF02 00FF" /* ........ */ - $"FF81 00AD FF99 009C FF84 0080 FF82 0001" /* ..... */ - $"FFFF 8100 ADFF 9900 9DFF 0400 FF00 FF00" /* ...... */ - $"85FF 0200 FFFF 8100 ADFF 9900 9EFF 8000" /* ..... */ - $"86FF 0200 FFFF 8100 ADFF 9900 9FFF 0000" /* ...... */ - $"84FF 8000 80FF 8100 ADFF 9A00 ABFF 8300" /* .... */ - $"ABFF 9C00 A9FF 8500 A9FF FF00 FF00 FF00" /* ..... */ - $"FF00 FF00 FF00 FF00 FF00 FF00 FF00 F900" /* ........ */ - $"FF00 FF00 FF00 FF00 FF00 FF00 FF00 FF00" /* ........ */ - $"FF00 FF00 FF00 FF00 F500 A9FF 8500 A9FF" /* ...... */ - $"9C00 ABFF 8300 ABFF 9A00 80FF 8200 80FF" /* .... */ - $"0400 00FF 0000 9DFF 8100 06FF FF00 FFFF" /* ........ */ - $"0000 83FF 0000 9FFF 9900 84FF 0200 FFFF" /* ....... */ - $"8400 9CFF 8100 07FF FF00 FF00 FFFF 0081" /* ...... */ - $"FF80 009E FF99 0083 FF00 0080 FF84 009C" /* ..... */ - $"FF81 0007 FFFF 00FF 00FF FF00 80FF 8200" /* ...... */ - $"9DFF 9900 82FF 0000 81FF 8400 9CFF 8100" /* ..... */ - $"09FF FF00 FF00 FFFF 00FF FF84 009C FF99" /* .... */ - $"0082 FF00 0082 FF82 009D FF81 0007 FFFF" /* ...... */ - $"00FF 00FF FF00 80FF 8200 9DFF 9900 82FF" /* ..... */ - $"0000 83FF 8000 9EFF 8100 07FF FF00 FF00" /* ....... */ - $"FFFF 0082 FF00 009F FF99 0082 FF00 0084" /* ...... */ - $"FF00 009F FF81 0006 FFFF 00FF FF00 0082" /* ....... */ - $"FF80 009E FF99 00AD FF81 00AD FF99 00AD" /* .... */ - $"FF81 0088 FF00 0095 FF00 0088 FF99 0001" /* ....... */ - $"FFFF A900 01FF FF81 0001 FFFF A900 01FF" /* ...... */ - $"FF9B 00A9 FF85 00A9 FF9C 00AB FF83 00AB" /* .... */ - $"FF9A 0080 FF82 0082 FF00 009F FF81 0081" /* ..... */ - $"FF80 0081 FF04 0000 FF00 009D FF99 0083" /* ....... */ - $"FF00 0082 FF80 009E FF81 0080 FF00 0080" /* ...... */ - $"FF02 00FF FF84 009C FF99 0083 FF00 0081" /* ...... */ - $"FF82 009D FF81 0080 FF00 0080 FF02 00FF" /* ...... */ - $"FF84 009C FF99 0083 FF00 0080 FF84 009C" /* ..... */ - $"FF81 0081 FF81 0001 FFFF 8400 9CFF 9900" /* ..... */ - $"83FF 0000 81FF 8200 9DFF 8100 84FF 0000" /* ...... */ - $"80FF 8200 9DFF 9900 80FF 0300 FFFF 0083" /* ..... */ - $"FF00 009F FF81 0083 FF00 0082 FF80 009E" /* ...... */ - $"FF99 0081 FF01 0000 83FF 8000 9EFF 8100" /* ...... */ - $"82FF 0000 84FF 0000 9FFF 9900 ADFF 8100" /* ...... */ - $"ADFF 9900 ADFF 8100 85FF 0100 0080 FF01" /* ...... */ - $"0000 8FFF 0100 0080 FF01 0000 85FF 9900" /* ......... */ - $"01FF FFA9 0001 FFFF 8100 01FF FFA9 0001" /* ....... */ - $"FFFF 9B00 A9FF 8500 A9FF 9C00 ABFF 8300" /* .... */ - $"ABFF 9A00 81FF 0100 0084 FF00 009F FF81" /* ...... */ - $"0081 FF80 0083 FF00 009F FF99 0080 FF03" /* ...... */ - $"00FF FF00 82FF 8000 9EFF 8100 80FF 0000" /* ...... */ - $"80FF 0000 81FF 8000 9EFF 9900 02FF FF00" /* ...... */ - $"81FF 0000 80FF 8200 9DFF 8100 80FF 0000" /* ...... */ - $"80FF 0000 80FF 8200 9DFF 9900 02FF FF00" /* ...... */ - $"81FF 0200 FFFF 8400 9CFF 8100 80FF 0000" /* ...... */ - $"80FF 0200 FFFF 8400 9CFF 9900 01FF FF83" /* ..... */ - $"0080 FF82 009D FF81 0080 FF04 00FF 00FF" /* ...... */ - $"0080 FF82 009D FF99 0002 FFFF 0081 FF00" /* ...... */ - $"0081 FF80 009E FF81 0080 FF03 00FF FF00" /* ...... */ - $"82FF 8000 9EFF 9900 02FF FF00 81FF 0000" /* ...... */ - $"82FF 0000 9FFF 8100 81FF 0300 00FF 0082" /* ....... */ - $"FF00 009F FF99 00AD FF81 00AD FF99 00AD" /* ..... */ - $"FF81 00AD FF99 0001 FFFF A900 01FF FF81" /* ..... */ - $"0001 FFFF A900 01FF FF9B 00A9 FF85 00A9" /* ...... */ - $"FF9C 00AB FF83 00AB FF9A 0081 FF80 0083" /* .... */ - $"FF00 009F FF81 0080 FF00 0080 FF00 0082" /* ....... */ - $"FF00 009F FF99 0080 FF00 0085 FF80 009E" /* ...... */ - $"FF81 0080 FF03 00FF FF00 82FF 8000 9EFF" /* ..... */ - $"9900 80FF 0000 84FF 0400 FF00 FF00 9DFF" /* ....... */ - $"8100 80FF 0200 FF00 82FF 8200 9DFF 9900" /* ...... */ - $"80FF 8100 80FF 8400 9CFF 8100 80FF 0100" /* ..... */ - $"0082 FF84 009C FF99 0080 FF00 0080 FF00" /* ...... */ - $"0080 FF04 00FF 00FF 009D FF81 0080 FF02" /* ....... */ - $"00FF 0082 FF82 009D FF99 0080 FF00 0080" /* ...... */ - $"FF00 0082 FF00 009F FF81 0080 FF03 00FF" /* ....... */ - $"FF00 82FF 8000 9EFF 9900 81FF 8000 82FF" /* .... */ - $"8000 9EFF 8100 80FF 0000 80FF 0000 82FF" /* ...... */ - $"0000 9FFF 9900 ADFF 8100 ADFF 9900 ADFF" /* ..... */ - $"8100 ADFF 9900 87FF 8000 93FF 8000 87FF" /* .... */ - $"8100 ADFF 9900 86FF 8200 91FF 8200 86FF" /* .... */ - $"8100 81FF A500 81FF 9900 86FF 8200 91FF" /* .... */ - $"8200 86FF 8100 81FF 0000 80FF 0000 83FF" /* ...... */ - $"8000 81FF 0000 82FF 0100 0082 FF00 0084" /* ........ */ - $"FF00 0081 FF99 0087 FF80 0093 FF80 0087" /* ..... */ - $"FF81 0081 FF05 00FF FF00 6D00 83FF 8000" /* ....m.. */ - $"01FF FF80 0080 FF80 0081 FF80 0083 FF00" /* ..... */ - $"0081 FF99 0084 FF08 0000 FFFF 00FF FF00" /* ....... */ - $"008D FF08 0000 FFFF 00FF FF00 0084 FF81" /* ....... */ - $"0081 FF06 00FF 00B4 6DFF 0083 FF89 0082" /* ....m.. */ - $"FF80 0083 FF00 0081 FF99 0083 FF81 0002" /* ...... */ - $"FF00 FF81 008B FF81 0002 FF00 FF81 0083" /* ...... */ - $"FF81 0081 FF06 00FF 00B4 6DFF 0083 FF89" /* ....m. */ - $"0081 FF82 0082 FF00 0081 FF99 0083 FF88" /* ..... */ - $"008B FF88 0083 FF81 0081 FF06 00FF 00B4" /* ...... */ - $"6DFF 0083 FF05 006D 0000 FF00 80FF 0200" /* m...m..... */ - $"FF00 80FF 8400 81FF 0000 81FF 9900 83FF" /* ..... */ - $"8100 02FF 00FF 8100 8BFF 8100 02FF 00FF" /* ....... */ - $"8100 83FF 8100 81FF 0600 FF00 B46D FF00" /* .....m. */ - $"83FF 0500 6D00 FF00 0080 FF04 0000 FF00" /* ..m....... */ - $"FF86 0080 FF00 0081 FF99 0084 FF08 0000" /* ....... */ - $"FFFF 00FF FF00 008D FF08 0000 FFFF 00FF" /* ....... */ - $"FF00 0084 FF81 0081 FF06 00FF 00B4 6DFF" /* ......m */ - $"0083 FF02 006D 0081 FF00 0081 FF02 00FF" /* ...m..... */ - $"FF84 0081 FF00 0081 FF99 0087 FF80 0093" /* ..... */ - $"FF80 0087 FF81 0081 FF06 00FF 00B4 6DFF" /* .....m */ - $"0083 FF02 006D 0082 FF00 0080 FF00 0080" /* ...m..... */ - $"FF82 0082 FF00 0081 FF99 0085 FF84 008F" /* ..... */ - $"FF84 0085 FF81 0081 FF06 00FF 00B4 6DFF" /* .....m */ - $"0083 FF02 006D 0081 FF01 0000 80FF 0000" /* ...m...... */ - $"81FF 8000 83FF 0000 81FF 9900 ADFF 8100" /* ..... */ - $"81FF 0600 FF00 B46D FF00 80FF 0600 00FF" /* ...m.... */ - $"006D 0000 85FF 0000 81FF 8000 83FF 0000" /* .m....... */ - $"81FF 9900 ADFF 8100 81FF 0600 FF00 B46D" /* .....m */ - $"FF00 80FF 8100 006D 8000 00FF 8100 02FF" /* ...m.... */ - $"0000 82FF 0000 84FF 0000 81FF 9900 ADFF" /* ....... */ - $"8100 81FF 0600 FF00 B46D FF00 81FF 0000" /* ....m... */ - $"806D 0800 6D00 00FF 00FF 00FF 8000 89FF" /* m..m..... */ - $"0000 81FF 9900 ADFF 8100 81FF 0600 FF00" /* ....... */ - $"B46D FF00 80FF 9000 87FF 0000 81FF 9900" /* m..... */ - $"ADFF 8100 81FF 0500 FF00 B46D FF82 0003" /* ....m.. */ - $"FF00 FFFF 8700 00FF 8300 84FF 0000 81FF" /* ...... */ - $"9900 ADFF 8100 81FF 0F00 FF00 B46D FF00" /* .....m. */ - $"00FF 0000 FFFF 00FF FF85 0000 FF88 0080" /* ....... */ - $"FF00 0081 FF99 00AD FF81 0081 FF86 0007" /* ...... */ - $"FF00 00FF FF00 FFFF 8300 00FF 8600 80FF" /* ...... */ - $"8100 81FF 9900 87FF 8000 93FF 8000 87FF" /* .... */ - $"8100 81FF 0100 0081 FF81 0007 FF00 00FF" /* ........ */ - $"FF00 FFFF 8100 01FF FF86 0000 FF81 0001" /* ....... */ - $"FF00 81FF 9900 86FF 8200 91FF 8200 86FF" /* .... */ - $"8100 81FF 8400 09FF 0000 FF00 006D FFFF" /* ......m */ - $"0083 FF04 0000 FF00 FF82 0006 FFFF 0000" /* ......... */ - $"FFFF 0081 FF99 0086 FF82 0091 FF82 0086" /* .... */ - $"FF81 0081 FF01 0000 81FF 0C00 FF00 00FF" /* ........ */ - $"0000 FF6D FFFF 00FF 8000 03FF 00FF 0081" /* ..m..... */ - $"FF80 0006 FFFF 0000 FFFF 0081 FF99 0087" /* ...... */ - $"FF80 0093 FF80 0087 FF81 0081 FF84 0010" /* ..... */ - $"FF00 00FF 0000 FFFF 6DFF FF00 FFFF 0000" /* ....m... */ - $"FF87 0081 FF01 0000 81FF 9900 84FF 0800" /* ....... */ - $"00FF FF00 FFFF 0000 8DFF 0800 00FF FF00" /* ........ */ - $"FFFF 0000 84FF 8100 81FF 0100 0081 FF13" /* ....... */ - $"00FF 0000 FF00 006D FFFF 6D00 00FF 00FF" /* .....mm... */ - $"FF00 FF6D 8100 09FF 0000 FFFF 0000 FFFF" /* .m..... */ - $"0081 FF99 0083 FF81 0002 FF00 FF81 008B" /* ...... */ - $"FF81 0002 FF00 FF81 0083 FF81 0081 FF87" /* ..... */ - $"0008 FF00 006D 6DFF FF00 FF80 0007 FF00" /* ....mm.... */ - $"FFFF 6D00 00FF 8700 81FF 9900 83FF 8800" /* m..... */ - $"8BFF 8800 83FF 8100 81FF 0900 FFFF 0000" /* ..... */ - $"FFFF 0000 FF81 0013 6D6D FF00 FFFF 00FF" /* ....mm.. */ - $"0000 6DFF FF00 00FF 0000 FF00 81FF 0100" /* ..m....... */ - $"0081 FF99 0083 FF81 0002 FF00 FF81 008B" /* ...... */ - $"FF81 0002 FF00 FF81 0083 FF81 0081 FF01" /* ...... */ - $"0000 81FF 0200 00FF 8300 116D 6DFF 0000" /* .......mm.. */ - $"FFFF 00FF FF6D FF00 00FF 0000 FF84 0081" /* .m..... */ - $"FF99 0084 FF08 0000 FFFF 00FF FF00 008D" /* ....... */ - $"FF08 0000 FFFF 00FF FF00 0084 FF81 0081" /* ....... */ - $"FF06 00FF FF00 00FF FF80 0081 FF04 00FF" /* ....... */ - $"6D00 FF80 000B FF00 FFFF 6D00 00FF 0000" /* m....m.... */ - $"FF00 81FF 0100 0081 FF99 0087 FF80 0093" /* ...... */ - $"FF80 0087 FF81 0081 FF06 00FF FF00 00FF" /* ...... */ - $"FF82 0005 FF00 FFFF 0000 83FF 0800 FFFF" /* ....... */ - $"0000 FF00 00FF 8400 81FF 9900 85FF 8400" /* ....... */ - $"8FFF 8400 85FF 8100 81FF 0100 FF81 0000" /* ...... */ - $"FF83 0000 FF80 0001 FFFF 8100 06FF FF00" /* ....... */ - $"FF00 00FF 8100 81FF 0100 0081 FF99 00AD" /* ....... */ - $"FF81 0081 FF81 0080 FF87 0000 FF83 0006" /* ...... */ - $"FFFF 00FF 0000 FF86 0081 FF99 00AD FF81" /* ..... */ - $"0081 FF00 0080 FF89 0000 FF85 000E FFFF" /* ....... */ - $"00FF 0000 FF00 00FF 6DB4 00FF 0081 FF99" /* .....m.. */ - $"00AD FF81 0081 FF00 0084 FF84 0000 FF87" /* ...... */ - $"0001 FFFF 8300 05FF 6DB4 00FF 0081 FF99" /* ....m.. */ - $"00AD FF81 0081 FF00 0087 FF90 0080 FF06" /* ...... */ - $"00FF 6DB4 00FF 0081 FF99 00AD FF81 0081" /* .m.... */ - $"FF00 0089 FF80 0008 FF00 FF00 FF00 006D" /* ........m */ - $"0080 6D00 0081 FF06 00FF 6DB4 00FF 0081" /* .m....m.. */ - $"FF99 00AD FF81 0081 FF00 0083 FF00 0083" /* ...... */ - $"FF02 0000 FF81 0000 FF80 0000 6D81 0080" /* .......m. */ - $"FF06 00FF 6DB4 00FF 0081 FF99 0085 FF84" /* ..m... */ - $"008F FF84 0085 FF81 0081 FF00 0082 FF80" /* ..... */ - $"0082 FF00 0085 FF06 0000 6D00 FF00 0080" /* ......m... */ - $"FF06 00FF 6DB4 00FF 0081 FF99 0087 FF80" /* ..m... */ - $"0093 FF80 0087 FF81 0081 FF00 0082 FF80" /* ..... */ - $"0082 FF00 0080 FF01 0000 81FF 0200 6D00" /* ........m. */ - $"83FF 0600 FF6D B400 FF00 81FF 9900 84FF" /* ..m... */ - $"0800 00FF FF00 FFFF 0000 8DFF 0800 00FF" /* ......... */ - $"FF00 FFFF 0000 84FF 8100 81FF 0000 81FF" /* ...... */ - $"8200 81FF 0000 80FF 0000 82FF 0200 6D00" /* .......m. */ - $"83FF 0600 FF6D B400 FF00 81FF 9900 83FF" /* ..m... */ - $"8100 02FF 00FF 8100 8BFF 8100 02FF 00FF" /* ....... */ - $"8100 83FF 8100 81FF 0000 80FF 8400 80FF" /* ..... */ - $"0000 81FF 0000 81FF 0200 6D00 83FF 0600" /* ......m... */ - $"FF6D B400 FF00 81FF 9900 83FF 8800 8BFF" /* m.... */ - $"8800 83FF 8100 81FF 0200 FFFF 8600 05FF" /* ...... */ - $"FF00 FF00 0080 FF05 0000 FF00 6D00 83FF" /* .......m. */ - $"0600 FF6D B400 FF00 81FF 9900 83FF 8100" /* ..m.... */ - $"02FF 00FF 8100 8BFF 8100 02FF 00FF 8100" /* ....... */ - $"83FF 8100 81FF 0000 80FF 8400 81FF 0200" /* ...... */ - $"FF00 80FF 0500 FFFF 006D 0083 FF06 00FF" /* ....m... */ - $"6DB4 00FF 0081 FF99 0084 FF08 0000 FFFF" /* m...... */ - $"00FF FF00 008D FF08 0000 FFFF 00FF FF00" /* ........ */ - $"0084 FF81 0081 FF00 0081 FF82 0082 FF89" /* ..... */ - $"0083 FF06 00FF 6DB4 00FF 0081 FF99 0087" /* ...m... */ - $"FF80 0093 FF80 0087 FF81 0081 FF00 0082" /* ..... */ - $"FF80 0083 FF89 0083 FF06 00FF 6DB4 00FF" /* ....m. */ - $"0081 FF99 0086 FF82 0091 FF82 0086 FF81" /* .... */ - $"0081 FF00 0082 FF80 0082 FF80 0080 FF80" /* ..... */ - $"0001 FFFF 8000 83FF 0500 6D00 FFFF 0081" /* .....m.. */ - $"FF99 0086 FF82 0091 FF82 0086 FF81 0081" /* .... */ - $"FF00 0083 FF00 0082 FF80 0082 FF00 0081" /* ....... */ - $"FF80 0083 FF00 0080 FF00 0081 FF99 0087" /* ...... */ - $"FF80 0093 FF80 0087 FF81 0081 FFA5 0081" /* .... */ - $"FF99 00AD FF81 00AD FF99 00AD FF81 00AD" /* .... */ - $"FF99 009E FF80 0083 FF80 0080 FF81 009F" /* .... */ - $"FF00 0083 FF00 0080 FF02 00FF FF99 009F" /* ....... */ - $"FF00 0083 FF00 0080 FF02 00FF FF81 009E" /* ....... */ - $"FF80 0083 FF05 00FF FF00 FFFF 9900 9DFF" /* ..... */ - $"0400 FF00 FF00 81FF 0000 80FF 0200 FFFF" /* ........ */ - $"8100 9DFF 8200 83FF 0400 FF00 FFFF 9900" /* ...... */ - $"9CFF 8400 80FF 8200 01FF FF81 009C FF84" /* .... */ - $"0083 FF03 0000 FFFF 9900 9DFF 0400 FF00" /* ........ */ - $"FF00 85FF 0200 FFFF 8100 9DFF 8200 83FF" /* ..... */ - $"0400 FF00 FFFF 9900 9EFF 8000 86FF 0200" /* ....... */ - $"FFFF 8100 9EFF 8000 83FF 0500 FFFF 00FF" /* ..... */ - $"FF99 009F FF00 0084 FF80 0080 FF81 009F" /* ..... */ - $"FF00 0083 FF00 0080 FF02 00FF FF9A 00AB" /* ....... */ - $"FF83 00AB FF9C 00A9 FF85 00A9 FFFF 00FF" /* .... */ - $"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF" /* ........ */ - $"00F9 00FF 00FF 00FF 00FF 00FF 00FF 00FF" /* ........ */ - $"00FF 00FF 00FF 00FF 00FF 00F5 00A9 FF85" /* ....... */ - $"00A9 FF9C 00AB FF83 00AB FF9A 0080 FF82" /* .... */ - $"0080 FF04 0000 FF00 009D FF81 0006 FFFF" /* ........ */ - $"00FF FF00 0083 FF00 009F FF99 0084 FF02" /* ....... */ - $"00FF FF84 009C FF81 0007 FFFF 00FF 00FF" /* ...... */ - $"FF00 81FF 8000 9EFF 9900 83FF 0000 80FF" /* ..... */ - $"8400 9CFF 8100 07FF FF00 FF00 FFFF 0080" /* ...... */ - $"FF82 009D FF99 0082 FF00 0081 FF84 009C" /* ..... */ - $"FF81 0009 FFFF 00FF 00FF FF00 FFFF 8400" /* ..... */ - $"9CFF 9900 82FF 0000 82FF 8200 9DFF 8100" /* ..... */ - $"07FF FF00 FF00 FFFF 0080 FF82 009D FF99" /* ..... */ - $"0082 FF00 0083 FF80 009E FF81 0007 FFFF" /* ...... */ - $"00FF 00FF FF00 82FF 0000 9FFF 9900 82FF" /* ...... */ - $"0000 84FF 0000 9FFF 8100 06FF FF00 FFFF" /* ....... */ - $"0000 82FF 8000 9EFF 9900 ADFF 8100 ADFF" /* ..... */ - $"9900 ADFF 8100 88FF 0000 95FF 0000 88FF" /* ...... */ - $"9900 01FF FFA9 0001 FFFF 8100 01FF FFA9" /* ...... */ - $"0001 FFFF 9B00 A9FF 8500 A9FF 9C00 ABFF" /* ..... */ - $"8300 ABFF 9A00 80FF 8200 82FF 0000 9FFF" /* ..... */ - $"8100 81FF 8000 81FF 0400 00FF 0000 9DFF" /* ....... */ - $"9900 83FF 0000 82FF 8000 9EFF 8100 80FF" /* ..... */ - $"0000 80FF 0200 FFFF 8400 9CFF 9900 83FF" /* ...... */ - $"0000 81FF 8200 9DFF 8100 80FF 0000 80FF" /* ...... */ - $"0200 FFFF 8400 9CFF 9900 83FF 0000 80FF" /* ...... */ - $"8400 9CFF 8100 81FF 8100 01FF FF84 009C" /* ..... */ - $"FF99 0083 FF00 0081 FF82 009D FF81 0084" /* ..... */ - $"FF00 0080 FF82 009D FF99 0080 FF03 00FF" /* ...... */ - $"FF00 83FF 0000 9FFF 8100 83FF 0000 82FF" /* ...... */ - $"8000 9EFF 9900 81FF 0100 0083 FF80 009E" /* ...... */ - $"FF81 0082 FF00 0084 FF00 009F FF99 00AD" /* ...... */ - $"FF81 00AD FF99 00AD FF81 0085 FF01 0000" /* ...... */ - $"80FF 0100 008F FF01 0000 80FF 0100 0085" /* ......... */ - $"FF99 0001 FFFF A900 01FF FF81 0001 FFFF" /* ...... */ - $"A900 01FF FF9B 00A9 FF85 00A9 FF9C 00AB" /* ..... */ - $"FF83 00AB FF9A 0081 FF01 0000 84FF 0000" /* ....... */ - $"9FFF 8100 81FF 8000 83FF 0000 9FFF 9900" /* ..... */ - $"80FF 0300 FFFF 0082 FF80 009E FF81 0080" /* ..... */ - $"FF00 0080 FF00 0081 FF80 009E FF99 0002" /* ....... */ - $"FFFF 0081 FF00 0080 FF82 009D FF81 0080" /* ..... */ - $"FF00 0080 FF00 0080 FF82 009D FF99 0002" /* ....... */ - $"FFFF 0081 FF02 00FF FF84 009C FF81 0080" /* ..... */ - $"FF00 0080 FF02 00FF FF84 009C FF99 0001" /* ....... */ - $"FFFF 8300 80FF 8200 9DFF 8100 80FF 0400" /* ..... */ - $"FF00 FF00 80FF 8200 9DFF 9900 02FF FF00" /* ...... */ - $"81FF 0000 81FF 8000 9EFF 8100 80FF 0300" /* ...... */ - $"FFFF 0082 FF80 009E FF99 0002 FFFF 0081" /* ..... */ - $"FF00 0082 FF00 009F FF81 0081 FF03 0000" /* ........ */ - $"FF00 82FF 0000 9FFF 9900 ADFF 8100 ADFF" /* ..... */ - $"9900 ADFF 8100 ADFF 9900 01FF FFA9 0001" /* ...... */ - $"FFFF 8100 01FF FFA9 0001 FFFF 9B00 A9FF" /* ..... */ - $"8500 A9FF 9C00 ABFF 8300 ABFF 9A00 81FF" /* .... */ - $"8000 83FF 0000 9FFF 8100 80FF 0000 80FF" /* ...... */ - $"0000 82FF 0000 9FFF 9900 80FF 0000 85FF" /* ....... */ - $"8000 9EFF 8100 80FF 0300 FFFF 0082 FF80" /* ..... */ - $"009E FF99 0080 FF00 0084 FF04 00FF 00FF" /* ....... */ - $"009D FF81 0080 FF02 00FF 0082 FF82 009D" /* ...... */ - $"FF99 0080 FF81 0080 FF84 009C FF81 0080" /* .... */ - $"FF01 0000 82FF 8400 9CFF 9900 80FF 0000" /* ....... */ - $"80FF 0000 80FF 0400 FF00 FF00 9DFF 8100" /* ....... */ - $"80FF 0200 FF00 82FF 8200 9DFF 9900 80FF" /* ..... */ - $"0000 80FF 0000 82FF 0000 9FFF 8100 80FF" /* ....... */ - $"0300 FFFF 0082 FF80 009E FF99 0081 FF80" /* ..... */ - $"0082 FF80 009E FF81 0080 FF00 0080 FF00" /* ...... */ - $"0082 FF00 009F FF99 00AD FF81 00AD FF99" /* ..... */ - $"00AD FF81 00AD FF99 0087 FF80 0093 FF80" /* .... */ - $"0087 FF81 00AD FF99 0086 FF82 0091 FF82" /* .... */ - $"0086 FF81 0081 FFA5 0081 FF99 0086 FF82" /* .... */ - $"0091 FF82 0086 FF81 0081 FF00 0080 FF00" /* ...... */ - $"0083 FF8C 0082 FF00 0084 FF00 0081 FF99" /* ...... */ - $"0087 FF80 0093 FF80 0087 FF81 0081 FF05" /* ..... */ - $"00FF FF00 6D00 83FF 8B00 81FF 8000 83FF" /* ..m... */ - $"0000 81FF 9900 84FF 0800 00FF FF00 FFFF" /* ....... */ - $"0000 8DFF 0800 00FF FF00 FFFF 0000 84FF" /* ........ */ - $"8100 81FF 0600 FF00 B46D FF00 83FF 8900" /* ....m.. */ - $"82FF 8000 83FF 0000 81FF 9900 83FF 8100" /* ..... */ - $"02FF 00FF 8100 8BFF 8100 02FF 00FF 8100" /* ....... */ - $"83FF 8100 81FF 0600 FF00 B46D FF00 83FF" /* ....m. */ - $"8900 81FF 8200 82FF 0000 81FF 9900 83FF" /* ..... */ - $"8800 8BFF 8800 83FF 8100 81FF 0600 FF00" /* ...... */ - $"B46D FF00 83FF 0500 6D00 00FF 0080 FF02" /* m...m.... */ - $"00FF 0080 FF84 0081 FF00 0081 FF99 0083" /* ...... */ - $"FF81 0002 FF00 FF81 008B FF81 0002 FF00" /* ....... */ - $"FF81 0083 FF81 0081 FF06 00FF 00B4 6DFF" /* .....m */ - $"0083 FF05 006D 00FF 0000 80FF 0400 00FF" /* ...m...... */ - $"00FF 8600 80FF 0000 81FF 9900 84FF 0800" /* ....... */ - $"00FF FF00 FFFF 0000 8DFF 0800 00FF FF00" /* ........ */ - $"FFFF 0000 84FF 8100 81FF 0600 FF00 B46D" /* ......m */ - $"FF00 83FF 0200 6D00 81FF 0000 81FF 0200" /* ...m..... */ - $"FFFF 8400 81FF 0000 81FF 9900 87FF 8000" /* ..... */ - $"93FF 8000 87FF 8100 81FF 0600 FF00 B46D" /* .....m */ - $"FF00 83FF 0200 6D00 82FF 0000 80FF 0000" /* ...m..... */ - $"80FF 8200 82FF 0000 81FF 9900 85FF 8400" /* ..... */ - $"8FFF 8400 85FF 8100 81FF 0600 FF00 B46D" /* .....m */ - $"FF00 83FF 0200 6D00 81FF 0100 0080 FF00" /* ...m..... */ - $"0081 FF80 0083 FF00 0081 FF99 00AD FF81" /* ..... */ - $"0081 FF06 00FF 00B4 6DFF 0080 FF06 0000" /* ....m.... */ - $"FF00 6D00 0085 FF00 0081 FF80 0083 FF00" /* .m...... */ - $"0081 FF99 00AD FF81 0081 FF06 00FF 00B4" /* ...... */ - $"6DFF 0080 FF81 0000 6D80 0000 FF81 0002" /* m...m.... */ - $"FF00 0082 FF00 0084 FF00 0081 FF99 00AD" /* ....... */ - $"FF81 0081 FF06 00FF 00B4 6DFF 0081 FF00" /* ....m.. */ - $"0080 6D08 006D 0000 FF00 FF00 FF80 0089" /* .m..m..... */ - $"FF00 0081 FF99 00AD FF81 0081 FF06 00FF" /* ...... */ - $"00B4 6DFF 0080 FF90 0087 FF00 0081 FF99" /* .m.... */ - $"00AD FF81 0081 FF05 00FF 00B4 6DFF 9700" /* .....m. */ - $"84FF 0000 81FF 9900 ADFF 8100 81FF 0500" /* ...... */ - $"FF00 B46D FF9B 0080 FF00 0081 FF99 00AD" /* .m.... */ - $"FF81 0081 FF9D 0081 FF81 0081 FF99 0087" /* .... */ - $"FF80 0093 FF80 0087 FF81 0081 FF01 0000" /* ...... */ - $"81FF 8000 00FF 8E00 01FF FF80 0084 FF00" /* ...... */ - $"0081 FF99 0086 FF82 0091 FF82 0086 FF81" /* .... */ - $"0081 FF84 0002 FF00 FF80 0000 6D88 0006" /* ......m.. */ - $"FFFF 0000 FF00 0084 FF00 0081 FF99 0086" /* ....... */ - $"FF82 0091 FF82 0086 FF81 0081 FF01 0000" /* ...... */ - $"81FF 0300 FF00 FF81 0000 6D86 0001 FFFF" /* .....m.. */ - $"8100 01FF 0084 FF00 0081 FF99 0087 FF80" /* ...... */ - $"0093 FF80 0087 FF81 0081 FF84 0002 FF00" /* ...... */ - $"FF82 0000 6D84 0081 FF04 00FF 00FF 0084" /* ..m..... */ - $"FF00 0081 FF99 0084 FF08 0000 FFFF 00FF" /* ....... */ - $"FF00 008D FF08 0000 FFFF 00FF FF00 0084" /* ........ */ - $"FF81 0081 FF01 0000 81FF 0300 FF00 FF80" /* ....... */ - $"0003 6D00 006D 8000 00FF 8100 006D 81FF" /* ..m..m....m */ - $"0000 81FF 0400 00FF FF00 81FF 9900 83FF" /* ....... */ - $"8100 02FF 00FF 8100 8BFF 8100 02FF 00FF" /* ....... */ - $"8100 83FF 8100 81FF 8500 06FF FF00 FFFF" /* ..... */ - $"6D6D 8100 80FF 8100 056D FFFF 00FF FF85" /* mm...m. */ - $"0081 FF99 0083 FF88 008B FF88 0083 FF81" /* .... */ - $"0081 FF04 00FF FF00 0081 FF00 0081 FF01" /* ........ */ - $"6D6D 8100 00FF 8000 006D 8200 03FF 00FF" /* mm....m... */ - $"0081 FF01 0000 81FF 9900 83FF 8100 02FF" /* ....... */ - $"00FF 8100 8BFF 8100 02FF 00FF 8100 83FF" /* ...... */ - $"8100 81FF 0000 84FF 0800 FF00 FF00 FFFF" /* ....... */ - $"6D6D 8500 006D 8100 02FF 00FF 8400 81FF" /* mm..m.... */ - $"9900 84FF 0800 00FF FF00 FFFF 0000 8DFF" /* ....... */ - $"0800 00FF FF00 FFFF 0000 84FF 8100 81FF" /* ....... */ - $"0000 84FF 0100 FF81 0002 FFFF 6D86 0000" /* ......m.. */ - $"6D80 0003 FF00 FF00 81FF 0100 0081 FF99" /* m....... */ - $"0087 FF80 0093 FF80 0087 FF81 0081 FF00" /* ..... */ - $"0084 FF04 0000 FF00 0080 FF8B 0002 FF00" /* ......... */ - $"FF84 0081 FF99 0085 FF84 008F FF84 0085" /* .... */ - $"FF81 0081 FF00 0084 FF80 0080 FF8D 0000" /* ...... */ - $"FF80 0081 FF01 0000 81FF 9900 ADFF 8100" /* ...... */ - $"81FF 8100 81FF 9D00 81FF 9900 ADFF 8100" /* .... */ - $"81FF 0000 80FF 9B00 05FF 6DB4 00FF 0081" /* ....m.. */ - $"FF99 00AD FF81 0081 FF00 0084 FF97 0005" /* ...... */ - $"FF6D B400 FF00 81FF 9900 ADFF 8100 81FF" /* m.... */ - $"0000 87FF 9000 80FF 0600 FF6D B400 FF00" /* .....m.. */ - $"81FF 9900 ADFF 8100 81FF 0000 89FF 8000" /* ..... */ - $"08FF 00FF 00FF 0000 6D00 806D 0000 81FF" /* .....m.m.. */ - $"0600 FF6D B400 FF00 81FF 9900 ADFF 8100" /* ..m.... */ - $"81FF 0000 83FF 0000 83FF 0200 00FF 8100" /* ........ */ - $"00FF 8000 006D 8100 80FF 0600 FF6D B400" /* ...m...m. */ - $"FF00 81FF 9900 85FF 8400 8FFF 8400 85FF" /* .... */ - $"8100 81FF 0000 82FF 8000 82FF 0000 85FF" /* ...... */ - $"0600 006D 00FF 0000 80FF 0600 FF6D B400" /* ...m.....m. */ - $"FF00 81FF 9900 87FF 8000 93FF 8000 87FF" /* .... */ - $"8100 81FF 0000 82FF 8000 82FF 0000 80FF" /* ...... */ - $"0100 0081 FF02 006D 0083 FF06 00FF 6DB4" /* .....m...m */ - $"00FF 0081 FF99 0084 FF08 0000 FFFF 00FF" /* ....... */ - $"FF00 008D FF08 0000 FFFF 00FF FF00 0084" /* ........ */ - $"FF81 0081 FF00 0081 FF82 0081 FF00 0080" /* ...... */ - $"FF00 0082 FF02 006D 0083 FF06 00FF 6DB4" /* ....m...m */ - $"00FF 0081 FF99 0083 FF81 0002 FF00 FF81" /* ...... */ - $"008B FF81 0002 FF00 FF81 0083 FF81 0081" /* ...... */ - $"FF00 0080 FF84 0080 FF00 0081 FF00 0081" /* ....... */ - $"FF02 006D 0083 FF06 00FF 6DB4 00FF 0081" /* ..m...m.. */ - $"FF99 0083 FF88 008B FF88 0083 FF81 0081" /* .... */ - $"FF02 00FF FF86 0005 FFFF 00FF 0000 80FF" /* ....... */ - $"0500 00FF 006D 0083 FF06 00FF 6DB4 00FF" /* ....m...m. */ - $"0081 FF99 0083 FF81 0002 FF00 FF81 008B" /* ...... */ - $"FF81 0002 FF00 FF81 0083 FF81 0081 FF00" /* ...... */ - $"0080 FF84 0081 FF02 00FF 0080 FF05 00FF" /* ....... */ - $"FF00 6D00 83FF 0600 FF6D B400 FF00 81FF" /* .m...m.. */ - $"9900 84FF 0800 00FF FF00 FFFF 0000 8DFF" /* ....... */ - $"0800 00FF FF00 FFFF 0000 84FF 8100 81FF" /* ....... */ - $"0000 81FF 8200 82FF 8900 83FF 0600 FF6D" /* ......m */ - $"B400 FF00 81FF 9900 87FF 8000 93FF 8000" /* ..... */ - $"87FF 8100 81FF 0000 82FF 8000 83FF 8900" /* ..... */ - $"83FF 0600 FF6D B400 FF00 81FF 9900 86FF" /* ..m... */ - $"8200 91FF 8200 86FF 8100 81FF 0000 82FF" /* ..... */ - $"8000 82FF 8B00 83FF 0500 6D00 FFFF 0081" /* ....m.. */ - $"FF99 0086 FF82 0091 FF82 0086 FF81 0081" /* .... */ - $"FF00 0083 FF00 0082 FF8D 0083 FF00 0080" /* ....... */ - $"FF00 0081 FF99 0087 FF80 0093 FF80 0087" /* ..... */ - $"FF81 0081 FFA5 0081 FF99 00AD FF81 00AD" /* .... */ - $"FF99 00AD FF81 00AD FF99 009E FF80 0083" /* .... */ - $"FF80 0080 FF81 009F FF00 0083 FF00 0080" /* ...... */ - $"FF02 00FF FF99 009F FF00 0083 FF00 0080" /* ....... */ - $"FF02 00FF FF81 009E FF80 0083 FF05 00FF" /* ...... */ - $"FF00 FFFF 9900 9DFF 0400 FF00 FF00 81FF" /* ...... */ - $"0000 80FF 0200 FFFF 8100 9DFF 8200 83FF" /* ...... */ - $"0400 FF00 FFFF 9900 9CFF 8400 80FF 8200" /* ...... */ - $"01FF FF81 009C FF84 0083 FF03 0000 FFFF" /* ...... */ - $"9900 9DFF 0400 FF00 FF00 85FF 0200 FFFF" /* ....... */ - $"8100 9DFF 8200 83FF 0400 FF00 FFFF 9900" /* ...... */ - $"9EFF 8000 86FF 0200 FFFF 8100 9EFF 8000" /* ..... */ - $"83FF 0500 FFFF 00FF FF99 009F FF00 0084" /* ...... */ - $"FF80 0080 FF81 009F FF00 0083 FF00 0080" /* ...... */ - $"FF02 00FF FF9A 00AB FF83 00AB FF9C 00A9" /* ..... */ - $"FF85 00A9 FFFF 00FF 00FF 00FF 00FF 00FF" /* ...... */ - $"00FF 00FF 00FF 00FF 00F9 0074 386D 6B00" /* ......t8mk. */ - $"0040 0800 0000 0000 0000 0000 0000 0000" /* .@.............. */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" /* ... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" /* . */ - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" /* ....... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FF00 0000 0000 0000 0000 0000 0000" /* ............. */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* . */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 00FF FFFF FFFF FFFF FFFF FFFF" /* .... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FF00 0000 0000 0000 0000 0000" /* ........... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* . */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 00FF FFFF FFFF FFFF FFFF FFFF" /* .... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FF00 0000 0000 0000 0000 0000" /* ........... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF 0000 FFFF FFFF FFFF FFFF FFFF FFFF" /* .. */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF 0000 0000 0000 0000 0000" /* .......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* . */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 00FF FFFF FFFF FFFF FFFF FFFF" /* .... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FF00 0000 0000 0000 0000 0000" /* ........... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* . */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FF00 0000 00FF FFFF FFFF FFFF FFFF FFFF" /* .... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FF00 0000 0000 0000 0000 0000" /* ........... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" /* ... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" /* . */ - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" /* ....... */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* */ - $"FFFF FF00 0000 0000 0000 0000 0000 0000" /* ............. */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 00" /* ... */ -}; - diff --git a/demos/forty/forty.r b/demos/forty/forty.r deleted file mode 100644 index 0328314499..0000000000 --- a/demos/forty/forty.r +++ /dev/null @@ -1,27 +0,0 @@ -#include "Types.r" - -resource 'BNDL' (128) { - 'FTHA', - 0, - { /* array TypeArray: 2 elements */ - /* [1] */ - 'ICN#', - { /* array IDArray: 1 element */ - /* [1] */ - 0, 128 - }, - /* [2] */ - 'FREF', - { /* array IDArray: 1 element */ - /* [1] */ - 0, 128 - } - } -}; - -resource 'FREF' (128) { - 'APPL', - 0, - "" -}; - diff --git a/demos/forty/forty_vc7.vcproj b/demos/forty/forty_vc7.vcproj index 651778768a..adc1c0ec5b 100644 --- a/demos/forty/forty_vc7.vcproj +++ b/demos/forty/forty_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/forty/forty_vc8.vcproj b/demos/forty/forty_vc8.vcproj index 13f9ff5b43..e5311bbc7b 100644 --- a/demos/forty/forty_vc8.vcproj +++ b/demos/forty/forty_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/forty/forty_vc9.vcproj b/demos/forty/forty_vc9.vcproj index cbd1ea45e5..591969f253 100644 --- a/demos/forty/forty_vc9.vcproj +++ b/demos/forty/forty_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/forty/makefile.bcc b/demos/forty/makefile.bcc index 20b407844a..5abf5b6c3e 100644 --- a/demos/forty/makefile.bcc +++ b/demos/forty/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/forty/makefile.gcc b/demos/forty/makefile.gcc index eaf9507059..4501b33c43 100644 --- a/demos/forty/makefile.gcc +++ b/demos/forty/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc index 3f6d727367..532381c97b 100644 --- a/demos/forty/makefile.vc +++ b/demos/forty/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 9e233139d5..45b8c8b2d6 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ FRACTAL_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__fractal___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__fractal___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL fractal$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___fractal___os2_emxbindcmd = $(NM) fractal$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep fractal$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__fractal___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fractal___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__fractal_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = fractal.app/Contents/PkgInfo @@ -151,8 +147,6 @@ distclean: clean fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc) $(CXX) -o $@ $(FRACTAL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__fractal___mac_setfilecmd) $(__fractal___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -181,7 +175,7 @@ fractal_fractal.o: $(srcdir)/fractal.cpp $(CXXC) -c -o $@ $(FRACTAL_CXXFLAGS) $(srcdir)/fractal.cpp fractal_fractal_rc.o: $(srcdir)/fractal.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/demos/fractal/fractal_vc7.vcproj b/demos/fractal/fractal_vc7.vcproj index 324c00a47e..5b8c6a03d9 100644 --- a/demos/fractal/fractal_vc7.vcproj +++ b/demos/fractal/fractal_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/fractal/fractal_vc8.vcproj b/demos/fractal/fractal_vc8.vcproj index e0cb2c5f64..60802dbcb3 100644 --- a/demos/fractal/fractal_vc8.vcproj +++ b/demos/fractal/fractal_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/fractal/fractal_vc9.vcproj b/demos/fractal/fractal_vc9.vcproj index 8a2ab9b844..19edc6ab8e 100644 --- a/demos/fractal/fractal_vc9.vcproj +++ b/demos/fractal/fractal_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/fractal/makefile.bcc b/demos/fractal/makefile.bcc index 390059121c..2bb7560b45 100644 --- a/demos/fractal/makefile.bcc +++ b/demos/fractal/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/fractal/makefile.gcc b/demos/fractal/makefile.gcc index 0f4fd7beb3..3dda17bf5c 100644 --- a/demos/fractal/makefile.gcc +++ b/demos/fractal/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc index 78cb5c04a3..3ed518d5ab 100644 --- a/demos/fractal/makefile.vc +++ b/demos/fractal/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index cf4b717205..2c687458d8 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -70,25 +69,22 @@ LIFE_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__life___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__life___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL life$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___life___os2_emxbindcmd = $(NM) life$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep life$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__life___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___life___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__life_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = life.app/Contents/PkgInfo @@ -154,8 +150,6 @@ distclean: clean life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc) $(CXX) -o $@ $(LIFE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__life___mac_setfilecmd) $(__life___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -205,7 +199,7 @@ life_reader.o: $(srcdir)/reader.cpp $(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $(srcdir)/reader.cpp life_life_rc.o: $(srcdir)/life.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/demos/life/life_vc7.vcproj b/demos/life/life_vc7.vcproj index 5759af3f16..3ba68795b4 100644 --- a/demos/life/life_vc7.vcproj +++ b/demos/life/life_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/life/life_vc8.vcproj b/demos/life/life_vc8.vcproj index 583230a2ef..39af6a9ac3 100644 --- a/demos/life/life_vc8.vcproj +++ b/demos/life/life_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/life/life_vc9.vcproj b/demos/life/life_vc9.vcproj index 5384be9480..78ef7432d5 100644 --- a/demos/life/life_vc9.vcproj +++ b/demos/life/life_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/life/makefile.bcc b/demos/life/makefile.bcc index 43c8c73db6..126e8b841f 100644 --- a/demos/life/makefile.bcc +++ b/demos/life/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/life/makefile.gcc b/demos/life/makefile.gcc index 6939c0550a..f3d854c349 100644 --- a/demos/life/makefile.gcc +++ b/demos/life/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc index b73eded6c0..8f06df7859 100644 --- a/demos/life/makefile.vc +++ b/demos/life/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/makefile.bcc b/demos/makefile.bcc index b3c6bda1ba..8f5637aa16 100644 --- a/demos/makefile.bcc +++ b/demos/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/makefile.gcc b/demos/makefile.gcc index 8b102860e9..99ff9d97ef 100644 --- a/demos/makefile.gcc +++ b/demos/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/makefile.vc b/demos/makefile.vc index 87567b8b03..98045b92c3 100644 --- a/demos/makefile.vc +++ b/demos/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index 318db8b408..3a199b75e6 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -68,25 +67,22 @@ WXPOEM_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__wxpoem___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__wxpoem___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxpoem$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___wxpoem___os2_emxbindcmd = $(NM) wxpoem$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep wxpoem$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__wxpoem___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxpoem___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__wxpoem_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = wxpoem.app/Contents/PkgInfo @@ -155,8 +151,6 @@ distclean: clean wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc) $(CXX) -o $@ $(WXPOEM_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__wxpoem___mac_setfilecmd) $(__wxpoem___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@wxpoem.app/Contents/PkgInfo: wxpoem$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -197,7 +191,7 @@ wxpoem_wxpoem.o: $(srcdir)/wxpoem.cpp $(CXXC) -c -o $@ $(WXPOEM_CXXFLAGS) $(srcdir)/wxpoem.cpp wxpoem_wxpoem_rc.o: $(srcdir)/wxpoem.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/demos/poem/makefile.bcc b/demos/poem/makefile.bcc index 78817740f5..2f713bd71e 100644 --- a/demos/poem/makefile.bcc +++ b/demos/poem/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/poem/makefile.gcc b/demos/poem/makefile.gcc index f8f10375f7..8580edc6f1 100644 --- a/demos/poem/makefile.gcc +++ b/demos/poem/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc index c1830ad5f1..4f657f0d0e 100644 --- a/demos/poem/makefile.vc +++ b/demos/poem/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/poem/poem_vc7.vcproj b/demos/poem/poem_vc7.vcproj index 1721f3c80b..4d9f52e82f 100644 --- a/demos/poem/poem_vc7.vcproj +++ b/demos/poem/poem_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/poem/poem_vc8.vcproj b/demos/poem/poem_vc8.vcproj index e598850c5c..c60d65177d 100644 --- a/demos/poem/poem_vc8.vcproj +++ b/demos/poem/poem_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/demos/poem/poem_vc9.vcproj b/demos/poem/poem_vc9.vcproj index a9c3675dae..cd31e5b5e1 100644 --- a/demos/poem/poem_vc9.vcproj +++ b/demos/poem/poem_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index c431c4c3b0..ee8fa03fe9 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ ACCESSTEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__accesstest___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__accesstest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL accesstest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd = $(NM) accesstest$(EXEEXT) \ | if grep -q pmwin.763 ; then emxbind -ep accesstest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__accesstest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_sample_rc.o @COND_PLATFORM_MACOSX_1@__accesstest_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc) $(CXX) -o $@ $(ACCESSTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__accesstest___mac_setfilecmd) $(__accesstest___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc) @COND_PLATFORM_MACOSX_1@accesstest_bundle: $(____accesstest_BUNDLE_TGT_REF_DEP) accesstest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include accesstest_accesstest.o: $(srcdir)/accesstest.cpp $(CXXC) -c -o $@ $(ACCESSTEST_CXXFLAGS) $(srcdir)/accesstest.cpp diff --git a/samples/access/access_vc7.vcproj b/samples/access/access_vc7.vcproj index 81cf98b23d..2224233e1c 100644 --- a/samples/access/access_vc7.vcproj +++ b/samples/access/access_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/access/access_vc8.vcproj b/samples/access/access_vc8.vcproj index 38cf7a7fe5..8bcdf0234c 100644 --- a/samples/access/access_vc8.vcproj +++ b/samples/access/access_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/access/access_vc9.vcproj b/samples/access/access_vc9.vcproj index d2d2c1f15d..4e3587a51e 100644 --- a/samples/access/access_vc9.vcproj +++ b/samples/access/access_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/access/makefile.bcc b/samples/access/makefile.bcc index c7d456d216..ce41305742 100644 --- a/samples/access/makefile.bcc +++ b/samples/access/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc index 25a3554274..c33c0d83eb 100644 --- a/samples/access/makefile.gcc +++ b/samples/access/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/access/makefile.unx b/samples/access/makefile.unx index e5d98a8d92..1d7f13b7d5 100644 --- a/samples/access/makefile.unx +++ b/samples/access/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc index 2f8343e642..a7ec7b9dbb 100644 --- a/samples/access/makefile.vc +++ b/samples/access/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in index 3d0ecfd878..7a307a641c 100644 --- a/samples/animate/Makefile.in +++ b/samples/animate/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ ANITEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__anitest___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__anitest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL anitest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd = $(NM) anitest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep anitest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__anitest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__anitest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = anitest.app/Contents/PkgInfo @@ -156,8 +152,6 @@ distclean: clean anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc) $(CXX) -o $@ $(ANITEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__anitest___mac_setfilecmd) $(__anitest___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -198,7 +192,7 @@ anitest_anitest.o: $(srcdir)/anitest.cpp $(CXXC) -c -o $@ $(ANITEST_CXXFLAGS) $(srcdir)/anitest.cpp anitest_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/animate/anitest_vc7.vcproj b/samples/animate/anitest_vc7.vcproj index b3303eac04..988221a38b 100644 --- a/samples/animate/anitest_vc7.vcproj +++ b/samples/animate/anitest_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/animate/anitest_vc8.vcproj b/samples/animate/anitest_vc8.vcproj index bbc15ac485..0124358289 100644 --- a/samples/animate/anitest_vc8.vcproj +++ b/samples/animate/anitest_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/animate/anitest_vc9.vcproj b/samples/animate/anitest_vc9.vcproj index 448c861b5d..9f43342345 100644 --- a/samples/animate/anitest_vc9.vcproj +++ b/samples/animate/anitest_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/animate/makefile.bcc b/samples/animate/makefile.bcc index bf076bc17f..628dfa04d2 100644 --- a/samples/animate/makefile.bcc +++ b/samples/animate/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/animate/makefile.gcc b/samples/animate/makefile.gcc index 8e85ef9c62..026e185023 100644 --- a/samples/animate/makefile.gcc +++ b/samples/animate/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/animate/makefile.unx b/samples/animate/makefile.unx index c279e2c28e..f590142e67 100644 --- a/samples/animate/makefile.unx +++ b/samples/animate/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/animate/makefile.vc b/samples/animate/makefile.vc index 555785067d..d9a1dd9635 100644 --- a/samples/animate/makefile.vc +++ b/samples/animate/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 0932729f1b..d8458dc844 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -68,25 +67,22 @@ ARTTEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__arttest___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__arttest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL arttest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd = $(NM) arttest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep arttest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__arttest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__arttest___win32rc = arttest_sample_rc.o @COND_PLATFORM_MACOSX_1@__arttest_app_Contents_PkgInfo___depname \ @@ -152,8 +148,6 @@ distclean: clean arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc) $(CXX) -o $@ $(ARTTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__arttest___mac_setfilecmd) $(__arttest___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -179,7 +173,7 @@ arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc) @COND_PLATFORM_MACOSX_1@arttest_bundle: $(____arttest_BUNDLE_TGT_REF_DEP) arttest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include arttest_arttest.o: $(srcdir)/arttest.cpp $(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $(srcdir)/arttest.cpp diff --git a/samples/artprov/artprov_vc7.vcproj b/samples/artprov/artprov_vc7.vcproj index 955ef9e778..25b1419f62 100644 --- a/samples/artprov/artprov_vc7.vcproj +++ b/samples/artprov/artprov_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/artprov/artprov_vc8.vcproj b/samples/artprov/artprov_vc8.vcproj index 2cbfa512ad..a6a8c15a87 100644 --- a/samples/artprov/artprov_vc8.vcproj +++ b/samples/artprov/artprov_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/artprov/artprov_vc9.vcproj b/samples/artprov/artprov_vc9.vcproj index a79877d01b..aa3da8886b 100644 --- a/samples/artprov/artprov_vc9.vcproj +++ b/samples/artprov/artprov_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/artprov/makefile.bcc b/samples/artprov/makefile.bcc index cac922400b..077fb197aa 100644 --- a/samples/artprov/makefile.bcc +++ b/samples/artprov/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc index c39a41370f..2a16db8950 100644 --- a/samples/artprov/makefile.gcc +++ b/samples/artprov/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/artprov/makefile.unx b/samples/artprov/makefile.unx index 28573b447b..b19a4ed7f1 100644 --- a/samples/artprov/makefile.unx +++ b/samples/artprov/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc index 9210d0b6c2..d8662d6af1 100644 --- a/samples/artprov/makefile.vc +++ b/samples/artprov/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in index 3589c90bb5..b107504320 100644 --- a/samples/aui/Makefile.in +++ b/samples/aui/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -70,25 +69,22 @@ AUIDEMO_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__auidemo___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__auidemo___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL auidemo$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd = $(NM) auidemo$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep auidemo$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__auidemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__auidemo___win32rc = auidemo_sample_rc.o @COND_PLATFORM_MACOSX_1@__auidemo_app_Contents_PkgInfo___depname \ @@ -166,8 +162,6 @@ distclean: clean auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc) $(CXX) -o $@ $(AUIDEMO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__auidemo___mac_setfilecmd) $(__auidemo___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@auidemo.app/Contents/PkgInfo: auidemo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -193,7 +187,7 @@ auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc) @COND_PLATFORM_MACOSX_1@auidemo_bundle: $(____auidemo_BUNDLE_TGT_REF_DEP) auidemo_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include auidemo_auidemo.o: $(srcdir)/auidemo.cpp $(CXXC) -c -o $@ $(AUIDEMO_CXXFLAGS) $(srcdir)/auidemo.cpp diff --git a/samples/aui/auidemo_vc7.vcproj b/samples/aui/auidemo_vc7.vcproj index f12d317e23..97a4bab84e 100644 --- a/samples/aui/auidemo_vc7.vcproj +++ b/samples/aui/auidemo_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/aui/auidemo_vc8.vcproj b/samples/aui/auidemo_vc8.vcproj index 183b131319..e2486f25db 100644 --- a/samples/aui/auidemo_vc8.vcproj +++ b/samples/aui/auidemo_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/aui/auidemo_vc9.vcproj b/samples/aui/auidemo_vc9.vcproj index 0d38a6daa6..59892df6a6 100644 --- a/samples/aui/auidemo_vc9.vcproj +++ b/samples/aui/auidemo_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/aui/makefile.bcc b/samples/aui/makefile.bcc index 9b59c5db59..473719a270 100644 --- a/samples/aui/makefile.bcc +++ b/samples/aui/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/aui/makefile.gcc b/samples/aui/makefile.gcc index cfa04686bf..6ed67b1f6f 100644 --- a/samples/aui/makefile.gcc +++ b/samples/aui/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/aui/makefile.unx b/samples/aui/makefile.unx index fe6476a925..006ad60f64 100644 --- a/samples/aui/makefile.unx +++ b/samples/aui/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc index 00835d816d..11fab71806 100644 --- a/samples/aui/makefile.vc +++ b/samples/aui/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index 6618fbd969..641583f1ee 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ CALENDAR_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__calendar___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL calendar$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd = $(NM) calendar$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep calendar$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__calendar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__calendar___win32rc = calendar_sample_rc.o @COND_PLATFORM_MACOSX_1@__calendar_app_Contents_PkgInfo___depname \ @@ -156,8 +152,6 @@ distclean: clean calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc) $(CXX) -o $@ $(CALENDAR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__calendar___mac_setfilecmd) $(__calendar___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -183,7 +177,7 @@ calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc) @COND_PLATFORM_MACOSX_1@calendar_bundle: $(____calendar_BUNDLE_TGT_REF_DEP) calendar_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include calendar_calendar.o: $(srcdir)/calendar.cpp $(CXXC) -c -o $@ $(CALENDAR_CXXFLAGS) $(srcdir)/calendar.cpp diff --git a/samples/calendar/calendar_vc7.vcproj b/samples/calendar/calendar_vc7.vcproj index 892c7f5a07..9c648b4bb3 100644 --- a/samples/calendar/calendar_vc7.vcproj +++ b/samples/calendar/calendar_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/calendar/calendar_vc8.vcproj b/samples/calendar/calendar_vc8.vcproj index 83096655f4..f2f4d56cad 100644 --- a/samples/calendar/calendar_vc8.vcproj +++ b/samples/calendar/calendar_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/calendar/calendar_vc9.vcproj b/samples/calendar/calendar_vc9.vcproj index ffc02f28f1..d6a9a5cd1f 100644 --- a/samples/calendar/calendar_vc9.vcproj +++ b/samples/calendar/calendar_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc index 2708cd91c3..2fac3f428e 100644 --- a/samples/calendar/makefile.bcc +++ b/samples/calendar/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc index d72762935f..864e250986 100644 --- a/samples/calendar/makefile.gcc +++ b/samples/calendar/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/calendar/makefile.unx b/samples/calendar/makefile.unx index 09eb3c65c5..a7445f47aa 100644 --- a/samples/calendar/makefile.unx +++ b/samples/calendar/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc index cbd24767bf..6ccdd37069 100644 --- a/samples/calendar/makefile.vc +++ b/samples/calendar/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 973741d8bb..0fc3d8ffec 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ CARET_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__caret___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL caret$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___caret___os2_emxbindcmd = $(NM) caret$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep caret$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__caret___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___caret___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__caret___win32rc = caret_sample_rc.o @COND_PLATFORM_MACOSX_1@__caret_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc) $(CXX) -o $@ $(CARET_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__caret___mac_setfilecmd) $(__caret___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc) @COND_PLATFORM_MACOSX_1@caret_bundle: $(____caret_BUNDLE_TGT_REF_DEP) caret_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include caret_caret.o: $(srcdir)/caret.cpp $(CXXC) -c -o $@ $(CARET_CXXFLAGS) $(srcdir)/caret.cpp diff --git a/samples/caret/caret_vc7.vcproj b/samples/caret/caret_vc7.vcproj index 97bbfcb536..74348b6d32 100644 --- a/samples/caret/caret_vc7.vcproj +++ b/samples/caret/caret_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/caret/caret_vc8.vcproj b/samples/caret/caret_vc8.vcproj index 1ed0e0a5f5..ab921903ec 100644 --- a/samples/caret/caret_vc8.vcproj +++ b/samples/caret/caret_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/caret/caret_vc9.vcproj b/samples/caret/caret_vc9.vcproj index dad6f7f654..826ce7f8dd 100644 --- a/samples/caret/caret_vc9.vcproj +++ b/samples/caret/caret_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/caret/makefile.bcc b/samples/caret/makefile.bcc index 2ae8daf3e6..ab429db739 100644 --- a/samples/caret/makefile.bcc +++ b/samples/caret/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc index 48ad56cad3..3bc309a808 100644 --- a/samples/caret/makefile.gcc +++ b/samples/caret/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/caret/makefile.unx b/samples/caret/makefile.unx index d14d540502..281000c74f 100644 --- a/samples/caret/makefile.unx +++ b/samples/caret/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc index 54a9f4d901..988327a21c 100644 --- a/samples/caret/makefile.vc +++ b/samples/caret/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in index 22c65f1d87..2bcdd69d72 100644 --- a/samples/clipboard/Makefile.in +++ b/samples/clipboard/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ CLIPBOARD_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__clipboard___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__clipboard___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL clipboard$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___clipboard___os2_emxbindcmd = $(NM) clipboard$(EXEEXT) | \ if grep -q pmwin.763 ; then emxbind -ep clipboard$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__clipboard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___clipboard___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__clipboard___win32rc = clipboard_sample_rc.o @COND_PLATFORM_MACOSX_1@__clipboard_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean clipboard$(EXEEXT): $(CLIPBOARD_OBJECTS) $(__clipboard___win32rc) $(CXX) -o $@ $(CLIPBOARD_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__clipboard___mac_setfilecmd) $(__clipboard___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@clipboard.app/Contents/PkgInfo: clipboard$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ clipboard$(EXEEXT): $(CLIPBOARD_OBJECTS) $(__clipboard___win32rc) @COND_PLATFORM_MACOSX_1@clipboard_bundle: $(____clipboard_BUNDLE_TGT_REF_DEP) clipboard_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include clipboard_clipboard.o: $(srcdir)/clipboard.cpp $(CXXC) -c -o $@ $(CLIPBOARD_CXXFLAGS) $(srcdir)/clipboard.cpp diff --git a/samples/clipboard/clipboard_vc7.vcproj b/samples/clipboard/clipboard_vc7.vcproj index 4475f86083..638c6ec59e 100644 --- a/samples/clipboard/clipboard_vc7.vcproj +++ b/samples/clipboard/clipboard_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/clipboard/clipboard_vc8.vcproj b/samples/clipboard/clipboard_vc8.vcproj index c8a02d954b..f5bc867280 100644 --- a/samples/clipboard/clipboard_vc8.vcproj +++ b/samples/clipboard/clipboard_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/clipboard/clipboard_vc9.vcproj b/samples/clipboard/clipboard_vc9.vcproj index f702d1d873..7724911d23 100644 --- a/samples/clipboard/clipboard_vc9.vcproj +++ b/samples/clipboard/clipboard_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/clipboard/makefile.bcc b/samples/clipboard/makefile.bcc index 8d2cde59cd..76f135634a 100644 --- a/samples/clipboard/makefile.bcc +++ b/samples/clipboard/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/clipboard/makefile.gcc b/samples/clipboard/makefile.gcc index efedcf6873..dfdc7d1645 100644 --- a/samples/clipboard/makefile.gcc +++ b/samples/clipboard/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/clipboard/makefile.unx b/samples/clipboard/makefile.unx index f3e5d22fef..8cdad6f81c 100644 --- a/samples/clipboard/makefile.unx +++ b/samples/clipboard/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/clipboard/makefile.vc b/samples/clipboard/makefile.vc index 633cdb1b92..7b687627df 100644 --- a/samples/clipboard/makefile.vc +++ b/samples/clipboard/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in index d5732d87ef..2784914254 100644 --- a/samples/collpane/Makefile.in +++ b/samples/collpane/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ COLLPANE_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__collpane___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__collpane___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL collpane$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___collpane___os2_emxbindcmd = $(NM) collpane$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep collpane$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__collpane___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___collpane___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__collpane_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = collpane.app/Contents/PkgInfo @@ -156,8 +152,6 @@ distclean: clean collpane$(EXEEXT): $(COLLPANE_OBJECTS) $(__collpane___win32rc) $(CXX) -o $@ $(COLLPANE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__collpane___mac_setfilecmd) $(__collpane___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@collpane.app/Contents/PkgInfo: collpane$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -186,7 +180,7 @@ collpane_collpane.o: $(srcdir)/collpane.cpp $(CXXC) -c -o $@ $(COLLPANE_CXXFLAGS) $(srcdir)/collpane.cpp collpane_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/collpane/collpane_vc7.vcproj b/samples/collpane/collpane_vc7.vcproj index 8e4b27273a..b8acad996d 100644 --- a/samples/collpane/collpane_vc7.vcproj +++ b/samples/collpane/collpane_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/collpane/collpane_vc8.vcproj b/samples/collpane/collpane_vc8.vcproj index 7d96ecbd4b..15634ff049 100644 --- a/samples/collpane/collpane_vc8.vcproj +++ b/samples/collpane/collpane_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/collpane/collpane_vc9.vcproj b/samples/collpane/collpane_vc9.vcproj index ffbb8d2766..af4c6100a4 100644 --- a/samples/collpane/collpane_vc9.vcproj +++ b/samples/collpane/collpane_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/collpane/makefile.bcc b/samples/collpane/makefile.bcc index c40ea3548e..d4cd5b7539 100644 --- a/samples/collpane/makefile.bcc +++ b/samples/collpane/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/collpane/makefile.gcc b/samples/collpane/makefile.gcc index e030997f47..dfe1d75562 100644 --- a/samples/collpane/makefile.gcc +++ b/samples/collpane/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/collpane/makefile.unx b/samples/collpane/makefile.unx index ddb5dec2ae..dcb8557b21 100644 --- a/samples/collpane/makefile.unx +++ b/samples/collpane/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/collpane/makefile.vc b/samples/collpane/makefile.vc index bfe6e6d0e8..e38ce458f3 100644 --- a/samples/collpane/makefile.vc +++ b/samples/collpane/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in index 8ec1aa0225..5999a5b85f 100644 --- a/samples/combo/Makefile.in +++ b/samples/combo/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ COMBO_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__combo___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__combo___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL combo$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___combo___os2_emxbindcmd = $(NM) combo$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep combo$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__combo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___combo___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__combo___win32rc = combo_sample_rc.o @COND_PLATFORM_MACOSX_1@__combo_app_Contents_PkgInfo___depname \ @@ -156,8 +152,6 @@ distclean: clean combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc) $(CXX) -o $@ $(COMBO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__combo___mac_setfilecmd) $(__combo___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@combo.app/Contents/PkgInfo: combo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -195,7 +189,7 @@ data: done combo_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include combo_combo.o: $(srcdir)/combo.cpp $(CXXC) -c -o $@ $(COMBO_CXXFLAGS) $(srcdir)/combo.cpp diff --git a/samples/combo/combo_vc7.vcproj b/samples/combo/combo_vc7.vcproj index 10a7448042..dd22f7c7bc 100644 --- a/samples/combo/combo_vc7.vcproj +++ b/samples/combo/combo_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/combo/combo_vc8.vcproj b/samples/combo/combo_vc8.vcproj index fdcbd97632..a0634092b3 100644 --- a/samples/combo/combo_vc8.vcproj +++ b/samples/combo/combo_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/combo/combo_vc9.vcproj b/samples/combo/combo_vc9.vcproj index 03d008b544..27c65d4b07 100644 --- a/samples/combo/combo_vc9.vcproj +++ b/samples/combo/combo_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/combo/makefile.bcc b/samples/combo/makefile.bcc index 2be14eebef..5af539b793 100644 --- a/samples/combo/makefile.bcc +++ b/samples/combo/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/combo/makefile.gcc b/samples/combo/makefile.gcc index e937a46953..834855271b 100644 --- a/samples/combo/makefile.gcc +++ b/samples/combo/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/combo/makefile.unx b/samples/combo/makefile.unx index ef3776189e..ce217f013b 100644 --- a/samples/combo/makefile.unx +++ b/samples/combo/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc index 72557611ca..e9fa46647f 100644 --- a/samples/combo/makefile.vc +++ b/samples/combo/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index a9b3534ac7..99be71019f 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ CONFTEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__conftest___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL conftest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd = $(NM) conftest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep conftest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__conftest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__conftest___win32rc = conftest_sample_rc.o @COND_PLATFORM_MACOSX_1@__conftest_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc) $(CXX) -o $@ $(CONFTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__conftest___mac_setfilecmd) $(__conftest___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc) @COND_PLATFORM_MACOSX_1@conftest_bundle: $(____conftest_BUNDLE_TGT_REF_DEP) conftest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include conftest_conftest.o: $(srcdir)/conftest.cpp $(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $(srcdir)/conftest.cpp diff --git a/samples/config/config_vc7.vcproj b/samples/config/config_vc7.vcproj index f50e4d4568..7d30b34bf0 100644 --- a/samples/config/config_vc7.vcproj +++ b/samples/config/config_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/config/config_vc8.vcproj b/samples/config/config_vc8.vcproj index abf284c059..18c78e56ff 100644 --- a/samples/config/config_vc8.vcproj +++ b/samples/config/config_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/config/config_vc9.vcproj b/samples/config/config_vc9.vcproj index 709e4c87fe..8ef66c6159 100644 --- a/samples/config/config_vc9.vcproj +++ b/samples/config/config_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/config/makefile.bcc b/samples/config/makefile.bcc index e807891117..7ff505cda0 100644 --- a/samples/config/makefile.bcc +++ b/samples/config/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc index e7976be594..9476d2eeec 100644 --- a/samples/config/makefile.gcc +++ b/samples/config/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/config/makefile.unx b/samples/config/makefile.unx index e30a7c46ef..adc0d24025 100644 --- a/samples/config/makefile.unx +++ b/samples/config/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc index 8c33b30b22..ad76b4c75a 100644 --- a/samples/config/makefile.vc +++ b/samples/config/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index 390fbad82c..85761ad9c1 100644 --- a/samples/console/Makefile.in +++ b/samples/console/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,6 @@ exec_prefix = @exec_prefix@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ -SETFILE = @SETFILE@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -59,9 +58,6 @@ CONSOLE_OBJECTS = \ @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) -@COND_PLATFORM_MAC_0@__console___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__console___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL console$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS @@ -109,8 +105,6 @@ distclean: clean console$(EXEEXT): $(CONSOLE_OBJECTS) $(CXX) -o $@ $(CONSOLE_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__console___mac_setfilecmd) console_console.o: $(srcdir)/console.cpp $(CXXC) -c -o $@ $(CONSOLE_CXXFLAGS) $(srcdir)/console.cpp diff --git a/samples/console/console_vc7.vcproj b/samples/console/console_vc7.vcproj index 25fc111afb..240ec86264 100644 --- a/samples/console/console_vc7.vcproj +++ b/samples/console/console_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/console/console_vc8.vcproj b/samples/console/console_vc8.vcproj index 8b063716fd..a41a98f5fc 100644 --- a/samples/console/console_vc8.vcproj +++ b/samples/console/console_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/console/console_vc9.vcproj b/samples/console/console_vc9.vcproj index a08e9637e2..1b5968a67b 100644 --- a/samples/console/console_vc9.vcproj +++ b/samples/console/console_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/console/makefile.bcc b/samples/console/makefile.bcc index 822d012c0e..ea3692fb1c 100644 --- a/samples/console/makefile.bcc +++ b/samples/console/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/console/makefile.gcc b/samples/console/makefile.gcc index d99aa8f29e..72e8c298a9 100644 --- a/samples/console/makefile.gcc +++ b/samples/console/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/console/makefile.unx b/samples/console/makefile.unx index 3da200c593..076535eadc 100644 --- a/samples/console/makefile.unx +++ b/samples/console/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/console/makefile.vc b/samples/console/makefile.vc index b8e4732a2a..f2cabab6da 100644 --- a/samples/console/makefile.vc +++ b/samples/console/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in index 9abd241ecc..4ce8cb01cc 100644 --- a/samples/dataview/Makefile.in +++ b/samples/dataview/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -70,25 +69,22 @@ DATAVIEW_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__dataview___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__dataview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL dataview$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___dataview___os2_emxbindcmd = $(NM) dataview$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep dataview$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__dataview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dataview___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__dataview_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = dataview.app/Contents/PkgInfo @@ -157,8 +153,6 @@ distclean: clean dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc) $(CXX) -o $@ $(DATAVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__dataview___mac_setfilecmd) $(__dataview___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@dataview.app/Contents/PkgInfo: dataview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -190,7 +184,7 @@ dataview_mymodels.o: $(srcdir)/mymodels.cpp $(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/mymodels.cpp dataview_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/dataview/dataview_vc7.vcproj b/samples/dataview/dataview_vc7.vcproj index 7efe5cbd6d..7cbca0de07 100644 --- a/samples/dataview/dataview_vc7.vcproj +++ b/samples/dataview/dataview_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dataview/dataview_vc8.vcproj b/samples/dataview/dataview_vc8.vcproj index bc274f7ad7..e32ab97483 100644 --- a/samples/dataview/dataview_vc8.vcproj +++ b/samples/dataview/dataview_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dataview/dataview_vc9.vcproj b/samples/dataview/dataview_vc9.vcproj index e7aacaf378..afb20166f0 100644 --- a/samples/dataview/dataview_vc9.vcproj +++ b/samples/dataview/dataview_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dataview/makefile.bcc b/samples/dataview/makefile.bcc index 030859fb57..bcacf4bb00 100644 --- a/samples/dataview/makefile.bcc +++ b/samples/dataview/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dataview/makefile.gcc b/samples/dataview/makefile.gcc index a3f2cfebb3..fa65cbfaed 100644 --- a/samples/dataview/makefile.gcc +++ b/samples/dataview/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dataview/makefile.unx b/samples/dataview/makefile.unx index 7de7223dfd..b14d642195 100644 --- a/samples/dataview/makefile.unx +++ b/samples/dataview/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc index 64b6d59ca0..c17f0056ec 100644 --- a/samples/dataview/makefile.vc +++ b/samples/dataview/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in index 24b02acd07..956e5c9894 100644 --- a/samples/debugrpt/Makefile.in +++ b/samples/debugrpt/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ DEBUGRPT_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__debugrpt___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__debugrpt___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL debugrpt$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___debugrpt___os2_emxbindcmd = $(NM) debugrpt$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep debugrpt$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__debugrpt___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___debugrpt___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__debugrpt___win32rc = debugrpt_sample_rc.o @COND_PLATFORM_MACOSX_1@__debugrpt_app_Contents_PkgInfo___depname \ @@ -157,8 +153,6 @@ distclean: clean debugrpt$(EXEEXT): $(DEBUGRPT_OBJECTS) $(__debugrpt___win32rc) $(CXX) -o $@ $(DEBUGRPT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__debugrpt___mac_setfilecmd) $(__debugrpt___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@debugrpt.app/Contents/PkgInfo: debugrpt$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -184,7 +178,7 @@ debugrpt$(EXEEXT): $(DEBUGRPT_OBJECTS) $(__debugrpt___win32rc) @COND_PLATFORM_MACOSX_1@debugrpt_bundle: $(____debugrpt_BUNDLE_TGT_REF_DEP) debugrpt_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include debugrpt_debugrpt.o: $(srcdir)/debugrpt.cpp $(CXXC) -c -o $@ $(DEBUGRPT_CXXFLAGS) $(srcdir)/debugrpt.cpp diff --git a/samples/debugrpt/debugrpt_vc7.vcproj b/samples/debugrpt/debugrpt_vc7.vcproj index 5e839cba6d..eb00af8ecb 100644 --- a/samples/debugrpt/debugrpt_vc7.vcproj +++ b/samples/debugrpt/debugrpt_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/debugrpt/debugrpt_vc8.vcproj b/samples/debugrpt/debugrpt_vc8.vcproj index 4851acd697..66dd05bafe 100644 --- a/samples/debugrpt/debugrpt_vc8.vcproj +++ b/samples/debugrpt/debugrpt_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/debugrpt/debugrpt_vc9.vcproj b/samples/debugrpt/debugrpt_vc9.vcproj index e411c6ccc2..10c5cf86fd 100644 --- a/samples/debugrpt/debugrpt_vc9.vcproj +++ b/samples/debugrpt/debugrpt_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/debugrpt/makefile.bcc b/samples/debugrpt/makefile.bcc index dcc1b474f2..cc1a6c00ba 100644 --- a/samples/debugrpt/makefile.bcc +++ b/samples/debugrpt/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/debugrpt/makefile.gcc b/samples/debugrpt/makefile.gcc index b81270d938..bd2df19b50 100644 --- a/samples/debugrpt/makefile.gcc +++ b/samples/debugrpt/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/debugrpt/makefile.unx b/samples/debugrpt/makefile.unx index 6eaa3e6b2c..6523856e93 100644 --- a/samples/debugrpt/makefile.unx +++ b/samples/debugrpt/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/debugrpt/makefile.vc b/samples/debugrpt/makefile.vc index 1e3c749eb6..1b6906e1f1 100644 --- a/samples/debugrpt/makefile.vc +++ b/samples/debugrpt/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index c3a22fe187..cef098323f 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -70,25 +69,22 @@ DIALOGS_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__dialogs___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL dialogs$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd = $(NM) dialogs$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep dialogs$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__dialogs___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__dialogs___win32rc = dialogs_sample_rc.o @COND_PLATFORM_MACOSX_1@__dialogs_app_Contents_PkgInfo___depname \ @@ -167,8 +163,6 @@ distclean: clean dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc) $(CXX) -o $@ $(DIALOGS_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__dialogs___mac_setfilecmd) $(__dialogs___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -206,7 +200,7 @@ data: done dialogs_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include dialogs_dialogs.o: $(srcdir)/dialogs.cpp $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/dialogs.cpp diff --git a/samples/dialogs/dialogs_vc7.vcproj b/samples/dialogs/dialogs_vc7.vcproj index b8f834f15a..26b4d97e8a 100644 --- a/samples/dialogs/dialogs_vc7.vcproj +++ b/samples/dialogs/dialogs_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dialogs/dialogs_vc8.vcproj b/samples/dialogs/dialogs_vc8.vcproj index 7e880519b1..bb8ace4c98 100644 --- a/samples/dialogs/dialogs_vc8.vcproj +++ b/samples/dialogs/dialogs_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dialogs/dialogs_vc9.vcproj b/samples/dialogs/dialogs_vc9.vcproj index 3f3d121f84..9370296e92 100644 --- a/samples/dialogs/dialogs_vc9.vcproj +++ b/samples/dialogs/dialogs_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc index f0100d4730..61bf3a6765 100644 --- a/samples/dialogs/makefile.bcc +++ b/samples/dialogs/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc index 7348787768..ebcdb7c06a 100644 --- a/samples/dialogs/makefile.gcc +++ b/samples/dialogs/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx index 1ddec20cf1..61dea31c47 100644 --- a/samples/dialogs/makefile.unx +++ b/samples/dialogs/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc index 28ba4643a9..eb2f74af43 100644 --- a/samples/dialogs/makefile.vc +++ b/samples/dialogs/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 6d6b85843d..b8e07e5faf 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ NETTEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__nettest___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL nettest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd = $(NM) nettest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep nettest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__nettest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_sample_rc.o @COND_PLATFORM_MACOSX_1@__nettest_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc) $(CXX) -o $@ $(NETTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__nettest___mac_setfilecmd) $(__nettest___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc) @COND_PLATFORM_MACOSX_1@nettest_bundle: $(____nettest_BUNDLE_TGT_REF_DEP) nettest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include nettest_nettest.o: $(srcdir)/nettest.cpp $(CXXC) -c -o $@ $(NETTEST_CXXFLAGS) $(srcdir)/nettest.cpp diff --git a/samples/dialup/dialup_vc7.vcproj b/samples/dialup/dialup_vc7.vcproj index 7b65d7c512..965a1c2247 100644 --- a/samples/dialup/dialup_vc7.vcproj +++ b/samples/dialup/dialup_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dialup/dialup_vc8.vcproj b/samples/dialup/dialup_vc8.vcproj index a1c25514cb..51b75c4f19 100644 --- a/samples/dialup/dialup_vc8.vcproj +++ b/samples/dialup/dialup_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dialup/dialup_vc9.vcproj b/samples/dialup/dialup_vc9.vcproj index d998e8c3ac..74a076ee74 100644 --- a/samples/dialup/dialup_vc9.vcproj +++ b/samples/dialup/dialup_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dialup/makefile.bcc b/samples/dialup/makefile.bcc index 2aeacc3175..bb706b7ac9 100644 --- a/samples/dialup/makefile.bcc +++ b/samples/dialup/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc index 0a65dc897d..f63ea26360 100644 --- a/samples/dialup/makefile.gcc +++ b/samples/dialup/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialup/makefile.unx b/samples/dialup/makefile.unx index b3dc0c272a..40b1c1ba2f 100644 --- a/samples/dialup/makefile.unx +++ b/samples/dialup/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc index a5dbed5f40..068912812a 100644 --- a/samples/dialup/makefile.vc +++ b/samples/dialup/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index c5e87d903d..b008450623 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ DISPLAY_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__display___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__display___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL display$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___display___os2_emxbindcmd = $(NM) display$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep display$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__display___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___display___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__display___win32rc = display_sample_rc.o @COND_PLATFORM_MACOSX_1@__display_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc) $(CXX) -o $@ $(DISPLAY_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__display___mac_setfilecmd) $(__display___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc) @COND_PLATFORM_MACOSX_1@display_bundle: $(____display_BUNDLE_TGT_REF_DEP) display_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include display_display.o: $(srcdir)/display.cpp $(CXXC) -c -o $@ $(DISPLAY_CXXFLAGS) $(srcdir)/display.cpp diff --git a/samples/display/display_vc7.vcproj b/samples/display/display_vc7.vcproj index 0a3f65b1bc..2a8c7ac7a4 100644 --- a/samples/display/display_vc7.vcproj +++ b/samples/display/display_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/display/display_vc8.vcproj b/samples/display/display_vc8.vcproj index d54e054132..1cac8cf101 100644 --- a/samples/display/display_vc8.vcproj +++ b/samples/display/display_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/display/display_vc9.vcproj b/samples/display/display_vc9.vcproj index ccdcb411eb..8f2d4ea929 100644 --- a/samples/display/display_vc9.vcproj +++ b/samples/display/display_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/display/makefile.bcc b/samples/display/makefile.bcc index 28dcbc2d97..b31ca6b3c1 100644 --- a/samples/display/makefile.bcc +++ b/samples/display/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/display/makefile.gcc b/samples/display/makefile.gcc index bfaf268530..7c970200d4 100644 --- a/samples/display/makefile.gcc +++ b/samples/display/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/display/makefile.unx b/samples/display/makefile.unx index 59ab4ae587..46d21fd60e 100644 --- a/samples/display/makefile.unx +++ b/samples/display/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc index 324d2fb34f..c8f0e7f7e7 100644 --- a/samples/display/makefile.vc +++ b/samples/display/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in index e6308980df..f6eba32980 100644 --- a/samples/dll/Makefile.in +++ b/samples/dll/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -17,7 +17,6 @@ SO_SUFFIX = @SO_SUFFIX@ DLLIMP_SUFFIX = @DLLIMP_SUFFIX@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ PIC_FLAG = @PIC_FLAG@ NM = @NM@ BK_DEPS = @BK_DEPS@ @@ -88,19 +87,16 @@ SDK_EXE_OBJECTS = \ @COND_WINDOWS_IMPLIB_1@__my_dll___importlib = \ @COND_WINDOWS_IMPLIB_1@ -Wl,--out-implib=$(LIBPREFIX)my_dll.$(DLLIMP_SUFFIX) @COND_PLATFORM_WIN32_1_SHARED_0@__wx_exe___depname = wx_exe$(EXEEXT) -@COND_PLATFORM_MAC_0@__wx_exe___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__wx_exe___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wx_exe$(EXEEXT) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_4 = --define __WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_4 = --define wxDEBUG_LEVEL=0 -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_4 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p_4 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p_4 = --define wxNO_THREADS -@COND_SHARED_1@__DLLFLAG_p_4 = --define WXUSINGDLL +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_3 = --define __WXUNIVERSAL__ +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_3 = --define wxDEBUG_LEVEL=0 +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_3 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p_3 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p_3 = --define wxNO_THREADS +@COND_SHARED_1@__DLLFLAG_p_3 = --define WXUSINGDLL COND_PLATFORM_OS2_1___wx_exe___os2_emxbindcmd = $(NM) wx_exe$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep wx_exe$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__wx_exe___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wx_exe___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__wx_exe___win32rc = wx_exe_sample_rc.o @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@__wx_exe_app_Contents_PkgInfo___depname \ @@ -119,9 +115,6 @@ COND_PLATFORM_OS2_1___wx_exe___os2_emxbindcmd = $(NM) wx_exe$(EXEEXT) | if grep @COND_TOOLKIT_COCOA@____wx_exe_BUNDLE_TGT_REF_DEP = \ @COND_TOOLKIT_COCOA@ $(__wx_exe_app_Contents_PkgInfo___depname) @COND_PLATFORM_WIN32_1@__sdk_exe___depname = sdk_exe$(EXEEXT) -@COND_PLATFORM_MAC_0@__sdk_exe___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__sdk_exe___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL sdk_exe$(EXEEXT) COND_PLATFORM_OS2_1___sdk_exe___os2_emxbindcmd = $(NM) sdk_exe$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep sdk_exe$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__sdk_exe___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___sdk_exe___os2_emxbindcmd) @@ -187,8 +180,6 @@ distclean: clean @COND_PLATFORM_WIN32_1_SHARED_0@wx_exe$(EXEEXT): $(WX_EXE_OBJECTS) $(__wx_exe___win32rc) $(__my_dll___depname) @COND_PLATFORM_WIN32_1_SHARED_0@ $(CXX) -o $@ $(WX_EXE_OBJECTS) -L. -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lmy_dll $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_PLATFORM_WIN32_1_SHARED_0@ -@COND_PLATFORM_WIN32_1_SHARED_0@ $(__wx_exe___mac_setfilecmd) @COND_PLATFORM_WIN32_1_SHARED_0@ $(__wx_exe___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@wx_exe.app/Contents/PkgInfo: $(__wx_exe___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -215,15 +206,13 @@ distclean: clean @COND_PLATFORM_WIN32_1@sdk_exe$(EXEEXT): $(SDK_EXE_OBJECTS) $(__my_dll___depname) @COND_PLATFORM_WIN32_1@ $(CXX) -o $@ $(SDK_EXE_OBJECTS) -L. $(LDFLAGS_GUI) $(LDFLAGS) -lmy_dll -luser32 $(LIBS) -@COND_PLATFORM_WIN32_1@ -@COND_PLATFORM_WIN32_1@ $(__sdk_exe___mac_setfilecmd) @COND_PLATFORM_WIN32_1@ $(__sdk_exe___os2_emxbindcmd) my_dll_my_dll.o: $(srcdir)/my_dll.cpp $(CXXC) -c -o $@ $(MY_DLL_CXXFLAGS) $(srcdir)/my_dll.cpp wx_exe_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) $(__DEBUG_DEFINE_p_4) $(__EXCEPTIONS_DEFINE_p_4) $(__RTTI_DEFINE_p_4) $(__THREAD_DEFINE_p_4) --include-dir $(srcdir) $(__DLLFLAG_p_4) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) --include-dir $(srcdir) $(__DLLFLAG_p_3) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include wx_exe_wx_exe.o: $(srcdir)/wx_exe.cpp $(CXXC) -c -o $@ $(WX_EXE_CXXFLAGS) $(srcdir)/wx_exe.cpp diff --git a/samples/dll/dll_vc7_my_dll.vcproj b/samples/dll/dll_vc7_my_dll.vcproj index 598400ad0e..8c9600a009 100644 --- a/samples/dll/dll_vc7_my_dll.vcproj +++ b/samples/dll/dll_vc7_my_dll.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dll/dll_vc7_sdk_exe.vcproj b/samples/dll/dll_vc7_sdk_exe.vcproj index d0893d113f..e79b58a41d 100644 --- a/samples/dll/dll_vc7_sdk_exe.vcproj +++ b/samples/dll/dll_vc7_sdk_exe.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dll/dll_vc7_wx_exe.vcproj b/samples/dll/dll_vc7_wx_exe.vcproj index f7ea32d831..86b62f2fb5 100644 --- a/samples/dll/dll_vc7_wx_exe.vcproj +++ b/samples/dll/dll_vc7_wx_exe.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dll/dll_vc8_my_dll.vcproj b/samples/dll/dll_vc8_my_dll.vcproj index 8b1350f464..905f3b9e93 100644 --- a/samples/dll/dll_vc8_my_dll.vcproj +++ b/samples/dll/dll_vc8_my_dll.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dll/dll_vc8_sdk_exe.vcproj b/samples/dll/dll_vc8_sdk_exe.vcproj index a30193ebd4..cc24d548f2 100644 --- a/samples/dll/dll_vc8_sdk_exe.vcproj +++ b/samples/dll/dll_vc8_sdk_exe.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dll/dll_vc8_wx_exe.vcproj b/samples/dll/dll_vc8_wx_exe.vcproj index dc3ae909d9..fd44c935fa 100644 --- a/samples/dll/dll_vc8_wx_exe.vcproj +++ b/samples/dll/dll_vc8_wx_exe.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dll/dll_vc9_my_dll.vcproj b/samples/dll/dll_vc9_my_dll.vcproj index fe662dc348..eea3ee7532 100644 --- a/samples/dll/dll_vc9_my_dll.vcproj +++ b/samples/dll/dll_vc9_my_dll.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dll/dll_vc9_sdk_exe.vcproj b/samples/dll/dll_vc9_sdk_exe.vcproj index b4aab6448b..3b934bf152 100644 --- a/samples/dll/dll_vc9_sdk_exe.vcproj +++ b/samples/dll/dll_vc9_sdk_exe.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dll/dll_vc9_wx_exe.vcproj b/samples/dll/dll_vc9_wx_exe.vcproj index 87ca7f1098..f2019ea1dd 100644 --- a/samples/dll/dll_vc9_wx_exe.vcproj +++ b/samples/dll/dll_vc9_wx_exe.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dll/makefile.bcc b/samples/dll/makefile.bcc index efd7aff916..68ab07796a 100644 --- a/samples/dll/makefile.bcc +++ b/samples/dll/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dll/makefile.gcc b/samples/dll/makefile.gcc index 6150cc3694..2d2b055fb0 100644 --- a/samples/dll/makefile.gcc +++ b/samples/dll/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dll/makefile.unx b/samples/dll/makefile.unx index d0cd3b8f49..a395caebac 100644 --- a/samples/dll/makefile.unx +++ b/samples/dll/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dll/makefile.vc b/samples/dll/makefile.vc index e5e8d25dab..a6b2700aca 100644 --- a/samples/dll/makefile.vc +++ b/samples/dll/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index 753feab706..bfca18e6ef 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ DND_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__dnd___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__dnd___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL dnd$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___dnd___os2_emxbindcmd = $(NM) dnd$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep dnd$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__dnd___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dnd___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__dnd_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = dnd.app/Contents/PkgInfo @@ -151,8 +147,6 @@ distclean: clean dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc) $(CXX) -o $@ $(DND_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__dnd___mac_setfilecmd) $(__dnd___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -193,7 +187,7 @@ dnd_dnd.o: $(srcdir)/dnd.cpp $(CXXC) -c -o $@ $(DND_CXXFLAGS) $(srcdir)/dnd.cpp dnd_dnd_rc.o: $(srcdir)/dnd.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/dnd/dnd_vc7.vcproj b/samples/dnd/dnd_vc7.vcproj index 62c9c1d00f..a323f6d5e6 100644 --- a/samples/dnd/dnd_vc7.vcproj +++ b/samples/dnd/dnd_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dnd/dnd_vc8.vcproj b/samples/dnd/dnd_vc8.vcproj index 1e72f2f14a..6ca9ffaaac 100644 --- a/samples/dnd/dnd_vc8.vcproj +++ b/samples/dnd/dnd_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dnd/dnd_vc9.vcproj b/samples/dnd/dnd_vc9.vcproj index 4c92a5c5b9..fdb5448924 100644 --- a/samples/dnd/dnd_vc9.vcproj +++ b/samples/dnd/dnd_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dnd/makefile.bcc b/samples/dnd/makefile.bcc index 5addbaec96..4a514a4a45 100644 --- a/samples/dnd/makefile.bcc +++ b/samples/dnd/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc index c6a10cb66e..85e91ad59b 100644 --- a/samples/dnd/makefile.gcc +++ b/samples/dnd/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dnd/makefile.unx b/samples/dnd/makefile.unx index 0dc810c882..1d4be594de 100644 --- a/samples/dnd/makefile.unx +++ b/samples/dnd/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc index 0b74f277d9..951dcb1de3 100644 --- a/samples/dnd/makefile.vc +++ b/samples/dnd/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 18227ec5e8..90eac61b26 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ DOCVIEW_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__docview___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL docview$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___docview___os2_emxbindcmd = $(NM) docview$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep docview$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__docview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___docview___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__docview_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = docview.app/Contents/PkgInfo @@ -153,8 +149,6 @@ distclean: clean docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc) $(CXX) -o $@ $(DOCVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__docview___mac_setfilecmd) $(__docview___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@docview.app/Contents/PkgInfo: docview$(EXEEXT) $(srcdir)/Info.plist.in $(srcdir)/doc.icns $(srcdir)/chart.icns $(srcdir)/notepad.icns @@ -190,7 +184,7 @@ docview_view.o: $(srcdir)/view.cpp $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $(srcdir)/view.cpp docview_docview_rc.o: $(srcdir)/docview.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/docview/chart.r b/samples/docview/chart.r deleted file mode 100644 index ad2572a6b1..0000000000 --- a/samples/docview/chart.r +++ /dev/null @@ -1,2611 +0,0 @@ -data 'ICN#' (130, "Chart Document Icon") { - $"0000 0000 0000 0000 3FFF FFF0 2000 0010" - $"2082 9418 2000 0010 2892 4918 2000 0010" - $"288A 5298 2000 0010 2000 0018 2FFF FFFC" - $"2800 0004 2800 4036 2802 40A4 2822 C346" - $"2A24 5C34 2A06 8246 3C66 5984 1E66 4006" - $"0E44 BFF4 0800 4926 0E66 0004 0800 0006" - $"0800 0004 0800 0006 0F3B 1D24 0800 0006" - $"0800 0004 0FFF FFFE 02AA AAA8 0000 0000" - $"0000 0000 0000 0000 3FFF FFF0 3FFF FFF8" - $"3FFF FFF8 3FFF FFF8 3FFF FFF8 3FFF FFF8" - $"3FFF FFF8 3FFF FFF8 3FFF FFF8 3FFF FFFC" - $"3FFF FFFE 3FFF FFFE 3FFF FFFE 3FFF FFFE" - $"3FFF FFFE 3FFF FFFE 3FFF FFFE 1FFF FFFE" - $"0FFF FFFE 0FFF FFFE 0FFF FFFE 0FFF FFFE" - $"0FFF FFFE 0FFF FFFE 0FFF FFFE 0FFF FFFE" - $"0FFF FFFE 0FFF FFFE 07FF FFFE 0000 0000" -}; - -data 'icl4' (130, "Chart Document Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"00FF FFFF FFFF FFFF FFFF FFFF FFFF 0000" - $"00F0 0000 0000 0000 0000 0000 000F D000" - $"00F0 0D00 D00D 00DD DD0D DDD0 000F D000" - $"00F0 0000 0000 0000 0000 0000 000F D000" - $"00F0 DD00 D00D D0D0 DD00 D00D 000F D000" - $"00F0 0000 0000 0000 0000 0000 000F D000" - $"00F0 DD00 DD00 DDD0 0DDD 00DD D00F D000" - $"00F0 0000 0000 0000 0000 0000 000F D000" - $"00F0 0000 0000 0000 0000 0000 000F D000" - $"00F0 FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"00F0 F000 0000 0000 0000 0000 0000 0FD0" - $"00F0 F000 0000 0000 0900 0000 0066 0FD0" - $"00F0 F000 0000 0030 0900 0000 6060 0FD0" - $"00F0 F000 0030 0030 9900 0066 0600 0FD0" - $"00F0 F030 0030 0630 0906 6600 0033 0FD0" - $"00F0 F030 0030 0630 9800 0030 0300 0FD0" - $"00FF F630 0630 0630 0903 3303 3000 0FD0" - $"000F F630 0630 0630 0900 0000 0000 0FD0" - $"0000 F630 0630 0630 9899 9999 9999 0FD0" - $"0000 F000 0000 0000 0900 9009 0090 0FD0" - $"0000 FA30 0A30 0A30 0000 0000 0000 0FD0" - $"0000 F000 0000 0000 0000 0000 0000 0FD0" - $"0000 F000 0000 0000 0000 0000 0000 0FD0" - $"0000 F000 0000 0000 0000 0000 0000 0FD0" - $"0000 FFFF 00FF F0FF 000F FF0F 00F0 0FD0" - $"0000 F000 0000 0000 0000 0000 0000 0FD0" - $"0000 F000 0000 0000 0000 0000 0000 0FD0" - $"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFD0" - $"0000 0DDD DDDD DDDD DDDD DDDD DDDD DDD0" - $"0000 0000 0000 0000 0000 0000 0000 0000" -}; - -data 'icl8' (130, "Chart Document Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF F900 0000" - $"0000 FF00 00F9 0000 FA00 00F9 0000 FAF9" - $"FAF9 00FA F9FA F900 0000 00FF FA00 0000" - $"0000 FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF F900 0000" - $"0000 FF00 FAF9 0000 FA00 00FA F900 FA00" - $"F9FA 0000 FA00 00FA 0000 00FF FA00 0000" - $"0000 FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF F900 0000" - $"0000 FF00 F9FA 0000 F9FA 0000 FAF9 FA00" - $"00FA F9FA 0000 F9FA F900 00FF FA00 0000" - $"0000 FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF F900 0000" - $"0000 FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FA00 0000" - $"0000 FF00 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000" - $"0000 FF00 FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF F900" - $"0000 FF00 FF00 0000 0000 0000 0000 0000" - $"00CB 0000 0000 0000 0000 D3EC 00FF FA00" - $"0000 FF00 FF00 0000 0000 0000 0000 D800" - $"00CB 0000 0000 0000 EC00 EC00 00FF F900" - $"0000 FF00 FF00 0000 0000 D800 0000 D800" - $"CACB 0000 0000 D3EC 00D3 0000 00FF FA00" - $"0000 FF00 FF00 D800 0000 D800 00EC D800" - $"00CB 00EC D3EC 0000 0000 D8D8 00FF F900" - $"0000 FF00 FF00 D800 0000 D800 00EC D800" - $"E7BE 0000 0000 D800 00D8 0000 00FF FA00" - $"0000 FFFF FFEC D800 00EC D800 00D3 D800" - $"00E7 00D8 D8D8 00D8 D800 0000 00FF F900" - $"0000 00FF FFEC D800 00EC D800 00EC D800" - $"00CB 0000 0000 0000 0000 0000 00FF FA00" - $"0000 0000 FFD3 D800 00D3 D800 00EC D800" - $"CB9A E7CB CBCB CACB CBCB CBCA 00FF F900" - $"0000 0000 FF00 0000 0000 0000 0000 0000" - $"00E7 0000 CB00 00E7 0000 CB00 00FF FA00" - $"0000 0000 FF89 D800 0089 D800 0089 D800" - $"0000 0000 0000 0000 0000 0000 00FF F900" - $"0000 0000 FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF FA00" - $"0000 0000 FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF F900" - $"0000 0000 FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF FA00" - $"0000 0000 FFFF FFFF 0000 FFFF FF00 FFFF" - $"0000 00FF FFFF 00FF 0000 FF00 00FF F900" - $"0000 0000 FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF FA00" - $"0000 0000 FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF F900" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FA00" - $"0000 0000 00F9 FAF9 FAF9 FAF9 FAF9 FAF9" - $"FAF9 FAF9 FAF9 FAF9 FAF9 FAF9 FAF9 F900" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" -}; - -data 'icm#' (130, "Chart Document Icon") { - $"2490 4104 0004 4810 2B4E 6092 24A1 294A" - $"2202 2424 0002 1AAA 7FFC 7FFE 7FFE 7FFE" - $"7FFF 7FFF 7FFF 7FFF 3FFF 3FFF 3FFF 3FFF" -}; - -data 'icm4' (130, "Chart Document Icon") { - $"0CDC CDCC DCCD CC00 0D00 C00C CCC0 0DC0" - $"0DC0 0C00 C0C0 0DC0 0DC0 C0CC 0C0C CDC0" - $"0DED DDDD DDDD DDEC 0DD0 000C D00C CDDC" - $"0EDD 02DC BCD0 C0DC 0CFC 5CC4 8DDD DDDC" - $"00DC 00C0 000C 0CDC 00EC 0DCC 0CCC 00DC" - $"00D0 0000 0000 00DC 00DD DDDD DDDD DDDC" -}; - -data 'icm8' (130, "Chart Document Icon") { - $"00F8 F8F8 F8F8 F8F8 F8F8 F8F8 F8F8 0000" - $"00FA F600 F5F6 00F7 2BF6 F7F5 00FA 2B00" - $"00F9 F600 F5F5 F5F5 2B00 F5F5 00FA F700" - $"00FA 2B00 2B00 2BF5 F5F6 002B F5FA 2B00" - $"00F9 ACF9 FAF9 FAFA FAFA F9FA F9F9 ACF5" - $"00FA F900 0007 0008 7B00 0054 F77E F9F7" - $"00FB FB0E 2A0E 7F14 9931 5C0E 070E FA2B" - $"002B EF0F 7E0F 7E0E A050 F974 5774 F9F7" - $"0000 FB07 F507 0107 F600 25F6 00F6 FA2B" - $"0000 FBF8 00F8 2BF8 002B F8F6 002B F9F7" - $"0000 FA00 0000 0000 0000 0000 0000 FA2B" - $"0000 56F9 FAF9 FAFA F9FA F9FA FAF9 FAF6" -}; - -data 'icns' (130, "Chart Document Icon") { - $"6963 6E73 0000 9733 4943 4E23 0000 0108" - $"0000 0000 0000 0000 3FFF FFF0 2000 0010" - $"2082 9418 2000 0010 2892 4918 2000 0010" - $"288A 5298 2000 0010 2000 0018 2FFF FFFC" - $"2800 0004 2800 4036 2802 40A4 2822 C346" - $"2A24 5C34 2A06 8246 3C66 5984 1E66 4006" - $"0E44 BFF4 0800 4926 0E66 0004 0800 0006" - $"0800 0004 0800 0006 0F3B 1D24 0800 0006" - $"0800 0004 0FFF FFFE 02AA AAA8 0000 0000" - $"0000 0000 0000 0000 3FFF FFF0 3FFF FFF8" - $"3FFF FFF8 3FFF FFF8 3FFF FFF8 3FFF FFF8" - $"3FFF FFF8 3FFF FFF8 3FFF FFF8 3FFF FFFC" - $"3FFF FFFE 3FFF FFFE 3FFF FFFE 3FFF FFFE" - $"3FFF FFFE 3FFF FFFE 3FFF FFFE 1FFF FFFE" - $"0FFF FFFE 0FFF FFFE 0FFF FFFE 0FFF FFFE" - $"0FFF FFFE 0FFF FFFE 0FFF FFFE 0FFF FFFE" - $"0FFF FFFE 0FFF FFFE 07FF FFFE 0000 0000" - $"6963 6C34 0000 0208 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 00FF FFFF FFFF FFFF" - $"FFFF FFFF FFFF 0000 00F0 0000 0000 0000" - $"0000 0000 000F D000 00F0 0D00 D00D 00DD" - $"DD0D DDD0 000F D000 00F0 0000 0000 0000" - $"0000 0000 000F D000 00F0 DD00 D00D D0D0" - $"DD00 D00D 000F D000 00F0 0000 0000 0000" - $"0000 0000 000F D000 00F0 DD00 DD00 DDD0" - $"0DDD 00DD D00F D000 00F0 0000 0000 0000" - $"0000 0000 000F D000 00F0 0000 0000 0000" - $"0000 0000 000F D000 00F0 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 00F0 F000 0000 0000" - $"0000 0000 0000 0FD0 00F0 F000 0000 0000" - $"0900 0000 0066 0FD0 00F0 F000 0000 0030" - $"0900 0000 6060 0FD0 00F0 F000 0030 0030" - $"9900 0066 0600 0FD0 00F0 F030 0030 0630" - $"0906 6600 0033 0FD0 00F0 F030 0030 0630" - $"9800 0030 0300 0FD0 00FF F630 0630 0630" - $"0903 3303 3000 0FD0 000F F630 0630 0630" - $"0900 0000 0000 0FD0 0000 F630 0630 0630" - $"9899 9999 9999 0FD0 0000 F000 0000 0000" - $"0900 9009 0090 0FD0 0000 FA30 0A30 0A30" - $"0000 0000 0000 0FD0 0000 F000 0000 0000" - $"0000 0000 0000 0FD0 0000 F000 0000 0000" - $"0000 0000 0000 0FD0 0000 F000 0000 0000" - $"0000 0000 0000 0FD0 0000 FFFF 00FF F0FF" - $"000F FF0F 00F0 0FD0 0000 F000 0000 0000" - $"0000 0000 0000 0FD0 0000 F000 0000 0000" - $"0000 0000 0000 0FD0 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFD0 0000 0DDD DDDD DDDD" - $"DDDD DDDD DDDD DDD0 0000 0000 0000 0000" - $"0000 0000 0000 0000 6963 6C38 0000 0408" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF F900 0000" - $"0000 FF00 00F9 0000 FA00 00F9 0000 FAF9" - $"FAF9 00FA F9FA F900 0000 00FF FA00 0000" - $"0000 FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF F900 0000" - $"0000 FF00 FAF9 0000 FA00 00FA F900 FA00" - $"F9FA 0000 FA00 00FA 0000 00FF FA00 0000" - $"0000 FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF F900 0000" - $"0000 FF00 F9FA 0000 F9FA 0000 FAF9 FA00" - $"00FA F9FA 0000 F9FA F900 00FF FA00 0000" - $"0000 FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF F900 0000" - $"0000 FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FA00 0000" - $"0000 FF00 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000" - $"0000 FF00 FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF F900" - $"0000 FF00 FF00 0000 0000 0000 0000 0000" - $"00CB 0000 0000 0000 0000 D3EC 00FF FA00" - $"0000 FF00 FF00 0000 0000 0000 0000 D800" - $"00CB 0000 0000 0000 EC00 EC00 00FF F900" - $"0000 FF00 FF00 0000 0000 D800 0000 D800" - $"CACB 0000 0000 D3EC 00D3 0000 00FF FA00" - $"0000 FF00 FF00 D800 0000 D800 00EC D800" - $"00CB 00EC D3EC 0000 0000 D8D8 00FF F900" - $"0000 FF00 FF00 D800 0000 D800 00EC D800" - $"E7BE 0000 0000 D800 00D8 0000 00FF FA00" - $"0000 FFFF FFEC D800 00EC D800 00D3 D800" - $"00E7 00D8 D8D8 00D8 D800 0000 00FF F900" - $"0000 00FF FFEC D800 00EC D800 00EC D800" - $"00CB 0000 0000 0000 0000 0000 00FF FA00" - $"0000 0000 FFD3 D800 00D3 D800 00EC D800" - $"CB9A E7CB CBCB CACB CBCB CBCA 00FF F900" - $"0000 0000 FF00 0000 0000 0000 0000 0000" - $"00E7 0000 CB00 00E7 0000 CB00 00FF FA00" - $"0000 0000 FF89 D800 0089 D800 0089 D800" - $"0000 0000 0000 0000 0000 0000 00FF F900" - $"0000 0000 FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF FA00" - $"0000 0000 FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF F900" - $"0000 0000 FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF FA00" - $"0000 0000 FFFF FFFF 0000 FFFF FF00 FFFF" - $"0000 00FF FFFF 00FF 0000 FF00 00FF F900" - $"0000 0000 FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF FA00" - $"0000 0000 FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF F900" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FA00" - $"0000 0000 00F9 FAF9 FAF9 FAF9 FAF9 FAF9" - $"FAF9 FAF9 FAF9 FAF9 FAF9 FAF9 FAF9 F900" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"696C 3332 0000 05B0 BFFF 9700 83FF 0000" - $"95FF 0100 8082 FF0B 00FF FF80 FFFF 80FF" - $"FF80 FFFF 8180 00FF 8180 81FF 0100 8082" - $"FF00 0095 FF01 0080 82FF 1500 FF80 80FF" - $"FF80 FFFF 8080 FF80 FF80 80FF FF80 FFFF" - $"8080 FF01 0080 82FF 0000 95FF 0100 8082" - $"FF09 00FF 8080 FFFF 8080 FFFF 8080 01FF" - $"FF80 8001 FFFF 8080 03FF FF00 8082 FF00" - $"0095 FF01 0080 82FF 0000 95FF 0100 8082" - $"FF01 00FF 9700 81FF 0200 FF00 95FF 0100" - $"8080 FF02 00FF 0089 FF00 0085 FF04 0000" - $"FF00 8080 FF02 00FF 0086 FF03 DDFF FF00" - $"83FF 0600 FF00 FFFF 0080 80FF 0200 FF00" - $"82FF 00DD 80FF 03DD FF00 0081 FF03 0000" - $"FF00 80FF 0100 8080 FF04 00FF 00FF DD80" - $"FF08 DDFF FF00 DDFF FF00 FF80 0081 FF04" - $"DDDD FF00 8080 FF04 00FF 00FF DD80 FF07" - $"DDFF FF00 DDFF 001F 81FF 03DD FFFF DD80" - $"FF01 0080 80FF 8100 0CDD FFFF 00DD FFFF" - $"00DD FFFF 00FF 80DD 02FF DDDD 81FF 0100" - $"8081 FF80 000B DDFF FF00 DDFF FF00 DDFF" - $"FF00 88FF 0100 8082 FF0D 0000 DDFF FF00" - $"DDFF FF00 DDFF 001F 8700 02FF 0080 82FF" - $"0000 89FF 0D00 FFFF 00FF FF00 FFFF 00FF" - $"FF00 8082 FF0A 0056 DDFF FF56 DDFF FF56" - $"DD8B FF01 0080 82FF 0000 95FF 0100 8082" - $"FF00 0095 FF01 0080 82FF 0000 95FF 0100" - $"8082 FF81 0001 FFFF 8000 02FF 0000 80FF" - $"8000 08FF 00FF FF00 FFFF 0080 82FF 0000" - $"95FF 0100 8082 FF00 0095 FF01 0080 82FF" - $"9700 0080 83FF 9780 9EFF BFFF 9700 83FF" - $"0000 95FF 0100 8082 FF0B 00FF FF80 FFFF" - $"80FF FF80 FFFF 8180 00FF 8180 81FF 0100" - $"8082 FF00 0095 FF01 0080 82FF 1500 FF80" - $"80FF FF80 FFFF 8080 FF80 FF80 80FF FF80" - $"FFFF 8080 FF01 0080 82FF 0000 95FF 0100" - $"8082 FF09 00FF 8080 FFFF 8080 FFFF 8080" - $"01FF FF80 8001 FFFF 8080 03FF FF00 8082" - $"FF00 0095 FF01 0080 82FF 0000 95FF 0100" - $"8082 FF01 00FF 9700 81FF 0200 FF00 95FF" - $"0100 8080 FF02 00FF 0089 FF00 6485 FF04" - $"0000 FF00 8080 FF02 00FF 0086 FF03 08FF" - $"FF64 83FF 0600 FF00 FFFF 0080 80FF 0200" - $"FF00 82FF 0008 80FF 0308 FF64 6481 FF03" - $"0000 FF00 80FF 0100 8080 FF04 00FF 00FF" - $"0880 FF08 08FF FF00 08FF FF64 FF80 0081" - $"FF04 0808 FF00 8080 FF04 00FF 00FF 0880" - $"FF07 08FF FF00 08FF 64B7 81FF 0308 FFFF" - $"0880 FF01 0080 80FF 8100 0C08 FFFF 0008" - $"FFFF 0008 FFFF 64FF 8008 02FF 0808 81FF" - $"0100 8081 FF80 000B 08FF FF00 08FF FF00" - $"08FF FF64 88FF 0100 8082 FF0D 0000 08FF" - $"FF00 08FF FF00 08FF 64B7 8764 02FF 0080" - $"82FF 0000 89FF 0D64 FFFF 64FF FF64 FFFF" - $"64FF FF00 8082 FF0A 002C 08FF FF2C 08FF" - $"FF2C 088B FF01 0080 82FF 0000 95FF 0100" - $"8082 FF00 0095 FF01 0080 82FF 0000 95FF" - $"0100 8082 FF81 0001 FFFF 8000 02FF 0000" - $"80FF 8000 08FF 00FF FF00 FFFF 0080 82FF" - $"0000 95FF 0100 8082 FF00 0095 FF01 0080" - $"82FF 9700 0080 83FF 9780 9EFF BFFF 9700" - $"83FF 0000 95FF 0100 8082 FF0B 00FF FF80" - $"FFFF 80FF FF80 FFFF 8180 00FF 8180 81FF" - $"0100 8082 FF00 0095 FF01 0080 82FF 1500" - $"FF80 80FF FF80 FFFF 8080 FF80 FF80 80FF" - $"FF80 FFFF 8080 FF01 0080 82FF 0000 95FF" - $"0100 8082 FF09 00FF 8080 FFFF 8080 FFFF" - $"8080 01FF FF80 8001 FFFF 8080 03FF FF00" - $"8082 FF00 0095 FF01 0080 82FF 0000 95FF" - $"0100 8082 FF01 00FF 9700 81FF 0200 FF00" - $"95FF 0100 8080 FF02 00FF 0089 FF00 1185" - $"FF04 D4D4 FF00 8080 FF02 00FF 0086 FF03" - $"06FF FF11 83FF 06D4 FFD4 FFFF 0080 80FF" - $"0200 FF00 82FF 0006 80FF 0306 FF11 1181" - $"FF03 D4D4 FFD4 80FF 0100 8080 FF04 00FF" - $"00FF 0680 FF08 06FF FFD4 06FF FF11 FF80" - $"D481 FF04 0606 FF00 8080 FF04 00FF 00FF" - $"0680 FF07 06FF FFD4 06FF 1114 81FF 0306" - $"FFFF 0680 FF01 0080 80FF 8000 0DD4 06FF" - $"FFD4 06FF FFD4 06FF FF11 FF80 0602 FF06" - $"0681 FF01 0080 81FF 0E00 00D4 06FF FFD4" - $"06FF FFD4 06FF FF11 88FF 0100 8082 FF0D" - $"00D4 06FF FFD4 06FF FFD4 06FF 1114 8711" - $"02FF 0080 82FF 0000 89FF 0D11 FFFF 11FF" - $"FF11 FFFF 11FF FF00 8082 FF0A 0005 06FF" - $"FF05 06FF FF05 068B FF01 0080 82FF 0000" - $"95FF 0100 8082 FF00 0095 FF01 0080 82FF" - $"0000 95FF 0100 8082 FF81 0001 FFFF 8000" - $"02FF 0000 80FF 8000 08FF 00FF FF00 FFFF" - $"0080 82FF 0000 95FF 0100 8082 FF00 0095" - $"FF01 0080 82FF 9700 0080 83FF 9780 9EFF" - $"6C38 6D6B 0000 0408 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 00FF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 6963 6823 0000 0248" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 1FFF FFFF FFC0 1FFF FFFF FFC0 1800" - $"0000 0060 1808 42A2 A050 1884 0545 4060" - $"1800 0000 0050 1A84 52A1 1060 1908 2442" - $"0050 1800 0000 0060 1A8A 2A28 5450 1904" - $"1414 2860 1800 0000 0050 1800 0000 0060" - $"1800 0000 0050 1BFF FFFF FFF8 1B00 0000" - $"000A 1B00 0000 000C 1B00 0020 01CA 1B00" - $"0620 0D8C 1B00 0220 0D8A 1B01 86E0 720C" - $"1B60 8C27 818A 1B41 8A27 814C 1B61 0EC0" - $"620A 1FA2 8A25 8C0C 1FC3 8C26 940A 07E2" - $"8E20 000C 03A3 0ADF FFCA 03E3 8E6D AD4C" - $"0300 0022 118A 03E3 8E00 000C 0342 8A00" - $"000A 0300 0000 000C 0300 0000 000A 0300" - $"0000 000C 0300 0000 000A 03F1 F707 918C" - $"03F1 F707 918A 0300 0000 000C 0300 0000" - $"000A 0300 0000 000C 03FF FFFF FFFA 0055" - $"5555 5554 00AA AAAA AAAA 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 1FFF FFFF FFC0 1FFF FFFF FFC0 1FFF" - $"FFFF FFF0 1FFF FFFF FFF0 1FFF FFFF FFF0" - $"1FFF FFFF FFF0 1FFF FFFF FFF0 1FFF FFFF" - $"FFF0 1FFF FFFF FFF0 1FFF FFFF FFF0 1FFF" - $"FFFF FFF0 1FFF FFFF FFF0 1FFF FFFF FFF0" - $"1FFF FFFF FFF0 1FFF FFFF FFF8 1FFF FFFF" - $"FFFE 1FFF FFFF FFFE 1FFF FFFF FFFE 1FFF" - $"FFFF FFFE 1FFF FFFF FFFE 1FFF FFFF FFFE" - $"1FFF FFFF FFFE 1FFF FFFF FFFE 1FFF FFFF" - $"FFFE 1FFF FFFF FFFE 1FFF FFFF FFFE 07FF" - $"FFFF FFFE 03FF FFFF FFFE 03FF FFFF FFFE" - $"03FF FFFF FFFE 03FF FFFF FFFE 03FF FFFF" - $"FFFE 03FF FFFF FFFE 03FF FFFF FFFE 03FF" - $"FFFF FFFE 03FF FFFF FFFE 03FF FFFF FFFE" - $"03FF FFFF FFFE 03FF FFFF FFFE 03FF FFFF" - $"FFFE 03FF FFFF FFFE 03FF FFFF FFFE 00FF" - $"FFFF FFFE 00FF FFFF FFFE 0000 0000 0000" - $"6963 6834 0000 0488 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"000F FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 000F FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000" - $"000F F000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0FDD 0000 000F F000 D000 DD00" - $"0D00 0DDD DDD0 0DDD DDD0 0000 0FDD 0000" - $"000F F000 D000 DD00 0D00 0DDD DDD0 0DDD" - $"DDD0 0000 0FDD 0000 000F F000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0FDD 0000" - $"000F F0DD D000 DD00 0DDD 0DD0 DDD0 00DD" - $"000D 0000 0FDD 0000 000F F0DD D000 DD00" - $"0DDD 0DD0 DDD0 00DD 000D 0000 0FDD 0000" - $"000F F000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0FDD 0000 000F F0DD D000 DDD0" - $"00DD DDD0 00DD DD00 0DDD DD00 0FDD 0000" - $"000F F0DD D000 DDD0 00DD DDD0 00DD DD00" - $"0DDD DD00 0FDD 0000 000F F000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0FDD 0000" - $"000F F000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0FDD 0000 000F F000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0FDD 0000" - $"000F F0FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF F000 000F F0FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 FDD0" - $"000F F0FF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 FDD0 000F F0FF 0000 0000" - $"0000 0000 0090 0000 0000 0006 6600 FDD0" - $"000F F0FF 0000 0000 0000 0330 0090 0000" - $"0000 6606 6000 FDD0 000F F0FF 0000 0000" - $"0000 0330 0090 0000 0000 6606 6000 FDD0" - $"000F F0FF 0000 0003 3000 0330 9990 0000" - $"0666 0060 0000 FDD0 000F F0FF 0330 0003" - $"3000 6330 0090 0666 6000 0003 3300 FDD0" - $"000F F0FF 0330 0003 3000 6330 0090 0666" - $"6000 0003 3300 FDD0 000F F0FF 0330 0003" - $"3000 6330 9980 0000 0330 0030 0000 FDD0" - $"000F FFFF 6330 0063 3000 6330 0090 0333" - $"3003 3300 0000 FDD0 000F FFFF 6330 0063" - $"3000 6330 0090 0333 3003 3300 0000 FDD0" - $"0000 0FFF 6330 0063 3000 6330 0090 0000" - $"0000 0000 0000 FDD0 0000 00FF 6330 0063" - $"3000 6330 9989 9999 9999 9999 9900 FDD0" - $"0000 00FF 6330 0063 3000 6330 9989 9999" - $"9999 9999 9900 FDD0 0000 00FF 0000 0000" - $"0000 0000 0090 0099 0009 0009 9000 FDD0" - $"0000 00FF A330 00A3 3000 A330 0000 0000" - $"0000 0000 0000 FDD0 0000 00FF A330 00A3" - $"3000 A330 0000 0000 0000 0000 0000 FDD0" - $"0000 00FF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 FDD0 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 FDD0" - $"0000 00FF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 FDD0 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 FDD0" - $"0000 00FF FFFF 000F FFFF 0FFF 0000 0FFF" - $"F00F 000F F000 FDD0 0000 00FF FFFF 000F" - $"FFFF 0FFF 0000 0FFF F00F 000F F000 FDD0" - $"0000 00FF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 FDD0 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 FDD0" - $"0000 00FF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 FDD0 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FDD0" - $"0000 0000 DDDD DDDD DDDD DDDD DDDD DDDD" - $"DDDD DDDD DDDD DDD0 0000 0000 DDDD DDDD" - $"DDDD DDDD DDDD DDDD DDDD DDDD DDDD DDD0" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 6963 6838 0000 0908" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000" - $"0000 00FF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 00FF FAF9 0000 0000" - $"0000 00FF FF00 0000 F900 0000 FAF9 0000" - $"00FA 0000 00F9 FAF9 FAF9 FA00 00F9 FAF9" - $"FAF9 FA00 0000 0000 00FF F9FA 0000 0000" - $"0000 00FF FF00 0000 FA00 0000 F9FA 0000" - $"00F9 0000 00FA F9FA F9FA F900 00FA F9FA" - $"F9FA F900 0000 0000 00FF FAF9 0000 0000" - $"0000 00FF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 00FF F9FA 0000 0000" - $"0000 00FF FF00 FAF9 FA00 0000 F9FA 0000" - $"00F9 FAF9 00FA F900 FAF9 FA00 0000 F9FA" - $"0000 00F9 0000 0000 00FF FAF9 0000 0000" - $"0000 00FF FF00 F9FA F900 0000 FAF9 0000" - $"00FA F9FA 00F9 FA00 F9FA F900 0000 FAF9" - $"0000 00FA 0000 0000 00FF F9FA 0000 0000" - $"0000 00FF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 00FF FAF9 0000 0000" - $"0000 00FF FF00 FAF9 FA00 0000 FAF9 FA00" - $"0000 FAF9 FAF9 FA00 0000 FAF9 FAF9 0000" - $"00FA F9FA F9FA 0000 00FF F9FA 0000 0000" - $"0000 00FF FF00 F9FA F900 0000 F9FA F900" - $"0000 F9FA F9FA F900 0000 F9FA F9FA 0000" - $"00F9 FAF9 FAF9 0000 00FF FAF9 0000 0000" - $"0000 00FF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 00FF F9FA 0000 0000" - $"0000 00FF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 00FF FAF9 0000 0000" - $"0000 00FF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 00FF F9FA 0000 0000" - $"0000 00FF FF00 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000" - $"0000 00FF FF00 FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFF9 FA00" - $"0000 00FF FF00 FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFA F900" - $"0000 00FF FF00 FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 CB00 0000 0000" - $"0000 0000 0000 00EC D3EC 0000 FFF9 FA00" - $"0000 00FF FF00 FFFF 0000 0000 0000 0000" - $"0000 0000 00D8 D800 0000 CB00 0000 0000" - $"0000 0000 D3EC 00D3 EC00 0000 FFFA F900" - $"0000 00FF FF00 FFFF 0000 0000 0000 0000" - $"0000 0000 00D8 D800 0000 CB00 0000 0000" - $"0000 0000 ECD3 00EC D300 0000 FFF9 FA00" - $"0000 00FF FF00 FFFF 0000 0000 0000 00D8" - $"D800 0000 00D8 D800 CBCA CB00 0000 0000" - $"00EC D3EC 0000 EC00 0000 0000 FFFA F900" - $"0000 00FF FF00 FFFF 00D8 D800 0000 00D8" - $"D800 0000 ECD8 D800 0000 CB00 00EC D3EC" - $"D300 0000 0000 00D8 D8D8 0000 FFF9 FA00" - $"0000 00FF FF00 FFFF 00D8 D800 0000 00D8" - $"D800 0000 ECD8 D800 0000 CB00 00D3 ECD3" - $"EC00 0000 0000 00D8 D8D8 0000 FFFA F900" - $"0000 00FF FF00 FFFF 00D8 D800 0000 00D8" - $"D800 0000 ECD8 D800 CBCB BE00 0000 0000" - $"00D8 D800 0000 D800 0000 0000 FFF9 FA00" - $"0000 00FF FFFF FFFF ECD8 D800 0000 ECD8" - $"D800 0000 EC41 D800 0000 E700 00D8 D8D8" - $"D800 00D8 D8D8 0000 0000 0000 FFFA F900" - $"0000 00FF FFFF FFFF ECD8 D800 0000 ECD8" - $"4100 0000 ECD7 D800 0000 CB00 00D8 D8D8" - $"D800 00D8 D8D8 0000 0000 0000 FFF9 FA00" - $"0000 0000 00FF FFFF EC41 D800 0000 ECD8" - $"D700 0000 ECD8 D800 0000 CB00 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFA F900" - $"0000 0000 0000 FFFF ECD7 D800 0000 ECD8" - $"D800 0000 D3D8 D800 CBCB 9AE7 CBCB CBCA" - $"CBCB CBCB CACB CBCB CBCA 0000 FFF9 FA00" - $"0000 0000 0000 FFFF ECD8 D800 0000 ECD8" - $"D800 0000 EBD8 D800 CBCA E4CB CAE7 CACB" - $"CBCA E7CA CBCB CAE7 CACB 0000 FFFA F900" - $"0000 0000 0000 FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 CB00 0000 CBE7" - $"0000 00CB 0000 00CB CB00 0000 FFF9 FA00" - $"0000 0000 0000 FFFF 89D8 D800 0000 89D8" - $"D800 0000 89D8 D800 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFA F900" - $"0000 0000 0000 FFFF ADD7 D800 0000 ADD7" - $"D800 0000 ADD7 D800 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFF9 FA00" - $"0000 0000 0000 FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFA F900" - $"0000 0000 0000 FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFF9 FA00" - $"0000 0000 0000 FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFA F900" - $"0000 0000 0000 FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFF9 FA00" - $"0000 0000 0000 FFFF FFFF FFFF 0000 00FF" - $"FFFF FFFF 00FF FFFF 0000 0000 00FF FFFF" - $"FF00 00FF 0000 00FF FF00 0000 FFFA F900" - $"0000 0000 0000 FFFF FFFF FFFF 0000 00FF" - $"FFFF FFFF 00FF FFFF 0000 0000 00FF FFFF" - $"FF00 00FF 0000 00FF FF00 0000 FFF9 FA00" - $"0000 0000 0000 FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFA F900" - $"0000 0000 0000 FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFF9 FA00" - $"0000 0000 0000 FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFA F900" - $"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFF9 FA00" - $"0000 0000 0000 0000 F9FA F9FA F9FA F9FA" - $"F9FA F9FA F9FA F9FA F9FA F9FA F9FA F9FA" - $"F9FA F9FA F9FA F9FA F9FA F9FA F9FA F900" - $"0000 0000 0000 0000 FAF9 FAF9 FAF9 FAF9" - $"FAF9 FAF9 FAF9 FAF9 FAF9 FAF9 FAF9 FAF9" - $"FAF9 FAF9 FAF9 FAF9 FAF9 FAF9 FAF9 FA00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"6968 3332 0000 0B4D FFFF 8EFF A400 86FF" - $"A400 86FF 0100 00A1 FF02 0080 8084 FF01" - $"0000 80FF 0080 80FF 0180 8080 FF00 8080" - $"FF83 8001 FFFF 8380 83FF 0200 8080 84FF" - $"0100 0080 FF00 8080 FF01 8080 80FF 0080" - $"80FF 8380 01FF FF83 8083 FF02 0080 8084" - $"FF01 0000 A1FF 0200 8080 84FF 0200 00FF" - $"8080 80FF 0180 8080 FF80 8003 FF80 80FF" - $"8080 80FF 0180 8080 FF00 8082 FF02 0080" - $"8084 FF02 0000 FF80 8080 FF01 8080 80FF" - $"8080 03FF 8080 FF80 8080 FF01 8080 80FF" - $"0080 82FF 0200 8080 84FF 0100 00A1 FF02" - $"0080 8084 FF02 0000 FF80 8080 FF80 8080" - $"FF82 8080 FF81 8080 FF82 8080 FF02 0080" - $"8084 FF02 0000 FF80 8080 FF80 8080 FF82" - $"8080 FF81 8080 FF82 8080 FF02 0080 8084" - $"FF01 0000 A1FF 0200 8080 84FF 0100 00A1" - $"FF02 0080 8084 FF01 0000 A1FF 0200 8080" - $"84FF 0200 00FF A400 83FF 0400 00FF 0000" - $"A1FF 0200 8080 81FF 0400 00FF 0000 A1FF" - $"0200 8080 81FF 0400 00FF 0000 8FFF 0000" - $"89FF 8000 04FF FF00 8080 81FF 0400 00FF" - $"0000 8AFF 01DD DD80 FF00 0086 FF04 0000" - $"FF00 0080 FF02 0080 8081 FF04 0000 FF00" - $"008A FF01 DDDD 80FF 0000 86FF 0400 00FF" - $"0000 80FF 0200 8080 81FF 0400 00FF 0000" - $"84FF 01DD DD81 FF02 DDDD FF80 0083 FF80" - $"0002 FFFF 0082 FF02 0080 8081 FF07 0000" - $"FF00 00FF DDDD 81FF 01DD DD80 FF02 00DD" - $"DD80 FF02 00FF FF81 0083 FF80 DD04 FFFF" - $"0080 8081 FF07 0000 FF00 00FF DDDD 81FF" - $"01DD DD80 FF02 00DD DD80 FF02 00FF FF81" - $"0083 FF80 DD04 FFFF 0080 8081 FF07 0000" - $"FF00 00FF DDDD 81FF 01DD DD80 FF06 00DD" - $"DDFF 0000 1F83 FF01 DDDD 80FF 00DD 82FF" - $"0200 8080 81FF 8300 01DD DD80 FF02 00DD" - $"DD80 FF02 00DD DD80 FF02 00FF FF81 DD01" - $"FFFF 80DD 83FF 0200 8080 81FF 8300 01DD" - $"DD80 FF02 00DD DD80 FF02 00DD DD80 FF02" - $"00FF FF81 DD01 FFFF 80DD 83FF 0200 8080" - $"83FF 8100 01DD DD80 FF02 00DD DD80 FF02" - $"00DD DD80 FF00 008E FF02 0080 8084 FF80" - $"0001 DDDD 80FF 0200 DDDD 80FF 0600 DDDD" - $"FF00 001F 8C00 04FF FF00 8080 84FF 8000" - $"01DD DD80 FF02 00DD DD80 FF06 00DD DDFF" - $"0000 1F8C 0004 FFFF 0080 8084 FF01 0000" - $"8FFF 0000 80FF 0100 0080 FF00 0080 FF01" - $"0000 80FF 0200 8080 84FF 0400 0056 DDDD" - $"80FF 0256 DDDD 80FF 0256 DDDD 92FF 0200" - $"8080 84FF 0400 0056 DDDD 80FF 0256 DDDD" - $"80FF 0256 DDDD 92FF 0200 8080 84FF 0100" - $"00A1 FF02 0080 8084 FF01 0000 A1FF 0200" - $"8080 84FF 0100 00A1 FF02 0080 8084 FF01" - $"0000 A1FF 0200 8080 84FF 8300 80FF 8200" - $"00FF 8000 82FF 8100 02FF FF00 80FF 0100" - $"0080 FF02 0080 8084 FF83 0080 FF82 0000" - $"FF80 0082 FF81 0002 FFFF 0080 FF01 0000" - $"80FF 0200 8080 84FF 0100 00A1 FF02 0080" - $"8084 FF01 0000 A1FF 0200 8080 84FF 0100" - $"00A1 FF02 0080 8084 FFA4 0001 8080 86FF" - $"A480 86FF A480 AEFF FFFF 8EFF A400 86FF" - $"A400 86FF 0100 00A1 FF02 0080 8084 FF01" - $"0000 80FF 0080 80FF 0180 8080 FF00 8080" - $"FF83 8001 FFFF 8380 83FF 0200 8080 84FF" - $"0100 0080 FF00 8080 FF01 8080 80FF 0080" - $"80FF 8380 01FF FF83 8083 FF02 0080 8084" - $"FF01 0000 A1FF 0200 8080 84FF 0200 00FF" - $"8080 80FF 0180 8080 FF80 8003 FF80 80FF" - $"8080 80FF 0180 8080 FF00 8082 FF02 0080" - $"8084 FF02 0000 FF80 8080 FF01 8080 80FF" - $"8080 03FF 8080 FF80 8080 FF01 8080 80FF" - $"0080 82FF 0200 8080 84FF 0100 00A1 FF02" - $"0080 8084 FF02 0000 FF80 8080 FF80 8080" - $"FF82 8080 FF81 8080 FF82 8080 FF02 0080" - $"8084 FF02 0000 FF80 8080 FF80 8080 FF82" - $"8080 FF81 8080 FF82 8080 FF02 0080 8084" - $"FF01 0000 A1FF 0200 8080 84FF 0100 00A1" - $"FF02 0080 8084 FF01 0000 A1FF 0200 8080" - $"84FF 0200 00FF A400 83FF 0400 00FF 0000" - $"A1FF 0200 8080 81FF 0400 00FF 0000 A1FF" - $"0200 8080 81FF 0400 00FF 0000 8FFF 0064" - $"89FF 8000 04FF FF00 8080 81FF 0400 00FF" - $"0000 8AFF 0108 0880 FF00 6486 FF04 0000" - $"FF00 0080 FF02 0080 8081 FF04 0000 FF00" - $"008A FF01 0808 80FF 0064 86FF 0400 00FF" - $"0000 80FF 0200 8080 81FF 0400 00FF 0000" - $"84FF 0108 0881 FF02 0808 FF80 6483 FF80" - $"0002 FFFF 0082 FF02 0080 8081 FF07 0000" - $"FF00 00FF 0808 81FF 0108 0880 FF02 0008" - $"0880 FF02 64FF FF81 0083 FF80 0804 FFFF" - $"0080 8081 FF07 0000 FF00 00FF 0808 81FF" - $"0108 0880 FF02 0008 0880 FF02 64FF FF81" - $"0083 FF80 0804 FFFF 0080 8081 FF07 0000" - $"FF00 00FF 0808 81FF 0108 0880 FF06 0008" - $"08FF 6464 B783 FF01 0808 80FF 0008 82FF" - $"0200 8080 81FF 8300 0108 0880 FF02 0008" - $"0880 FF02 0008 0880 FF02 64FF FF81 0801" - $"FFFF 8008 83FF 0200 8080 81FF 8300 0108" - $"0880 FF02 0008 0880 FF02 0008 0880 FF02" - $"64FF FF81 0801 FFFF 8008 83FF 0200 8080" - $"83FF 8100 0108 0880 FF02 0008 0880 FF02" - $"0008 0880 FF00 648E FF02 0080 8084 FF80" - $"0001 0808 80FF 0200 0808 80FF 0600 0808" - $"FF64 64B7 8C64 04FF FF00 8080 84FF 8000" - $"0108 0880 FF02 0008 0880 FF06 0008 08FF" - $"6464 B78C 6404 FFFF 0080 8084 FF01 0000" - $"8FFF 0064 80FF 0164 6480 FF00 6480 FF01" - $"6464 80FF 0200 8080 84FF 0400 002C 0808" - $"80FF 022C 0808 80FF 022C 0808 92FF 0200" - $"8080 84FF 0400 002C 0808 80FF 022C 0808" - $"80FF 022C 0808 92FF 0200 8080 84FF 0100" - $"00A1 FF02 0080 8084 FF01 0000 A1FF 0200" - $"8080 84FF 0100 00A1 FF02 0080 8084 FF01" - $"0000 A1FF 0200 8080 84FF 8300 80FF 8200" - $"00FF 8000 82FF 8100 02FF FF00 80FF 0100" - $"0080 FF02 0080 8084 FF83 0080 FF82 0000" - $"FF80 0082 FF81 0002 FFFF 0080 FF01 0000" - $"80FF 0200 8080 84FF 0100 00A1 FF02 0080" - $"8084 FF01 0000 A1FF 0200 8080 84FF 0100" - $"00A1 FF02 0080 8084 FFA4 0001 8080 86FF" - $"A480 86FF A480 AEFF FFFF 8EFF A400 86FF" - $"A400 86FF 0100 00A1 FF02 0080 8084 FF01" - $"0000 80FF 0080 80FF 0180 8080 FF00 8080" - $"FF83 8001 FFFF 8380 83FF 0200 8080 84FF" - $"0100 0080 FF00 8080 FF01 8080 80FF 0080" - $"80FF 8380 01FF FF83 8083 FF02 0080 8084" - $"FF01 0000 A1FF 0200 8080 84FF 0200 00FF" - $"8080 80FF 0180 8080 FF80 8003 FF80 80FF" - $"8080 80FF 0180 8080 FF00 8082 FF02 0080" - $"8084 FF02 0000 FF80 8080 FF01 8080 80FF" - $"8080 03FF 8080 FF80 8080 FF01 8080 80FF" - $"0080 82FF 0200 8080 84FF 0100 00A1 FF02" - $"0080 8084 FF02 0000 FF80 8080 FF80 8080" - $"FF82 8080 FF81 8080 FF82 8080 FF02 0080" - $"8084 FF02 0000 FF80 8080 FF80 8080 FF82" - $"8080 FF81 8080 FF82 8080 FF02 0080 8084" - $"FF01 0000 A1FF 0200 8080 84FF 0100 00A1" - $"FF02 0080 8084 FF01 0000 A1FF 0200 8080" - $"84FF 0200 00FF A400 83FF 0400 00FF 0000" - $"A1FF 0200 8080 81FF 0400 00FF 0000 A1FF" - $"0200 8080 81FF 0400 00FF 0000 8FFF 0011" - $"89FF 80D4 04FF FF00 8080 81FF 0400 00FF" - $"0000 8AFF 0106 0680 FF00 1186 FF04 D4D4" - $"FFD4 D480 FF02 0080 8081 FF04 0000 FF00" - $"008A FF01 0606 80FF 0011 86FF 04D4 D4FF" - $"D4D4 80FF 0200 8080 81FF 0400 00FF 0000" - $"84FF 0106 0681 FF02 0606 FF80 1183 FF80" - $"D402 FFFF D482 FF02 0080 8081 FF07 0000" - $"FF00 00FF 0606 81FF 0106 0680 FF02 D406" - $"0680 FF02 11FF FF81 D483 FF80 0604 FFFF" - $"0080 8081 FF07 0000 FF00 00FF 0606 81FF" - $"0106 0680 FF02 D406 0680 FF02 11FF FF81" - $"D483 FF80 0604 FFFF 0080 8081 FF07 0000" - $"FF00 00FF 0606 81FF 0106 0680 FF06 D406" - $"06FF 1111 1483 FF01 0606 80FF 0006 82FF" - $"0200 8080 81FF 8200 02D4 0606 80FF 02D4" - $"0606 80FF 02D4 0606 80FF 0211 FFFF 8106" - $"01FF FF80 0683 FF02 0080 8081 FF82 0002" - $"D406 0680 FF02 D406 0680 FF02 D406 0680" - $"FF02 11FF FF81 0601 FFFF 8006 83FF 0200" - $"8080 83FF 8000 02D4 0606 80FF 02D4 0606" - $"80FF 02D4 0606 80FF 0011 8EFF 0200 8080" - $"84FF 0400 00D4 0606 80FF 02D4 0606 80FF" - $"06D4 0606 FF11 1114 8C11 04FF FF00 8080" - $"84FF 0400 00D4 0606 80FF 02D4 0606 80FF" - $"06D4 0606 FF11 1114 8C11 04FF FF00 8080" - $"84FF 0100 008F FF00 1180 FF01 1111 80FF" - $"0011 80FF 0111 1180 FF02 0080 8084 FF04" - $"0000 0506 0680 FF02 0506 0680 FF02 0506" - $"0692 FF02 0080 8084 FF04 0000 0506 0680" - $"FF02 0506 0680 FF02 0506 0692 FF02 0080" - $"8084 FF01 0000 A1FF 0200 8080 84FF 0100" - $"00A1 FF02 0080 8084 FF01 0000 A1FF 0200" - $"8080 84FF 0100 00A1 FF02 0080 8084 FF83" - $"0080 FF82 0000 FF80 0082 FF81 0002 FFFF" - $"0080 FF01 0000 80FF 0200 8080 84FF 8300" - $"80FF 8200 00FF 8000 82FF 8100 02FF FF00" - $"80FF 0100 0080 FF02 0080 8084 FF01 0000" - $"A1FF 0200 8080 84FF 0100 00A1 FF02 0080" - $"8084 FF01 0000 A1FF 0200 8080 84FF A400" - $"0180 8086 FFA4 8086 FFA4 80AE FF68 386D" - $"6B00 0009 0800 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 00FF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 00FF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0069 6373 2300 0000 4800 0055" - $"5420 8440 2008 0A75 D400 0460 8A25 226A" - $"4220 B524 0200 0035 222A AA00 4400 007F" - $"FE7F FE7F FE7F FE7F FE7F FF7F FF7F FF7F" - $"FF3F FF3F FF3F FF3F FF3F FF3F FF69 6373" - $"3400 0000 8800 0000 0000 0000 000E DDDD" - $"DDDD DDDE 000D 00C0 0CCC C00D C00D C00C" - $"0CC0 0C0D C00D C0C0 C0CC 0CCD C00D DDDD" - $"DDDD DDDE E00D D000 00C0 000D CC0D D00C" - $"0CE0 0DDC DC0D DD02 D480 7004 DC0E FC50" - $"DCCC 4CC0 DC00 5C0C 0CBD 8DDE DC00 BCCC" - $"CC00 0000 DC00 D000 0000 0000 DC00 ED0D" - $"CD0C DC0C DC00 EDDD DDDD DDDD EC00 CCCC" - $"CCCC CCCC C069 6373 3800 0001 0800 0000" - $"0000 0000 0000 0000 0000 0000 0000 ACF9" - $"FAF9 FAF9 FAF9 FAF9 FAF9 ACF5 0000 F9F6" - $"00F6 F500 F72B F6F7 F500 FAF7 0000 FAF7" - $"00F5 F6F6 F6F7 00F5 F600 FA2B 0000 F9F7" - $"00F7 00F7 F5F6 F700 F7F5 FAF7 0000 FAF9" - $"FAF9 FAF9 FAFA F9FA F9FA FC81 0000 F9FA" - $"0000 0000 002B 0000 0000 7EF9 2B00 FAF9" - $"0000 0700 0EA0 0000 547E 2BF9 F700 F9FA" - $"0EF5 1578 159F 2A7F 0707 0FFA F700 ACF0" - $"0F7E 0F7E 0E7B 070E 0807 00FA 2B00 00AB" - $"072A 072A 07A0 7AA0 A551 A5FA F700 00FC" - $"07F7 072C 0700 0000 0000 00FA 2B00 00F9" - $"0000 0000 0000 0000 0000 00F9 F700 00AC" - $"FA00 FAF7 FA00 2BFA F700 2BFA F700 00FC" - $"F9FA F9F9 FAFA FAF9 FAF9 FAFC 2B00 00F5" - $"F72B F7F7 2BF7 2BF7 2BF7 2BF7 F669 7333" - $"3200 0002 488E FF00 4088 8016 40E0 FFFF" - $"80E0 FFE0 E0FF C0C0 E0C0 E0FF 80C0 FFFF" - $"80C0 FF81 E018 C0FF E0E0 FF80 C0FF FF80" - $"C0FF C0FF C0E0 E0C0 FFC0 E080 C0FF FF89" - $"8005 4060 FFFF 8080 82FF 00C0 81FF 4A80" - $"80C0 FF80 80FF FFF7 FFEE 40FF FF80 80C0" - $"80C0 FF80 80EE FFEE 80EE 48C0 80F7 F7EE" - $"80C0 FF40 00EE 80EE 80EE 80F7 EEF7 F7FF" - $"80C0 FFFF 40F7 C0F7 C0F7 4880 4040 8040" - $"80C0 FFFF 56F7 D5F7 D5F7 83FF 0480 C0FF" - $"FF80 88FF 1480 C0FF FF40 80FF 80C0 80FF" - $"C080 C0FF C080 C0FF FF40 8880 0440 C0FF" - $"FFE0 89C0 00E0 8EFF 0040 8880 1640 E0FF" - $"FF80 E0FF E0E0 FFC0 C0E0 C0E0 FF80 C0FF" - $"FF80 C0FF 81E0 18C0 FFE0 E0FF 80C0 FFFF" - $"80C0 FFC0 FFC0 E0E0 C0FF C0E0 80C0 FFFF" - $"8980 0540 60FF FF80 8082 FF00 D981 FF4A" - $"8080 C0FF 8080 FFFF C2FF 848B FFFF 8080" - $"C080 C0FF 8080 84FF 8480 84A0 C080 C2C2" - $"8480 C0FF 4000 8480 8480 84B2 C284 C2C2" - $"FF80 C0FF FF40 C2C0 C2C0 C2A0 B28B 8BB2" - $"8B80 C0FF FF4B C2CB C2CB C283 FF04 80C0" - $"FFFF 8088 FF14 80C0 FFFF 4080 FF80 C080" - $"FFC0 80C0 FFC0 80C0 FFFF 4088 8004 40C0" - $"FFFF E089 C000 E08E FF00 4088 8016 40E0" - $"FFFF 80E0 FFE0 E0FF C0C0 E0C0 E0FF 80C0" - $"FFFF 80C0 FF81 E018 C0FF E0E0 FF80 C0FF" - $"FF80 C0FF C0FF C0E0 E0C0 FFC0 E080 C0FF" - $"FF89 8005 4060 FFFF 8080 82FF 00C4 81FF" - $"45EA 80C0 FF80 80FF FFC1 FF83 4DFF FFEA" - $"EAF5 80C0 FF80 8083 FF83 EA83 4EF5 EAC1" - $"C183 80C0 FF40 6A83 EA83 EA83 88C1 83C1" - $"C1FF 80C0 FFFF 75C1 F5C1 F5C1 4E88 4D4D" - $"884D 80C0 FFFF 4182 C183 FF04 80C0 FFFF" - $"8088 FF14 80C0 FFFF 4080 FF80 C080 FFC0" - $"80C0 FFC0 80C0 FFFF 4088 8004 40C0 FFFF" - $"E089 C000 E073 386D 6B00 0001 0800 0000" - $"0000 0000 0000 0000 0000 0000 0000 FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF69 636D" - $"2300 0000 3824 9041 0400 0448 102B 4E60" - $"9224 A129 4A22 0224 2400 021A AA7F FC7F" - $"FE7F FE7F FE7F FF7F FF7F FF7F FF3F FF3F" - $"FF3F FF3F FF69 636D 3400 0000 680C DCCD" - $"CCDC CDCC 000D 00C0 0CCC C00D C00D C00C" - $"00C0 C00D C00D C0C0 CC0C 0CCD C00D EDDD" - $"DDDD DDDD EC0D D000 0CD0 0CCD DC0E DD02" - $"DCBC D0C0 DC0C FC5C C48D DDDD DC00 DC00" - $"C000 0C0C DC00 EC0D CC0C CC00 DC00 D000" - $"0000 0000 DC00 DDDD DDDD DDDD DC69 636D" - $"3800 0000 C800 F8F8 F8F8 F8F8 F8F8 F8F8" - $"F8F8 F800 0000 FAF6 00F5 F600 F72B F6F7" - $"F500 FA2B 0000 F9F6 00F5 F5F5 F52B 00F5" - $"F500 FAF7 0000 FA2B 002B 002B F5F5 F600" - $"2BF5 FA2B 0000 F9AC F9FA F9FA FAFA FAF9" - $"FAF9 F9AC F500 FAF9 0000 0700 087B 0000" - $"54F7 7EF9 F700 FBFB 0E2A 0E7F 1499 315C" - $"0E07 0EFA 2B00 2BEF 0F7E 0F7E 0EA0 50F9" - $"7457 74F9 F700 00FB 07F5 0701 07F6 0025" - $"F600 F6FA 2B00 00FB F800 F82B F800 2BF8" - $"F600 2BF9 F700 00FA 0000 0000 0000 0000" - $"0000 00FA 2B00 0056 F9FA F9FA FAF9 FAF9" - $"FAFA F9FA F669 7433 3200 001B 9600 0000" - $"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFF7" - $"FFE5 0095 FFE5 0095 FFE5 0095 FFE5 0095" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FF81 0085 FF81 8085" - $"FF81 8085 FF81 8085 FF8D 8081 FF8D 808D" - $"FF81 0081 8091 FF81 0085 FF81 8085 FF81" - $"8085 FF81 8085 FF8D 8081 FF8D 808D FF81" - $"0081 8091 FF81 0085 FF81 8085 FF81 8085" - $"FF81 8085 FF8D 8081 FF8D 808D FF81 0081" - $"8091 FF81 0085 FF81 8085 FF81 8085 FF81" - $"8085 FF8D 8081 FF8D 808D FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FF81 0081 FF85 8085" - $"FF81 8085 FF85 8081 FF81 8081 FF85 8085" - $"FF81 8085 FF81 8089 FF81 0081 8091 FF81" - $"0081 FF85 8085 FF81 8085 FF85 8081 FF81" - $"8081 FF85 8085 FF81 8085 FF81 8089 FF81" - $"0081 8091 FF81 0081 FF85 8085 FF81 8085" - $"FF85 8081 FF81 8081 FF85 8085 FF81 8085" - $"FF81 8089 FF81 0081 8091 FF81 0081 FF85" - $"8085 FF81 8085 FF85 8081 FF81 8081 FF85" - $"8085 FF81 8085 FF81 8089 FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FF81 0081 FF85 8085" - $"FF85 8085 FF89 8085 FF89 8085 FF89 8085" - $"FF81 0081 8091 FF81 0081 FF85 8085 FF85" - $"8085 FF89 8085 FF89 8085 FF89 8085 FF81" - $"0081 8091 FF81 0081 FF85 8085 FF85 8085" - $"FF89 8085 FF89 8085 FF89 8085 FF81 0081" - $"8091 FF81 0081 FF85 8085 FF85 8085 FF89" - $"8085 FF89 8085 FF89 8085 FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FF81 00DD FF81 0081" - $"8091 FF81 00DD FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 0081 FFE5 008D FF81 0081 FFE5 008D" - $"FF81 0081 FFE5 008D FF81 0081 FFE5 008D" - $"FF81 0081 FF81 00DD FF81 0081 8089 FF81" - $"0081 FF81 00DD FF81 0081 8089 FF81 0081" - $"FF81 00DD FF81 0081 8089 FF81 0081 FF81" - $"00DD FF81 0081 8089 FF81 0081 FF81 00AD" - $"FF81 009D FF85 0081 FF81 0081 8089 FF81" - $"0081 FF81 00AD FF81 009D FF85 0081 FF81" - $"0081 8089 FF81 0081 FF81 00AD FF81 009D" - $"FF85 0081 FF81 0081 8089 FF81 0081 FF81" - $"00AD FF81 009D FF85 0081 FF81 0081 8089" - $"FF81 0081 FF81 00A1 FF81 DD85 FF81 0095" - $"FF81 0081 FF81 0085 FF81 0081 8089 FF81" - $"0081 FF81 00A1 FF81 DD85 FF81 0095 FF81" - $"0081 FF81 0085 FF81 0081 8089 FF81 0081" - $"FF81 00A1 FF81 DD85 FF81 0095 FF81 0081" - $"FF81 0085 FF81 0081 8089 FF81 0081 FF81" - $"00A1 FF81 DD85 FF81 0095 FF81 0081 FF81" - $"0085 FF81 0081 8089 FF81 0081 FF81 0091" - $"FF81 DD89 FF81 DD81 FF85 008D FF85 0081" - $"FF81 0089 FF81 0081 8089 FF81 0081 FF81" - $"0091 FF81 DD89 FF81 DD81 FF85 008D FF85" - $"0081 FF81 0089 FF81 0081 8089 FF81 0081" - $"FF81 0091 FF81 DD89 FF81 DD81 FF85 008D" - $"FF85 0081 FF81 0089 FF81 0081 8089 FF81" - $"0081 FF81 0091 FF81 DD89 FF81 DD81 FF85" - $"008D FF85 0081 FF81 0089 FF81 0081 8089" - $"FF81 0081 FF81 0081 FF81 DD89 FF81 DD85" - $"FF81 0081 DD85 FF81 0081 FF89 008D FF85" - $"DD81 FF81 0081 8089 FF81 0081 FF81 0081" - $"FF81 DD89 FF81 DD85 FF81 0081 DD85 FF81" - $"0081 FF89 008D FF85 DD81 FF81 0081 8089" - $"FF81 0081 FF81 0081 FF81 DD89 FF81 DD85" - $"FF81 0081 DD85 FF81 0081 FF89 008D FF85" - $"DD81 FF81 0081 8089 FF81 0081 FF81 0081" - $"FF81 DD89 FF81 DD85 FF81 0081 DD85 FF81" - $"0081 FF89 008D FF85 DD81 FF81 0081 8089" - $"FF81 0081 FF81 0081 FF81 DD89 FF81 DD85" - $"FF81 0081 DD81 FF81 0081 1F8D FF81 DD85" - $"FF81 DD89 FF81 0081 8089 FF81 0081 FF81" - $"0081 FF81 DD89 FF81 DD85 FF81 0081 DD81" - $"FF81 0081 1F8D FF81 DD85 FF81 DD89 FF81" - $"0081 8089 FF81 0081 FF81 0081 FF81 DD89" - $"FF81 DD85 FF81 0081 DD81 FF81 0081 1F8D" - $"FF81 DD85 FF81 DD89 FF81 0081 8089 FF81" - $"0081 FF81 0081 FF81 DD89 FF81 DD85 FF81" - $"0081 DD81 FF81 0081 1F8D FF81 DD85 FF81" - $"DD89 FF81 0081 8089 FF8D 0081 DD85 FF81" - $"0081 DD85 FF81 0081 DD85 FF81 0081 FF89" - $"DD81 FF85 DD8D FF81 0081 8089 FF8D 0081" - $"DD85 FF81 0081 DD85 FF81 0081 DD85 FF81" - $"0081 FF89 DD81 FF85 DD8D FF81 0081 8089" - $"FF8D 0081 DD85 FF81 0081 DD85 FF81 0081" - $"DD85 FF81 0081 FF89 DD81 FF85 DD8D FF81" - $"0081 8089 FF8D 0081 DD85 FF81 0081 DD85" - $"FF81 0081 DD85 FF81 0081 FF89 DD81 FF85" - $"DD8D FF81 0081 808D FF89 0081 DD85 FF81" - $"0081 DD85 FF81 0081 DD85 FF81 00A9 FF81" - $"0081 808D FF89 0081 DD85 FF81 0081 DD85" - $"FF81 0081 DD85 FF81 00A9 FF81 0081 808D" - $"FF89 0081 DD85 FF81 0081 DD85 FF81 0081" - $"DD85 FF81 00A9 FF81 0081 808D FF89 0081" - $"DD85 FF81 0081 DD85 FF81 0081 DD85 FF81" - $"00A9 FF81 0081 8091 FF85 0081 DD85 FF81" - $"0081 DD85 FF81 0081 DD81 FF81 0081 1FA5" - $"0081 FF81 0081 8091 FF85 0081 DD85 FF81" - $"0081 DD85 FF81 0081 DD81 FF81 0081 1FA5" - $"0081 FF81 0081 8091 FF85 0081 DD85 FF81" - $"0081 DD85 FF81 0081 DD81 FF81 0081 1FA5" - $"0081 FF81 0081 8091 FF85 0081 DD85 FF81" - $"0081 DD85 FF81 0081 DD81 FF81 0081 1FA5" - $"0081 FF81 0081 8091 FF81 00AD FF81 0085" - $"FF81 0085 FF81 0085 FF81 0085 FF81 0081" - $"8091 FF81 00AD FF81 0085 FF81 0085 FF81" - $"0085 FF81 0085 FF81 0081 8091 FF81 00AD" - $"FF81 0085 FF81 0085 FF81 0085 FF81 0085" - $"FF81 0081 8091 FF81 00AD FF81 0085 FF81" - $"0085 FF81 0085 FF81 0085 FF81 0081 8091" - $"FF81 0081 5681 DD85 FF81 5681 DD85 FF81" - $"5681 DDB5 FF81 0081 8091 FF81 0081 5681" - $"DD85 FF81 5681 DD85 FF81 5681 DDB5 FF81" - $"0081 8091 FF81 0081 5681 DD85 FF81 5681" - $"DD85 FF81 5681 DDB5 FF81 0081 8091 FF81" - $"0081 5681 DD85 FF81 5681 DD85 FF81 5681" - $"DDB5 FF81 0081 8091 FF81 00DD FF81 0081" - $"8091 FF81 00DD FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FF81 00DD FF81 0081" - $"8091 FF81 00DD FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF8D 0085 FF89 0081 FF85 0089 FF89 0081" - $"FF81 0085 FF81 0085 FF81 0081 8091 FF8D" - $"0085 FF89 0081 FF85 0089 FF89 0081 FF81" - $"0085 FF81 0085 FF81 0081 8091 FF8D 0085" - $"FF89 0081 FF85 0089 FF89 0081 FF81 0085" - $"FF81 0085 FF81 0081 8091 FF8D 0085 FF89" - $"0081 FF85 0089 FF89 0081 FF81 0085 FF81" - $"0085 FF81 0081 8091 FF81 00DD FF81 0081" - $"8091 FF81 00DD FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FFE5 0081 8091 FFE5" - $"0081 8091 FFE5 0081 8091 FFE5 0081 8095" - $"FFE5 8095 FFE5 8095 FFE5 8095 FFE5 80FF" - $"FFFF FFFF FFFB FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFF7 FFE5 0095 FFE5 0095 FFE5" - $"0095 FFE5 0095 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"0085 FF81 8085 FF81 8085 FF81 8085 FF8D" - $"8081 FF8D 808D FF81 0081 8091 FF81 0085" - $"FF81 8085 FF81 8085 FF81 8085 FF8D 8081" - $"FF8D 808D FF81 0081 8091 FF81 0085 FF81" - $"8085 FF81 8085 FF81 8085 FF8D 8081 FF8D" - $"808D FF81 0081 8091 FF81 0085 FF81 8085" - $"FF81 8085 FF81 8085 FF8D 8081 FF8D 808D" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"0081 FF85 8085 FF81 8085 FF85 8081 FF81" - $"8081 FF85 8085 FF81 8085 FF81 8089 FF81" - $"0081 8091 FF81 0081 FF85 8085 FF81 8085" - $"FF85 8081 FF81 8081 FF85 8085 FF81 8085" - $"FF81 8089 FF81 0081 8091 FF81 0081 FF85" - $"8085 FF81 8085 FF85 8081 FF81 8081 FF85" - $"8085 FF81 8085 FF81 8089 FF81 0081 8091" - $"FF81 0081 FF85 8085 FF81 8085 FF85 8081" - $"FF81 8081 FF85 8085 FF81 8085 FF81 8089" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"0081 FF85 8085 FF85 8085 FF89 8085 FF89" - $"8085 FF89 8085 FF81 0081 8091 FF81 0081" - $"FF85 8085 FF85 8085 FF89 8085 FF89 8085" - $"FF89 8085 FF81 0081 8091 FF81 0081 FF85" - $"8085 FF85 8085 FF89 8085 FF89 8085 FF89" - $"8085 FF81 0081 8091 FF81 0081 FF85 8085" - $"FF85 8085 FF89 8085 FF89 8085 FF89 8085" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FF81 00DD FF81 0081" - $"8091 FF81 00DD FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 0081 FFE5 008D FF81" - $"0081 FFE5 008D FF81 0081 FFE5 008D FF81" - $"0081 FFE5 008D FF81 0081 FF81 00DD FF81" - $"0081 8089 FF81 0081 FF81 00DD FF81 0081" - $"8089 FF81 0081 FF81 00DD FF81 0081 8089" - $"FF81 0081 FF81 00DD FF81 0081 8089 FF81" - $"0081 FF81 00AD FF81 649D FF85 0081 FF81" - $"0081 8089 FF81 0081 FF81 00AD FF81 649D" - $"FF85 0081 FF81 0081 8089 FF81 0081 FF81" - $"00AD FF81 649D FF85 0081 FF81 0081 8089" - $"FF81 0081 FF81 00AD FF81 649D FF85 0081" - $"FF81 0081 8089 FF81 0081 FF81 00A1 FF81" - $"0885 FF81 6495 FF81 0081 FF81 0085 FF81" - $"0081 8089 FF81 0081 FF81 00A1 FF81 0885" - $"FF81 6495 FF81 0081 FF81 0085 FF81 0081" - $"8089 FF81 0081 FF81 00A1 FF81 0885 FF81" - $"6495 FF81 0081 FF81 0085 FF81 0081 8089" - $"FF81 0081 FF81 00A1 FF81 0885 FF81 6495" - $"FF81 0081 FF81 0085 FF81 0081 8089 FF81" - $"0081 FF81 0091 FF81 0889 FF81 0881 FF85" - $"648D FF85 0081 FF81 0089 FF81 0081 8089" - $"FF81 0081 FF81 0091 FF81 0889 FF81 0881" - $"FF85 648D FF85 0081 FF81 0089 FF81 0081" - $"8089 FF81 0081 FF81 0091 FF81 0889 FF81" - $"0881 FF85 648D FF85 0081 FF81 0089 FF81" - $"0081 8089 FF81 0081 FF81 0091 FF81 0889" - $"FF81 0881 FF85 648D FF85 0081 FF81 0089" - $"FF81 0081 8089 FF81 0081 FF81 0081 FF81" - $"0889 FF81 0885 FF81 0081 0885 FF81 6481" - $"FF89 008D FF85 0881 FF81 0081 8089 FF81" - $"0081 FF81 0081 FF81 0889 FF81 0885 FF81" - $"0081 0885 FF81 6481 FF89 008D FF85 0881" - $"FF81 0081 8089 FF81 0081 FF81 0081 FF81" - $"0889 FF81 0885 FF81 0081 0885 FF81 6481" - $"FF89 008D FF85 0881 FF81 0081 8089 FF81" - $"0081 FF81 0081 FF81 0889 FF81 0885 FF81" - $"0081 0885 FF81 6481 FF89 008D FF85 0881" - $"FF81 0081 8089 FF81 0081 FF81 0081 FF81" - $"0889 FF81 0885 FF81 0081 0881 FF81 6481" - $"B78D FF81 0885 FF81 0889 FF81 0081 8089" - $"FF81 0081 FF81 0081 FF81 0889 FF81 0885" - $"FF81 0081 0881 FF81 6481 B78D FF81 0885" - $"FF81 0889 FF81 0081 8089 FF81 0081 FF81" - $"0081 FF81 0889 FF81 0885 FF81 0081 0881" - $"FF81 6481 B78D FF81 0885 FF81 0889 FF81" - $"0081 8089 FF81 0081 FF81 0081 FF81 0889" - $"FF81 0885 FF81 0081 0881 FF81 6481 B78D" - $"FF81 0885 FF81 0889 FF81 0081 8089 FF8D" - $"0081 0885 FF81 0081 0885 FF81 0081 0885" - $"FF81 6481 FF89 0881 FF85 088D FF81 0081" - $"8089 FF8D 0081 0885 FF81 0081 0885 FF81" - $"0081 0885 FF81 6481 FF89 0881 FF85 088D" - $"FF81 0081 8089 FF8D 0081 0885 FF81 0081" - $"0885 FF81 0081 0885 FF81 6481 FF89 0881" - $"FF85 088D FF81 0081 8089 FF8D 0081 0885" - $"FF81 0081 0885 FF81 0081 0885 FF81 6481" - $"FF89 0881 FF85 088D FF81 0081 808D FF89" - $"0081 0885 FF81 0081 0885 FF81 0081 0885" - $"FF81 64A9 FF81 0081 808D FF89 0081 0885" - $"FF81 0081 0885 FF81 0081 0885 FF81 64A9" - $"FF81 0081 808D FF89 0081 0885 FF81 0081" - $"0885 FF81 0081 0885 FF81 64A9 FF81 0081" - $"808D FF89 0081 0885 FF81 0081 0885 FF81" - $"0081 0885 FF81 64A9 FF81 0081 8091 FF85" - $"0081 0885 FF81 0081 0885 FF81 0081 0881" - $"FF81 6481 B7A5 6481 FF81 0081 8091 FF85" - $"0081 0885 FF81 0081 0885 FF81 0081 0881" - $"FF81 6481 B7A5 6481 FF81 0081 8091 FF85" - $"0081 0885 FF81 0081 0885 FF81 0081 0881" - $"FF81 6481 B7A5 6481 FF81 0081 8091 FF85" - $"0081 0885 FF81 0081 0885 FF81 0081 0881" - $"FF81 6481 B7A5 6481 FF81 0081 8091 FF81" - $"00AD FF81 6485 FF81 6485 FF81 6485 FF81" - $"6485 FF81 0081 8091 FF81 00AD FF81 6485" - $"FF81 6485 FF81 6485 FF81 6485 FF81 0081" - $"8091 FF81 00AD FF81 6485 FF81 6485 FF81" - $"6485 FF81 6485 FF81 0081 8091 FF81 00AD" - $"FF81 6485 FF81 6485 FF81 6485 FF81 6485" - $"FF81 0081 8091 FF81 0081 2C81 0885 FF81" - $"2C81 0885 FF81 2C81 08B5 FF81 0081 8091" - $"FF81 0081 2C81 0885 FF81 2C81 0885 FF81" - $"2C81 08B5 FF81 0081 8091 FF81 0081 2C81" - $"0885 FF81 2C81 0885 FF81 2C81 08B5 FF81" - $"0081 8091 FF81 0081 2C81 0885 FF81 2C81" - $"0885 FF81 2C81 08B5 FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FF81 00DD FF81 0081" - $"8091 FF81 00DD FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FF81 00DD FF81 0081" - $"8091 FF81 00DD FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF8D 0085 FF89 0081 FF85" - $"0089 FF89 0081 FF81 0085 FF81 0085 FF81" - $"0081 8091 FF8D 0085 FF89 0081 FF85 0089" - $"FF89 0081 FF81 0085 FF81 0085 FF81 0081" - $"8091 FF8D 0085 FF89 0081 FF85 0089 FF89" - $"0081 FF81 0085 FF81 0085 FF81 0081 8091" - $"FF8D 0085 FF89 0081 FF85 0089 FF89 0081" - $"FF81 0085 FF81 0085 FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FF81 00DD FF81 0081" - $"8091 FF81 00DD FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FFE5" - $"0081 8091 FFE5 0081 8091 FFE5 0081 8091" - $"FFE5 0081 8095 FFE5 8095 FFE5 8095 FFE5" - $"8095 FFE5 80FF FFFF FFFF FFFB FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFF7 FFE5 0095" - $"FFE5 0095 FFE5 0095 FFE5 0095 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 0085 FF81 8085 FF81 8085" - $"FF81 8085 FF8D 8081 FF8D 808D FF81 0081" - $"8091 FF81 0085 FF81 8085 FF81 8085 FF81" - $"8085 FF8D 8081 FF8D 808D FF81 0081 8091" - $"FF81 0085 FF81 8085 FF81 8085 FF81 8085" - $"FF8D 8081 FF8D 808D FF81 0081 8091 FF81" - $"0085 FF81 8085 FF81 8085 FF81 8085 FF8D" - $"8081 FF8D 808D FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 0081 FF85 8085 FF81 8085" - $"FF85 8081 FF81 8081 FF85 8085 FF81 8085" - $"FF81 8089 FF81 0081 8091 FF81 0081 FF85" - $"8085 FF81 8085 FF85 8081 FF81 8081 FF85" - $"8085 FF81 8085 FF81 8089 FF81 0081 8091" - $"FF81 0081 FF85 8085 FF81 8085 FF85 8081" - $"FF81 8081 FF85 8085 FF81 8085 FF81 8089" - $"FF81 0081 8091 FF81 0081 FF85 8085 FF81" - $"8085 FF85 8081 FF81 8081 FF85 8085 FF81" - $"8085 FF81 8089 FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 0081 FF85 8085 FF85 8085" - $"FF89 8085 FF89 8085 FF89 8085 FF81 0081" - $"8091 FF81 0081 FF85 8085 FF85 8085 FF89" - $"8085 FF89 8085 FF89 8085 FF81 0081 8091" - $"FF81 0081 FF85 8085 FF85 8085 FF89 8085" - $"FF89 8085 FF89 8085 FF81 0081 8091 FF81" - $"0081 FF85 8085 FF85 8085 FF89 8085 FF89" - $"8085 FF89 8085 FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FF81 00DD FF81 0081" - $"8091 FF81 00DD FF81 0081 8091 FF81 0081" - $"FFE5 008D FF81 0081 FFE5 008D FF81 0081" - $"FFE5 008D FF81 0081 FFE5 008D FF81 0081" - $"FF81 00DD FF81 0081 8089 FF81 0081 FF81" - $"00DD FF81 0081 8089 FF81 0081 FF81 00DD" - $"FF81 0081 8089 FF81 0081 FF81 00DD FF81" - $"0081 8089 FF81 0081 FF81 00AD FF81 119D" - $"FF85 D481 FF81 0081 8089 FF81 0081 FF81" - $"00AD FF81 119D FF85 D481 FF81 0081 8089" - $"FF81 0081 FF81 00AD FF81 119D FF85 D481" - $"FF81 0081 8089 FF81 0081 FF81 00AD FF81" - $"119D FF85 D481 FF81 0081 8089 FF81 0081" - $"FF81 00A1 FF81 0685 FF81 1195 FF81 D481" - $"FF81 D485 FF81 0081 8089 FF81 0081 FF81" - $"00A1 FF81 0685 FF81 1195 FF81 D481 FF81" - $"D485 FF81 0081 8089 FF81 0081 FF81 00A1" - $"FF81 0685 FF81 1195 FF81 D481 FF81 D485" - $"FF81 0081 8089 FF81 0081 FF81 00A1 FF81" - $"0685 FF81 1195 FF81 D481 FF81 D485 FF81" - $"0081 8089 FF81 0081 FF81 0091 FF81 0689" - $"FF81 0681 FF85 118D FF85 D481 FF81 D489" - $"FF81 0081 8089 FF81 0081 FF81 0091 FF81" - $"0689 FF81 0681 FF85 118D FF85 D481 FF81" - $"D489 FF81 0081 8089 FF81 0081 FF81 0091" - $"FF81 0689 FF81 0681 FF85 118D FF85 D481" - $"FF81 D489 FF81 0081 8089 FF81 0081 FF81" - $"0091 FF81 0689 FF81 0681 FF85 118D FF85" - $"D481 FF81 D489 FF81 0081 8089 FF81 0081" - $"FF81 0081 FF81 0689 FF81 0685 FF81 D481" - $"0685 FF81 1181 FF89 D48D FF85 0681 FF81" - $"0081 8089 FF81 0081 FF81 0081 FF81 0689" - $"FF81 0685 FF81 D481 0685 FF81 1181 FF89" - $"D48D FF85 0681 FF81 0081 8089 FF81 0081" - $"FF81 0081 FF81 0689 FF81 0685 FF81 D481" - $"0685 FF81 1181 FF89 D48D FF85 0681 FF81" - $"0081 8089 FF81 0081 FF81 0081 FF81 0689" - $"FF81 0685 FF81 D481 0685 FF81 1181 FF89" - $"D48D FF85 0681 FF81 0081 8089 FF81 0081" - $"FF81 0081 FF81 0689 FF81 0685 FF81 D481" - $"0681 FF81 1181 148D FF81 0685 FF81 0689" - $"FF81 0081 8089 FF81 0081 FF81 0081 FF81" - $"0689 FF81 0685 FF81 D481 0681 FF81 1181" - $"148D FF81 0685 FF81 0689 FF81 0081 8089" - $"FF81 0081 FF81 0081 FF81 0689 FF81 0685" - $"FF81 D481 0681 FF81 1181 148D FF81 0685" - $"FF81 0689 FF81 0081 8089 FF81 0081 FF81" - $"0081 FF81 0689 FF81 0685 FF81 D481 0681" - $"FF81 1181 148D FF81 0685 FF81 0689 FF81" - $"0081 8089 FF89 0081 D481 0685 FF81 D481" - $"0685 FF81 D481 0685 FF81 1181 FF89 0681" - $"FF85 068D FF81 0081 8089 FF89 0081 D481" - $"0685 FF81 D481 0685 FF81 D481 0685 FF81" - $"1181 FF89 0681 FF85 068D FF81 0081 8089" - $"FF89 0081 D481 0685 FF81 D481 0685 FF81" - $"D481 0685 FF81 1181 FF89 0681 FF85 068D" - $"FF81 0081 8089 FF89 0081 D481 0685 FF81" - $"D481 0685 FF81 D481 0685 FF81 1181 FF89" - $"0681 FF85 068D FF81 0081 808D FF85 0081" - $"D481 0685 FF81 D481 0685 FF81 D481 0685" - $"FF81 11A9 FF81 0081 808D FF85 0081 D481" - $"0685 FF81 D481 0685 FF81 D481 0685 FF81" - $"11A9 FF81 0081 808D FF85 0081 D481 0685" - $"FF81 D481 0685 FF81 D481 0685 FF81 11A9" - $"FF81 0081 808D FF85 0081 D481 0685 FF81" - $"D481 0685 FF81 D481 0685 FF81 11A9 FF81" - $"0081 8091 FF81 0081 D481 0685 FF81 D481" - $"0685 FF81 D481 0681 FF81 1181 14A5 1181" - $"FF81 0081 8091 FF81 0081 D481 0685 FF81" - $"D481 0685 FF81 D481 0681 FF81 1181 14A5" - $"1181 FF81 0081 8091 FF81 0081 D481 0685" - $"FF81 D481 0685 FF81 D481 0681 FF81 1181" - $"14A5 1181 FF81 0081 8091 FF81 0081 D481" - $"0685 FF81 D481 0685 FF81 D481 0681 FF81" - $"1181 14A5 1181 FF81 0081 8091 FF81 00AD" - $"FF81 1185 FF81 1185 FF81 1185 FF81 1185" - $"FF81 0081 8091 FF81 00AD FF81 1185 FF81" - $"1185 FF81 1185 FF81 1185 FF81 0081 8091" - $"FF81 00AD FF81 1185 FF81 1185 FF81 1185" - $"FF81 1185 FF81 0081 8091 FF81 00AD FF81" - $"1185 FF81 1185 FF81 1185 FF81 1185 FF81" - $"0081 8091 FF81 0081 0581 0685 FF81 0581" - $"0685 FF81 0581 06B5 FF81 0081 8091 FF81" - $"0081 0581 0685 FF81 0581 0685 FF81 0581" - $"06B5 FF81 0081 8091 FF81 0081 0581 0685" - $"FF81 0581 0685 FF81 0581 06B5 FF81 0081" - $"8091 FF81 0081 0581 0685 FF81 0581 0685" - $"FF81 0581 06B5 FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FF81 00DD FF81 0081" - $"8091 FF81 00DD FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF8D 0085 FF89 0081 FF85 0089" - $"FF89 0081 FF81 0085 FF81 0085 FF81 0081" - $"8091 FF8D 0085 FF89 0081 FF85 0089 FF89" - $"0081 FF81 0085 FF81 0085 FF81 0081 8091" - $"FF8D 0085 FF89 0081 FF85 0089 FF89 0081" - $"FF81 0085 FF81 0085 FF81 0081 8091 FF8D" - $"0085 FF89 0081 FF85 0089 FF89 0081 FF81" - $"0085 FF81 0085 FF81 0081 8091 FF81 00DD" - $"FF81 0081 8091 FF81 00DD FF81 0081 8091" - $"FF81 00DD FF81 0081 8091 FF81 00DD FF81" - $"0081 8091 FF81 00DD FF81 0081 8091 FF81" - $"00DD FF81 0081 8091 FF81 00DD FF81 0081" - $"8091 FF81 00DD FF81 0081 8091 FFE5 0081" - $"8091 FFE5 0081 8091 FFE5 0081 8091 FFE5" - $"0081 8095 FFE5 8095 FFE5 8095 FFE5 8095" - $"FFE5 80FF FFFF FFFF FFFB FF74 386D 6B00" - $"0040 0800 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00" -}; - -data 'ics#' (130, "Chart Document Icon") { - $"0000 5554 2084 4020 080A 75D4 0004 608A" - $"2522 6A42 20B5 2402 0000 3522 2AAA 0044" - $"0000 7FFE 7FFE 7FFE 7FFE 7FFE 7FFF 7FFF" - $"7FFF 7FFF 3FFF 3FFF 3FFF 3FFF 3FFF 3FFF" -}; - -data 'ics4' (130, "Chart Document Icon") { - $"0000 0000 0000 0000 0EDD DDDD DDDD DE00" - $"0D00 C00C CCC0 0DC0 0DC0 0C0C C00C 0DC0" - $"0DC0 C0C0 CC0C CDC0 0DDD DDDD DDDD DEE0" - $"0DD0 0000 C000 0DCC 0DD0 0C0C E00D DCDC" - $"0DDD 02D4 8070 04DC 0EFC 50DC CC4C C0DC" - $"005C 0C0C BD8D DEDC 00BC CCCC 0000 00DC" - $"00D0 0000 0000 00DC 00ED 0DCD 0CDC 0CDC" - $"00ED DDDD DDDD DDEC 00CC CCCC CCCC CCC0" -}; - -data 'ics8' (130, "Chart Document Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"00AC F9FA F9FA F9FA F9FA F9FA F9AC F500" - $"00F9 F600 F6F5 00F7 2BF6 F7F5 00FA F700" - $"00FA F700 F5F6 F6F6 F700 F5F6 00FA 2B00" - $"00F9 F700 F700 F7F5 F6F7 00F7 F5FA F700" - $"00FA F9FA F9FA F9FA FAF9 FAF9 FAFC 8100" - $"00F9 FA00 0000 0000 2B00 0000 007E F92B" - $"00FA F900 0007 000E A000 0054 7E2B F9F7" - $"00F9 FA0E F515 7815 9F2A 7F07 070F FAF7" - $"00AC F00F 7E0F 7E0E 7B07 0E08 0700 FA2B" - $"0000 AB07 2A07 2A07 A07A A0A5 51A5 FAF7" - $"0000 FC07 F707 2C07 0000 0000 0000 FA2B" - $"0000 F900 0000 0000 0000 0000 0000 F9F7" - $"0000 ACFA 00FA F7FA 002B FAF7 002B FAF7" - $"0000 FCF9 FAF9 F9FA FAFA F9FA F9FA FC2B" - $"0000 F5F7 2BF7 F72B F72B F72B F72B F7F6" -}; - diff --git a/samples/docview/doc.r b/samples/docview/doc.r deleted file mode 100644 index 12110b23ca..0000000000 --- a/samples/docview/doc.r +++ /dev/null @@ -1,2588 +0,0 @@ -data 'ICN#' (129, "Document Icon") { - $"0000 0000 0007 FF00 001C 0180 0067 0340" - $"018C 87A0 0618 7870 1828 0418 6051 3006" - $"8090 D001 8127 A001 4220 6602 4440 8182" - $"2840 8C64 308C 0304 2083 18C8 4118 C608" - $"4106 3190 2231 8C10 120C 6320 0C63 1820" - $"0418 C640 0806 3040 0801 8C80 0600 6080" - $"0180 1900 0060 0100 0018 0200 0006 0200" - $"0001 8400 0000 6400 0000 1800 0000 0000" - $"0000 0000 0007 FF00 001F FF80 007F FFC0" - $"01FF FFE0 07FF FFF0 1FFF FFF8 7FFF FFFE" - $"FFFF FFFF FFFF FFFF 7FFF FFFE 7FFF FFFE" - $"3FFF FFFC 3FFF FFFC 3FFF FFF8 7FFF FFF8" - $"7FFF FFF0 3FFF FFF0 1FFF FFE0 0FFF FFE0" - $"07FF FFC0 0FFF FFC0 0FFF FF80 07FF FF80" - $"01FF FF00 007F FF00 001F FE00 0007 FE00" - $"0001 FC00 0000 7C00 0000 1800 0000 0000" -}; - -data 'icl4' (129, "Document Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0FFF FFFF FFFF 0000 0000" - $"0000 0000 000F FF00 0000 000F F000 0000" - $"0000 0000 0FF0 CFFF 0000 00FD CF00 0000" - $"0000 000F F00C FF00 FCCC CFFF FCF0 0000" - $"0000 0FF0 00CF F000 0FFF FCCC 0FFF 0000" - $"000F F000 0CFC F000 00CC CC00 000F F000" - $"0FF0 0000 CFCF 0005 0045 0000 0000 0FF0" - $"F000 000C F0CF 0000 550E 0000 0000 000F" - $"F000 00CF 0CF0 0355 3050 0000 0000 000F" - $"0F00 0CF0 0CF0 0000 0530 0660 0000 00F0" - $"0F00 CF00 CF00 0000 5000 0006 6000 00F0" - $"00FC F000 CF00 0000 E000 6600 0660 0F00" - $"00FF 000C F000 6600 0000 0066 0000 0F00" - $"00F0 000C F000 0066 0006 6000 6600 F000" - $"0F00 00CF 0006 6000 6600 0660 0000 F000" - $"0F00 00CF 0000 0660 0066 0006 600F 0000" - $"00F0 0CF0 0066 0006 6000 6600 000F 0000" - $"000F 0CF0 0000 6600 0660 0066 00F0 0000" - $"0000 FF00 0660 0066 0006 6000 00F0 0000" - $"0000 0F00 0006 6000 6600 0660 0F00 0000" - $"0000 F000 0000 0660 0066 0000 0F00 0000" - $"0000 F000 0000 0006 6000 6600 F000 0000" - $"0000 0FF0 0000 0000 0660 0000 F000 0000" - $"0000 000F F000 0000 0006 600F 0000 0000" - $"0000 0000 0FF0 0000 0000 000F 0000 0000" - $"0000 0000 000F F000 0000 00F0 0000 0000" - $"0000 0000 0000 0FF0 0000 00F0 0000 0000" - $"0000 0000 0000 000F F000 0F00 0000 0000" - $"0000 0000 0000 0000 0FF0 0F00 0000 0000" - $"0000 0000 0000 0000 000F F000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" -}; - -data 'icl8' (129, "Document Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF 0000" - $"0000 0000 0000 00FF FF00 0000 0000 0000" - $"0000 0000 0000 0000 00FF FF00 2BFF FFFF" - $"0000 0000 0000 FFFA 2BFF 0000 0000 0000" - $"0000 0000 0000 00FF FF00 00F7 FFFF 0000" - $"FF2B F7F7 2BFF FFFF FF2B FF00 0000 0000" - $"0000 0000 00FF FF00 0000 2BFF FF00 0000" - $"00FF FFFF FF2B F72B 00FF FFFF 0000 0000" - $"0000 00FF FF00 0000 00F7 FF2B FF00 0000" - $"0000 2BF7 2BF7 0000 0000 00FF FF00 0000" - $"00FF FF00 0000 0000 F7FF 2BFF 0000 00B0" - $"0000 20B0 0000 0000 0000 0000 00FF FF00" - $"FF00 0000 0000 002B FF00 F7FF 0000 0000" - $"B0B0 00FC 0000 0000 0000 0000 0000 00FF" - $"FF00 0000 0000 2BFF 002B FF00 00D7 B0B0" - $"D700 B000 0000 0000 0000 0000 0000 00FF" - $"00FF 0000 00F7 FF00 00F7 FF00 0000 0000" - $"00B0 D700 00EC D300 0000 0000 0000 FF00" - $"00FF 0000 F7FF 0000 F7FF 0000 0000 0000" - $"B000 0000 0000 00D3 EC00 0000 0000 FF00" - $"0000 FF2B FF00 0000 2BFF 0000 0000 0000" - $"FC00 0000 ECD3 0000 00EC D300 00FF 0000" - $"0000 FFFF 0000 002B FF00 0000 D3EC 0000" - $"0000 0000 0000 D3EC 0000 0000 00FF 0000" - $"0000 FF00 0000 00F7 FF00 0000 0000 ECD3" - $"0000 00EC D300 0000 D3EC 0000 FF00 0000" - $"00FF 0000 0000 F7FF 0000 00D3 EC00 0000" - $"D3EC 0000 00D3 EC00 0000 0000 FF00 0000" - $"00FF 0000 0000 2BFF 0000 0000 00D3 EC00" - $"0000 ECD3 0000 00D3 EC00 00FF 0000 0000" - $"0000 FF00 002B FF00 0000 D3EC 0000 00D3" - $"EC00 0000 D3EC 0000 0000 00FF 0000 0000" - $"0000 00FF 00F7 FF00 0000 0000 D3EC 0000" - $"00D3 EC00 0000 ECD3 0000 FF00 0000 0000" - $"0000 0000 FFFF 0000 00D3 EC00 0000 ECD3" - $"0000 00EC D300 0000 0000 FF00 0000 0000" - $"0000 0000 00FF 0000 0000 00D3 EC00 0000" - $"D3EC 0000 00D3 EC00 00FF 0000 0000 0000" - $"0000 0000 FF00 0000 0000 0000 00EC D300" - $"0000 D3D3 0000 0000 00FF 0000 0000 0000" - $"0000 0000 FF00 0000 0000 0000 0000 00EC" - $"D300 0000 ECD3 0000 FF00 0000 0000 0000" - $"0000 0000 00FF FF00 0000 0000 0000 0000" - $"00D3 EC00 0000 0000 FF00 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 0000" - $"0000 00EC D300 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 00FF FF00 0000 0000" - $"0000 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FF00 0000" - $"0000 0000 0000 FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF FF00" - $"0000 0000 0000 FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FF00 0000 00FF 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"00FF FF00 00FF 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" -}; - -data 'icm#' (129, "Document Icon") { - $"0250 0A98 2444 8481 2828 4292 1144 2490" - $"2148 0420 0110 0040 07F8 1FFC FFFF FFFF" - $"FFFF FFFE FFFC 3FFC 3FF8 1FF0 03F0 00E0" -}; - -data 'icm4' (129, "Document Icon") { - $"0000 0CDC CDCD C000 000C DCED D0CF DC00" - $"CCCC CECC 0EC0 CDCC D00D CDC0 5CCC 000D" - $"CCE0 E000 C0DC DCCC CD0C CCDC CCCD C0D0" - $"CC0D 0C7C C5CD CD00 00A0 050D 50DC CC00" - $"00DC 00CC C7C0 D000 0000 DCC0 000D 0000" - $"0000 00CD C0CC 0000 0000 0000 CCD0 0000" -}; - -data 'icm8' (129, "Document Icon") { - $"0000 0000 00F6 FAF8 F8F8 F8F9 F600 0000" - $"0000 00F7 F9F8 ACFA F7F6 F7FE FBF7 0000" - $"F6F8 F8F6 F781 F806 2B87 F7F5 F6FA F8F6" - $"FA00 0056 F7FA 0730 5C32 2A2A 0000 00FA" - $"2BF8 8100 FB00 0000 5500 542A 7F2A F72B" - $"F6FA 00F7 F82A 5A4F 542A 5455 5400 F900" - $"2BF8 F581 004E 7F30 4E5B 4E7E F5FA 0000" - $"0000 AC00 2A5B 2A78 5B4E 5B2A F72B 0000" - $"0000 F9F6 0000 2A30 4E5B 4E00 FA00 0000" - $"0000 00F6 F856 F600 002A 2AFA 0000 0000" - $"0000 0000 0000 F7FA 2B00 F7F7 0000 0000" - $"0000 0000 0000 0000 2BF8 F800 0000 0000" -}; - -data 'icns' (129, "Document Icon") { - $"6963 6E73 0000 95C4 4943 4E23 0000 0108" - $"0000 0000 0007 FF00 001C 0180 0067 0340" - $"018C 87A0 0618 7870 1828 0418 6051 3006" - $"8090 D001 8127 A001 4220 6602 4440 8182" - $"2840 8C64 308C 0304 2083 18C8 4118 C608" - $"4106 3190 2231 8C10 120C 6320 0C63 1820" - $"0418 C640 0806 3040 0801 8C80 0600 6080" - $"0180 1900 0060 0100 0018 0200 0006 0200" - $"0001 8400 0000 6400 0000 1800 0000 0000" - $"0000 0000 0007 FF00 001F FF80 007F FFC0" - $"01FF FFE0 07FF FFF0 1FFF FFF8 7FFF FFFE" - $"FFFF FFFF FFFF FFFF 7FFF FFFE 7FFF FFFE" - $"3FFF FFFC 3FFF FFFC 3FFF FFF8 7FFF FFF8" - $"7FFF FFF0 3FFF FFF0 1FFF FFE0 0FFF FFE0" - $"07FF FFC0 0FFF FFC0 0FFF FF80 07FF FF80" - $"01FF FF00 007F FF00 001F FE00 0007 FE00" - $"0001 FC00 0000 7C00 0000 1800 0000 0000" - $"6963 6C34 0000 0208 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0FFF" - $"FFFF FFFF 0000 0000 0000 0000 000F FF00" - $"0000 000F F000 0000 0000 0000 0FF0 CFFF" - $"0000 00FD CF00 0000 0000 000F F00C FF00" - $"FCCC CFFF FCF0 0000 0000 0FF0 00CF F000" - $"0FFF FCCC 0FFF 0000 000F F000 0CFC F000" - $"00CC CC00 000F F000 0FF0 0000 CFCF 0005" - $"0045 0000 0000 0FF0 F000 000C F0CF 0000" - $"550E 0000 0000 000F F000 00CF 0CF0 0355" - $"3050 0000 0000 000F 0F00 0CF0 0CF0 0000" - $"0530 0660 0000 00F0 0F00 CF00 CF00 0000" - $"5000 0006 6000 00F0 00FC F000 CF00 0000" - $"E000 6600 0660 0F00 00FF 000C F000 6600" - $"0000 0066 0000 0F00 00F0 000C F000 0066" - $"0006 6000 6600 F000 0F00 00CF 0006 6000" - $"6600 0660 0000 F000 0F00 00CF 0000 0660" - $"0066 0006 600F 0000 00F0 0CF0 0066 0006" - $"6000 6600 000F 0000 000F 0CF0 0000 6600" - $"0660 0066 00F0 0000 0000 FF00 0660 0066" - $"0006 6000 00F0 0000 0000 0F00 0006 6000" - $"6600 0660 0F00 0000 0000 F000 0000 0660" - $"0066 0000 0F00 0000 0000 F000 0000 0006" - $"6000 6600 F000 0000 0000 0FF0 0000 0000" - $"0660 0000 F000 0000 0000 000F F000 0000" - $"0006 600F 0000 0000 0000 0000 0FF0 0000" - $"0000 000F 0000 0000 0000 0000 000F F000" - $"0000 00F0 0000 0000 0000 0000 0000 0FF0" - $"0000 00F0 0000 0000 0000 0000 0000 000F" - $"F000 0F00 0000 0000 0000 0000 0000 0000" - $"0FF0 0F00 0000 0000 0000 0000 0000 0000" - $"000F F000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 6963 6C38 0000 0408" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF 0000" - $"0000 0000 0000 00FF FF00 0000 0000 0000" - $"0000 0000 0000 0000 00FF FF00 2BFF FFFF" - $"0000 0000 0000 FFFA 2BFF 0000 0000 0000" - $"0000 0000 0000 00FF FF00 00F7 FFFF 0000" - $"FF2B F7F7 2BFF FFFF FF2B FF00 0000 0000" - $"0000 0000 00FF FF00 0000 2BFF FF00 0000" - $"00FF FFFF FF2B F72B 00FF FFFF 0000 0000" - $"0000 00FF FF00 0000 00F7 FF2B FF00 0000" - $"0000 2BF7 2BF7 0000 0000 00FF FF00 0000" - $"00FF FF00 0000 0000 F7FF 2BFF 0000 00B0" - $"0000 20B0 0000 0000 0000 0000 00FF FF00" - $"FF00 0000 0000 002B FF00 F7FF 0000 0000" - $"B0B0 00FC 0000 0000 0000 0000 0000 00FF" - $"FF00 0000 0000 2BFF 002B FF00 00D7 B0B0" - $"D700 B000 0000 0000 0000 0000 0000 00FF" - $"00FF 0000 00F7 FF00 00F7 FF00 0000 0000" - $"00B0 D700 00EC D300 0000 0000 0000 FF00" - $"00FF 0000 F7FF 0000 F7FF 0000 0000 0000" - $"B000 0000 0000 00D3 EC00 0000 0000 FF00" - $"0000 FF2B FF00 0000 2BFF 0000 0000 0000" - $"FC00 0000 ECD3 0000 00EC D300 00FF 0000" - $"0000 FFFF 0000 002B FF00 0000 D3EC 0000" - $"0000 0000 0000 D3EC 0000 0000 00FF 0000" - $"0000 FF00 0000 00F7 FF00 0000 0000 ECD3" - $"0000 00EC D300 0000 D3EC 0000 FF00 0000" - $"00FF 0000 0000 F7FF 0000 00D3 EC00 0000" - $"D3EC 0000 00D3 EC00 0000 0000 FF00 0000" - $"00FF 0000 0000 2BFF 0000 0000 00D3 EC00" - $"0000 ECD3 0000 00D3 EC00 00FF 0000 0000" - $"0000 FF00 002B FF00 0000 D3EC 0000 00D3" - $"EC00 0000 D3EC 0000 0000 00FF 0000 0000" - $"0000 00FF 00F7 FF00 0000 0000 D3EC 0000" - $"00D3 EC00 0000 ECD3 0000 FF00 0000 0000" - $"0000 0000 FFFF 0000 00D3 EC00 0000 ECD3" - $"0000 00EC D300 0000 0000 FF00 0000 0000" - $"0000 0000 00FF 0000 0000 00D3 EC00 0000" - $"D3EC 0000 00D3 EC00 00FF 0000 0000 0000" - $"0000 0000 FF00 0000 0000 0000 00EC D300" - $"0000 D3D3 0000 0000 00FF 0000 0000 0000" - $"0000 0000 FF00 0000 0000 0000 0000 00EC" - $"D300 0000 ECD3 0000 FF00 0000 0000 0000" - $"0000 0000 00FF FF00 0000 0000 0000 0000" - $"00D3 EC00 0000 0000 FF00 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 0000" - $"0000 00EC D300 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 00FF FF00 0000 0000" - $"0000 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FF00 0000" - $"0000 0000 0000 FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 00FF FF00" - $"0000 0000 0000 FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FF00 0000 00FF 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"00FF FF00 00FF 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 00FF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"696C 3332 0000 067D AAFF 8800 90FF 8000" - $"86FF 0100 008D FF03 0000 FFC0 8000 83FF" - $"0300 80C0 008A FF09 0000 FFFF C000 00FF" - $"FF00 81C0 8100 01C0 0087 FF01 0000 80FF" - $"02C0 0000 81FF 8100 80C0 00FF 8000 84FF" - $"0100 0081 FF03 C000 C000 82FF 81C0 82FF" - $"0100 0081 FF01 0000 82FF 03C0 00C0 0080" - $"FF04 46FF FFF2 4686 FF03 0000 FF00 83FF" - $"04C0 00FF C000 81FF 0346 46FF 4088 FF01" - $"0000 82FF 0CC0 00FF C000 FFFF DD46 46DD" - $"FF46 89FF 0200 FF00 80FF 05C0 00FF FFC0" - $"0083 FF05 46DD FFFF 0000 84FF 0B00 FFFF" - $"00FF FFC0 00FF FFC0 0083 FF00 4683 FF01" - $"0000 82FF 0000 80FF 0200 C000 80FF 01C0" - $"0083 FF00 4080 FF01 0000 80FF 0400 00FF" - $"FF00 81FF 0100 0080 FF01 C000 80FF 0100" - $"0085 FF01 0000 82FF 0000 81FF 0000 81FF" - $"01C0 0082 FF01 0000 80FF 0100 0080 FF04" - $"0000 FFFF 0081 FF00 0081 FF01 C000 80FF" - $"0100 0080 FF01 0000 80FF 0100 0082 FF00" - $"0081 FF00 0081 FF01 C000 82FF 0100 0080" - $"FF01 0000 80FF 0400 00FF FF00 83FF 0400" - $"FFFF C000 80FF 0100 0080 FF01 0000 80FF" - $"0100 0082 FF00 0084 FF03 00FF C000 82FF" - $"0100 0080 FF01 0000 80FF 0400 00FF FF00" - $"86FF 0100 0080 FF01 0000 80FF 0100 0080" - $"FF01 0000 82FF 0000 87FF 0000 82FF 0100" - $"0080 FF01 0000 80FF 0400 00FF FF00 87FF" - $"0000 85FF 0100 0080 FF01 0000 82FF 0000" - $"87FF 0000 87FF 0100 0080 FF04 0000 FFFF" - $"0089 FF01 0000 87FF 0100 0082 FF00 008B" - $"FF01 0000 87FF 0400 00FF FF00 8EFF 0100" - $"0089 FF00 0090 FF01 0000 86FF 0000 93FF" - $"0100 0084 FF00 0095 FF01 0000 81FF 0000" - $"98FF 0400 00FF FF00 9AFF 0100 00A8 FFAA" - $"FF88 0090 FF80 0086 FF01 0000 8DFF 0300" - $"00FF C080 0083 FF03 0080 C000 8AFF 0900" - $"00FF FFC0 0000 FFFF 0081 C081 0001 C000" - $"87FF 0100 0080 FF02 C000 0081 FF81 0080" - $"C000 FF80 0084 FF01 0000 81FF 03C0 00C0" - $"0082 FF81 C082 FF01 0000 81FF 0100 0082" - $"FF03 C000 C000 80FF 0400 FFFF 0800 86FF" - $"0300 00FF 0083 FF04 C000 FFC0 0081 FF03" - $"0000 FF40 88FF 0100 0082 FF0C C000 FFC0" - $"00FF FF08 0000 08FF 0089 FF02 00FF 0080" - $"FF05 C000 FFFF C000 83FF 0500 08FF FF00" - $"0084 FF0B 00FF FF00 FFFF C000 FFFF C000" - $"83FF 0000 83FF 0100 0082 FF00 0080 FF02" - $"00C0 0080 FF01 C000 83FF 0040 80FF 0100" - $"0080 FF04 0000 FFFF 0081 FF01 0000 80FF" - $"01C0 0080 FF01 0000 85FF 0100 0082 FF00" - $"0081 FF00 0081 FF01 C000 82FF 0100 0080" - $"FF01 0000 80FF 0400 00FF FF00 81FF 0000" - $"81FF 01C0 0080 FF01 0000 80FF 0100 0080" - $"FF01 0000 82FF 0000 81FF 0000 81FF 01C0" - $"0082 FF01 0000 80FF 0100 0080 FF04 0000" - $"FFFF 0083 FF04 00FF FFC0 0080 FF01 0000" - $"80FF 0100 0080 FF01 0000 82FF 0000 84FF" - $"0300 FFC0 0082 FF01 0000 80FF 0100 0080" - $"FF04 0000 FFFF 0086 FF01 0000 80FF 0100" - $"0080 FF01 0000 80FF 0100 0082 FF00 0087" - $"FF00 0082 FF01 0000 80FF 0100 0080 FF04" - $"0000 FFFF 0087 FF00 0085 FF01 0000 80FF" - $"0100 0082 FF00 0087 FF00 0087 FF01 0000" - $"80FF 0400 00FF FF00 89FF 0100 0087 FF01" - $"0000 82FF 0000 8BFF 0100 0087 FF04 0000" - $"FFFF 008E FF01 0000 89FF 0000 90FF 0100" - $"0086 FF00 0093 FF01 0000 84FF 0000 95FF" - $"0100 0081 FF00 0098 FF04 0000 FFFF 009A" - $"FF01 0000 A8FF AAFF 8800 90FF 8000 86FF" - $"0100 008D FF03 0000 FFC0 8000 83FF 0300" - $"80C0 008A FF09 0000 FFFF C000 00FF FF00" - $"81C0 8100 01C0 0087 FF01 0000 80FF 02C0" - $"0000 81FF 8100 80C0 00FF 8000 84FF 0100" - $"0081 FF03 C000 C000 82FF 81C0 82FF 0100" - $"0081 FF01 0000 82FF 03C0 00C0 0080 FF04" - $"A5FF FF84 A586 FF03 0000 FF00 83FF 04C0" - $"00FF C000 81FF 03A5 A5FF 4088 FF01 0000" - $"82FF 0CC0 00FF C000 FFFF 06A5 A506 FFA5" - $"89FF 0200 FF00 80FF 05C0 00FF FFC0 0083" - $"FF05 A506 FFFF D4D4 84FF 0B00 FFFF 00FF" - $"FFC0 00FF FFC0 0083 FF00 A583 FF01 D4D4" - $"82FF 0000 80FF 0200 C000 80FF 01C0 0083" - $"FF00 4080 FF01 D4D4 80FF 04D4 D4FF FF00" - $"81FF 0100 0080 FF01 C000 80FF 01D4 D485" - $"FF01 D4D4 82FF 0000 81FF 0000 81FF 01C0" - $"0082 FF01 D4D4 80FF 01D4 D480 FF04 D4D4" - $"FFFF 0081 FF00 0081 FF01 C000 80FF 01D4" - $"D480 FF01 D4D4 80FF 01D4 D482 FF00 0081" - $"FF00 0081 FF01 C000 82FF 01D4 D480 FF01" - $"D4D4 80FF 04D4 D4FF FF00 83FF 0400 FFFF" - $"C000 80FF 01D4 D480 FF01 D4D4 80FF 01D4" - $"D482 FF00 0084 FF03 00FF C000 82FF 01D4" - $"D480 FF01 D4D4 80FF 04D4 D4FF FF00 86FF" - $"0100 0080 FF01 D4D4 80FF 01D4 D480 FF01" - $"D4D4 82FF 0000 87FF 0000 82FF 01D4 D480" - $"FF01 D4D4 80FF 04D4 D4FF FF00 87FF 0000" - $"85FF 01D4 D480 FF01 D4D4 82FF 0000 87FF" - $"0000 87FF 01D4 D480 FF04 D4D4 FFFF 0089" - $"FF01 0000 87FF 01D4 D482 FF00 008B FF01" - $"0000 87FF 04D4 D4FF FF00 8EFF 0100 0089" - $"FF00 0090 FF01 0000 86FF 0000 93FF 0100" - $"0084 FF00 0095 FF01 0000 81FF 0000 98FF" - $"0400 00FF FF00 9AFF 0100 00A8 FF6C 386D" - $"6B00 0004 0800 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 FFFF FFFF FFFF FFFF FFFF FF00 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000" - $"0000 0000 0000 0000 0000 0000 0000 FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF 0000 0000 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 00FF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FF00 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FF00 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF 0000 0000 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF 0000 0000 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 00FF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 00FF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00" - $"0000 0000 0000 0000 00FF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000" - $"0000 0000 0000 0000 0000 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000" - $"0000 0000 0000 0000 0000 0000 0000 FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FF00 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 FFFF FFFF FF00 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0069 6368 2300 0002 4800 0000" - $"0000 0000 0000 0000 0000 000F FFF0 0000" - $"0078 001C 0000 0078 001C 0000 038F 0072" - $"0000 1C38 C0FD 8000 1C38 CAFD 8000 E0F0" - $"3F03 C007 01B0 0080 7007 01B0 1400 7038" - $"0241 0C00 0EC0 0CC0 E400 01C0 0C40 E400" - $"01C0 318F 5800 0120 6180 28E0 0620 6380" - $"30E0 0620 8200 C01C 061B 0600 C383 881B" - $"0200 4383 881C 0C38 0070 0818 0C07 070E" - $"3018 1C07 070E 3020 1070 E0E0 3020 500E" - $"1C1C 4020 100E 1C1C 4018 61C1 C380 4004" - $"6038 3871 8004 E038 3871 8003 8387 0701" - $"8000 8070 E0E2 0000 8070 E0E2 0003 000E" - $"1C02 0003 0001 C38C 0003 0001 C38C 0000" - $"E000 380C 0000 1C00 0710 0000 1C00 0710" - $"0000 0380 0010 0000 0070 0060 0000 0070" - $"0060 0000 000E 0060 0000 0001 C080 0000" - $"0001 C080 0000 0000 3880 0000 0000 0700" - $"0000 0000 0700 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 000F FFF0 0000" - $"007F FFFC 0000 007F FFFC 0000 03FF FFFE" - $"0000 1FFF FFFF 8000 1FFF FFFF 8000 FFFF" - $"FFFF C007 FFFF FFFF F007 FFFF FFFF F03F" - $"FFFF FFFF FEFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF3F FFFF FFFF FE3F FFFF" - $"FFFF FE3F FFFF FFFF FE1F FFFF FFFF F81F" - $"FFFF FFFF F81F FFFF FFFF F81F FFFF FFFF" - $"F01F FFFF FFFF F03F FFFF FFFF F03F FFFF" - $"FFFF C03F FFFF FFFF C01F FFFF FFFF C007" - $"FFFF FFFF 8007 FFFF FFFF 8003 FFFF FFFF" - $"8000 FFFF FFFE 0000 FFFF FFFE 0003 FFFF" - $"FFFE 0003 FFFF FFFC 0003 FFFF FFFC 0000" - $"FFFF FFFC 0000 1FFF FFF0 0000 1FFF FFF0" - $"0000 03FF FFF0 0000 007F FFE0 0000 007F" - $"FFE0 0000 000F FFE0 0000 0001 FF80 0000" - $"0001 FF80 0000 0000 3F80 0000 0000 0700" - $"0000 0000 0700 0000 0000 0000 0069 6368" - $"3400 0004 8800 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 000F FFF0 0000 0000 0000 0FFF" - $"0000 0000 0000 0000 0000 0000 000F FFF0" - $"0000 0000 0000 0FFF 0000 0000 0000 0000" - $"0000 0000 FFF0 CCFF FF00 0000 000F FDCC" - $"F000 0000 0000 0000 0000 0FFF 000C FFF0" - $"00FF CCCC CCFF FFFF CFF0 0000 0000 0000" - $"0000 0FFF 000C FFF0 00FF CCCC CCFF FFFF" - $"CFF0 0000 0000 0000 00FF F000 0CCF FF00" - $"0000 FFFF FFCC CC00 FFFF 0000 0000 000F" - $"FF00 0000 CFFC FF00 0000 0CCC CCC0 0000" - $"000F FF00 0000 000F FF00 0000 CFFC FF00" - $"0000 0CCC CCC0 0000 000F FF00 0000 FFF0" - $"0000 00CC FCCF 0000 0500 0445 0000 0000" - $"0000 00FF F0FF 0000 0000 0CFF 0CCF 0000" - $"0055 500E 0000 0000 0000 0000 0FFF 0000" - $"0000 0CFF 0CCF 0000 0055 500E 0000 0000" - $"0000 0000 0FFF 0000 000C CF00 CFF0 0035" - $"5533 0550 0000 0000 0000 0000 0F00 F000" - $"00CF F000 CFF0 0000 0000 5330 0066 6000" - $"0000 000F F000 F000 00CF F000 CFF0 0000" - $"0000 5330 0066 6000 0000 000F F000 F000" - $"CCF0 00CC F000 0000 0055 0000 0000 0666" - $"0000 000F F000 0FFC FF00 00CC F000 0000" - $"00EE 0000 6660 0000 6660 00F0 0000 0FFC" - $"FF00 00CC F000 0000 00EE 0000 6660 0000" - $"6660 00F0 0000 0FFF 0000 0CFF 0000 6660" - $"0000 0000 0006 6600 0000 00F0 0000 0FF0" - $"0000 0CFF 0000 0006 6600 0006 6600 0066" - $"6000 FF00 0000 0FF0 0000 0CFF 0000 0006" - $"6600 0006 6600 0066 6000 FF00 0000 F000" - $"000C CF00 0006 6600 0066 6000 0066 6000" - $"0000 FF00 0000 F000 000C CF00 0000 0066" - $"6000 0666 0000 0666 000F 0000 0000 F000" - $"000C CF00 0000 0066 6000 0666 0000 0666" - $"000F 0000 0000 0FF0 00CF F000 0666 0000" - $"0666 0000 6660 0000 000F 0000 0000 000F" - $"00CF F000 0000 6660 0000 6660 0006 6600" - $"0FF0 0000 0000 000F 00CF F000 0000 6660" - $"0000 6660 0006 6600 0FF0 0000 0000 0000" - $"FFF0 0000 6660 0006 6600 0006 6600 0000" - $"0FF0 0000 0000 0000 00F0 0000 0006 6600" - $"0066 6000 0066 6000 F000 0000 0000 0000" - $"00F0 0000 0006 6600 0066 6000 0066 6000" - $"F000 0000 0000 0000 FF00 0000 0000 0066" - $"6000 0666 0000 0000 F000 0000 0000 0000" - $"FF00 0000 0000 0000 0666 0000 6660 00FF" - $"0000 0000 0000 0000 FF00 0000 0000 0000" - $"0666 0000 6660 00FF 0000 0000 0000 0000" - $"00FF F000 0000 0000 0000 6660 0000 00FF" - $"0000 0000 0000 0000 0000 0FFF 0000 0000" - $"0000 0006 6600 0F00 0000 0000 0000 0000" - $"0000 0FFF 0000 0000 0000 0006 6600 0F00" - $"0000 0000 0000 0000 0000 0000 FFF0 0000" - $"0000 0000 0000 0F00 0000 0000 0000 0000" - $"0000 0000 000F FF00 0000 0000 000F F000" - $"0000 0000 0000 0000 0000 0000 000F FF00" - $"0000 0000 000F F000 0000 0000 0000 0000" - $"0000 0000 0000 00FF F000 0000 000F F000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0FFF 0000 00F0 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0FFF 0000 00F0 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 FFF0 00F0 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 000F FF00 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 000F FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0069 6368 3800 0009 0800 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 FFFF" - $"FFFF 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 FFFF" - $"FFFF 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF 00F7" - $"2BFF FFFF FF00 0000 0000 0000 0000 FFFF" - $"FAF7 2BFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FF00 0000 2BFF" - $"FFFF 0000 00FF FF2B F7F7 2BF7 2BFF FFFF" - $"FFFF FF2B FFFF 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FF00 0000 F7FF" - $"FFFF 0000 00FF FFF7 F72B F7F7 F7FF FFFF" - $"FFFF FFF7 FFFF 0000 0000 0000 0000 0000" - $"0000 0000 00FF FFFF 0000 0000 2BF7 FFFF" - $"FF00 0000 0000 00FF FFFF FFFF FF2B F72B" - $"F700 00FF FFFF FF00 0000 0000 0000 0000" - $"0000 FFFF FF00 0000 0000 002B FFFF 2BFF" - $"FF00 0000 0000 0000 F7F7 2BF7 2BF7 0000" - $"0000 0000 0000 FFFF FF00 0000 0000 0000" - $"0000 FFFF FF00 0000 0000 00F7 FFFF F7FF" - $"FF00 0000 0000 0000 2BF7 F72B F7F7 0000" - $"0000 0000 0000 FFFF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 002B F7FF F72B FF00" - $"0000 0000 B000 0000 2120 B000 0000 0000" - $"0000 0000 0000 0000 00FF FFFF 00FF FF00" - $"0000 0000 0000 0000 F7FF FF00 2BF7 FF00" - $"0000 0000 00B0 B0B0 0000 FC00 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FF00" - $"0000 0000 0000 0000 2BFF FF00 F7F7 FF00" - $"0000 0000 008C B08B 0000 AC00 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FF00" - $"0000 0000 0000 F7F7 FF00 002B FFFF 0000" - $"00D8 B0B0 8C47 D700 B0B0 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FF00 00FF" - $"0000 0000 002B FFFF 0000 00F7 FFFF 0000" - $"0000 0000 0000 00B0 D7D7 0000 00EC D3EC" - $"0000 0000 0000 0000 0000 FFFF 0000 00FF" - $"0000 0000 00F7 FFFF 0000 002B FFFF 0000" - $"0000 0000 0000 00B0 D7D8 0000 00D3 ECD3" - $"0000 0000 0000 0000 0000 FFFF 0000 00FF" - $"0000 002B F7FF 0000 00F7 2BFF 0000 0000" - $"0000 0000 00B0 B000 0000 0000 0000 0000" - $"ECD3 EC00 0000 0000 0000 FFFF 0000 0000" - $"FFFF F7FF FF00 0000 002B F7FF 0000 0000" - $"0000 0000 00FC FC00 0000 00EC D3EC 0000" - $"0000 00EC D3EC 0000 00FF 0000 0000 0000" - $"FFFF 2BFF FF00 0000 00F7 F7FF 0000 0000" - $"0000 0000 00FC FC00 0000 00D3 ECD3 0000" - $"0000 00D3 ECD3 0000 00FF 0000 0000 0000" - $"FFFF FF00 0000 0000 2BFF FF00 0000 00EC" - $"D3EC 0000 0000 0000 0000 0000 0000 D3EC" - $"D300 0000 0000 0000 00FF 0000 0000 0000" - $"FFFF 0000 0000 0000 F7FF FF00 0000 0000" - $"0000 ECD3 EC00 0000 0000 ECD3 EC00 0000" - $"00EC D3EC 0000 00FF FF00 0000 0000 0000" - $"FFFF 0000 0000 0000 2BFF FF00 0000 0000" - $"0000 D3EC D300 0000 0000 D3EC D300 0000" - $"00D3 ECD3 0000 00FF FF00 0000 0000 00FF" - $"0000 0000 0000 F72B FF00 0000 0000 ECD3" - $"EC00 0000 00EC D3EC 0000 0000 00EC D3EC" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"0000 0000 0000 2BF7 FF00 0000 0000 0000" - $"00D3 ECD3 0000 0000 ECD3 EC00 0000 0000" - $"D3EC D300 0000 FF00 0000 0000 0000 00FF" - $"0000 0000 0000 F7F7 FF00 0000 0000 0000" - $"00EC D3EC 0000 0000 D3EC D300 0000 0000" - $"ECD3 EC00 0000 FF00 0000 0000 0000 0000" - $"FFFF 0000 002B FFFF 0000 0000 ECD3 EC00" - $"0000 0000 D3EC D300 0000 00D3 ECD3 0000" - $"0000 0000 0000 FF00 0000 0000 0000 0000" - $"0000 FF00 00F7 FFFF 0000 0000 0000 00D3" - $"ECD3 0000 0000 00EC D3EC 0000 0000 D3EC" - $"D300 0000 FFFF 0000 0000 0000 0000 0000" - $"0000 FF00 002B FFFF 0000 0000 0000 00D3" - $"D3EC 0000 0000 00D3 ECD3 0000 0000 ECD3" - $"EC00 0000 FFFF 0000 0000 0000 0000 0000" - $"0000 00FF FFFF 0000 0000 00EC D3EC 0000" - $"0000 D3EC D300 0000 0000 D3EC D300 0000" - $"0000 0000 FFFF 0000 0000 0000 0000 0000" - $"0000 0000 00FF 0000 0000 0000 0000 D3EC" - $"EC00 0000 00EC D3EC 0000 0000 00EC D3EC" - $"0000 00FF 0000 0000 0000 0000 0000 0000" - $"0000 0000 00FF 0000 0000 0000 0000 ECD3" - $"D300 0000 00D3 ECD3 0000 0000 00D3 ECD3" - $"0000 00FF 0000 0000 0000 0000 0000 0000" - $"0000 00FF FF00 0000 0000 0000 0000 0000" - $"00EC D3EC 0000 0000 ECD3 EC00 0000 0000" - $"0000 00FF 0000 0000 0000 0000 0000 0000" - $"0000 00FF FF00 0000 0000 0000 0000 0000" - $"0000 0000 D3EC D300 0000 00D3 ECD3 0000" - $"00FF FF00 0000 0000 0000 0000 0000 0000" - $"0000 00FF FF00 0000 0000 0000 0000 0000" - $"0000 0000 ECD3 EC00 0000 00EC D3EC 0000" - $"00FF FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 00FF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 00D3 ECD3 0000 0000 0000" - $"00FF FF00 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FF00 0000 0000" - $"0000 0000 0000 0000 0000 D3EC D300 0000" - $"FF00 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FF00 0000 0000" - $"0000 0000 0000 0000 0000 ECD3 EC00 0000" - $"FF00 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FF00 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 FFFF" - $"FF00 0000 0000 0000 0000 0000 0000 FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 FFFF" - $"FF00 0000 0000 0000 0000 0000 0000 FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"00FF FFFF 0000 0000 0000 0000 0000 FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FF00 0000 0000 00FF 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FF00 0000 0000 00FF 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFFF 0000 00FF 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FFFF FF00 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FFFF FF00 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0069 6833" - $"3200 000A 1CF1 FF8D 009A FF81 008B FF80" - $"0098 FF81 008B FF80 0095 FF80 0002 FFC0" - $"C081 0086 FF05 0000 80C0 C000 91FF 8000" - $"80FF 00C0 8000 80FF 0100 0083 C083 0002" - $"C000 008F FF80 0080 FF00 C080 0080 FF01" - $"0000 83C0 8300 02C0 0000 8CFF 8000 81FF" - $"01C0 C080 0083 FF83 0081 C001 FFFF 8100" - $"88FF 8000 83FF 05C0 0000 C000 0084 FF83" - $"C085 FF80 0086 FF80 0083 FF05 C000 00C0" - $"0000 84FF 83C0 85FF 8000 83FF 8000 84FF" - $"05C0 C000 C0C0 0082 FF00 4680 FF02 F2F2" - $"468B FF80 0002 FF00 0086 FF06 C000 00FF" - $"C0C0 0083 FF80 4602 FFFF 408E FF80 0086" - $"FF06 C000 00FF C0C0 0083 FF80 4602 FFFF" - $"408E FF80 0084 FF07 C0C0 00FF FFC0 0000" - $"80FF 00DD 8046 04DD DDFF 4646 8FFF 0300" - $"FFFF 0082 FF02 C000 0080 FF02 C000 0086" - $"FF02 46DD DD80 FF80 0087 FF01 0000 80FF" - $"0000 82FF 02C0 0000 80FF 02C0 0000 86FF" - $"0246 DDDD 80FF 8000 87FF 0100 0080 FF00" - $"0080 FF02 C0C0 0080 FF02 C0C0 0086 FF01" - $"4646 86FF 8000 84FF 0100 0081 FF04 0000" - $"C000 0081 FF02 C0C0 0086 FF01 4040 81FF" - $"8000 82FF 8000 80FF 0000 83FF 0400 00C0" - $"0000 81FF 02C0 C000 86FF 0140 4081 FF80" - $"0082 FF80 0080 FF00 0083 FF80 0082 FF02" - $"C000 0081 FF80 0089 FF80 0085 FF00 0083" - $"FF01 0000 83FF 02C0 0000 84FF 8000 82FF" - $"8000 81FF 8000 80FF 0100 0084 FF01 0000" - $"83FF 02C0 0000 84FF 8000 82FF 8000 81FF" - $"8000 80FF 0100 0083 FF00 0083 FF02 C0C0" - $"0082 FF80 0081 FF80 0082 FF80 0084 FF01" - $"0000 83FF 0000 83FF 02C0 C000 85FF 8000" - $"81FF 8000 82FF 8000 80FF 0000 85FF 0000" - $"83FF 02C0 C000 85FF 8000 81FF 8000 82FF" - $"8000 80FF 0000 86FF 0100 0080 FF02 C000" - $"0081 FF80 0082 FF80 0081 FF80 0085 FF00" - $"0088 FF05 00FF FFC0 0000 84FF 8000 82FF" - $"8000 81FF 8000 80FF 0100 0089 FF05 00FF" - $"FFC0 0000 84FF 8000 82FF 8000 81FF 8000" - $"80FF 0100 008A FF80 0082 FF80 0081 FF80" - $"0082 FF80 0084 FF01 0000 8CFF 0000 85FF" - $"8000 81FF 8000 82FF 8000 80FF 0000 8EFF" - $"0000 85FF 8000 81FF 8000 82FF 8000 80FF" - $"0000 8CFF 0100 0089 FF80 0081 FF80 0085" - $"FF00 008C FF01 0000 8CFF 8000 81FF 8000" - $"80FF 0100 008D FF01 0000 8CFF 8000 81FF" - $"8000 80FF 0100 008F FF80 008C FF80 0084" - $"FF01 0000 92FF 8000 8CFF 8000 80FF 0000" - $"94FF 8000 8CFF 8000 80FF 0000 97FF 8000" - $"8FFF 0000 9AFF 8000 8AFF 0100 009B FF80" - $"008A FF01 0000 9EFF 8000 87FF 0100 00A1" - $"FF80 0083 FF00 00A3 FF80 0083 FF00 00A6" - $"FF80 0080 FF00 00A9 FF80 00AA FF80 00BD" - $"FFF1 FF8D 009A FF81 008B FF80 0098 FF81" - $"008B FF80 0095 FF80 0002 FFC0 C081 0086" - $"FF05 0000 80C0 C000 91FF 8000 80FF 00C0" - $"8000 80FF 0100 0083 C083 0002 C000 008F" - $"FF80 0080 FF00 C080 0080 FF01 0000 83C0" - $"8300 02C0 0000 8CFF 8000 81FF 01C0 C080" - $"0083 FF83 0081 C001 FFFF 8100 88FF 8000" - $"83FF 05C0 0000 C000 0084 FF83 C085 FF80" - $"0086 FF80 0083 FF05 C000 00C0 0000 84FF" - $"83C0 85FF 8000 83FF 8000 84FF 05C0 C000" - $"C0C0 0082 FF00 0080 FF02 0808 008B FF80" - $"0002 FF00 0086 FF06 C000 00FF C0C0 0083" - $"FF80 0002 FFFF 408E FF80 0086 FF06 C000" - $"00FF C0C0 0083 FF80 0002 FFFF 408E FF80" - $"0084 FF07 C0C0 00FF FFC0 0000 80FF 0008" - $"8000 0408 08FF 0000 8FFF 0300 FFFF 0082" - $"FF02 C000 0080 FF02 C000 0086 FF02 0008" - $"0880 FF80 0087 FF01 0000 80FF 0000 82FF" - $"02C0 0000 80FF 02C0 0000 86FF 0200 0808" - $"80FF 8000 87FF 0100 0080 FF00 0080 FF02" - $"C0C0 0080 FF02 C0C0 0086 FF01 0000 86FF" - $"8000 84FF 0100 0081 FF04 0000 C000 0081" - $"FF02 C0C0 0086 FF01 4040 81FF 8000 82FF" - $"8000 80FF 0000 83FF 0400 00C0 0000 81FF" - $"02C0 C000 86FF 0140 4081 FF80 0082 FF80" - $"0080 FF00 0083 FF80 0082 FF02 C000 0081" - $"FF80 0089 FF80 0085 FF00 0083 FF01 0000" - $"83FF 02C0 0000 84FF 8000 82FF 8000 81FF" - $"8000 80FF 0100 0084 FF01 0000 83FF 02C0" - $"0000 84FF 8000 82FF 8000 81FF 8000 80FF" - $"0100 0083 FF00 0083 FF02 C0C0 0082 FF80" - $"0081 FF80 0082 FF80 0084 FF01 0000 83FF" - $"0000 83FF 02C0 C000 85FF 8000 81FF 8000" - $"82FF 8000 80FF 0000 85FF 0000 83FF 02C0" - $"C000 85FF 8000 81FF 8000 82FF 8000 80FF" - $"0000 86FF 0100 0080 FF02 C000 0081 FF80" - $"0082 FF80 0081 FF80 0085 FF00 0088 FF05" - $"00FF FFC0 0000 84FF 8000 82FF 8000 81FF" - $"8000 80FF 0100 0089 FF05 00FF FFC0 0000" - $"84FF 8000 82FF 8000 81FF 8000 80FF 0100" - $"008A FF80 0082 FF80 0081 FF80 0082 FF80" - $"0084 FF01 0000 8CFF 0000 85FF 8000 81FF" - $"8000 82FF 8000 80FF 0000 8EFF 0000 85FF" - $"8000 81FF 8000 82FF 8000 80FF 0000 8CFF" - $"0100 0089 FF80 0081 FF80 0085 FF00 008C" - $"FF01 0000 8CFF 8000 81FF 8000 80FF 0100" - $"008D FF01 0000 8CFF 8000 81FF 8000 80FF" - $"0100 008F FF80 008C FF80 0084 FF01 0000" - $"92FF 8000 8CFF 8000 80FF 0000 94FF 8000" - $"8CFF 8000 80FF 0000 97FF 8000 8FFF 0000" - $"9AFF 8000 8AFF 0100 009B FF80 008A FF01" - $"0000 9EFF 8000 87FF 0100 00A1 FF80 0083" - $"FF00 00A3 FF80 0083 FF00 00A6 FF80 0080" - $"FF00 00A9 FF80 00AA FF80 00BD FFF1 FF8D" - $"009A FF81 008B FF80 0098 FF81 008B FF80" - $"0095 FF80 0002 FFC0 C081 0086 FF05 0000" - $"80C0 C000 91FF 8000 80FF 00C0 8000 80FF" - $"0100 0083 C083 0002 C000 008F FF80 0080" - $"FF00 C080 0080 FF01 0000 83C0 8300 02C0" - $"0000 8CFF 8000 81FF 01C0 C080 0083 FF83" - $"0081 C001 FFFF 8100 88FF 8000 83FF 05C0" - $"0000 C000 0084 FF83 C085 FF80 0086 FF80" - $"0083 FF05 C000 00C0 0000 84FF 83C0 85FF" - $"8000 83FF 8000 84FF 05C0 C000 C0C0 0082" - $"FF00 A580 FF02 8484 A58B FF80 0002 FF00" - $"0086 FF06 C000 00FF C0C0 0083 FF80 A502" - $"FFFF 408E FF80 0086 FF06 C000 00FF C0C0" - $"0083 FF80 A502 FFFF 408E FF80 0084 FF07" - $"C0C0 00FF FFC0 0000 80FF 0006 80A5 0406" - $"06FF A5A5 8FFF 0300 FFFF 0082 FF02 C000" - $"0080 FF02 C000 0086 FF02 A506 0680 FF80" - $"D487 FF01 0000 80FF 0000 82FF 02C0 0000" - $"80FF 02C0 0000 86FF 02A5 0606 80FF 80D4" - $"87FF 0100 0080 FF00 0080 FF02 C0C0 0080" - $"FF02 C0C0 0086 FF01 A5A5 86FF 80D4 84FF" - $"0100 0081 FF04 0000 C000 0081 FF02 C0C0" - $"0086 FF01 4040 81FF 80D4 82FF 80D4 80FF" - $"0000 83FF 0400 00C0 0000 81FF 02C0 C000" - $"86FF 0140 4081 FF80 D482 FF80 D480 FF00" - $"0083 FF80 0082 FF02 C000 0081 FF80 D489" - $"FF80 D485 FF00 0083 FF01 0000 83FF 02C0" - $"0000 84FF 80D4 82FF 80D4 81FF 80D4 80FF" - $"0100 0084 FF01 0000 83FF 02C0 0000 84FF" - $"80D4 82FF 80D4 81FF 80D4 80FF 0100 0083" - $"FF00 0083 FF02 C0C0 0082 FF80 D481 FF80" - $"D482 FF80 D484 FF01 0000 83FF 0000 83FF" - $"02C0 C000 85FF 80D4 81FF 80D4 82FF 80D4" - $"80FF 0000 85FF 0000 83FF 02C0 C000 85FF" - $"80D4 81FF 80D4 82FF 80D4 80FF 0000 86FF" - $"0100 0080 FF02 C000 0081 FF80 D482 FF80" - $"D481 FF80 D485 FF00 0088 FF05 00FF FFC0" - $"0000 84FF 80D4 82FF 80D4 81FF 80D4 80FF" - $"0100 0089 FF05 00FF FFC0 0000 84FF 80D4" - $"82FF 80D4 81FF 80D4 80FF 0100 008A FF80" - $"0082 FF80 D481 FF80 D482 FF80 D484 FF01" - $"0000 8CFF 0000 85FF 80D4 81FF 80D4 82FF" - $"80D4 80FF 0000 8EFF 0000 85FF 80D4 81FF" - $"80D4 82FF 80D4 80FF 0000 8CFF 0100 0089" - $"FF80 D481 FF80 D485 FF00 008C FF01 0000" - $"8CFF 80D4 81FF 80D4 80FF 0100 008D FF01" - $"0000 8CFF 80D4 81FF 80D4 80FF 0100 008F" - $"FF80 008C FF80 D484 FF01 0000 92FF 8000" - $"8CFF 80D4 80FF 0000 94FF 8000 8CFF 80D4" - $"80FF 0000 97FF 8000 8FFF 0000 9AFF 8000" - $"8AFF 0100 009B FF80 008A FF01 0000 9EFF" - $"8000 87FF 0100 00A1 FF80 0083 FF00 00A3" - $"FF80 0083 FF00 00A6 FF80 0080 FF00 00A9" - $"FF80 00AA FF80 00BD FF68 386D 6B00 0009" - $"0800 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000" - $"0000 0000 0000 0000 00FF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000" - $"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000" - $"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF00 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000" - $"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000" - $"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000" - $"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000" - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000" - $"0000 0000 0000 0000 00FF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 00FF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 00FF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FF00 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 FFFF" - $"FF00 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 FFFF" - $"FF00 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0069 6373 2300 0000 4801 5002 0816 B444" - $"4295 0108 5042 2288 8835 5442 2021 4820" - $"A008 1002 0000 A000 0003 F00F F83F FCFF" - $"FFFF FFFF FF7F FEFF FEFF FC7F FC3F F83F" - $"F81F F007 F001 E000 6069 6373 3400 0000" - $"8800 0000 CDDD DD00 0000 00CD ED00 0ED0" - $"0000 CDCD E0DE DDEE 00CD C0DD CC0C C00C" - $"DCD0 0CCE CC5C 0000 0DD0 DCDC 00CC CDC0" - $"0D0E C0D0 D0C0 DDCC D0CC 0DCC CDDC DCD0" - $"D0CC 0D0D CDCD DCCD 000C DCCC DDCD CD0D" - $"0000 D00C DCDD CCD0 0000 DC00 0CDC D0D0" - $"0000 0CDC 000C CD00 0000 000C DC00 0D00" - $"0000 0000 0CDC D000 0000 0000 000C C000" - $"0069 6373 3800 0001 0800 0000 0000 002B" - $"FAF9 FAF9 FA00 0000 0000 0000 00F7 F9FD" - $"F900 0000 FBFA 0000 0000 002B FA2B 56FC" - $"0081 81FB 8181 FC00 002B FAF7 0056 FBF7" - $"2A00 5CF5 0000 2BFA 2BFA 0000 F8F8 FA07" - $"5B62 5500 0000 0000 FAF9 0056 F7F8 F700" - $"0055 072A 7F2A 0000 F900 FD2B F581 007E" - $"002B 007F 542A 2AFA 00F7 2B00 56F7 2AF6" - $"5A79 3054 2A7F 00FA 002B F7F5 FA00 7E2A" - $"7930 795A 2A2A FA00 0000 2B81 F72A 2A79" - $"5A2A 782A 7F00 FA00 0000 00FA 0000 2A7F" - $"2A7F 5A2A 2AFA 0000 0000 00F9 F700 F500" - $"2A54 2A7F 00F9 0000 0000 0000 F7F9 F700" - $"00F5 2A2A FA00 0000 0000 0000 0000 2BFA" - $"F700 0000 FA00 0000 0000 0000 0000 0000" - $"F7FA F7FA 0000 0000 0000 0000 0000 0000" - $"0000 F72B 0000 0000 0069 7333 3200 0002" - $"7583 FF00 C082 8085 FF03 C080 3080 80FF" - $"0160 7082 FF06 C080 C0A0 40FF 7080 601D" - $"7040 FFFF C080 C0FF A060 C0D1 FFAE E0FF" - $"FFC0 80C0 80FF FFA0 B070 F7A3 9BA2 82FF" - $"2480 80FF A0C0 A0C0 FFFF A3F7 C080 C0FF" - $"FF80 FF30 C0F0 70FF 80FF D0FF 8080 C0C0" - $"80FF C0C0 FFA0 80C0 1680 80C0 80C0 80FF" - $"80FF C0C0 F070 FF80 C080 C080 80C0 C080" - $"80FF 01C0 7080 C007 8080 C080 C080 FF80" - $"81FF 0A80 FFFF C080 C080 80C0 C080 82FF" - $"0180 C080 FF05 C080 C080 FF80 83FF 02C0" - $"80C0 80FF 02C0 C080 86FF 02C0 80C0 80FF" - $"0080 88FF 03C0 80C0 808B FF01 C0C0 82FF" - $"83FF 00C0 8280 85FF 03C0 8030 8080 FF01" - $"6070 82FF 06C0 80C0 A040 FF70 8060 1D70" - $"40FF FFC0 80C0 FFA0 60C0 C0FF 62E0 FFFF" - $"C080 C080 FFFF A0B0 70C2 8042 9082 FF24" - $"8080 FFA0 C0A0 C0FF FF80 C2C0 80C0 FFFF" - $"80FF 30C0 F070 FF80 FFD0 FF80 80C0 C080" - $"FFC0 C0FF A080 C016 8080 C080 C080 FF80" - $"FFC0 C0F0 70FF 80C0 80C0 8080 C0C0 8080" - $"FF01 C070 80C0 0780 80C0 80C0 80FF 8081" - $"FF0A 80FF FFC0 80C0 8080 C0C0 8082 FF01" - $"80C0 80FF 05C0 80C0 80FF 8083 FF02 C080" - $"C080 FF02 C0C0 8086 FF02 C080 C080 FF00" - $"8088 FF03 C080 C080 8BFF 01C0 C082 FF83" - $"FF00 C082 8085 FF03 C080 3080 80FF 0160" - $"7082 FF06 C080 C0A0 40FF 7080 601D 7040" - $"FFFF C080 C0FF A060 C0E9 FFAB E0FF FFC0" - $"80C0 80FF FFA0 B070 C1D2 94B9 82FF 3E80" - $"80FF A0C0 A0C0 FFFF D2C1 F5EA F5FF FF80" - $"FF30 C0F0 70FF EAFF D0FF EAEA F5F5 80FF" - $"C0C0 FFA0 C0F5 F5EA EAF5 EAF5 EAFF 80FF" - $"C0C0 F070 FFEA F5EA F5EA EAF5 F580 80FF" - $"0CC0 70C0 F5F5 EAEA F5EA F5EA FF80 81FF" - $"0A80 FFFF F5EA F5EA EAF5 F580 82FF 0180" - $"C080 FF05 F5EA F5EA FF80 83FF 02C0 80C0" - $"80FF 02F5 F580 86FF 02C0 80C0 80FF 0080" - $"88FF 03C0 80C0 808B FF01 C0C0 82FF 7338" - $"6D6B 0000 0108 0000 0000 0000 FFFF FFFF" - $"FFFF 0000 0000 0000 0000 FFFF FFFF FFFF" - $"FFFF FF00 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FF00 FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FF00 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FF00 0000 0000 00FF FFFF FFFF FFFF" - $"FFFF 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF 0000 0000 0000 0000 0000 00FF FFFF" - $"FF00 0000 0000 0000 0000 0000 0000 00FF" - $"FF00 0000 0000 6963 6D23 0000 0038 0250" - $"0A98 2444 8481 2828 4292 1144 2490 2148" - $"0420 0110 0040 07F8 1FFC FFFF FFFF FFFF" - $"FFFE FFFC 3FFC 3FF8 1FF0 03F0 00E0 6963" - $"6D34 0000 0068 0000 0CDC CDCD C000 000C" - $"DCED D0CF DC00 CCCC CECC 0EC0 CDCC D00D" - $"CDC0 5CCC 000D CCE0 E000 C0DC DCCC CD0C" - $"CCDC CCCD C0D0 CC0D 0C7C C5CD CD00 00A0" - $"050D 50DC CC00 00DC 00CC C7C0 D000 0000" - $"DCC0 000D 0000 0000 00CD C0CC 0000 0000" - $"0000 CCD0 0000 6963 6D38 0000 00C8 0000" - $"0000 00F6 FAF8 F8F8 F8F9 F600 0000 0000" - $"00F7 F9F8 ACFA F7F6 F7FE FBF7 0000 F6F8" - $"F8F6 F781 F806 2B87 F7F5 F6FA F8F6 FA00" - $"0056 F7FA 0730 5C32 2A2A 0000 00FA 2BF8" - $"8100 FB00 0000 5500 542A 7F2A F72B F6FA" - $"00F7 F82A 5A4F 542A 5455 5400 F900 2BF8" - $"F581 004E 7F30 4E5B 4E7E F5FA 0000 0000" - $"AC00 2A5B 2A78 5B4E 5B2A F72B 0000 0000" - $"F9F6 0000 2A30 4E5B 4E00 FA00 0000 0000" - $"00F6 F856 F600 002A 2AFA 0000 0000 0000" - $"0000 0000 F7FA 2B00 F7F7 0000 0000 0000" - $"0000 0000 0000 2BF8 F800 0000 0000 6974" - $"3332 0000 1A5E 0000 0000 FFFF FFFF FFFF" - $"FFFF A9FF A900 D1FF A900 D1FF A900 D1FF" - $"A900 C9FF 8900 A1FF 8500 C5FF 8900 A1FF" - $"8500 C5FF 8900 A1FF 8500 C5FF 8900 A1FF" - $"8500 BDFF 8500 81FF 81C0 8900 95FF 8100" - $"8180 81C0 8100 B9FF 8500 81FF 81C0 8900" - $"95FF 8100 8180 81C0 8100 B9FF 8500 81FF" - $"81C0 8900 95FF 8100 8180 81C0 8100 B9FF" - $"8500 81FF 81C0 8900 95FF 8100 8180 81C0" - $"8100 B1FF 8500 85FF 81C0 8500 85FF 8100" - $"8DC0 8D00 81C0 8100 ADFF 8500 85FF 81C0" - $"8500 85FF 8100 8DC0 8D00 81C0 8100 ADFF" - $"8500 85FF 81C0 8500 85FF 8100 8DC0 8D00" - $"81C0 8100 ADFF 8500 85FF 81C0 8500 85FF" - $"8100 8DC0 8D00 81C0 8100 A5FF 8500 89FF" - $"81C0 8500 8DFF 8D00 89C0 81FF 8900 A1FF" - $"8500 89FF 81C0 8500 8DFF 8D00 89C0 81FF" - $"8900 A1FF 8500 89FF 81C0 8500 8DFF 8D00" - $"89C0 81FF 8900 A1FF 8500 89FF 81C0 8500" - $"8DFF 8D00 89C0 81FF 8900 99FF 8500 8DFF" - $"81C0 8100 81C0 8100 91FF 8DC0 91FF 8500" - $"95FF 8500 8DFF 81C0 8100 81C0 8100 91FF" - $"8DC0 91FF 8500 95FF 8500 8DFF 81C0 8100" - $"81C0 8100 91FF 8DC0 91FF 8500 95FF 8500" - $"8DFF 81C0 8100 81C0 8100 91FF 8DC0 91FF" - $"8500 8DFF 8500 91FF 81C0 8100 81C0 8100" - $"89FF 8146 85FF 81F2 8146 A1FF 8500 85FF" - $"8500 91FF 81C0 8100 81C0 8100 89FF 8146" - $"85FF 81F2 8146 A1FF 8500 85FF 8500 91FF" - $"81C0 8100 81C0 8100 89FF 8146 85FF 81F2" - $"8146 A1FF 8500 85FF 8500 91FF 81C0 8100" - $"81C0 8100 89FF 8146 85FF 81F2 8146 A1FF" - $"8500 81FF 8100 95FF 81C0 8100 81FF 81C0" - $"8100 8DFF 8546 81FF 8140 A9FF 8500 95FF" - $"81C0 8100 81FF 81C0 8100 8DFF 8546 81FF" - $"8140 A9FF 8500 95FF 81C0 8100 81FF 81C0" - $"8100 8DFF 8546 81FF 8140 A9FF 8500 95FF" - $"81C0 8100 81FF 81C0 8100 8DFF 8546 81FF" - $"8140 A9FF 8500 91FF 81C0 8100 81FF 81C0" - $"8100 85FF 81DD 8546 81DD 81FF 8146 ADFF" - $"8500 91FF 81C0 8100 81FF 81C0 8100 85FF" - $"81DD 8546 81DD 81FF 8146 ADFF 8500 91FF" - $"81C0 8100 81FF 81C0 8100 85FF 81DD 8546" - $"81DD 81FF 8146 ADFF 8500 91FF 81C0 8100" - $"81FF 81C0 8100 85FF 81DD 8546 81DD 81FF" - $"8146 ADFF 8100 81FF 8100 89FF 81C0 8100" - $"85FF 81C0 8100 95FF 8146 81DD 85FF 8500" - $"99FF 8100 85FF 8100 89FF 81C0 8100 85FF" - $"81C0 8100 95FF 8146 81DD 85FF 8500 99FF" - $"8100 85FF 8100 89FF 81C0 8100 85FF 81C0" - $"8100 95FF 8146 81DD 85FF 8500 99FF 8100" - $"85FF 8100 89FF 81C0 8100 85FF 81C0 8100" - $"95FF 8146 81DD 85FF 8500 99FF 8100 85FF" - $"8100 85FF 81C0 8100 85FF 81C0 8100 95FF" - $"8146 95FF 8500 91FF 8100 85FF 8100 85FF" - $"81C0 8100 85FF 81C0 8100 95FF 8146 95FF" - $"8500 91FF 8100 85FF 8100 85FF 81C0 8100" - $"85FF 81C0 8100 95FF 8146 95FF 8500 91FF" - $"8100 85FF 8100 85FF 81C0 8100 85FF 81C0" - $"8100 95FF 8146 95FF 8500 91FF 8100 89FF" - $"8100 81C0 8100 89FF 81C0 8100 95FF 8140" - $"89FF 8500 89FF 8500 85FF 8100 8DFF 8100" - $"81C0 8100 89FF 81C0 8100 95FF 8140 89FF" - $"8500 89FF 8500 85FF 8100 8DFF 8100 81C0" - $"8100 89FF 81C0 8100 95FF 8140 89FF 8500" - $"89FF 8500 85FF 8100 8DFF 8100 81C0 8100" - $"89FF 81C0 8100 95FF 8140 89FF 8500 89FF" - $"8500 85FF 8100 8DFF 8500 89FF 81C0 8100" - $"89FF 8500 9DFF 8500 91FF 8100 8DFF 8500" - $"89FF 81C0 8100 89FF 8500 9DFF 8500 91FF" - $"8100 8DFF 8500 89FF 81C0 8100 89FF 8500" - $"9DFF 8500 91FF 8100 8DFF 8500 89FF 81C0" - $"8100 89FF 8500 9DFF 8500 91FF 8100 8DFF" - $"8100 8DFF 81C0 8100 91FF 8500 89FF 8500" - $"89FF 8500 85FF 8100 91FF 8100 8DFF 81C0" - $"8100 91FF 8500 89FF 8500 89FF 8500 85FF" - $"8100 91FF 8100 8DFF 81C0 8100 91FF 8500" - $"89FF 8500 89FF 8500 85FF 8100 91FF 8100" - $"8DFF 81C0 8100 91FF 8500 89FF 8500 89FF" - $"8500 85FF 8100 8DFF 8100 8DFF 81C0 8100" - $"89FF 8500 89FF 8500 89FF 8500 91FF 8100" - $"8DFF 8100 8DFF 81C0 8100 89FF 8500 89FF" - $"8500 89FF 8500 91FF 8100 8DFF 8100 8DFF" - $"81C0 8100 89FF 8500 89FF 8500 89FF 8500" - $"91FF 8100 8DFF 8100 8DFF 81C0 8100 89FF" - $"8500 89FF 8500 89FF 8500 91FF 8100 8DFF" - $"8100 8DFF 81C0 8100 91FF 8500 89FF 8500" - $"89FF 8500 85FF 8100 91FF 8100 8DFF 81C0" - $"8100 91FF 8500 89FF 8500 89FF 8500 85FF" - $"8100 91FF 8100 8DFF 81C0 8100 91FF 8500" - $"89FF 8500 89FF 8500 85FF 8100 91FF 8100" - $"8DFF 81C0 8100 91FF 8500 89FF 8500 89FF" - $"8500 85FF 8100 95FF 8100 85FF 81C0 8100" - $"89FF 8500 89FF 8500 89FF 8500 91FF 8100" - $"95FF 8100 85FF 81C0 8100 89FF 8500 89FF" - $"8500 89FF 8500 91FF 8100 95FF 8100 85FF" - $"81C0 8100 89FF 8500 89FF 8500 89FF 8500" - $"91FF 8100 95FF 8100 85FF 81C0 8100 89FF" - $"8500 89FF 8500 89FF 8500 91FF 8100 99FF" - $"8100 81FF 81C0 8100 91FF 8500 89FF 8500" - $"89FF 8500 85FF 8100 9DFF 8100 81FF 81C0" - $"8100 91FF 8500 89FF 8500 89FF 8500 85FF" - $"8100 9DFF 8100 81FF 81C0 8100 91FF 8500" - $"89FF 8500 89FF 8500 85FF 8100 9DFF 8100" - $"81FF 81C0 8100 91FF 8500 89FF 8500 89FF" - $"8500 85FF 8100 A1FF 8500 89FF 8500 89FF" - $"8500 89FF 8500 91FF 8100 A1FF 8500 89FF" - $"8500 89FF 8500 89FF 8500 91FF 8100 A1FF" - $"8500 89FF 8500 89FF 8500 89FF 8500 91FF" - $"8100 A1FF 8500 89FF 8500 89FF 8500 89FF" - $"8500 91FF 8100 A5FF 8100 91FF 8500 89FF" - $"8500 89FF 8500 85FF 8100 A9FF 8100 91FF" - $"8500 89FF 8500 89FF 8500 85FF 8100 A9FF" - $"8100 91FF 8500 89FF 8500 89FF 8500 85FF" - $"8100 A9FF 8100 91FF 8500 89FF 8500 89FF" - $"8500 85FF 8100 A5FF 8100 9DFF 8500 89FF" - $"8500 91FF 8100 A5FF 8100 9DFF 8500 89FF" - $"8500 91FF 8100 A5FF 8100 9DFF 8500 89FF" - $"8500 91FF 8100 A5FF 8100 9DFF 8500 89FF" - $"8500 91FF 8100 A5FF 8100 A5FF 8500 89FF" - $"8500 85FF 8100 A9FF 8100 A5FF 8500 89FF" - $"8500 85FF 8100 A9FF 8100 A5FF 8500 89FF" - $"8500 85FF 8100 A9FF 8100 A5FF 8500 89FF" - $"8500 85FF 8100 ADFF 8500 A5FF 8500 91FF" - $"8100 ADFF 8500 A5FF 8500 91FF 8100 ADFF" - $"8500 A5FF 8500 91FF 8100 ADFF 8500 A5FF" - $"8500 91FF 8100 B5FF 8500 A5FF 8500 85FF" - $"8100 B9FF 8500 A5FF 8500 85FF 8100 B9FF" - $"8500 A5FF 8500 85FF 8100 B9FF 8500 A5FF" - $"8500 85FF 8100 C1FF 8500 ADFF 8100 C1FF" - $"8500 ADFF 8100 C1FF 8500 ADFF 8100 C1FF" - $"8500 ADFF 8100 C9FF 8500 A1FF 8100 CDFF" - $"8500 A1FF 8100 CDFF 8500 A1FF 8100 CDFF" - $"8500 A1FF 8100 D5FF 8500 99FF 8100 D5FF" - $"8500 99FF 8100 D5FF 8500 99FF 8100 D5FF" - $"8500 99FF 8100 DDFF 8500 8DFF 8100 E1FF" - $"8500 8DFF 8100 E1FF 8500 8DFF 8100 E1FF" - $"8500 8DFF 8100 E9FF 8500 85FF 8100 E9FF" - $"8500 85FF 8100 E9FF 8500 85FF 8100 E9FF" - $"8500 85FF 8100 F1FF 8500 F5FF 8500 F5FF" - $"8500 F5FF 8500 FFFF FFFF FFFF FFFF A1FF" - $"FFFF FFFF FFFF FFFF A9FF A900 D1FF A900" - $"D1FF A900 D1FF A900 C9FF 8900 A1FF 8500" - $"C5FF 8900 A1FF 8500 C5FF 8900 A1FF 8500" - $"C5FF 8900 A1FF 8500 BDFF 8500 81FF 81C0" - $"8900 95FF 8100 8180 81C0 8100 B9FF 8500" - $"81FF 81C0 8900 95FF 8100 8180 81C0 8100" - $"B9FF 8500 81FF 81C0 8900 95FF 8100 8180" - $"81C0 8100 B9FF 8500 81FF 81C0 8900 95FF" - $"8100 8180 81C0 8100 B1FF 8500 85FF 81C0" - $"8500 85FF 8100 8DC0 8D00 81C0 8100 ADFF" - $"8500 85FF 81C0 8500 85FF 8100 8DC0 8D00" - $"81C0 8100 ADFF 8500 85FF 81C0 8500 85FF" - $"8100 8DC0 8D00 81C0 8100 ADFF 8500 85FF" - $"81C0 8500 85FF 8100 8DC0 8D00 81C0 8100" - $"A5FF 8500 89FF 81C0 8500 8DFF 8D00 89C0" - $"81FF 8900 A1FF 8500 89FF 81C0 8500 8DFF" - $"8D00 89C0 81FF 8900 A1FF 8500 89FF 81C0" - $"8500 8DFF 8D00 89C0 81FF 8900 A1FF 8500" - $"89FF 81C0 8500 8DFF 8D00 89C0 81FF 8900" - $"99FF 8500 8DFF 81C0 8100 81C0 8100 91FF" - $"8DC0 91FF 8500 95FF 8500 8DFF 81C0 8100" - $"81C0 8100 91FF 8DC0 91FF 8500 95FF 8500" - $"8DFF 81C0 8100 81C0 8100 91FF 8DC0 91FF" - $"8500 95FF 8500 8DFF 81C0 8100 81C0 8100" - $"91FF 8DC0 91FF 8500 8DFF 8500 91FF 81C0" - $"8100 81C0 8100 89FF 8100 85FF 8108 8100" - $"A1FF 8500 85FF 8500 91FF 81C0 8100 81C0" - $"8100 89FF 8100 85FF 8108 8100 A1FF 8500" - $"85FF 8500 91FF 81C0 8100 81C0 8100 89FF" - $"8100 85FF 8108 8100 A1FF 8500 85FF 8500" - $"91FF 81C0 8100 81C0 8100 89FF 8100 85FF" - $"8108 8100 A1FF 8500 81FF 8100 95FF 81C0" - $"8100 81FF 81C0 8100 8DFF 8500 81FF 8140" - $"A9FF 8500 95FF 81C0 8100 81FF 81C0 8100" - $"8DFF 8500 81FF 8140 A9FF 8500 95FF 81C0" - $"8100 81FF 81C0 8100 8DFF 8500 81FF 8140" - $"A9FF 8500 95FF 81C0 8100 81FF 81C0 8100" - $"8DFF 8500 81FF 8140 A9FF 8500 91FF 81C0" - $"8100 81FF 81C0 8100 85FF 8108 8500 8108" - $"81FF 8100 ADFF 8500 91FF 81C0 8100 81FF" - $"81C0 8100 85FF 8108 8500 8108 81FF 8100" - $"ADFF 8500 91FF 81C0 8100 81FF 81C0 8100" - $"85FF 8108 8500 8108 81FF 8100 ADFF 8500" - $"91FF 81C0 8100 81FF 81C0 8100 85FF 8108" - $"8500 8108 81FF 8100 ADFF 8100 81FF 8100" - $"89FF 81C0 8100 85FF 81C0 8100 95FF 8100" - $"8108 85FF 8500 99FF 8100 85FF 8100 89FF" - $"81C0 8100 85FF 81C0 8100 95FF 8100 8108" - $"85FF 8500 99FF 8100 85FF 8100 89FF 81C0" - $"8100 85FF 81C0 8100 95FF 8100 8108 85FF" - $"8500 99FF 8100 85FF 8100 89FF 81C0 8100" - $"85FF 81C0 8100 95FF 8100 8108 85FF 8500" - $"99FF 8100 85FF 8100 85FF 81C0 8100 85FF" - $"81C0 8100 95FF 8100 95FF 8500 91FF 8100" - $"85FF 8100 85FF 81C0 8100 85FF 81C0 8100" - $"95FF 8100 95FF 8500 91FF 8100 85FF 8100" - $"85FF 81C0 8100 85FF 81C0 8100 95FF 8100" - $"95FF 8500 91FF 8100 85FF 8100 85FF 81C0" - $"8100 85FF 81C0 8100 95FF 8100 95FF 8500" - $"91FF 8100 89FF 8100 81C0 8100 89FF 81C0" - $"8100 95FF 8140 89FF 8500 89FF 8500 85FF" - $"8100 8DFF 8100 81C0 8100 89FF 81C0 8100" - $"95FF 8140 89FF 8500 89FF 8500 85FF 8100" - $"8DFF 8100 81C0 8100 89FF 81C0 8100 95FF" - $"8140 89FF 8500 89FF 8500 85FF 8100 8DFF" - $"8100 81C0 8100 89FF 81C0 8100 95FF 8140" - $"89FF 8500 89FF 8500 85FF 8100 8DFF 8500" - $"89FF 81C0 8100 89FF 8500 9DFF 8500 91FF" - $"8100 8DFF 8500 89FF 81C0 8100 89FF 8500" - $"9DFF 8500 91FF 8100 8DFF 8500 89FF 81C0" - $"8100 89FF 8500 9DFF 8500 91FF 8100 8DFF" - $"8500 89FF 81C0 8100 89FF 8500 9DFF 8500" - $"91FF 8100 8DFF 8100 8DFF 81C0 8100 91FF" - $"8500 89FF 8500 89FF 8500 85FF 8100 91FF" - $"8100 8DFF 81C0 8100 91FF 8500 89FF 8500" - $"89FF 8500 85FF 8100 91FF 8100 8DFF 81C0" - $"8100 91FF 8500 89FF 8500 89FF 8500 85FF" - $"8100 91FF 8100 8DFF 81C0 8100 91FF 8500" - $"89FF 8500 89FF 8500 85FF 8100 8DFF 8100" - $"8DFF 81C0 8100 89FF 8500 89FF 8500 89FF" - $"8500 91FF 8100 8DFF 8100 8DFF 81C0 8100" - $"89FF 8500 89FF 8500 89FF 8500 91FF 8100" - $"8DFF 8100 8DFF 81C0 8100 89FF 8500 89FF" - $"8500 89FF 8500 91FF 8100 8DFF 8100 8DFF" - $"81C0 8100 89FF 8500 89FF 8500 89FF 8500" - $"91FF 8100 8DFF 8100 8DFF 81C0 8100 91FF" - $"8500 89FF 8500 89FF 8500 85FF 8100 91FF" - $"8100 8DFF 81C0 8100 91FF 8500 89FF 8500" - $"89FF 8500 85FF 8100 91FF 8100 8DFF 81C0" - $"8100 91FF 8500 89FF 8500 89FF 8500 85FF" - $"8100 91FF 8100 8DFF 81C0 8100 91FF 8500" - $"89FF 8500 89FF 8500 85FF 8100 95FF 8100" - $"85FF 81C0 8100 89FF 8500 89FF 8500 89FF" - $"8500 91FF 8100 95FF 8100 85FF 81C0 8100" - $"89FF 8500 89FF 8500 89FF 8500 91FF 8100" - $"95FF 8100 85FF 81C0 8100 89FF 8500 89FF" - $"8500 89FF 8500 91FF 8100 95FF 8100 85FF" - $"81C0 8100 89FF 8500 89FF 8500 89FF 8500" - $"91FF 8100 99FF 8100 81FF 81C0 8100 91FF" - $"8500 89FF 8500 89FF 8500 85FF 8100 9DFF" - $"8100 81FF 81C0 8100 91FF 8500 89FF 8500" - $"89FF 8500 85FF 8100 9DFF 8100 81FF 81C0" - $"8100 91FF 8500 89FF 8500 89FF 8500 85FF" - $"8100 9DFF 8100 81FF 81C0 8100 91FF 8500" - $"89FF 8500 89FF 8500 85FF 8100 A1FF 8500" - $"89FF 8500 89FF 8500 89FF 8500 91FF 8100" - $"A1FF 8500 89FF 8500 89FF 8500 89FF 8500" - $"91FF 8100 A1FF 8500 89FF 8500 89FF 8500" - $"89FF 8500 91FF 8100 A1FF 8500 89FF 8500" - $"89FF 8500 89FF 8500 91FF 8100 A5FF 8100" - $"91FF 8500 89FF 8500 89FF 8500 85FF 8100" - $"A9FF 8100 91FF 8500 89FF 8500 89FF 8500" - $"85FF 8100 A9FF 8100 91FF 8500 89FF 8500" - $"89FF 8500 85FF 8100 A9FF 8100 91FF 8500" - $"89FF 8500 89FF 8500 85FF 8100 A5FF 8100" - $"9DFF 8500 89FF 8500 91FF 8100 A5FF 8100" - $"9DFF 8500 89FF 8500 91FF 8100 A5FF 8100" - $"9DFF 8500 89FF 8500 91FF 8100 A5FF 8100" - $"9DFF 8500 89FF 8500 91FF 8100 A5FF 8100" - $"A5FF 8500 89FF 8500 85FF 8100 A9FF 8100" - $"A5FF 8500 89FF 8500 85FF 8100 A9FF 8100" - $"A5FF 8500 89FF 8500 85FF 8100 A9FF 8100" - $"A5FF 8500 89FF 8500 85FF 8100 ADFF 8500" - $"A5FF 8500 91FF 8100 ADFF 8500 A5FF 8500" - $"91FF 8100 ADFF 8500 A5FF 8500 91FF 8100" - $"ADFF 8500 A5FF 8500 91FF 8100 B5FF 8500" - $"A5FF 8500 85FF 8100 B9FF 8500 A5FF 8500" - $"85FF 8100 B9FF 8500 A5FF 8500 85FF 8100" - $"B9FF 8500 A5FF 8500 85FF 8100 C1FF 8500" - $"ADFF 8100 C1FF 8500 ADFF 8100 C1FF 8500" - $"ADFF 8100 C1FF 8500 ADFF 8100 C9FF 8500" - $"A1FF 8100 CDFF 8500 A1FF 8100 CDFF 8500" - $"A1FF 8100 CDFF 8500 A1FF 8100 D5FF 8500" - $"99FF 8100 D5FF 8500 99FF 8100 D5FF 8500" - $"99FF 8100 D5FF 8500 99FF 8100 DDFF 8500" - $"8DFF 8100 E1FF 8500 8DFF 8100 E1FF 8500" - $"8DFF 8100 E1FF 8500 8DFF 8100 E9FF 8500" - $"85FF 8100 E9FF 8500 85FF 8100 E9FF 8500" - $"85FF 8100 E9FF 8500 85FF 8100 F1FF 8500" - $"F5FF 8500 F5FF 8500 F5FF 8500 FFFF FFFF" - $"FFFF FFFF A1FF FFFF FFFF FFFF FFFF A9FF" - $"A900 D1FF A900 D1FF A900 D1FF A900 C9FF" - $"8900 A1FF 8500 C5FF 8900 A1FF 8500 C5FF" - $"8900 A1FF 8500 C5FF 8900 A1FF 8500 BDFF" - $"8500 81FF 81C0 8900 95FF 8100 8180 81C0" - $"8100 B9FF 8500 81FF 81C0 8900 95FF 8100" - $"8180 81C0 8100 B9FF 8500 81FF 81C0 8900" - $"95FF 8100 8180 81C0 8100 B9FF 8500 81FF" - $"81C0 8900 95FF 8100 8180 81C0 8100 B1FF" - $"8500 85FF 81C0 8500 85FF 8100 8DC0 8D00" - $"81C0 8100 ADFF 8500 85FF 81C0 8500 85FF" - $"8100 8DC0 8D00 81C0 8100 ADFF 8500 85FF" - $"81C0 8500 85FF 8100 8DC0 8D00 81C0 8100" - $"ADFF 8500 85FF 81C0 8500 85FF 8100 8DC0" - $"8D00 81C0 8100 A5FF 8500 89FF 81C0 8500" - $"8DFF 8D00 89C0 81FF 8900 A1FF 8500 89FF" - $"81C0 8500 8DFF 8D00 89C0 81FF 8900 A1FF" - $"8500 89FF 81C0 8500 8DFF 8D00 89C0 81FF" - $"8900 A1FF 8500 89FF 81C0 8500 8DFF 8D00" - $"89C0 81FF 8900 99FF 8500 8DFF 81C0 8100" - $"81C0 8100 91FF 8DC0 91FF 8500 95FF 8500" - $"8DFF 81C0 8100 81C0 8100 91FF 8DC0 91FF" - $"8500 95FF 8500 8DFF 81C0 8100 81C0 8100" - $"91FF 8DC0 91FF 8500 95FF 8500 8DFF 81C0" - $"8100 81C0 8100 91FF 8DC0 91FF 8500 8DFF" - $"8500 91FF 81C0 8100 81C0 8100 89FF 81A5" - $"85FF 8184 81A5 A1FF 8500 85FF 8500 91FF" - $"81C0 8100 81C0 8100 89FF 81A5 85FF 8184" - $"81A5 A1FF 8500 85FF 8500 91FF 81C0 8100" - $"81C0 8100 89FF 81A5 85FF 8184 81A5 A1FF" - $"8500 85FF 8500 91FF 81C0 8100 81C0 8100" - $"89FF 81A5 85FF 8184 81A5 A1FF 8500 81FF" - $"8100 95FF 81C0 8100 81FF 81C0 8100 8DFF" - $"85A5 81FF 8140 A9FF 8500 95FF 81C0 8100" - $"81FF 81C0 8100 8DFF 85A5 81FF 8140 A9FF" - $"8500 95FF 81C0 8100 81FF 81C0 8100 8DFF" - $"85A5 81FF 8140 A9FF 8500 95FF 81C0 8100" - $"81FF 81C0 8100 8DFF 85A5 81FF 8140 A9FF" - $"8500 91FF 81C0 8100 81FF 81C0 8100 85FF" - $"8106 85A5 8106 81FF 81A5 ADFF 8500 91FF" - $"81C0 8100 81FF 81C0 8100 85FF 8106 85A5" - $"8106 81FF 81A5 ADFF 8500 91FF 81C0 8100" - $"81FF 81C0 8100 85FF 8106 85A5 8106 81FF" - $"81A5 ADFF 8500 91FF 81C0 8100 81FF 81C0" - $"8100 85FF 8106 85A5 8106 81FF 81A5 ADFF" - $"8100 81FF 8100 89FF 81C0 8100 85FF 81C0" - $"8100 95FF 81A5 8106 85FF 85D4 99FF 8100" - $"85FF 8100 89FF 81C0 8100 85FF 81C0 8100" - $"95FF 81A5 8106 85FF 85D4 99FF 8100 85FF" - $"8100 89FF 81C0 8100 85FF 81C0 8100 95FF" - $"81A5 8106 85FF 85D4 99FF 8100 85FF 8100" - $"89FF 81C0 8100 85FF 81C0 8100 95FF 81A5" - $"8106 85FF 85D4 99FF 8100 85FF 8100 85FF" - $"81C0 8100 85FF 81C0 8100 95FF 81A5 95FF" - $"85D4 91FF 8100 85FF 8100 85FF 81C0 8100" - $"85FF 81C0 8100 95FF 81A5 95FF 85D4 91FF" - $"8100 85FF 8100 85FF 81C0 8100 85FF 81C0" - $"8100 95FF 81A5 95FF 85D4 91FF 8100 85FF" - $"8100 85FF 81C0 8100 85FF 81C0 8100 95FF" - $"81A5 95FF 85D4 91FF 8100 89FF 8100 81C0" - $"8100 89FF 81C0 8100 95FF 8140 89FF 85D4" - $"89FF 85D4 85FF 8100 8DFF 8100 81C0 8100" - $"89FF 81C0 8100 95FF 8140 89FF 85D4 89FF" - $"85D4 85FF 8100 8DFF 8100 81C0 8100 89FF" - $"81C0 8100 95FF 8140 89FF 85D4 89FF 85D4" - $"85FF 8100 8DFF 8100 81C0 8100 89FF 81C0" - $"8100 95FF 8140 89FF 85D4 89FF 85D4 85FF" - $"8100 8DFF 8500 89FF 81C0 8100 89FF 85D4" - $"9DFF 85D4 91FF 8100 8DFF 8500 89FF 81C0" - $"8100 89FF 85D4 9DFF 85D4 91FF 8100 8DFF" - $"8500 89FF 81C0 8100 89FF 85D4 9DFF 85D4" - $"91FF 8100 8DFF 8500 89FF 81C0 8100 89FF" - $"85D4 9DFF 85D4 91FF 8100 8DFF 8100 8DFF" - $"81C0 8100 91FF 85D4 89FF 85D4 89FF 85D4" - $"85FF 8100 91FF 8100 8DFF 81C0 8100 91FF" - $"85D4 89FF 85D4 89FF 85D4 85FF 8100 91FF" - $"8100 8DFF 81C0 8100 91FF 85D4 89FF 85D4" - $"89FF 85D4 85FF 8100 91FF 8100 8DFF 81C0" - $"8100 91FF 85D4 89FF 85D4 89FF 85D4 85FF" - $"8100 8DFF 8100 8DFF 81C0 8100 89FF 85D4" - $"89FF 85D4 89FF 85D4 91FF 8100 8DFF 8100" - $"8DFF 81C0 8100 89FF 85D4 89FF 85D4 89FF" - $"85D4 91FF 8100 8DFF 8100 8DFF 81C0 8100" - $"89FF 85D4 89FF 85D4 89FF 85D4 91FF 8100" - $"8DFF 8100 8DFF 81C0 8100 89FF 85D4 89FF" - $"85D4 89FF 85D4 91FF 8100 8DFF 8100 8DFF" - $"81C0 8100 91FF 85D4 89FF 85D4 89FF 85D4" - $"85FF 8100 91FF 8100 8DFF 81C0 8100 91FF" - $"85D4 89FF 85D4 89FF 85D4 85FF 8100 91FF" - $"8100 8DFF 81C0 8100 91FF 85D4 89FF 85D4" - $"89FF 85D4 85FF 8100 91FF 8100 8DFF 81C0" - $"8100 91FF 85D4 89FF 85D4 89FF 85D4 85FF" - $"8100 95FF 8100 85FF 81C0 8100 89FF 85D4" - $"89FF 85D4 89FF 85D4 91FF 8100 95FF 8100" - $"85FF 81C0 8100 89FF 85D4 89FF 85D4 89FF" - $"85D4 91FF 8100 95FF 8100 85FF 81C0 8100" - $"89FF 85D4 89FF 85D4 89FF 85D4 91FF 8100" - $"95FF 8100 85FF 81C0 8100 89FF 85D4 89FF" - $"85D4 89FF 85D4 91FF 8100 99FF 8100 81FF" - $"81C0 8100 91FF 85D4 89FF 85D4 89FF 85D4" - $"85FF 8100 9DFF 8100 81FF 81C0 8100 91FF" - $"85D4 89FF 85D4 89FF 85D4 85FF 8100 9DFF" - $"8100 81FF 81C0 8100 91FF 85D4 89FF 85D4" - $"89FF 85D4 85FF 8100 9DFF 8100 81FF 81C0" - $"8100 91FF 85D4 89FF 85D4 89FF 85D4 85FF" - $"8100 A1FF 8500 89FF 85D4 89FF 85D4 89FF" - $"85D4 91FF 8100 A1FF 8500 89FF 85D4 89FF" - $"85D4 89FF 85D4 91FF 8100 A1FF 8500 89FF" - $"85D4 89FF 85D4 89FF 85D4 91FF 8100 A1FF" - $"8500 89FF 85D4 89FF 85D4 89FF 85D4 91FF" - $"8100 A5FF 8100 91FF 85D4 89FF 85D4 89FF" - $"85D4 85FF 8100 A9FF 8100 91FF 85D4 89FF" - $"85D4 89FF 85D4 85FF 8100 A9FF 8100 91FF" - $"85D4 89FF 85D4 89FF 85D4 85FF 8100 A9FF" - $"8100 91FF 85D4 89FF 85D4 89FF 85D4 85FF" - $"8100 A5FF 8100 9DFF 85D4 89FF 85D4 91FF" - $"8100 A5FF 8100 9DFF 85D4 89FF 85D4 91FF" - $"8100 A5FF 8100 9DFF 85D4 89FF 85D4 91FF" - $"8100 A5FF 8100 9DFF 85D4 89FF 85D4 91FF" - $"8100 A5FF 8100 A5FF 85D4 89FF 85D4 85FF" - $"8100 A9FF 8100 A5FF 85D4 89FF 85D4 85FF" - $"8100 A9FF 8100 A5FF 85D4 89FF 85D4 85FF" - $"8100 A9FF 8100 A5FF 85D4 89FF 85D4 85FF" - $"8100 ADFF 8500 A5FF 85D4 91FF 8100 ADFF" - $"8500 A5FF 85D4 91FF 8100 ADFF 8500 A5FF" - $"85D4 91FF 8100 ADFF 8500 A5FF 85D4 91FF" - $"8100 B5FF 8500 A5FF 85D4 85FF 8100 B9FF" - $"8500 A5FF 85D4 85FF 8100 B9FF 8500 A5FF" - $"85D4 85FF 8100 B9FF 8500 A5FF 85D4 85FF" - $"8100 C1FF 8500 ADFF 8100 C1FF 8500 ADFF" - $"8100 C1FF 8500 ADFF 8100 C1FF 8500 ADFF" - $"8100 C9FF 8500 A1FF 8100 CDFF 8500 A1FF" - $"8100 CDFF 8500 A1FF 8100 CDFF 8500 A1FF" - $"8100 D5FF 8500 99FF 8100 D5FF 8500 99FF" - $"8100 D5FF 8500 99FF 8100 D5FF 8500 99FF" - $"8100 DDFF 8500 8DFF 8100 E1FF 8500 8DFF" - $"8100 E1FF 8500 8DFF 8100 E1FF 8500 8DFF" - $"8100 E9FF 8500 85FF 8100 E9FF 8500 85FF" - $"8100 E9FF 8500 85FF 8100 E9FF 8500 85FF" - $"8100 F1FF 8500 F5FF 8500 F5FF 8500 F5FF" - $"8500 FFFF FFFF FFFF FFFF A1FF 7438 6D6B" - $"0000 4008 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"FFFF FFFF FFFF FFFF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000" -}; - -data 'ics#' (129, "Document Icon") { - $"0150 0208 16B4 4442 9501 0850 4222 8888" - $"3554 4220 2148 20A0 0810 0200 00A0 0000" - $"03F0 0FF8 3FFC FFFF FFFF FFFF 7FFE FFFE" - $"FFFC 7FFC 3FF8 3FF8 1FF0 07F0 01E0 0060" -}; - -data 'ics4' (129, "Document Icon") { - $"0000 00CD DDDD 0000 0000 CDED 000E D000" - $"00CD CDE0 DEDD EE00 CDC0 DDCC 0CC0 0CDC" - $"D00C CECC 5C00 000D D0DC DC00 CCCD C00D" - $"0EC0 D0D0 C0DD CCD0 CC0D CCCD DCDC D0D0" - $"CC0D 0DCD CDDC CD00 0CDC CCDD CDCD 0D00" - $"00D0 0CDC DDCC D000 00DC 000C DCD0 D000" - $"000C DC00 0CCD 0000 0000 0CDC 000D 0000" - $"0000 000C DCD0 0000 0000 0000 0CC0 0000" -}; - -data 'ics8' (129, "Document Icon") { - $"0000 0000 0000 2BFA F9FA F9FA 0000 0000" - $"0000 0000 F7F9 FDF9 0000 00FB FA00 0000" - $"0000 2BFA 2B56 FC00 8181 FB81 81FC 0000" - $"2BFA F700 56FB F72A 005C F500 002B FA2B" - $"FA00 00F8 F8FA 075B 6255 0000 0000 00FA" - $"F900 56F7 F8F7 0000 5507 2A7F 2A00 00F9" - $"00FD 2BF5 8100 7E00 2B00 7F54 2A2A FA00" - $"F72B 0056 F72A F65A 7930 542A 7F00 FA00" - $"2BF7 F5FA 007E 2A79 3079 5A2A 2AFA 0000" - $"002B 81F7 2A2A 795A 2A78 2A7F 00FA 0000" - $"0000 FA00 002A 7F2A 7F5A 2A2A FA00 0000" - $"0000 F9F7 00F5 002A 542A 7F00 F900 0000" - $"0000 00F7 F9F7 0000 F52A 2AFA 0000 0000" - $"0000 0000 002B FAF7 0000 00FA 0000 0000" - $"0000 0000 0000 00F7 FAF7 FA00 0000 0000" - $"0000 0000 0000 0000 00F7 2B00 0000 0000" -}; - diff --git a/samples/docview/docview.r b/samples/docview/docview.r deleted file mode 100644 index 153adf5b13..0000000000 --- a/samples/docview/docview.r +++ /dev/null @@ -1,50 +0,0 @@ -#ifdef __DARWIN__ -# include -#else -# include -#endif - -resource 'BNDL' (128) { - 'WXMA', - 0, - { /* array TypeArray: 2 elements */ - /* [1] */ - 'ICN#', - { /* array IDArray: 3 elements */ - /* [1] */ - 0, 128, - /* [2] */ - 1, 129, - /* [3] */ - 2, 130, - }, - /* [2] */ - 'FREF', - { /* array IDArray: 3 elements */ - /* [1] */ - 0, 128, - /* [2] */ - 1, 129, - /* [3] */ - 2, 130, - } - } -}; - -resource 'FREF' (128) { - 'APPL', - 0, - "" -}; - -resource 'FREF' (129) { - 'TEXT', - 1, - "" -}; - -resource 'FREF' (130) { - 'WXMB', - 2, - "" -}; diff --git a/samples/docview/docview_vc7.vcproj b/samples/docview/docview_vc7.vcproj index 3183086a63..c7b31a484a 100644 --- a/samples/docview/docview_vc7.vcproj +++ b/samples/docview/docview_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/docview/docview_vc8.vcproj b/samples/docview/docview_vc8.vcproj index 50efbe290c..e39218756c 100644 --- a/samples/docview/docview_vc8.vcproj +++ b/samples/docview/docview_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/docview/docview_vc9.vcproj b/samples/docview/docview_vc9.vcproj index 4d554f7fc8..dcca50e7e3 100644 --- a/samples/docview/docview_vc9.vcproj +++ b/samples/docview/docview_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/docview/makefile.bcc b/samples/docview/makefile.bcc index 717983c79f..9bc0a3b5d0 100644 --- a/samples/docview/makefile.bcc +++ b/samples/docview/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/docview/makefile.gcc b/samples/docview/makefile.gcc index f4f696b233..28fe0ccb9a 100644 --- a/samples/docview/makefile.gcc +++ b/samples/docview/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/docview/makefile.unx b/samples/docview/makefile.unx index ac58e43c91..e4751ad590 100644 --- a/samples/docview/makefile.unx +++ b/samples/docview/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc index 3832746e3e..9343f39ecc 100644 --- a/samples/docview/makefile.vc +++ b/samples/docview/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 10cee14273..62806b6b3a 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ DRAGIMAG_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__dragimag___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__dragimag___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL dragimag$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd = $(NM) dragimag$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep dragimag$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__dragimag___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__dragimag_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = dragimag.app/Contents/PkgInfo @@ -151,8 +147,6 @@ distclean: clean dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc) $(CXX) -o $@ $(DRAGIMAG_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__dragimag___mac_setfilecmd) $(__dragimag___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -193,7 +187,7 @@ dragimag_dragimag.o: $(srcdir)/dragimag.cpp $(CXXC) -c -o $@ $(DRAGIMAG_CXXFLAGS) $(srcdir)/dragimag.cpp dragimag_dragimag_rc.o: $(srcdir)/dragimag.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/dragimag/dragimag_vc7.vcproj b/samples/dragimag/dragimag_vc7.vcproj index 01cfbff34c..16fec323f6 100644 --- a/samples/dragimag/dragimag_vc7.vcproj +++ b/samples/dragimag/dragimag_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dragimag/dragimag_vc8.vcproj b/samples/dragimag/dragimag_vc8.vcproj index edc2ad5274..998765eb0a 100644 --- a/samples/dragimag/dragimag_vc8.vcproj +++ b/samples/dragimag/dragimag_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dragimag/dragimag_vc9.vcproj b/samples/dragimag/dragimag_vc9.vcproj index eaaa9c6ace..c039cd015f 100644 --- a/samples/dragimag/dragimag_vc9.vcproj +++ b/samples/dragimag/dragimag_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/dragimag/makefile.bcc b/samples/dragimag/makefile.bcc index 404291ab67..9b521efcb2 100644 --- a/samples/dragimag/makefile.bcc +++ b/samples/dragimag/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dragimag/makefile.gcc b/samples/dragimag/makefile.gcc index 10d5c4f4b0..4a4286d519 100644 --- a/samples/dragimag/makefile.gcc +++ b/samples/dragimag/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dragimag/makefile.unx b/samples/dragimag/makefile.unx index 900dffb818..d497f9a70a 100644 --- a/samples/dragimag/makefile.unx +++ b/samples/dragimag/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc index 8d2ebdf1b0..7a9286738c 100644 --- a/samples/dragimag/makefile.vc +++ b/samples/dragimag/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index 472d48d930..cfef6a68f6 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ DRAWING_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__drawing___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL drawing$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd = $(NM) drawing$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep drawing$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__drawing___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__drawing___win32rc = drawing_sample_rc.o @COND_PLATFORM_MACOSX_1@__drawing_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc) $(CXX) -o $@ $(DRAWING_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__drawing___mac_setfilecmd) $(__drawing___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -190,7 +184,7 @@ data: done drawing_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include drawing_drawing.o: $(srcdir)/drawing.cpp $(CXXC) -c -o $@ $(DRAWING_CXXFLAGS) $(srcdir)/drawing.cpp diff --git a/samples/drawing/drawing_vc7.vcproj b/samples/drawing/drawing_vc7.vcproj index 4db05cf500..8bff22fa71 100644 --- a/samples/drawing/drawing_vc7.vcproj +++ b/samples/drawing/drawing_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/drawing/drawing_vc8.vcproj b/samples/drawing/drawing_vc8.vcproj index 57020f9859..a30aa53c57 100644 --- a/samples/drawing/drawing_vc8.vcproj +++ b/samples/drawing/drawing_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/drawing/drawing_vc9.vcproj b/samples/drawing/drawing_vc9.vcproj index 30f1cfa270..a43c758d93 100644 --- a/samples/drawing/drawing_vc9.vcproj +++ b/samples/drawing/drawing_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/drawing/makefile.bcc b/samples/drawing/makefile.bcc index c8026c09eb..4d6d2c187f 100644 --- a/samples/drawing/makefile.bcc +++ b/samples/drawing/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc index 63cbd54930..4f4209ad11 100644 --- a/samples/drawing/makefile.gcc +++ b/samples/drawing/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/drawing/makefile.unx b/samples/drawing/makefile.unx index da776328f0..244fa877b9 100644 --- a/samples/drawing/makefile.unx +++ b/samples/drawing/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc index bc2db0af2d..fddcd8231a 100644 --- a/samples/drawing/makefile.vc +++ b/samples/drawing/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 63a107859e..cdcaf07bcd 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ ERASE_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__erase___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__erase___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL erase$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___erase___os2_emxbindcmd = $(NM) erase$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep erase$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__erase___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___erase___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__erase___win32rc = erase_sample_rc.o @COND_PLATFORM_MACOSX_1@__erase_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc) $(CXX) -o $@ $(ERASE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__erase___mac_setfilecmd) $(__erase___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc) @COND_PLATFORM_MACOSX_1@erase_bundle: $(____erase_BUNDLE_TGT_REF_DEP) erase_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include erase_erase.o: $(srcdir)/erase.cpp $(CXXC) -c -o $@ $(ERASE_CXXFLAGS) $(srcdir)/erase.cpp diff --git a/samples/erase/erase_vc7.vcproj b/samples/erase/erase_vc7.vcproj index 364e041a62..3953026cb0 100644 --- a/samples/erase/erase_vc7.vcproj +++ b/samples/erase/erase_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/erase/erase_vc8.vcproj b/samples/erase/erase_vc8.vcproj index 42ffffb224..33bd2670f6 100644 --- a/samples/erase/erase_vc8.vcproj +++ b/samples/erase/erase_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/erase/erase_vc9.vcproj b/samples/erase/erase_vc9.vcproj index c4079801c1..4a15fa226d 100644 --- a/samples/erase/erase_vc9.vcproj +++ b/samples/erase/erase_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc index b707c6ada4..39cee15fee 100644 --- a/samples/erase/makefile.bcc +++ b/samples/erase/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc index 9f1541adcd..498f4521a8 100644 --- a/samples/erase/makefile.gcc +++ b/samples/erase/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/erase/makefile.unx b/samples/erase/makefile.unx index ba3d5bcb17..1dd54becc6 100644 --- a/samples/erase/makefile.unx +++ b/samples/erase/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc index e9466a3676..4bdfb7bdf4 100644 --- a/samples/erase/makefile.vc +++ b/samples/erase/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index 6d2379473c..a790ba23cd 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ EVENT_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__event___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__event___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL event$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___event___os2_emxbindcmd = $(NM) event$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep event$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__event___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___event___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__event___win32rc = event_sample_rc.o @COND_PLATFORM_MACOSX_1@__event_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc) $(CXX) -o $@ $(EVENT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__event___mac_setfilecmd) $(__event___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc) @COND_PLATFORM_MACOSX_1@event_bundle: $(____event_BUNDLE_TGT_REF_DEP) event_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include event_event.o: $(srcdir)/event.cpp $(CXXC) -c -o $@ $(EVENT_CXXFLAGS) $(srcdir)/event.cpp diff --git a/samples/event/event_vc7.vcproj b/samples/event/event_vc7.vcproj index bf33c2cc77..cbf52c337f 100644 --- a/samples/event/event_vc7.vcproj +++ b/samples/event/event_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/event/event_vc8.vcproj b/samples/event/event_vc8.vcproj index b55d374303..d7322e36a2 100644 --- a/samples/event/event_vc8.vcproj +++ b/samples/event/event_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/event/event_vc9.vcproj b/samples/event/event_vc9.vcproj index a980ecb076..7d5a3a6b58 100644 --- a/samples/event/event_vc9.vcproj +++ b/samples/event/event_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/event/makefile.bcc b/samples/event/makefile.bcc index b45fd6d01d..c079d2d558 100644 --- a/samples/event/makefile.bcc +++ b/samples/event/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc index e3d49b187d..2e3508cef9 100644 --- a/samples/event/makefile.gcc +++ b/samples/event/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/event/makefile.unx b/samples/event/makefile.unx index 290cef3b31..a7bc05ede4 100644 --- a/samples/event/makefile.unx +++ b/samples/event/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc index ed0fcc9d2c..cf6ad41a6c 100644 --- a/samples/event/makefile.vc +++ b/samples/event/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index 3a0ce3a624..ff11f1ecd8 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ EXCEPT_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__except___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__except___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL except$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___except___os2_emxbindcmd = $(NM) except$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep except$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__except___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___except___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__except___win32rc = except_sample_rc.o @COND_PLATFORM_MACOSX_1@__except_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc) $(CXX) -o $@ $(EXCEPT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__except___mac_setfilecmd) $(__except___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc) @COND_PLATFORM_MACOSX_1@except_bundle: $(____except_BUNDLE_TGT_REF_DEP) except_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include except_except.o: $(srcdir)/except.cpp $(CXXC) -c -o $@ $(EXCEPT_CXXFLAGS) $(srcdir)/except.cpp diff --git a/samples/except/except_vc7.vcproj b/samples/except/except_vc7.vcproj index 8495cbda6d..67bacd6f03 100644 --- a/samples/except/except_vc7.vcproj +++ b/samples/except/except_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/except/except_vc8.vcproj b/samples/except/except_vc8.vcproj index 80f5a3647d..242b68c626 100644 --- a/samples/except/except_vc8.vcproj +++ b/samples/except/except_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/except/except_vc9.vcproj b/samples/except/except_vc9.vcproj index 6a3066a42c..f88726376a 100644 --- a/samples/except/except_vc9.vcproj +++ b/samples/except/except_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/except/makefile.bcc b/samples/except/makefile.bcc index cfcc723e7b..d480321d83 100644 --- a/samples/except/makefile.bcc +++ b/samples/except/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/except/makefile.gcc b/samples/except/makefile.gcc index dce7c13e6d..59b10a279f 100644 --- a/samples/except/makefile.gcc +++ b/samples/except/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/except/makefile.unx b/samples/except/makefile.unx index c81f9dbc21..4c20bfa427 100644 --- a/samples/except/makefile.unx +++ b/samples/except/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc index 06e488119a..b99c9804df 100644 --- a/samples/except/makefile.vc +++ b/samples/except/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index bab8738ed3..cf2f9e9cf1 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ EXEC_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__exec___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__exec___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL exec$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___exec___os2_emxbindcmd = $(NM) exec$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep exec$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__exec___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___exec___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__exec___win32rc = exec_sample_rc.o @COND_PLATFORM_MACOSX_1@__exec_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc) $(CXX) -o $@ $(EXEC_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__exec___mac_setfilecmd) $(__exec___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc) @COND_PLATFORM_MACOSX_1@exec_bundle: $(____exec_BUNDLE_TGT_REF_DEP) exec_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include exec_exec.o: $(srcdir)/exec.cpp $(CXXC) -c -o $@ $(EXEC_CXXFLAGS) $(srcdir)/exec.cpp diff --git a/samples/exec/exec_vc7.vcproj b/samples/exec/exec_vc7.vcproj index 287e635120..ca1f6a8455 100644 --- a/samples/exec/exec_vc7.vcproj +++ b/samples/exec/exec_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/exec/exec_vc8.vcproj b/samples/exec/exec_vc8.vcproj index a10db622a6..b2ae0e2e18 100644 --- a/samples/exec/exec_vc8.vcproj +++ b/samples/exec/exec_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/exec/exec_vc9.vcproj b/samples/exec/exec_vc9.vcproj index cbf5795b66..036c999d2b 100644 --- a/samples/exec/exec_vc9.vcproj +++ b/samples/exec/exec_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/exec/makefile.bcc b/samples/exec/makefile.bcc index d7596b4bb8..46585c4db6 100644 --- a/samples/exec/makefile.bcc +++ b/samples/exec/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc index 16ef37586e..23a28020ec 100644 --- a/samples/exec/makefile.gcc +++ b/samples/exec/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/exec/makefile.unx b/samples/exec/makefile.unx index c7d457ab85..7fa1b6dfde 100644 --- a/samples/exec/makefile.unx +++ b/samples/exec/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc index 9f268f79b6..2d3e103b27 100644 --- a/samples/exec/makefile.vc +++ b/samples/exec/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/flash/flash_vc7.vcproj b/samples/flash/flash_vc7.vcproj index 23f4bf676e..26c5f3bbbd 100644 --- a/samples/flash/flash_vc7.vcproj +++ b/samples/flash/flash_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/flash/flash_vc8.vcproj b/samples/flash/flash_vc8.vcproj index 812e848c96..8087af76c1 100644 --- a/samples/flash/flash_vc8.vcproj +++ b/samples/flash/flash_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/flash/flash_vc9.vcproj b/samples/flash/flash_vc9.vcproj index 56c51aa9de..d9914aa86a 100644 --- a/samples/flash/flash_vc9.vcproj +++ b/samples/flash/flash_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/flash/makefile.vc b/samples/flash/makefile.vc index 638dd1a2ad..73623a9533 100644 --- a/samples/flash/makefile.vc +++ b/samples/flash/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index 8760626c8c..d4b565c83e 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ FONT_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__font___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__font___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL font$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___font___os2_emxbindcmd = $(NM) font$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep font$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__font___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___font___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__font___win32rc = font_sample_rc.o @COND_PLATFORM_MACOSX_1@__font_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc) $(CXX) -o $@ $(FONT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__font___mac_setfilecmd) $(__font___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc) @COND_PLATFORM_MACOSX_1@font_bundle: $(____font_BUNDLE_TGT_REF_DEP) font_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include font_font.o: $(srcdir)/font.cpp $(CXXC) -c -o $@ $(FONT_CXXFLAGS) $(srcdir)/font.cpp diff --git a/samples/font/font_vc7.vcproj b/samples/font/font_vc7.vcproj index ee437c9382..9f64b059f2 100644 --- a/samples/font/font_vc7.vcproj +++ b/samples/font/font_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/font/font_vc8.vcproj b/samples/font/font_vc8.vcproj index a1e26b043f..c54af699c0 100644 --- a/samples/font/font_vc8.vcproj +++ b/samples/font/font_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/font/font_vc9.vcproj b/samples/font/font_vc9.vcproj index 3e7f98cd66..1de85bf976 100644 --- a/samples/font/font_vc9.vcproj +++ b/samples/font/font_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc index 55d4fe228b..083765af16 100644 --- a/samples/font/makefile.bcc +++ b/samples/font/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc index ff164a21ff..bcad6221d1 100644 --- a/samples/font/makefile.gcc +++ b/samples/font/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/font/makefile.unx b/samples/font/makefile.unx index 9b0e074bf5..5f0cf61133 100644 --- a/samples/font/makefile.unx +++ b/samples/font/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc index 4f3580b191..10c1cccd58 100644 --- a/samples/font/makefile.vc +++ b/samples/font/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/fswatcher/Makefile.in b/samples/fswatcher/Makefile.in index 8e83652b36..0cd7b7870d 100644 --- a/samples/fswatcher/Makefile.in +++ b/samples/fswatcher/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ FSWATCHER_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__fswatcher___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__fswatcher___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL fswatcher$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___fswatcher___os2_emxbindcmd = $(NM) fswatcher$(EXEEXT) | \ if grep -q pmwin.763 ; then emxbind -ep fswatcher$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__fswatcher___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fswatcher___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__fswatcher___win32rc = fswatcher_sample_rc.o @COND_PLATFORM_MACOSX_1@__fswatcher_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean fswatcher$(EXEEXT): $(FSWATCHER_OBJECTS) $(__fswatcher___win32rc) $(CXX) -o $@ $(FSWATCHER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__fswatcher___mac_setfilecmd) $(__fswatcher___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@fswatcher.app/Contents/PkgInfo: fswatcher$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ fswatcher$(EXEEXT): $(FSWATCHER_OBJECTS) $(__fswatcher___win32rc) @COND_PLATFORM_MACOSX_1@fswatcher_bundle: $(____fswatcher_BUNDLE_TGT_REF_DEP) fswatcher_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include fswatcher_fswatcher.o: $(srcdir)/fswatcher.cpp $(CXXC) -c -o $@ $(FSWATCHER_CXXFLAGS) $(srcdir)/fswatcher.cpp diff --git a/samples/fswatcher/fswatcher_vc7.vcproj b/samples/fswatcher/fswatcher_vc7.vcproj index 113daaf151..51a75b9387 100644 --- a/samples/fswatcher/fswatcher_vc7.vcproj +++ b/samples/fswatcher/fswatcher_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/fswatcher/fswatcher_vc8.vcproj b/samples/fswatcher/fswatcher_vc8.vcproj index 8e1527ba5a..dbd752babb 100644 --- a/samples/fswatcher/fswatcher_vc8.vcproj +++ b/samples/fswatcher/fswatcher_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/fswatcher/fswatcher_vc9.vcproj b/samples/fswatcher/fswatcher_vc9.vcproj index 6254ad60e5..7d24df8d83 100644 --- a/samples/fswatcher/fswatcher_vc9.vcproj +++ b/samples/fswatcher/fswatcher_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/fswatcher/makefile.bcc b/samples/fswatcher/makefile.bcc index f5fd37b518..50415ff8da 100644 --- a/samples/fswatcher/makefile.bcc +++ b/samples/fswatcher/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/fswatcher/makefile.gcc b/samples/fswatcher/makefile.gcc index ec39e76155..2c35167715 100644 --- a/samples/fswatcher/makefile.gcc +++ b/samples/fswatcher/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/fswatcher/makefile.unx b/samples/fswatcher/makefile.unx index ac6f4f0cb2..db101c8622 100644 --- a/samples/fswatcher/makefile.unx +++ b/samples/fswatcher/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/fswatcher/makefile.vc b/samples/fswatcher/makefile.vc index 23e35231cb..bae4ec492b 100644 --- a/samples/fswatcher/makefile.vc +++ b/samples/fswatcher/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 8f29198d9b..c03685d06c 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ GRID_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__grid___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__grid___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL grid$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___grid___os2_emxbindcmd = $(NM) grid$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep grid$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__grid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___grid___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__grid___win32rc = grid_sample_rc.o @COND_PLATFORM_MACOSX_1@__grid_app_Contents_PkgInfo___depname \ @@ -156,8 +152,6 @@ distclean: clean grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc) $(CXX) -o $@ $(GRID_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__grid___mac_setfilecmd) $(__grid___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -183,7 +177,7 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc) @COND_PLATFORM_MACOSX_1@grid_bundle: $(____grid_BUNDLE_TGT_REF_DEP) grid_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include grid_griddemo.o: $(srcdir)/griddemo.cpp $(CXXC) -c -o $@ $(GRID_CXXFLAGS) $(srcdir)/griddemo.cpp diff --git a/samples/grid/grid_vc7.vcproj b/samples/grid/grid_vc7.vcproj index c9397c2330..4299b1135e 100644 --- a/samples/grid/grid_vc7.vcproj +++ b/samples/grid/grid_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/grid/grid_vc8.vcproj b/samples/grid/grid_vc8.vcproj index 70a02e853a..3903b1c571 100644 --- a/samples/grid/grid_vc8.vcproj +++ b/samples/grid/grid_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/grid/grid_vc9.vcproj b/samples/grid/grid_vc9.vcproj index 6d3a5d8f1d..c6c8387cb6 100644 --- a/samples/grid/grid_vc9.vcproj +++ b/samples/grid/grid_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/grid/makefile.bcc b/samples/grid/makefile.bcc index 030a6fdcc6..93a11bf585 100644 --- a/samples/grid/makefile.bcc +++ b/samples/grid/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/grid/makefile.gcc b/samples/grid/makefile.gcc index f80b3a05be..ebdec45674 100644 --- a/samples/grid/makefile.gcc +++ b/samples/grid/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/grid/makefile.unx b/samples/grid/makefile.unx index 4828185eb3..7adfc1a734 100644 --- a/samples/grid/makefile.unx +++ b/samples/grid/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc index 7f1a842ce7..45b7f4ae10 100644 --- a/samples/grid/makefile.vc +++ b/samples/grid/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index 480f226dd1..baca165290 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -70,25 +69,22 @@ HELP_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__help___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL help$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___help___os2_emxbindcmd = $(NM) help$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep help$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__help___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___help___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__help___win32rc = help_sample_rc.o @COND_PLATFORM_MACOSX_1@__help_app_Contents_PkgInfo___depname \ @@ -160,8 +156,6 @@ distclean: clean help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) $(CXX) -o $@ $(HELP_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__help___mac_setfilecmd) $(__help___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -211,7 +205,7 @@ data_doc: done help_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include help_demo.o: $(srcdir)/demo.cpp $(CXXC) -c -o $@ $(HELP_CXXFLAGS) $(srcdir)/demo.cpp diff --git a/samples/help/help_vc7.vcproj b/samples/help/help_vc7.vcproj index 16693faf81..caddd23658 100644 --- a/samples/help/help_vc7.vcproj +++ b/samples/help/help_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/help/help_vc8.vcproj b/samples/help/help_vc8.vcproj index 3a91d50840..135514251c 100644 --- a/samples/help/help_vc8.vcproj +++ b/samples/help/help_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/help/help_vc9.vcproj b/samples/help/help_vc9.vcproj index 6d8530bc42..9502984656 100644 --- a/samples/help/help_vc9.vcproj +++ b/samples/help/help_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc index 65ff5ccfc1..e482238ff4 100644 --- a/samples/help/makefile.bcc +++ b/samples/help/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc index 06a8eb652f..20ab94973a 100644 --- a/samples/help/makefile.gcc +++ b/samples/help/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/help/makefile.unx b/samples/help/makefile.unx index f510552224..af96fddd00 100644 --- a/samples/help/makefile.unx +++ b/samples/help/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc index eadd04412b..debbb3c689 100644 --- a/samples/help/makefile.vc +++ b/samples/help/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 02aeb1d4da..c66365452e 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -68,25 +67,22 @@ HTLBOX_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__htlbox___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__htlbox___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL htlbox$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___htlbox___os2_emxbindcmd = $(NM) htlbox$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep htlbox$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__htlbox___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htlbox___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__htlbox___win32rc = htlbox_sample_rc.o @COND_PLATFORM_MACOSX_1@__htlbox_app_Contents_PkgInfo___depname \ @@ -155,8 +151,6 @@ distclean: clean htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc) $(CXX) -o $@ $(HTLBOX_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__htlbox___mac_setfilecmd) $(__htlbox___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -182,7 +176,7 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc) @COND_PLATFORM_MACOSX_1@htlbox_bundle: $(____htlbox_BUNDLE_TGT_REF_DEP) htlbox_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include htlbox_htlbox.o: $(srcdir)/htlbox.cpp $(CXXC) -c -o $@ $(HTLBOX_CXXFLAGS) $(srcdir)/htlbox.cpp diff --git a/samples/htlbox/htlbox_vc7.vcproj b/samples/htlbox/htlbox_vc7.vcproj index 09ef44b099..56d361aa1b 100644 --- a/samples/htlbox/htlbox_vc7.vcproj +++ b/samples/htlbox/htlbox_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/htlbox/htlbox_vc8.vcproj b/samples/htlbox/htlbox_vc8.vcproj index 08ddfdd345..3d703c5586 100644 --- a/samples/htlbox/htlbox_vc8.vcproj +++ b/samples/htlbox/htlbox_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/htlbox/htlbox_vc9.vcproj b/samples/htlbox/htlbox_vc9.vcproj index 1f9e42dde6..590c7d5563 100644 --- a/samples/htlbox/htlbox_vc9.vcproj +++ b/samples/htlbox/htlbox_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/htlbox/makefile.bcc b/samples/htlbox/makefile.bcc index 7e4e04ffe8..e2ee1599c3 100644 --- a/samples/htlbox/makefile.bcc +++ b/samples/htlbox/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc index 0f8834417e..9532dbf68c 100644 --- a/samples/htlbox/makefile.gcc +++ b/samples/htlbox/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/htlbox/makefile.unx b/samples/htlbox/makefile.unx index da824b7f99..55e43f06da 100644 --- a/samples/htlbox/makefile.unx +++ b/samples/htlbox/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc index 2cd36e5204..561c3adb5d 100644 --- a/samples/htlbox/makefile.vc +++ b/samples/htlbox/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/Makefile.in b/samples/html/Makefile.in index 0bb36c2787..a27dad8001 100644 --- a/samples/html/Makefile.in +++ b/samples/html/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index 0d81ffd62f..b427662e19 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -68,25 +67,22 @@ ABOUT_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__about___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__about___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL about$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___about___os2_emxbindcmd = $(NM) about$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep about$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__about___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___about___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__about___win32rc = about_sample_rc.o @COND_PLATFORM_MACOSX_1@__about_app_Contents_PkgInfo___depname \ @@ -155,8 +151,6 @@ distclean: clean about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc) $(CXX) -o $@ $(ABOUT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__about___mac_setfilecmd) $(__about___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -194,7 +188,7 @@ data_files: done about_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include about_about.o: $(srcdir)/about.cpp $(CXXC) -c -o $@ $(ABOUT_CXXFLAGS) $(srcdir)/about.cpp diff --git a/samples/html/about/about_vc7.vcproj b/samples/html/about/about_vc7.vcproj index 796af22bcc..3d7bde3619 100644 --- a/samples/html/about/about_vc7.vcproj +++ b/samples/html/about/about_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/about/about_vc8.vcproj b/samples/html/about/about_vc8.vcproj index f177f6dc16..7f723f2acd 100644 --- a/samples/html/about/about_vc8.vcproj +++ b/samples/html/about/about_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/about/about_vc9.vcproj b/samples/html/about/about_vc9.vcproj index 796c4aa360..365f86a672 100644 --- a/samples/html/about/about_vc9.vcproj +++ b/samples/html/about/about_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/about/makefile.bcc b/samples/html/about/makefile.bcc index c72101eecc..9484e46d4c 100644 --- a/samples/html/about/makefile.bcc +++ b/samples/html/about/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc index 721e3fe4b0..7ed5b99d9d 100644 --- a/samples/html/about/makefile.gcc +++ b/samples/html/about/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/about/makefile.unx b/samples/html/about/makefile.unx index ba52fb70f3..7c329116be 100644 --- a/samples/html/about/makefile.unx +++ b/samples/html/about/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc index 1c87140b66..0e376dc0a8 100644 --- a/samples/html/about/makefile.vc +++ b/samples/html/about/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index d5f075c085..ea7fe0033b 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ HTMLHELP_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__htmlhelp___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__htmlhelp___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL htmlhelp$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd = $(NM) htmlhelp$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep htmlhelp$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__htmlhelp___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__htmlhelp___win32rc = htmlhelp_sample_rc.o @COND_PLATFORM_MACOSX_1@__htmlhelp_app_Contents_PkgInfo___depname \ @@ -156,8 +152,6 @@ distclean: clean htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc) $(CXX) -o $@ $(HTMLHELP_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__htmlhelp___mac_setfilecmd) $(__htmlhelp___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@htmlhelp.app/Contents/PkgInfo: htmlhelp$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -195,7 +189,7 @@ data: done htmlhelp_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include htmlhelp_help.o: $(srcdir)/help.cpp $(CXXC) -c -o $@ $(HTMLHELP_CXXFLAGS) $(srcdir)/help.cpp diff --git a/samples/html/help/help_vc7.vcproj b/samples/html/help/help_vc7.vcproj index 7aa34d0f0b..2debddd4bf 100644 --- a/samples/html/help/help_vc7.vcproj +++ b/samples/html/help/help_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/help/help_vc8.vcproj b/samples/html/help/help_vc8.vcproj index b664522fcf..b9d58a0005 100644 --- a/samples/html/help/help_vc8.vcproj +++ b/samples/html/help/help_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/help/help_vc9.vcproj b/samples/html/help/help_vc9.vcproj index 40d90788f4..74e4eceff6 100644 --- a/samples/html/help/help_vc9.vcproj +++ b/samples/html/help/help_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc index 4652778620..b0137584e5 100644 --- a/samples/html/help/makefile.bcc +++ b/samples/html/help/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc index 98924d9b62..4b689ed534 100644 --- a/samples/html/help/makefile.gcc +++ b/samples/html/help/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/help/makefile.unx b/samples/html/help/makefile.unx index 6a789c1c4d..1cae88cf67 100644 --- a/samples/html/help/makefile.unx +++ b/samples/html/help/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc index db842f4ecd..3b12ca6586 100644 --- a/samples/html/help/makefile.vc +++ b/samples/html/help/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 547a6ce661..77e2d67137 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ HELPVIEW_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__helpview___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL helpview$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd = $(NM) helpview$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep helpview$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__helpview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__helpview___win32rc = helpview_sample_rc.o @COND_PLATFORM_MACOSX_1@__helpview_app_Contents_PkgInfo___depname \ @@ -156,8 +152,6 @@ distclean: clean helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) $(CXX) -o $@ $(HELPVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__helpview___mac_setfilecmd) $(__helpview___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -195,7 +189,7 @@ data: done helpview_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include helpview_helpview.o: $(srcdir)/helpview.cpp $(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $(srcdir)/helpview.cpp diff --git a/samples/html/helpview/helpview_vc7.vcproj b/samples/html/helpview/helpview_vc7.vcproj index d70350ac9b..a41c8539f6 100644 --- a/samples/html/helpview/helpview_vc7.vcproj +++ b/samples/html/helpview/helpview_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/helpview/helpview_vc8.vcproj b/samples/html/helpview/helpview_vc8.vcproj index 82e43b7faa..4940f690c5 100644 --- a/samples/html/helpview/helpview_vc8.vcproj +++ b/samples/html/helpview/helpview_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/helpview/helpview_vc9.vcproj b/samples/html/helpview/helpview_vc9.vcproj index 70e57e1dfe..095adf9f5a 100644 --- a/samples/html/helpview/helpview_vc9.vcproj +++ b/samples/html/helpview/helpview_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/helpview/makefile.bcc b/samples/html/helpview/makefile.bcc index 23938c46e5..59aaa33399 100644 --- a/samples/html/helpview/makefile.bcc +++ b/samples/html/helpview/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc index 38448b532c..bd55b7707e 100644 --- a/samples/html/helpview/makefile.gcc +++ b/samples/html/helpview/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/helpview/makefile.unx b/samples/html/helpview/makefile.unx index b05471b71e..c263cbb2c5 100644 --- a/samples/html/helpview/makefile.unx +++ b/samples/html/helpview/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc index 28b39ce5f1..d952584a0b 100644 --- a/samples/html/helpview/makefile.vc +++ b/samples/html/helpview/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in index b63e814b51..87b8e4c22a 100644 --- a/samples/html/htmlctrl/Makefile.in +++ b/samples/html/htmlctrl/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -68,25 +67,22 @@ HTMLCTRL_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__htmlctrl___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__htmlctrl___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL htmlctrl$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___htmlctrl___os2_emxbindcmd = $(NM) htmlctrl$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep htmlctrl$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__htmlctrl___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlctrl___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__htmlctrl___win32rc = htmlctrl_sample_rc.o @COND_PLATFORM_MACOSX_1@__htmlctrl_app_Contents_PkgInfo___depname \ @@ -152,8 +148,6 @@ distclean: clean htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc) $(CXX) -o $@ $(HTMLCTRL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__htmlctrl___mac_setfilecmd) $(__htmlctrl___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -179,7 +173,7 @@ htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc) @COND_PLATFORM_MACOSX_1@htmlctrl_bundle: $(____htmlctrl_BUNDLE_TGT_REF_DEP) htmlctrl_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include htmlctrl_htmlctrl.o: $(srcdir)/htmlctrl.cpp $(CXXC) -c -o $@ $(HTMLCTRL_CXXFLAGS) $(srcdir)/htmlctrl.cpp diff --git a/samples/html/htmlctrl/makefile.unx b/samples/html/htmlctrl/makefile.unx index 97f44cdd95..fa97872c1e 100644 --- a/samples/html/htmlctrl/makefile.unx +++ b/samples/html/htmlctrl/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/makefile.bcc b/samples/html/makefile.bcc index 15be74d3cf..8920175db8 100644 --- a/samples/html/makefile.bcc +++ b/samples/html/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/makefile.gcc b/samples/html/makefile.gcc index ffe7d28907..42d59e495a 100644 --- a/samples/html/makefile.gcc +++ b/samples/html/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/makefile.unx b/samples/html/makefile.unx index 786bdcf3f2..47bc72559d 100644 --- a/samples/html/makefile.unx +++ b/samples/html/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/makefile.vc b/samples/html/makefile.vc index be57249c51..14b2219897 100644 --- a/samples/html/makefile.vc +++ b/samples/html/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index 418b58cfd7..a3d89f10b5 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,26 +68,23 @@ HTMLPRINTING_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__htmlprinting___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__htmlprinting___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL htmlprinting$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___htmlprinting___os2_emxbindcmd = $(NM) \ htmlprinting$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ htmlprinting$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__htmlprinting___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlprinting___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__htmlprinting___win32rc = htmlprinting_sample_rc.o @COND_PLATFORM_MACOSX_1@__htmlprinting_app_Contents_PkgInfo___depname \ @@ -161,8 +157,6 @@ distclean: clean htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc) $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__htmlprinting___mac_setfilecmd) $(__htmlprinting___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@htmlprinting.app/Contents/PkgInfo: htmlprinting$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -200,7 +194,7 @@ data: done htmlprinting_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include htmlprinting_printing.o: $(srcdir)/printing.cpp $(CXXC) -c -o $@ $(HTMLPRINTING_CXXFLAGS) $(srcdir)/printing.cpp diff --git a/samples/html/printing/makefile.bcc b/samples/html/printing/makefile.bcc index 5db6a70bfc..964a37b4f5 100644 --- a/samples/html/printing/makefile.bcc +++ b/samples/html/printing/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc index 022fc44162..047ae980f1 100644 --- a/samples/html/printing/makefile.gcc +++ b/samples/html/printing/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/printing/makefile.unx b/samples/html/printing/makefile.unx index 76e3af79bc..0f45911b91 100644 --- a/samples/html/printing/makefile.unx +++ b/samples/html/printing/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc index 6f15e9a0e6..0cb638aa41 100644 --- a/samples/html/printing/makefile.vc +++ b/samples/html/printing/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/printing/printing_vc7.vcproj b/samples/html/printing/printing_vc7.vcproj index fc88747088..ea15b4ee0c 100644 --- a/samples/html/printing/printing_vc7.vcproj +++ b/samples/html/printing/printing_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/printing/printing_vc8.vcproj b/samples/html/printing/printing_vc8.vcproj index c4f4649b41..568afe25c7 100644 --- a/samples/html/printing/printing_vc8.vcproj +++ b/samples/html/printing/printing_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/printing/printing_vc9.vcproj b/samples/html/printing/printing_vc9.vcproj index 2ba3a8aa97..711b140e03 100644 --- a/samples/html/printing/printing_vc9.vcproj +++ b/samples/html/printing/printing_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 31307adbf8..770985c696 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -68,25 +67,22 @@ TEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__test___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep test$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__test___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___test___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__test___win32rc = test_sample_rc.o @COND_PLATFORM_MACOSX_1@__test_app_Contents_PkgInfo___depname \ @@ -158,8 +154,6 @@ distclean: clean test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) $(CXX) -o $@ $(TEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__test___mac_setfilecmd) $(__test___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -197,7 +191,7 @@ data: done test_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include test_test.o: $(srcdir)/test.cpp $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp diff --git a/samples/html/test/makefile.bcc b/samples/html/test/makefile.bcc index c6c41932ad..781041f5b9 100644 --- a/samples/html/test/makefile.bcc +++ b/samples/html/test/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc index 39623fd835..88efccc04d 100644 --- a/samples/html/test/makefile.gcc +++ b/samples/html/test/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/test/makefile.unx b/samples/html/test/makefile.unx index ec16808419..e8ac5b7ae0 100644 --- a/samples/html/test/makefile.unx +++ b/samples/html/test/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc index 04733556ca..46367b2ba6 100644 --- a/samples/html/test/makefile.vc +++ b/samples/html/test/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/test/test_vc7.vcproj b/samples/html/test/test_vc7.vcproj index df38ac8617..31659506da 100644 --- a/samples/html/test/test_vc7.vcproj +++ b/samples/html/test/test_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/test/test_vc8.vcproj b/samples/html/test/test_vc8.vcproj index c53f243d1e..125f36cf1f 100644 --- a/samples/html/test/test_vc8.vcproj +++ b/samples/html/test/test_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/test/test_vc9.vcproj b/samples/html/test/test_vc9.vcproj index 1d16497f8c..681f332b75 100644 --- a/samples/html/test/test_vc9.vcproj +++ b/samples/html/test/test_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index ac6adae72b..0c413ad5c2 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -68,25 +67,22 @@ VIRTUAL_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__virtual___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__virtual___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL virtual$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd = $(NM) virtual$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep virtual$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__virtual___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__virtual___win32rc = virtual_sample_rc.o @COND_PLATFORM_MACOSX_1@__virtual_app_Contents_PkgInfo___depname \ @@ -155,8 +151,6 @@ distclean: clean virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc) $(CXX) -o $@ $(VIRTUAL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__virtual___mac_setfilecmd) $(__virtual___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -194,7 +188,7 @@ data: done virtual_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include virtual_virtual.o: $(srcdir)/virtual.cpp $(CXXC) -c -o $@ $(VIRTUAL_CXXFLAGS) $(srcdir)/virtual.cpp diff --git a/samples/html/virtual/makefile.bcc b/samples/html/virtual/makefile.bcc index 1f4898d6bb..7bd3c5fc9d 100644 --- a/samples/html/virtual/makefile.bcc +++ b/samples/html/virtual/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc index 1fcb151478..d70212c306 100644 --- a/samples/html/virtual/makefile.gcc +++ b/samples/html/virtual/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/virtual/makefile.unx b/samples/html/virtual/makefile.unx index 8c8bbfe5e7..3a96557527 100644 --- a/samples/html/virtual/makefile.unx +++ b/samples/html/virtual/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc index 7b85e98833..482c569d8c 100644 --- a/samples/html/virtual/makefile.vc +++ b/samples/html/virtual/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/virtual/virtual_vc7.vcproj b/samples/html/virtual/virtual_vc7.vcproj index 0d62d7b60c..0e2aeca6d7 100644 --- a/samples/html/virtual/virtual_vc7.vcproj +++ b/samples/html/virtual/virtual_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/virtual/virtual_vc8.vcproj b/samples/html/virtual/virtual_vc8.vcproj index 977a85d0bd..32e508bda1 100644 --- a/samples/html/virtual/virtual_vc8.vcproj +++ b/samples/html/virtual/virtual_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/virtual/virtual_vc9.vcproj b/samples/html/virtual/virtual_vc9.vcproj index 84684da7ed..3a7b1acbd1 100644 --- a/samples/html/virtual/virtual_vc9.vcproj +++ b/samples/html/virtual/virtual_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index 75a21cdfa3..f596abdff3 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -68,25 +67,22 @@ WIDGET_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__widget___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__widget___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL widget$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___widget___os2_emxbindcmd = $(NM) widget$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep widget$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__widget___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___widget___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__widget___win32rc = widget_sample_rc.o @COND_PLATFORM_MACOSX_1@__widget_app_Contents_PkgInfo___depname \ @@ -155,8 +151,6 @@ distclean: clean widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc) $(CXX) -o $@ $(WIDGET_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__widget___mac_setfilecmd) $(__widget___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -194,7 +188,7 @@ data: done widget_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include widget_widget.o: $(srcdir)/widget.cpp $(CXXC) -c -o $@ $(WIDGET_CXXFLAGS) $(srcdir)/widget.cpp diff --git a/samples/html/widget/makefile.bcc b/samples/html/widget/makefile.bcc index 42b5733d71..1e04c8e799 100644 --- a/samples/html/widget/makefile.bcc +++ b/samples/html/widget/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc index 1c5b2d97f2..eeba506dc2 100644 --- a/samples/html/widget/makefile.gcc +++ b/samples/html/widget/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/widget/makefile.unx b/samples/html/widget/makefile.unx index eeca4ce316..c22b35d43e 100644 --- a/samples/html/widget/makefile.unx +++ b/samples/html/widget/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc index 2c79d09f06..defc89b394 100644 --- a/samples/html/widget/makefile.vc +++ b/samples/html/widget/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/widget/widget_vc7.vcproj b/samples/html/widget/widget_vc7.vcproj index cf52d78978..61a64fc523 100644 --- a/samples/html/widget/widget_vc7.vcproj +++ b/samples/html/widget/widget_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/widget/widget_vc8.vcproj b/samples/html/widget/widget_vc8.vcproj index 1b3c8bf391..dd26d3accc 100644 --- a/samples/html/widget/widget_vc8.vcproj +++ b/samples/html/widget/widget_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/widget/widget_vc9.vcproj b/samples/html/widget/widget_vc9.vcproj index e2a9ee3025..41f311824b 100644 --- a/samples/html/widget/widget_vc9.vcproj +++ b/samples/html/widget/widget_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index 85400c58f2..5f338921a5 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -68,25 +67,22 @@ ZIP_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__zip___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__zip___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL zip$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___zip___os2_emxbindcmd = $(NM) zip$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep zip$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__zip___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___zip___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__zip___win32rc = zip_sample_rc.o @COND_PLATFORM_MACOSX_1@__zip_app_Contents_PkgInfo___depname \ @@ -155,8 +151,6 @@ distclean: clean zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc) $(CXX) -o $@ $(ZIP_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__zip___mac_setfilecmd) $(__zip___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -194,7 +188,7 @@ data: done zip_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include zip_zip.o: $(srcdir)/zip.cpp $(CXXC) -c -o $@ $(ZIP_CXXFLAGS) $(srcdir)/zip.cpp diff --git a/samples/html/zip/makefile.bcc b/samples/html/zip/makefile.bcc index 7691caecc5..a7c0931eb3 100644 --- a/samples/html/zip/makefile.bcc +++ b/samples/html/zip/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc index 9a49271967..b95713925d 100644 --- a/samples/html/zip/makefile.gcc +++ b/samples/html/zip/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/zip/makefile.unx b/samples/html/zip/makefile.unx index cceecca5a7..99a469e889 100644 --- a/samples/html/zip/makefile.unx +++ b/samples/html/zip/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc index abde0041de..4d33a3704f 100644 --- a/samples/html/zip/makefile.vc +++ b/samples/html/zip/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/zip/zip_vc7.vcproj b/samples/html/zip/zip_vc7.vcproj index 704d2f9957..e94210ed5e 100644 --- a/samples/html/zip/zip_vc7.vcproj +++ b/samples/html/zip/zip_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/zip/zip_vc8.vcproj b/samples/html/zip/zip_vc8.vcproj index 16fb968511..73762aadfb 100644 --- a/samples/html/zip/zip_vc8.vcproj +++ b/samples/html/zip/zip_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/html/zip/zip_vc9.vcproj b/samples/html/zip/zip_vc9.vcproj index 215ebdcb86..1e2e807053 100644 --- a/samples/html/zip/zip_vc9.vcproj +++ b/samples/html/zip/zip_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 492cc93e96..7067b22f69 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -68,25 +67,22 @@ IMAGE_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__image___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__image___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL image$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___image___os2_emxbindcmd = $(NM) image$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep image$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__image___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___image___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__image_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = image.app/Contents/PkgInfo @@ -152,8 +148,6 @@ distclean: clean image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc) $(CXX) -o $@ $(IMAGE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__image___mac_setfilecmd) $(__image___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns $(srcdir)/cursor.png @@ -198,7 +192,7 @@ image_canvas.o: $(srcdir)/canvas.cpp $(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/canvas.cpp image_image_rc.o: $(srcdir)/image.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/image/image_vc7.vcproj b/samples/image/image_vc7.vcproj index 87c2127fbc..d70496a2eb 100644 --- a/samples/image/image_vc7.vcproj +++ b/samples/image/image_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/image/image_vc8.vcproj b/samples/image/image_vc8.vcproj index 67d62a7955..a48135691c 100644 --- a/samples/image/image_vc8.vcproj +++ b/samples/image/image_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/image/image_vc9.vcproj b/samples/image/image_vc9.vcproj index d4b40588f6..5de7375687 100644 --- a/samples/image/image_vc9.vcproj +++ b/samples/image/image_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc index 66789ca8ae..1f68ea8194 100644 --- a/samples/image/makefile.bcc +++ b/samples/image/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc index 3ef66b3352..755fe5fca1 100644 --- a/samples/image/makefile.gcc +++ b/samples/image/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/image/makefile.unx b/samples/image/makefile.unx index fb4c93fb3f..18269b689f 100644 --- a/samples/image/makefile.unx +++ b/samples/image/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc index 29319aa25c..3001b43fad 100644 --- a/samples/image/makefile.vc +++ b/samples/image/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index cec0fda725..b92469d241 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ INTERNAT_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__internat___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL internat$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___internat___os2_emxbindcmd = $(NM) internat$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep internat$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__internat___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___internat___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__internat___win32rc = internat_sample_rc.o @COND_PLATFORM_MACOSX_1@__internat_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc) $(CXX) -o $@ $(INTERNAT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__internat___mac_setfilecmd) $(__internat___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -322,7 +316,7 @@ ja_JP.EUC-JP: done internat_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include internat_internat.o: $(srcdir)/internat.cpp $(CXXC) -c -o $@ $(INTERNAT_CXXFLAGS) $(srcdir)/internat.cpp diff --git a/samples/internat/internat_vc7.vcproj b/samples/internat/internat_vc7.vcproj index 9a29fa46c8..f7989b6916 100644 --- a/samples/internat/internat_vc7.vcproj +++ b/samples/internat/internat_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/internat/internat_vc8.vcproj b/samples/internat/internat_vc8.vcproj index 2a2cc50b1d..d16f134f23 100644 --- a/samples/internat/internat_vc8.vcproj +++ b/samples/internat/internat_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/internat/internat_vc9.vcproj b/samples/internat/internat_vc9.vcproj index c380922c0e..5b0c5719bc 100644 --- a/samples/internat/internat_vc9.vcproj +++ b/samples/internat/internat_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/internat/makefile.bcc b/samples/internat/makefile.bcc index de0d2d2696..19ec3e705a 100644 --- a/samples/internat/makefile.bcc +++ b/samples/internat/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc index 5af0f0f3ec..9c0bb1fcbc 100644 --- a/samples/internat/makefile.gcc +++ b/samples/internat/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/internat/makefile.unx b/samples/internat/makefile.unx index 73a778b7c1..9848a6d9cc 100644 --- a/samples/internat/makefile.unx +++ b/samples/internat/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc index 462e3a200d..8925961e2a 100644 --- a/samples/internat/makefile.vc +++ b/samples/internat/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 846e1a4fe4..4021ba8cd0 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -87,9 +86,6 @@ BASEIPCSERVER_OBJECTS = \ @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_USE_GUI_1@__ipcclient___depname = ipcclient$(EXEEXT) -@COND_PLATFORM_MAC_0@__ipcclient___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__ipcclient___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ipcclient$(EXEEXT) COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd = $(NM) ipcclient$(EXEEXT) | \ if grep -q pmwin.763 ; then emxbind -ep ipcclient$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__ipcclient___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd) @@ -109,9 +105,6 @@ COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd = $(NM) ipcclient$(EXEEXT) | \ @COND_TOOLKIT_OSX_IPHONE@____ipcclient_BUNDLE_TGT_REF_DEP \ @COND_TOOLKIT_OSX_IPHONE@ = $(__ipcclient_app_Contents_PkgInfo___depname) @COND_USE_GUI_1@__ipcserver___depname = ipcserver$(EXEEXT) -@COND_PLATFORM_MAC_0@__ipcserver___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__ipcserver___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ipcserver$(EXEEXT) COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \ if grep -q pmwin.763 ; then emxbind -ep ipcserver$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__ipcserver___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd) @@ -130,13 +123,7 @@ COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \ @COND_TOOLKIT_OSX_COCOA@ = $(__ipcserver_app_Contents_PkgInfo___depname) @COND_TOOLKIT_OSX_IPHONE@____ipcserver_BUNDLE_TGT_REF_DEP \ @COND_TOOLKIT_OSX_IPHONE@ = $(__ipcserver_app_Contents_PkgInfo___depname) -@COND_PLATFORM_MAC_0@__baseipcclient___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__baseipcclient___mac_setfilecmd \ -@COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL baseipcclient$(EXEEXT) @COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) -@COND_PLATFORM_MAC_0@__baseipcserver___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__baseipcserver___mac_setfilecmd \ -@COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL baseipcserver$(EXEEXT) @COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0 @@ -209,8 +196,6 @@ distclean: clean @COND_USE_GUI_1@ipcclient$(EXEEXT): $(IPCCLIENT_OBJECTS) $(__ipcclient___win32rc) @COND_USE_GUI_1@ $(CXX) -o $@ $(IPCCLIENT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_GUI_1@ -@COND_USE_GUI_1@ $(__ipcclient___mac_setfilecmd) @COND_USE_GUI_1@ $(__ipcclient___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcclient.app/Contents/PkgInfo: $(__ipcclient___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -237,8 +222,6 @@ distclean: clean @COND_USE_GUI_1@ipcserver$(EXEEXT): $(IPCSERVER_OBJECTS) $(__ipcserver___win32rc) @COND_USE_GUI_1@ $(CXX) -o $@ $(IPCSERVER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_GUI_1@ -@COND_USE_GUI_1@ $(__ipcserver___mac_setfilecmd) @COND_USE_GUI_1@ $(__ipcserver___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcserver.app/Contents/PkgInfo: $(__ipcserver___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -265,13 +248,9 @@ distclean: clean baseipcclient$(EXEEXT): $(BASEIPCCLIENT_OBJECTS) $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__baseipcclient___mac_setfilecmd) baseipcserver$(EXEEXT): $(BASEIPCSERVER_OBJECTS) $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__baseipcserver___mac_setfilecmd) ipcclient_sample_rc.o: $(srcdir)/../../samples/sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include diff --git a/samples/ipc/ipc_vc7_baseipcclient.vcproj b/samples/ipc/ipc_vc7_baseipcclient.vcproj index 12285801da..71d0d31cd7 100644 --- a/samples/ipc/ipc_vc7_baseipcclient.vcproj +++ b/samples/ipc/ipc_vc7_baseipcclient.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ipc/ipc_vc7_baseipcserver.vcproj b/samples/ipc/ipc_vc7_baseipcserver.vcproj index a3fa91250f..32eb1eb4af 100644 --- a/samples/ipc/ipc_vc7_baseipcserver.vcproj +++ b/samples/ipc/ipc_vc7_baseipcserver.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ipc/ipc_vc7_ipcclient.vcproj b/samples/ipc/ipc_vc7_ipcclient.vcproj index c8e5559b3c..461f9cba94 100644 --- a/samples/ipc/ipc_vc7_ipcclient.vcproj +++ b/samples/ipc/ipc_vc7_ipcclient.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ipc/ipc_vc7_ipcserver.vcproj b/samples/ipc/ipc_vc7_ipcserver.vcproj index 1da8a06b0b..84cd5a00fb 100644 --- a/samples/ipc/ipc_vc7_ipcserver.vcproj +++ b/samples/ipc/ipc_vc7_ipcserver.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ipc/ipc_vc8_baseipcclient.vcproj b/samples/ipc/ipc_vc8_baseipcclient.vcproj index e3f000e30f..7ed4761ece 100644 --- a/samples/ipc/ipc_vc8_baseipcclient.vcproj +++ b/samples/ipc/ipc_vc8_baseipcclient.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ipc/ipc_vc8_baseipcserver.vcproj b/samples/ipc/ipc_vc8_baseipcserver.vcproj index e46682d95b..05d324cfc5 100644 --- a/samples/ipc/ipc_vc8_baseipcserver.vcproj +++ b/samples/ipc/ipc_vc8_baseipcserver.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ipc/ipc_vc8_ipcclient.vcproj b/samples/ipc/ipc_vc8_ipcclient.vcproj index 2700e06e9d..29fedcaec2 100644 --- a/samples/ipc/ipc_vc8_ipcclient.vcproj +++ b/samples/ipc/ipc_vc8_ipcclient.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ipc/ipc_vc8_ipcserver.vcproj b/samples/ipc/ipc_vc8_ipcserver.vcproj index 45287b493f..ff2062e5ec 100644 --- a/samples/ipc/ipc_vc8_ipcserver.vcproj +++ b/samples/ipc/ipc_vc8_ipcserver.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ipc/ipc_vc9_baseipcclient.vcproj b/samples/ipc/ipc_vc9_baseipcclient.vcproj index e08a35614c..0f20255b79 100644 --- a/samples/ipc/ipc_vc9_baseipcclient.vcproj +++ b/samples/ipc/ipc_vc9_baseipcclient.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ipc/ipc_vc9_baseipcserver.vcproj b/samples/ipc/ipc_vc9_baseipcserver.vcproj index a66b832b7c..2321eef626 100644 --- a/samples/ipc/ipc_vc9_baseipcserver.vcproj +++ b/samples/ipc/ipc_vc9_baseipcserver.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ipc/ipc_vc9_ipcclient.vcproj b/samples/ipc/ipc_vc9_ipcclient.vcproj index a616f82760..7b9f514aa4 100644 --- a/samples/ipc/ipc_vc9_ipcclient.vcproj +++ b/samples/ipc/ipc_vc9_ipcclient.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ipc/ipc_vc9_ipcserver.vcproj b/samples/ipc/ipc_vc9_ipcserver.vcproj index 12d6209ee0..6fcd552c52 100644 --- a/samples/ipc/ipc_vc9_ipcserver.vcproj +++ b/samples/ipc/ipc_vc9_ipcserver.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ipc/makefile.bcc b/samples/ipc/makefile.bcc index 12116ac8c4..40e063d3ea 100644 --- a/samples/ipc/makefile.bcc +++ b/samples/ipc/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ipc/makefile.gcc b/samples/ipc/makefile.gcc index d6f62141b0..42385f8689 100644 --- a/samples/ipc/makefile.gcc +++ b/samples/ipc/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ipc/makefile.unx b/samples/ipc/makefile.unx index 360f5d11dc..7a06efff19 100644 --- a/samples/ipc/makefile.unx +++ b/samples/ipc/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc index 359b2f3c48..ec3122890a 100644 --- a/samples/ipc/makefile.vc +++ b/samples/ipc/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 7fbfdd48ce..699ee76111 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ JOYTEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__joytest___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__joytest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL joytest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___joytest___os2_emxbindcmd = $(NM) joytest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep joytest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__joytest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___joytest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__joytest___win32rc = joytest_sample_rc.o @COND_PLATFORM_MACOSX_1@__joytest_app_Contents_PkgInfo___depname \ @@ -156,8 +152,6 @@ distclean: clean joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc) $(CXX) -o $@ $(JOYTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__joytest___mac_setfilecmd) $(__joytest___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -183,7 +177,7 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc) @COND_PLATFORM_MACOSX_1@joytest_bundle: $(____joytest_BUNDLE_TGT_REF_DEP) joytest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include joytest_joytest.o: $(srcdir)/joytest.cpp $(CXXC) -c -o $@ $(JOYTEST_CXXFLAGS) $(srcdir)/joytest.cpp diff --git a/samples/joytest/joytest_vc7.vcproj b/samples/joytest/joytest_vc7.vcproj index 2632cceff3..89b0ad58f5 100644 --- a/samples/joytest/joytest_vc7.vcproj +++ b/samples/joytest/joytest_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/joytest/joytest_vc8.vcproj b/samples/joytest/joytest_vc8.vcproj index ebf96d2941..1550c02685 100644 --- a/samples/joytest/joytest_vc8.vcproj +++ b/samples/joytest/joytest_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/joytest/joytest_vc9.vcproj b/samples/joytest/joytest_vc9.vcproj index 86b77f0512..47f01121d7 100644 --- a/samples/joytest/joytest_vc9.vcproj +++ b/samples/joytest/joytest_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/joytest/makefile.bcc b/samples/joytest/makefile.bcc index 58416fd47c..cc808666b6 100644 --- a/samples/joytest/makefile.bcc +++ b/samples/joytest/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/joytest/makefile.gcc b/samples/joytest/makefile.gcc index 619702dd9b..df95730908 100644 --- a/samples/joytest/makefile.gcc +++ b/samples/joytest/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/joytest/makefile.unx b/samples/joytest/makefile.unx index 5f10be20b8..b6bd9c622e 100644 --- a/samples/joytest/makefile.unx +++ b/samples/joytest/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc index d520f32627..36b7b5a349 100644 --- a/samples/joytest/makefile.vc +++ b/samples/joytest/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 8174f173ab..5308401534 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ KEYBOARD_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__keyboard___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__keyboard___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL keyboard$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd = $(NM) keyboard$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep keyboard$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__keyboard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__keyboard___win32rc = keyboard_sample_rc.o @COND_PLATFORM_MACOSX_1@__keyboard_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc) $(CXX) -o $@ $(KEYBOARD_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__keyboard___mac_setfilecmd) $(__keyboard___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc) @COND_PLATFORM_MACOSX_1@keyboard_bundle: $(____keyboard_BUNDLE_TGT_REF_DEP) keyboard_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include keyboard_keyboard.o: $(srcdir)/keyboard.cpp $(CXXC) -c -o $@ $(KEYBOARD_CXXFLAGS) $(srcdir)/keyboard.cpp diff --git a/samples/keyboard/keyboard_vc7.vcproj b/samples/keyboard/keyboard_vc7.vcproj index 70fd758683..a0df21193d 100644 --- a/samples/keyboard/keyboard_vc7.vcproj +++ b/samples/keyboard/keyboard_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/keyboard/keyboard_vc8.vcproj b/samples/keyboard/keyboard_vc8.vcproj index dd4047fea3..116f0a1494 100644 --- a/samples/keyboard/keyboard_vc8.vcproj +++ b/samples/keyboard/keyboard_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/keyboard/keyboard_vc9.vcproj b/samples/keyboard/keyboard_vc9.vcproj index c5c636e854..b6c6ae6810 100644 --- a/samples/keyboard/keyboard_vc9.vcproj +++ b/samples/keyboard/keyboard_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/keyboard/makefile.bcc b/samples/keyboard/makefile.bcc index b395e16cb8..dfd4245487 100644 --- a/samples/keyboard/makefile.bcc +++ b/samples/keyboard/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc index 8b2008332f..240c90e7ae 100644 --- a/samples/keyboard/makefile.gcc +++ b/samples/keyboard/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/keyboard/makefile.unx b/samples/keyboard/makefile.unx index 3aa55a682f..db646f9982 100644 --- a/samples/keyboard/makefile.unx +++ b/samples/keyboard/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc index 2c71107442..8137cc83a9 100644 --- a/samples/keyboard/makefile.vc +++ b/samples/keyboard/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index 68de9e75de..0e90eb6a56 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ LAYOUT_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__layout___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL layout$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___layout___os2_emxbindcmd = $(NM) layout$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep layout$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__layout___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___layout___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__layout___win32rc = layout_sample_rc.o @COND_PLATFORM_MACOSX_1@__layout_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc) $(CXX) -o $@ $(LAYOUT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__layout___mac_setfilecmd) $(__layout___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc) @COND_PLATFORM_MACOSX_1@layout_bundle: $(____layout_BUNDLE_TGT_REF_DEP) layout_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include layout_layout.o: $(srcdir)/layout.cpp $(CXXC) -c -o $@ $(LAYOUT_CXXFLAGS) $(srcdir)/layout.cpp diff --git a/samples/layout/layout_vc7.vcproj b/samples/layout/layout_vc7.vcproj index dc7a653c28..790568107e 100644 --- a/samples/layout/layout_vc7.vcproj +++ b/samples/layout/layout_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/layout/layout_vc8.vcproj b/samples/layout/layout_vc8.vcproj index a59ff66943..8e8b3d44b4 100644 --- a/samples/layout/layout_vc8.vcproj +++ b/samples/layout/layout_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/layout/layout_vc9.vcproj b/samples/layout/layout_vc9.vcproj index 247287dd34..fe1dea0537 100644 --- a/samples/layout/layout_vc9.vcproj +++ b/samples/layout/layout_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/layout/makefile.bcc b/samples/layout/makefile.bcc index 4a6d4c623c..c8e2db8537 100644 --- a/samples/layout/makefile.bcc +++ b/samples/layout/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc index 9e7ce0f473..23004a7fee 100644 --- a/samples/layout/makefile.gcc +++ b/samples/layout/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/layout/makefile.unx b/samples/layout/makefile.unx index 4cecc4e12e..19feb83f37 100644 --- a/samples/layout/makefile.unx +++ b/samples/layout/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc index ad3ae00d02..7f617fd927 100644 --- a/samples/layout/makefile.vc +++ b/samples/layout/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index e16051412c..5b12acde35 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ LISTCTRL_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__listctrl___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__listctrl___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL listctrl$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___listctrl___os2_emxbindcmd = $(NM) listctrl$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep listctrl$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__listctrl___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___listctrl___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__listctrl_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = listctrl.app/Contents/PkgInfo @@ -151,8 +147,6 @@ distclean: clean listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc) $(CXX) -o $@ $(LISTCTRL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__listctrl___mac_setfilecmd) $(__listctrl___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -181,7 +175,7 @@ listctrl_listtest.o: $(srcdir)/listtest.cpp $(CXXC) -c -o $@ $(LISTCTRL_CXXFLAGS) $(srcdir)/listtest.cpp listctrl_listtest_rc.o: $(srcdir)/listtest.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/listctrl/listctrl_vc7.vcproj b/samples/listctrl/listctrl_vc7.vcproj index 97b84a7eff..d135f82af5 100644 --- a/samples/listctrl/listctrl_vc7.vcproj +++ b/samples/listctrl/listctrl_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/listctrl/listctrl_vc8.vcproj b/samples/listctrl/listctrl_vc8.vcproj index 3f701435a3..2f02bbe779 100644 --- a/samples/listctrl/listctrl_vc8.vcproj +++ b/samples/listctrl/listctrl_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/listctrl/listctrl_vc9.vcproj b/samples/listctrl/listctrl_vc9.vcproj index f037e5196a..981798e692 100644 --- a/samples/listctrl/listctrl_vc9.vcproj +++ b/samples/listctrl/listctrl_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/listctrl/makefile.bcc b/samples/listctrl/makefile.bcc index 0caf26fc77..b9beab0623 100644 --- a/samples/listctrl/makefile.bcc +++ b/samples/listctrl/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/listctrl/makefile.gcc b/samples/listctrl/makefile.gcc index 27ee70a2ce..2642494e93 100644 --- a/samples/listctrl/makefile.gcc +++ b/samples/listctrl/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/listctrl/makefile.unx b/samples/listctrl/makefile.unx index e961a0e606..2926322a31 100644 --- a/samples/listctrl/makefile.unx +++ b/samples/listctrl/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc index a6cb7dd6ec..0b1efea05a 100644 --- a/samples/listctrl/makefile.vc +++ b/samples/listctrl/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/makefile.bcc b/samples/makefile.bcc index 32064c34ca..db8f31e3ac 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/makefile.gcc b/samples/makefile.gcc index 6724cc805a..01c4b6e1f1 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/makefile.vc b/samples/makefile.vc index 08bee2e064..120e60a236 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index ee2d79e327..a6e9d4eb4e 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ MDI_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__mdi___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__mdi___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL mdi$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd = $(NM) mdi$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep mdi$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__mdi___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__mdi_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = mdi.app/Contents/PkgInfo @@ -151,8 +147,6 @@ distclean: clean mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc) $(CXX) -o $@ $(MDI_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__mdi___mac_setfilecmd) $(__mdi___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -181,7 +175,7 @@ mdi_mdi.o: $(srcdir)/mdi.cpp $(CXXC) -c -o $@ $(MDI_CXXFLAGS) $(srcdir)/mdi.cpp mdi_mdi_rc.o: $(srcdir)/mdi.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/mdi/makefile.bcc b/samples/mdi/makefile.bcc index 60a619f5d0..f8f47f66bf 100644 --- a/samples/mdi/makefile.bcc +++ b/samples/mdi/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc index 0e446b9a46..55ecec86af 100644 --- a/samples/mdi/makefile.gcc +++ b/samples/mdi/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mdi/makefile.unx b/samples/mdi/makefile.unx index 31dd1577b9..87cd72f800 100644 --- a/samples/mdi/makefile.unx +++ b/samples/mdi/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc index c9465e8e77..c121b6aaa4 100644 --- a/samples/mdi/makefile.vc +++ b/samples/mdi/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mdi/mdi_vc7.vcproj b/samples/mdi/mdi_vc7.vcproj index 43b997fe9d..ba52b764da 100644 --- a/samples/mdi/mdi_vc7.vcproj +++ b/samples/mdi/mdi_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/mdi/mdi_vc8.vcproj b/samples/mdi/mdi_vc8.vcproj index f7ce93dfca..18a3f4c7f7 100644 --- a/samples/mdi/mdi_vc8.vcproj +++ b/samples/mdi/mdi_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/mdi/mdi_vc9.vcproj b/samples/mdi/mdi_vc9.vcproj index 99dd9416d2..5847c90578 100644 --- a/samples/mdi/mdi_vc9.vcproj +++ b/samples/mdi/mdi_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in index e5dd807c9f..f2e83d27a4 100644 --- a/samples/mediaplayer/Makefile.in +++ b/samples/mediaplayer/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -68,26 +67,23 @@ MEDIAPLAYER_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__mediaplayer___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__mediaplayer___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL mediaplayer$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \ mediaplayer$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ mediaplayer$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__mediaplayer___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__mediaplayer___win32rc = mediaplayer_sample_rc.o @COND_PLATFORM_MACOSX_1@__mediaplayer_app_Contents_PkgInfo___depname \ @@ -158,8 +154,6 @@ distclean: clean mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc) $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__mediaplayer___mac_setfilecmd) $(__mediaplayer___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -185,7 +179,7 @@ mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc) @COND_PLATFORM_MACOSX_1@mediaplayer_bundle: $(____mediaplayer_BUNDLE_TGT_REF_DEP) mediaplayer_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include mediaplayer_mediaplayer.o: $(srcdir)/mediaplayer.cpp $(CXXC) -c -o $@ $(MEDIAPLAYER_CXXFLAGS) $(srcdir)/mediaplayer.cpp diff --git a/samples/mediaplayer/makefile.bcc b/samples/mediaplayer/makefile.bcc index a7b0ba702f..38f19120df 100644 --- a/samples/mediaplayer/makefile.bcc +++ b/samples/mediaplayer/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mediaplayer/makefile.gcc b/samples/mediaplayer/makefile.gcc index 1083f7e0dd..235e48f980 100644 --- a/samples/mediaplayer/makefile.gcc +++ b/samples/mediaplayer/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mediaplayer/makefile.unx b/samples/mediaplayer/makefile.unx index 5cb4528937..3e737fd7a9 100644 --- a/samples/mediaplayer/makefile.unx +++ b/samples/mediaplayer/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mediaplayer/makefile.vc b/samples/mediaplayer/makefile.vc index 5afa9b226c..ccb56be3a1 100644 --- a/samples/mediaplayer/makefile.vc +++ b/samples/mediaplayer/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mediaplayer/mediaplayer_vc7.vcproj b/samples/mediaplayer/mediaplayer_vc7.vcproj index d009789901..6e6296ddde 100644 --- a/samples/mediaplayer/mediaplayer_vc7.vcproj +++ b/samples/mediaplayer/mediaplayer_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/mediaplayer/mediaplayer_vc8.vcproj b/samples/mediaplayer/mediaplayer_vc8.vcproj index 04f3b6f0e7..b51cbfe28f 100644 --- a/samples/mediaplayer/mediaplayer_vc8.vcproj +++ b/samples/mediaplayer/mediaplayer_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/mediaplayer/mediaplayer_vc9.vcproj b/samples/mediaplayer/mediaplayer_vc9.vcproj index 6964a9c03f..b559341ba9 100644 --- a/samples/mediaplayer/mediaplayer_vc9.vcproj +++ b/samples/mediaplayer/mediaplayer_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index caba2f0c8c..6eb71ad8c9 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ MEMCHECK_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__memcheck___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL memcheck$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___memcheck___os2_emxbindcmd = $(NM) memcheck$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep memcheck$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__memcheck___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___memcheck___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__memcheck___win32rc = memcheck_sample_rc.o @COND_PLATFORM_MACOSX_1@__memcheck_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc) $(CXX) -o $@ $(MEMCHECK_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__memcheck___mac_setfilecmd) $(__memcheck___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc) @COND_PLATFORM_MACOSX_1@memcheck_bundle: $(____memcheck_BUNDLE_TGT_REF_DEP) memcheck_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include memcheck_memcheck.o: $(srcdir)/memcheck.cpp $(CXXC) -c -o $@ $(MEMCHECK_CXXFLAGS) $(srcdir)/memcheck.cpp diff --git a/samples/memcheck/makefile.bcc b/samples/memcheck/makefile.bcc index 8604d6e382..2ae5a77004 100644 --- a/samples/memcheck/makefile.bcc +++ b/samples/memcheck/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc index 864b9aac2b..0e60f79893 100644 --- a/samples/memcheck/makefile.gcc +++ b/samples/memcheck/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/memcheck/makefile.unx b/samples/memcheck/makefile.unx index 303f913249..0fc98d2b06 100644 --- a/samples/memcheck/makefile.unx +++ b/samples/memcheck/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/memcheck/makefile.vc b/samples/memcheck/makefile.vc index 29a77b3bda..9c2c9696e1 100644 --- a/samples/memcheck/makefile.vc +++ b/samples/memcheck/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/memcheck/memcheck_vc7.vcproj b/samples/memcheck/memcheck_vc7.vcproj index cb406d14ec..08e159b47b 100644 --- a/samples/memcheck/memcheck_vc7.vcproj +++ b/samples/memcheck/memcheck_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/memcheck/memcheck_vc8.vcproj b/samples/memcheck/memcheck_vc8.vcproj index 07182fa676..a3b31d307a 100644 --- a/samples/memcheck/memcheck_vc8.vcproj +++ b/samples/memcheck/memcheck_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/memcheck/memcheck_vc9.vcproj b/samples/memcheck/memcheck_vc9.vcproj index 2c93154a7d..99e99d6b02 100644 --- a/samples/memcheck/memcheck_vc9.vcproj +++ b/samples/memcheck/memcheck_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index ba69a0c901..228fcbe943 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ MENU_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__menu___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__menu___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL menu$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___menu___os2_emxbindcmd = $(NM) menu$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep menu$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__menu___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___menu___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__menu___win32rc = menu_sample_rc.o @COND_PLATFORM_MACOSX_1@__menu_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc) $(CXX) -o $@ $(MENU_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__menu___mac_setfilecmd) $(__menu___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc) @COND_PLATFORM_MACOSX_1@menu_bundle: $(____menu_BUNDLE_TGT_REF_DEP) menu_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include menu_menu.o: $(srcdir)/menu.cpp $(CXXC) -c -o $@ $(MENU_CXXFLAGS) $(srcdir)/menu.cpp diff --git a/samples/menu/makefile.bcc b/samples/menu/makefile.bcc index 076556f496..f900fa2edb 100644 --- a/samples/menu/makefile.bcc +++ b/samples/menu/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/menu/makefile.gcc b/samples/menu/makefile.gcc index d341fb9c01..87a5216b43 100644 --- a/samples/menu/makefile.gcc +++ b/samples/menu/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/menu/makefile.unx b/samples/menu/makefile.unx index 384dfb256f..1eecdee569 100644 --- a/samples/menu/makefile.unx +++ b/samples/menu/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc index 365b966004..da1d14bcea 100644 --- a/samples/menu/makefile.vc +++ b/samples/menu/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/menu/menu_vc7.vcproj b/samples/menu/menu_vc7.vcproj index bf59327438..4731514e15 100644 --- a/samples/menu/menu_vc7.vcproj +++ b/samples/menu/menu_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/menu/menu_vc8.vcproj b/samples/menu/menu_vc8.vcproj index 649e743ef0..b756922d77 100644 --- a/samples/menu/menu_vc8.vcproj +++ b/samples/menu/menu_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/menu/menu_vc9.vcproj b/samples/menu/menu_vc9.vcproj index 5001503257..69ea2958a4 100644 --- a/samples/menu/menu_vc9.vcproj +++ b/samples/menu/menu_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc index 0192a3d2df..305cebc9a0 100644 --- a/samples/mfc/makefile.vc +++ b/samples/mfc/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mfc/mfc_vc7.vcproj b/samples/mfc/mfc_vc7.vcproj index 159def3613..224261b947 100644 --- a/samples/mfc/mfc_vc7.vcproj +++ b/samples/mfc/mfc_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/mfc/mfc_vc8.vcproj b/samples/mfc/mfc_vc8.vcproj index 34725cf2d1..f05caf9eed 100644 --- a/samples/mfc/mfc_vc8.vcproj +++ b/samples/mfc/mfc_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/mfc/mfc_vc9.vcproj b/samples/mfc/mfc_vc9.vcproj index 09ce85c0ad..06afd62c05 100644 --- a/samples/mfc/mfc_vc9.vcproj +++ b/samples/mfc/mfc_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 992c0fb7b4..8102000e7e 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ MINIMAL_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__minimal___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL minimal$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd = $(NM) minimal$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep minimal$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__minimal___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_sample_rc.o @COND_PLATFORM_MACOSX_1@__minimal_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc) $(CXX) -o $@ $(MINIMAL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__minimal___mac_setfilecmd) $(__minimal___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc) @COND_PLATFORM_MACOSX_1@minimal_bundle: $(____minimal_BUNDLE_TGT_REF_DEP) minimal_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include minimal_minimal.o: $(srcdir)/minimal.cpp $(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $(srcdir)/minimal.cpp diff --git a/samples/minimal/makefile.bcc b/samples/minimal/makefile.bcc index 3413570c68..54dc0e4c48 100644 --- a/samples/minimal/makefile.bcc +++ b/samples/minimal/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/minimal/makefile.gcc b/samples/minimal/makefile.gcc index bd116a1471..41830b907e 100644 --- a/samples/minimal/makefile.gcc +++ b/samples/minimal/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/minimal/makefile.unx b/samples/minimal/makefile.unx index b1b45a0f77..5a9adf15d5 100644 --- a/samples/minimal/makefile.unx +++ b/samples/minimal/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc index d30dd93265..5c8289f4e4 100644 --- a/samples/minimal/makefile.vc +++ b/samples/minimal/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/minimal/minimal_vc7.vcproj b/samples/minimal/minimal_vc7.vcproj index 87b64991db..d8e7298be3 100644 --- a/samples/minimal/minimal_vc7.vcproj +++ b/samples/minimal/minimal_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/minimal/minimal_vc8.vcproj b/samples/minimal/minimal_vc8.vcproj index ff52f0322f..49aaf36b23 100644 --- a/samples/minimal/minimal_vc8.vcproj +++ b/samples/minimal/minimal_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/minimal/minimal_vc9.vcproj b/samples/minimal/minimal_vc9.vcproj index b2a4a0ac99..512d6c2eff 100644 --- a/samples/minimal/minimal_vc9.vcproj +++ b/samples/minimal/minimal_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index 2b0a0c2b20..ae8635fdb4 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ NATIVDLG_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__nativdlg___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__nativdlg___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL nativdlg$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___nativdlg___os2_emxbindcmd = $(NM) nativdlg$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep nativdlg$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__nativdlg___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___nativdlg___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__nativdlg_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = nativdlg.app/Contents/PkgInfo @@ -151,8 +147,6 @@ distclean: clean nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc) $(CXX) -o $@ $(NATIVDLG_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__nativdlg___mac_setfilecmd) $(__nativdlg___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -181,7 +175,7 @@ nativdlg_nativdlg.o: $(srcdir)/nativdlg.cpp $(CXXC) -c -o $@ $(NATIVDLG_CXXFLAGS) $(srcdir)/nativdlg.cpp nativdlg_nativdlg_rc.o: $(srcdir)/nativdlg.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/nativdlg/makefile.bcc b/samples/nativdlg/makefile.bcc index f2440d7661..0b2c397f05 100644 --- a/samples/nativdlg/makefile.bcc +++ b/samples/nativdlg/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/nativdlg/makefile.gcc b/samples/nativdlg/makefile.gcc index df445f3141..ecfc98a195 100644 --- a/samples/nativdlg/makefile.gcc +++ b/samples/nativdlg/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/nativdlg/makefile.unx b/samples/nativdlg/makefile.unx index 15f2de5272..8464533170 100644 --- a/samples/nativdlg/makefile.unx +++ b/samples/nativdlg/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc index 121e725bb4..0c8d53bc3f 100644 --- a/samples/nativdlg/makefile.vc +++ b/samples/nativdlg/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/nativdlg/nativdlg_vc7.vcproj b/samples/nativdlg/nativdlg_vc7.vcproj index ebcbc432d5..5dd67155dd 100644 --- a/samples/nativdlg/nativdlg_vc7.vcproj +++ b/samples/nativdlg/nativdlg_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/nativdlg/nativdlg_vc8.vcproj b/samples/nativdlg/nativdlg_vc8.vcproj index bb3ddc64c2..f632de94b5 100644 --- a/samples/nativdlg/nativdlg_vc8.vcproj +++ b/samples/nativdlg/nativdlg_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/nativdlg/nativdlg_vc9.vcproj b/samples/nativdlg/nativdlg_vc9.vcproj index 5a4a33f859..92b17ecb03 100644 --- a/samples/nativdlg/nativdlg_vc9.vcproj +++ b/samples/nativdlg/nativdlg_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index 03f685f533..4f5ad6ce82 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ NOTEBOOK_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__notebook___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__notebook___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL notebook$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd = $(NM) notebook$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep notebook$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__notebook___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook_sample_rc.o @COND_PLATFORM_MACOSX_1@__notebook_app_Contents_PkgInfo___depname \ @@ -159,8 +155,6 @@ distclean: clean notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc) $(CXX) -o $@ $(NOTEBOOK_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__notebook___mac_setfilecmd) $(__notebook___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -186,7 +180,7 @@ notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc) @COND_PLATFORM_MACOSX_1@notebook_bundle: $(____notebook_BUNDLE_TGT_REF_DEP) notebook_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include notebook_notebook.o: $(srcdir)/notebook.cpp $(CXXC) -c -o $@ $(NOTEBOOK_CXXFLAGS) $(srcdir)/notebook.cpp diff --git a/samples/notebook/makefile.bcc b/samples/notebook/makefile.bcc index af2b657bc8..564fad40f0 100644 --- a/samples/notebook/makefile.bcc +++ b/samples/notebook/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/notebook/makefile.gcc b/samples/notebook/makefile.gcc index be91104266..63dd763309 100644 --- a/samples/notebook/makefile.gcc +++ b/samples/notebook/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/notebook/makefile.unx b/samples/notebook/makefile.unx index cd806c98d8..172d8c88a2 100644 --- a/samples/notebook/makefile.unx +++ b/samples/notebook/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc index 851bc29ffb..090dc24a5e 100644 --- a/samples/notebook/makefile.vc +++ b/samples/notebook/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/notebook/notebook_vc7.vcproj b/samples/notebook/notebook_vc7.vcproj index 6df24bc0a9..d753af2927 100644 --- a/samples/notebook/notebook_vc7.vcproj +++ b/samples/notebook/notebook_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/notebook/notebook_vc8.vcproj b/samples/notebook/notebook_vc8.vcproj index 96835749fd..351d17e5d5 100644 --- a/samples/notebook/notebook_vc8.vcproj +++ b/samples/notebook/notebook_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/notebook/notebook_vc9.vcproj b/samples/notebook/notebook_vc9.vcproj index a5d0374c9b..3f82e2d89e 100644 --- a/samples/notebook/notebook_vc9.vcproj +++ b/samples/notebook/notebook_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 5c9aef6415..95ad72f552 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ OLEAUTO_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__oleauto___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__oleauto___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL oleauto$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___oleauto___os2_emxbindcmd = $(NM) oleauto$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep oleauto$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__oleauto___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___oleauto___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__oleauto___win32rc = oleauto_sample_rc.o @COND_PLATFORM_MACOSX_1@__oleauto_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc) $(CXX) -o $@ $(OLEAUTO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__oleauto___mac_setfilecmd) $(__oleauto___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc) @COND_PLATFORM_MACOSX_1@oleauto_bundle: $(____oleauto_BUNDLE_TGT_REF_DEP) oleauto_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include oleauto_oleauto.o: $(srcdir)/oleauto.cpp $(CXXC) -c -o $@ $(OLEAUTO_CXXFLAGS) $(srcdir)/oleauto.cpp diff --git a/samples/oleauto/makefile.bcc b/samples/oleauto/makefile.bcc index 8906f9a577..c55b679b58 100644 --- a/samples/oleauto/makefile.bcc +++ b/samples/oleauto/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc index 4e47f29945..9523461c22 100644 --- a/samples/oleauto/makefile.gcc +++ b/samples/oleauto/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/oleauto/makefile.unx b/samples/oleauto/makefile.unx index f86d101767..85ad74a482 100644 --- a/samples/oleauto/makefile.unx +++ b/samples/oleauto/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc index 823bf8bed7..0312a428ec 100644 --- a/samples/oleauto/makefile.vc +++ b/samples/oleauto/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/oleauto/oleauto_vc7.vcproj b/samples/oleauto/oleauto_vc7.vcproj index 9cbda3e67c..c3a422107b 100644 --- a/samples/oleauto/oleauto_vc7.vcproj +++ b/samples/oleauto/oleauto_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/oleauto/oleauto_vc8.vcproj b/samples/oleauto/oleauto_vc8.vcproj index fbd8bd57c5..37474b15e0 100644 --- a/samples/oleauto/oleauto_vc8.vcproj +++ b/samples/oleauto/oleauto_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/oleauto/oleauto_vc9.vcproj b/samples/oleauto/oleauto_vc9.vcproj index 547a91ac89..1fe5a255cf 100644 --- a/samples/oleauto/oleauto_vc9.vcproj +++ b/samples/oleauto/oleauto_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/opengl/Makefile.in b/samples/opengl/Makefile.in index 088d6117a7..d7994c7422 100644 --- a/samples/opengl/Makefile.in +++ b/samples/opengl/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index ed2f2120cb..cdce7101ca 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ CUBE_OBJECTS = \ @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_USE_OPENGL_1@__cube___depname = cube$(EXEEXT) -@COND_PLATFORM_MAC_0@__cube___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL cube$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___cube___os2_emxbindcmd = $(NM) cube$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep cube$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__cube___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___cube___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__cube___win32rc = cube_sample_rc.o @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__cube_app_Contents_PkgInfo___depname \ @@ -153,8 +149,6 @@ distclean: clean @COND_USE_OPENGL_1@cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc) @COND_USE_OPENGL_1@ $(CXX) -o $@ $(CUBE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_OPENGL_1@ -@COND_USE_OPENGL_1@ $(__cube___mac_setfilecmd) @COND_USE_OPENGL_1@ $(__cube___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -180,7 +174,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube_bundle: $(____cube_BUNDLE_TGT_REF_DEP) cube_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include cube_cube.o: $(srcdir)/cube.cpp $(CXXC) -c -o $@ $(CUBE_CXXFLAGS) $(srcdir)/cube.cpp diff --git a/samples/opengl/cube/cube_vc7.vcproj b/samples/opengl/cube/cube_vc7.vcproj index f278bdad5d..520d225053 100644 --- a/samples/opengl/cube/cube_vc7.vcproj +++ b/samples/opengl/cube/cube_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/opengl/cube/cube_vc8.vcproj b/samples/opengl/cube/cube_vc8.vcproj index 183a916155..366b5d091d 100644 --- a/samples/opengl/cube/cube_vc8.vcproj +++ b/samples/opengl/cube/cube_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/opengl/cube/cube_vc9.vcproj b/samples/opengl/cube/cube_vc9.vcproj index e84e6dfa3a..88cea536cb 100644 --- a/samples/opengl/cube/cube_vc9.vcproj +++ b/samples/opengl/cube/cube_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/opengl/cube/makefile.bcc b/samples/opengl/cube/makefile.bcc index 80e18bea08..b4904cf64d 100644 --- a/samples/opengl/cube/makefile.bcc +++ b/samples/opengl/cube/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/cube/makefile.gcc b/samples/opengl/cube/makefile.gcc index 3460b499fa..ae98ae7e43 100644 --- a/samples/opengl/cube/makefile.gcc +++ b/samples/opengl/cube/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/cube/makefile.unx b/samples/opengl/cube/makefile.unx index 89d8c71763..fbf354029c 100644 --- a/samples/opengl/cube/makefile.unx +++ b/samples/opengl/cube/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc index 3a6bdf5e79..e8a1c10f8e 100644 --- a/samples/opengl/cube/makefile.vc +++ b/samples/opengl/cube/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index a00bf7532d..d8014aff5b 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ ISOSURF_OBJECTS = \ @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_USE_OPENGL_1@__isosurf___depname = isosurf$(EXEEXT) -@COND_PLATFORM_MAC_0@__isosurf___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__isosurf___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL isosurf$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd = $(NM) isosurf$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep isosurf$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__isosurf___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_sample_rc.o @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__isosurf_app_Contents_PkgInfo___depname \ @@ -154,8 +150,6 @@ distclean: clean @COND_USE_OPENGL_1@isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc) @COND_USE_OPENGL_1@ $(CXX) -o $@ $(ISOSURF_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_OPENGL_1@ -@COND_USE_OPENGL_1@ $(__isosurf___mac_setfilecmd) @COND_USE_OPENGL_1@ $(__isosurf___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -193,7 +187,7 @@ data: done isosurf_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include isosurf_isosurf.o: $(srcdir)/isosurf.cpp $(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $(srcdir)/isosurf.cpp diff --git a/samples/opengl/isosurf/isosurf_vc7.vcproj b/samples/opengl/isosurf/isosurf_vc7.vcproj index 1d8b6ede5c..d88d90daa6 100644 --- a/samples/opengl/isosurf/isosurf_vc7.vcproj +++ b/samples/opengl/isosurf/isosurf_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/opengl/isosurf/isosurf_vc8.vcproj b/samples/opengl/isosurf/isosurf_vc8.vcproj index e47a3e5706..543b50ff19 100644 --- a/samples/opengl/isosurf/isosurf_vc8.vcproj +++ b/samples/opengl/isosurf/isosurf_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/opengl/isosurf/isosurf_vc9.vcproj b/samples/opengl/isosurf/isosurf_vc9.vcproj index a343af2fdd..394b1879e0 100644 --- a/samples/opengl/isosurf/isosurf_vc9.vcproj +++ b/samples/opengl/isosurf/isosurf_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/opengl/isosurf/makefile.bcc b/samples/opengl/isosurf/makefile.bcc index f5ae7899b1..b30f10fe32 100644 --- a/samples/opengl/isosurf/makefile.bcc +++ b/samples/opengl/isosurf/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/isosurf/makefile.gcc b/samples/opengl/isosurf/makefile.gcc index cd560c6f30..1a3e836b9b 100644 --- a/samples/opengl/isosurf/makefile.gcc +++ b/samples/opengl/isosurf/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx index 883f383726..39b41b316a 100644 --- a/samples/opengl/isosurf/makefile.unx +++ b/samples/opengl/isosurf/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc index 811d8b6499..cd03ede606 100644 --- a/samples/opengl/isosurf/makefile.vc +++ b/samples/opengl/isosurf/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/makefile.bcc b/samples/opengl/makefile.bcc index 39a2465948..378104c434 100644 --- a/samples/opengl/makefile.bcc +++ b/samples/opengl/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/makefile.gcc b/samples/opengl/makefile.gcc index 59543e6705..c7506234ac 100644 --- a/samples/opengl/makefile.gcc +++ b/samples/opengl/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/makefile.unx b/samples/opengl/makefile.unx index 628c0ecf66..e33582a69f 100644 --- a/samples/opengl/makefile.unx +++ b/samples/opengl/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/makefile.vc b/samples/opengl/makefile.vc index 0d4aba2cdf..4f455e4ae8 100644 --- a/samples/opengl/makefile.vc +++ b/samples/opengl/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index 0f2cba9ffc..116722c8c4 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -79,25 +78,22 @@ PENGUIN_OBJECTS = \ @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_USE_OPENGL_1@__penguin___depname = penguin$(EXEEXT) -@COND_PLATFORM_MAC_0@__penguin___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__penguin___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL penguin$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd = $(NM) penguin$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep penguin$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__penguin___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__penguin___win32rc = penguin_sample_rc.o @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__penguin_app_Contents_PkgInfo___depname \ @@ -164,8 +160,6 @@ distclean: clean @COND_USE_OPENGL_1@penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc) @COND_USE_OPENGL_1@ $(CXX) -o $@ $(PENGUIN_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_OPENGL_1@ -@COND_USE_OPENGL_1@ $(__penguin___mac_setfilecmd) @COND_USE_OPENGL_1@ $(__penguin___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -203,7 +197,7 @@ data: done penguin_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include penguin_penguin.o: $(srcdir)/penguin.cpp $(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $(srcdir)/penguin.cpp diff --git a/samples/opengl/penguin/makefile.bcc b/samples/opengl/penguin/makefile.bcc index b8c978075c..1d92eb5dae 100644 --- a/samples/opengl/penguin/makefile.bcc +++ b/samples/opengl/penguin/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc index 914af82ed1..d78bec52f8 100644 --- a/samples/opengl/penguin/makefile.gcc +++ b/samples/opengl/penguin/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx index c8f8f88723..56a27b91e5 100644 --- a/samples/opengl/penguin/makefile.unx +++ b/samples/opengl/penguin/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc index 3bb85c7800..4453a94b71 100644 --- a/samples/opengl/penguin/makefile.vc +++ b/samples/opengl/penguin/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/penguin/penguin_vc7.vcproj b/samples/opengl/penguin/penguin_vc7.vcproj index 724f482d98..94ad84dff9 100644 --- a/samples/opengl/penguin/penguin_vc7.vcproj +++ b/samples/opengl/penguin/penguin_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/opengl/penguin/penguin_vc8.vcproj b/samples/opengl/penguin/penguin_vc8.vcproj index f561f4525f..4734529d9c 100644 --- a/samples/opengl/penguin/penguin_vc8.vcproj +++ b/samples/opengl/penguin/penguin_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/opengl/penguin/penguin_vc9.vcproj b/samples/opengl/penguin/penguin_vc9.vcproj index ba808c1bb4..5cd954ae24 100644 --- a/samples/opengl/penguin/penguin_vc9.vcproj +++ b/samples/opengl/penguin/penguin_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/opengl/pyramid/Makefile.in b/samples/opengl/pyramid/Makefile.in index 46546ef67d..49712fb2ce 100644 --- a/samples/opengl/pyramid/Makefile.in +++ b/samples/opengl/pyramid/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -72,25 +71,22 @@ PYRAMID_OBJECTS = \ @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_USE_OPENGL_1@__pyramid___depname = pyramid$(EXEEXT) -@COND_PLATFORM_MAC_0@__pyramid___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__pyramid___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL pyramid$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___pyramid___os2_emxbindcmd = $(NM) pyramid$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep pyramid$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__pyramid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___pyramid___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__pyramid___win32rc = pyramid_sample_rc.o @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__pyramid_app_Contents_PkgInfo___depname \ @@ -157,8 +153,6 @@ distclean: clean @COND_USE_OPENGL_1@pyramid$(EXEEXT): $(PYRAMID_OBJECTS) $(__pyramid___win32rc) @COND_USE_OPENGL_1@ $(CXX) -o $@ $(PYRAMID_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_OPENGL_1@ -@COND_USE_OPENGL_1@ $(__pyramid___mac_setfilecmd) @COND_USE_OPENGL_1@ $(__pyramid___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@pyramid.app/Contents/PkgInfo: $(__pyramid___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -184,7 +178,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@pyramid_bundle: $(____pyramid_BUNDLE_TGT_REF_DEP) pyramid_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include pyramid_pyramid.o: $(srcdir)/pyramid.cpp $(CXXC) -c -o $@ $(PYRAMID_CXXFLAGS) $(srcdir)/pyramid.cpp diff --git a/samples/opengl/pyramid/makefile.bcc b/samples/opengl/pyramid/makefile.bcc index 9c45ea2a1d..a921cb1372 100644 --- a/samples/opengl/pyramid/makefile.bcc +++ b/samples/opengl/pyramid/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/pyramid/makefile.gcc b/samples/opengl/pyramid/makefile.gcc index 395a866da3..d5b36f1fbb 100644 --- a/samples/opengl/pyramid/makefile.gcc +++ b/samples/opengl/pyramid/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/pyramid/makefile.unx b/samples/opengl/pyramid/makefile.unx index 2cc472a0a2..27d6fab2d4 100644 --- a/samples/opengl/pyramid/makefile.unx +++ b/samples/opengl/pyramid/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/pyramid/makefile.vc b/samples/opengl/pyramid/makefile.vc index df188ed68a..54a868e859 100644 --- a/samples/opengl/pyramid/makefile.vc +++ b/samples/opengl/pyramid/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/pyramid/pyramid_vc7.vcproj b/samples/opengl/pyramid/pyramid_vc7.vcproj index d212789a55..d9b3ee4530 100644 --- a/samples/opengl/pyramid/pyramid_vc7.vcproj +++ b/samples/opengl/pyramid/pyramid_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/opengl/pyramid/pyramid_vc8.vcproj b/samples/opengl/pyramid/pyramid_vc8.vcproj index 327638f9d0..a434d044d2 100644 --- a/samples/opengl/pyramid/pyramid_vc8.vcproj +++ b/samples/opengl/pyramid/pyramid_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/opengl/pyramid/pyramid_vc9.vcproj b/samples/opengl/pyramid/pyramid_vc9.vcproj index b446316e1d..10ead52dd6 100644 --- a/samples/opengl/pyramid/pyramid_vc9.vcproj +++ b/samples/opengl/pyramid/pyramid_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index b6b0ff737b..695e936165 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ OWNERDRW_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__ownerdrw___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__ownerdrw___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ownerdrw$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___ownerdrw___os2_emxbindcmd = $(NM) ownerdrw$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep ownerdrw$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__ownerdrw___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ownerdrw___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__ownerdrw_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = ownerdrw.app/Contents/PkgInfo @@ -151,8 +147,6 @@ distclean: clean ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc) $(CXX) -o $@ $(OWNERDRW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__ownerdrw___mac_setfilecmd) $(__ownerdrw___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -193,7 +187,7 @@ ownerdrw_ownerdrw.o: $(srcdir)/ownerdrw.cpp $(CXXC) -c -o $@ $(OWNERDRW_CXXFLAGS) $(srcdir)/ownerdrw.cpp ownerdrw_ownerdrw_rc.o: $(srcdir)/ownerdrw.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/ownerdrw/makefile.bcc b/samples/ownerdrw/makefile.bcc index a6d7d3ea69..ebd9ccd7a8 100644 --- a/samples/ownerdrw/makefile.bcc +++ b/samples/ownerdrw/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ownerdrw/makefile.gcc b/samples/ownerdrw/makefile.gcc index 845f07c4c2..1df36b4e42 100644 --- a/samples/ownerdrw/makefile.gcc +++ b/samples/ownerdrw/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ownerdrw/makefile.unx b/samples/ownerdrw/makefile.unx index bfae682323..7c28d09976 100644 --- a/samples/ownerdrw/makefile.unx +++ b/samples/ownerdrw/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc index e9e6b0182f..d33a78a35c 100644 --- a/samples/ownerdrw/makefile.vc +++ b/samples/ownerdrw/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ownerdrw/ownerdrw_vc7.vcproj b/samples/ownerdrw/ownerdrw_vc7.vcproj index 42b67ce4dd..b3d55d8d16 100644 --- a/samples/ownerdrw/ownerdrw_vc7.vcproj +++ b/samples/ownerdrw/ownerdrw_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ownerdrw/ownerdrw_vc8.vcproj b/samples/ownerdrw/ownerdrw_vc8.vcproj index fc40b88e06..1ea530cd05 100644 --- a/samples/ownerdrw/ownerdrw_vc8.vcproj +++ b/samples/ownerdrw/ownerdrw_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ownerdrw/ownerdrw_vc9.vcproj b/samples/ownerdrw/ownerdrw_vc9.vcproj index 4b14b599d6..933f07dbc6 100644 --- a/samples/ownerdrw/ownerdrw_vc9.vcproj +++ b/samples/ownerdrw/ownerdrw_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in index 91e6570072..f2d10143a7 100644 --- a/samples/popup/Makefile.in +++ b/samples/popup/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ POPUP_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__popup___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__popup___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL popup$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___popup___os2_emxbindcmd = $(NM) popup$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep popup$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__popup___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___popup___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__popup_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = popup.app/Contents/PkgInfo @@ -151,8 +147,6 @@ distclean: clean popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc) $(CXX) -o $@ $(POPUP_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__popup___mac_setfilecmd) $(__popup___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -181,7 +175,7 @@ popup_popup.o: $(srcdir)/popup.cpp $(CXXC) -c -o $@ $(POPUP_CXXFLAGS) $(srcdir)/popup.cpp popup_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/popup/makefile.bcc b/samples/popup/makefile.bcc index c09d8f421b..29b477d4ac 100644 --- a/samples/popup/makefile.bcc +++ b/samples/popup/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/popup/makefile.gcc b/samples/popup/makefile.gcc index df36547a1f..d83e980c5e 100644 --- a/samples/popup/makefile.gcc +++ b/samples/popup/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/popup/makefile.unx b/samples/popup/makefile.unx index 6b51a72a79..a96c18b42d 100644 --- a/samples/popup/makefile.unx +++ b/samples/popup/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/popup/makefile.vc b/samples/popup/makefile.vc index 4ec954bc98..9e93660f22 100644 --- a/samples/popup/makefile.vc +++ b/samples/popup/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/popup/popup_vc7.vcproj b/samples/popup/popup_vc7.vcproj index 438063790c..e2fa891d2f 100644 --- a/samples/popup/popup_vc7.vcproj +++ b/samples/popup/popup_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/popup/popup_vc8.vcproj b/samples/popup/popup_vc8.vcproj index ac199ccb48..5d0653b7f9 100644 --- a/samples/popup/popup_vc8.vcproj +++ b/samples/popup/popup_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/popup/popup_vc9.vcproj b/samples/popup/popup_vc9.vcproj index 3a070f67e4..f19be27da3 100644 --- a/samples/popup/popup_vc9.vcproj +++ b/samples/popup/popup_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in index f6e0f150f3..a00ee8944c 100644 --- a/samples/power/Makefile.in +++ b/samples/power/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ POWER_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__power___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__power___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL power$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___power___os2_emxbindcmd = $(NM) power$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep power$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__power___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___power___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__power___win32rc = power_sample_rc.o @COND_PLATFORM_MACOSX_1@__power_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc) $(CXX) -o $@ $(POWER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__power___mac_setfilecmd) $(__power___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@power.app/Contents/PkgInfo: power$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc) @COND_PLATFORM_MACOSX_1@power_bundle: $(____power_BUNDLE_TGT_REF_DEP) power_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include power_power.o: $(srcdir)/power.cpp $(CXXC) -c -o $@ $(POWER_CXXFLAGS) $(srcdir)/power.cpp diff --git a/samples/power/makefile.bcc b/samples/power/makefile.bcc index dcd7f44c38..40206995a6 100644 --- a/samples/power/makefile.bcc +++ b/samples/power/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/power/makefile.gcc b/samples/power/makefile.gcc index b732c69398..847a64d091 100644 --- a/samples/power/makefile.gcc +++ b/samples/power/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/power/makefile.unx b/samples/power/makefile.unx index 359a59363d..0027dfb63a 100644 --- a/samples/power/makefile.unx +++ b/samples/power/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc index 1d7b753f1f..b12773fd4d 100644 --- a/samples/power/makefile.vc +++ b/samples/power/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/power/power_vc7.vcproj b/samples/power/power_vc7.vcproj index 0d62535af0..d28f6e09dc 100644 --- a/samples/power/power_vc7.vcproj +++ b/samples/power/power_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/power/power_vc8.vcproj b/samples/power/power_vc8.vcproj index d3014e3033..2ec192882c 100644 --- a/samples/power/power_vc8.vcproj +++ b/samples/power/power_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/power/power_vc9.vcproj b/samples/power/power_vc9.vcproj index 24013f4a3b..53a961f60f 100644 --- a/samples/power/power_vc9.vcproj +++ b/samples/power/power_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/preferences/Makefile.in b/samples/preferences/Makefile.in index f27c25561e..b9983f145d 100644 --- a/samples/preferences/Makefile.in +++ b/samples/preferences/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,26 +66,23 @@ PREFERENCES_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__preferences___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__preferences___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL preferences$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___preferences___os2_emxbindcmd = $(NM) \ preferences$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ preferences$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__preferences___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___preferences___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__preferences___win32rc = preferences_sample_rc.o @COND_PLATFORM_MACOSX_1@__preferences_app_Contents_PkgInfo___depname \ @@ -154,8 +150,6 @@ distclean: clean preferences$(EXEEXT): $(PREFERENCES_OBJECTS) $(__preferences___win32rc) $(CXX) -o $@ $(PREFERENCES_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__preferences___mac_setfilecmd) $(__preferences___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@preferences.app/Contents/PkgInfo: preferences$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -181,7 +175,7 @@ preferences$(EXEEXT): $(PREFERENCES_OBJECTS) $(__preferences___win32rc) @COND_PLATFORM_MACOSX_1@preferences_bundle: $(____preferences_BUNDLE_TGT_REF_DEP) preferences_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include preferences_preferences.o: $(srcdir)/preferences.cpp $(CXXC) -c -o $@ $(PREFERENCES_CXXFLAGS) $(srcdir)/preferences.cpp diff --git a/samples/preferences/makefile.bcc b/samples/preferences/makefile.bcc index 23ae3c4b2e..3788266b20 100644 --- a/samples/preferences/makefile.bcc +++ b/samples/preferences/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/preferences/makefile.gcc b/samples/preferences/makefile.gcc index 22323fcb9e..10b21bbb02 100644 --- a/samples/preferences/makefile.gcc +++ b/samples/preferences/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/preferences/makefile.unx b/samples/preferences/makefile.unx index 2d15a1fbd9..ac84f69141 100644 --- a/samples/preferences/makefile.unx +++ b/samples/preferences/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/preferences/makefile.vc b/samples/preferences/makefile.vc index 39af5ee046..5bbed41e5c 100644 --- a/samples/preferences/makefile.vc +++ b/samples/preferences/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/preferences/preferences_vc7.vcproj b/samples/preferences/preferences_vc7.vcproj index fa6ac10264..e00230c6bf 100644 --- a/samples/preferences/preferences_vc7.vcproj +++ b/samples/preferences/preferences_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/preferences/preferences_vc8.vcproj b/samples/preferences/preferences_vc8.vcproj index d8b2a89193..ae80890119 100644 --- a/samples/preferences/preferences_vc8.vcproj +++ b/samples/preferences/preferences_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/preferences/preferences_vc9.vcproj b/samples/preferences/preferences_vc9.vcproj index 6ad26f2681..1c1e047262 100644 --- a/samples/preferences/preferences_vc9.vcproj +++ b/samples/preferences/preferences_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index 7ff37fde6c..66a6485d24 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ PRINTING_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__printing___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL printing$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___printing___os2_emxbindcmd = $(NM) printing$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep printing$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__printing___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___printing___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__printing___win32rc = printing_sample_rc.o @COND_PLATFORM_MACOSX_1@__printing_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) $(CXX) -o $@ $(PRINTING_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__printing___mac_setfilecmd) $(__printing___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) @COND_PLATFORM_MACOSX_1@printing_bundle: $(____printing_BUNDLE_TGT_REF_DEP) printing_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include printing_printing.o: $(srcdir)/printing.cpp $(CXXC) -c -o $@ $(PRINTING_CXXFLAGS) $(srcdir)/printing.cpp diff --git a/samples/printing/makefile.bcc b/samples/printing/makefile.bcc index 8f686cac97..29a7f05217 100644 --- a/samples/printing/makefile.bcc +++ b/samples/printing/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc index 78323db2ad..74ca4081c2 100644 --- a/samples/printing/makefile.gcc +++ b/samples/printing/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/printing/makefile.unx b/samples/printing/makefile.unx index 942f703757..0bf9406b47 100644 --- a/samples/printing/makefile.unx +++ b/samples/printing/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc index 5b03eb6eeb..0485212dad 100644 --- a/samples/printing/makefile.vc +++ b/samples/printing/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/printing/printing_vc7.vcproj b/samples/printing/printing_vc7.vcproj index e1ba629f18..363dc6a9c8 100644 --- a/samples/printing/printing_vc7.vcproj +++ b/samples/printing/printing_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/printing/printing_vc8.vcproj b/samples/printing/printing_vc8.vcproj index 7fdb1aee6e..12c529c346 100644 --- a/samples/printing/printing_vc8.vcproj +++ b/samples/printing/printing_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/printing/printing_vc9.vcproj b/samples/printing/printing_vc9.vcproj index 27452f7bf3..ab896075fc 100644 --- a/samples/printing/printing_vc9.vcproj +++ b/samples/printing/printing_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in index dd23cb77dd..9fcc1a4ce6 100644 --- a/samples/propgrid/Makefile.in +++ b/samples/propgrid/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -72,25 +71,22 @@ PROPGRID_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__propgrid___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__propgrid___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL propgrid$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___propgrid___os2_emxbindcmd = $(NM) propgrid$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep propgrid$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__propgrid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___propgrid___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__propgrid_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = propgrid.app/Contents/PkgInfo @@ -162,8 +158,6 @@ distclean: clean propgrid$(EXEEXT): $(PROPGRID_OBJECTS) $(__propgrid___win32rc) $(CXX) -o $@ $(PROPGRID_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_PROPGRID_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__propgrid___mac_setfilecmd) $(__propgrid___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@propgrid.app/Contents/PkgInfo: propgrid$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -201,7 +195,7 @@ propgrid_tests.o: $(srcdir)/tests.cpp $(CXXC) -c -o $@ $(PROPGRID_CXXFLAGS) $(srcdir)/tests.cpp propgrid_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/propgrid/makefile.bcc b/samples/propgrid/makefile.bcc index dd8f925faf..018a800b31 100644 --- a/samples/propgrid/makefile.bcc +++ b/samples/propgrid/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/propgrid/makefile.gcc b/samples/propgrid/makefile.gcc index f458236108..a7be5b6cdd 100644 --- a/samples/propgrid/makefile.gcc +++ b/samples/propgrid/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/propgrid/makefile.unx b/samples/propgrid/makefile.unx index a9bf18be03..80259a338e 100644 --- a/samples/propgrid/makefile.unx +++ b/samples/propgrid/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/propgrid/makefile.vc b/samples/propgrid/makefile.vc index 9c6d723191..e9ff0b99a9 100644 --- a/samples/propgrid/makefile.vc +++ b/samples/propgrid/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/propgrid/propgrid_vc7.vcproj b/samples/propgrid/propgrid_vc7.vcproj index 94b9156bff..c7d03aa097 100644 --- a/samples/propgrid/propgrid_vc7.vcproj +++ b/samples/propgrid/propgrid_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/propgrid/propgrid_vc8.vcproj b/samples/propgrid/propgrid_vc8.vcproj index 4a77c4fe07..6b30029f38 100644 --- a/samples/propgrid/propgrid_vc8.vcproj +++ b/samples/propgrid/propgrid_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/propgrid/propgrid_vc9.vcproj b/samples/propgrid/propgrid_vc9.vcproj index e8739e5a14..66262382c2 100644 --- a/samples/propgrid/propgrid_vc9.vcproj +++ b/samples/propgrid/propgrid_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 18d6e92f0f..7be60c9bec 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ REGTEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__regtest___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__regtest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL regtest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___regtest___os2_emxbindcmd = $(NM) regtest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep regtest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__regtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___regtest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__regtest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = regtest.app/Contents/PkgInfo @@ -151,8 +147,6 @@ distclean: clean regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc) $(CXX) -o $@ $(REGTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__regtest___mac_setfilecmd) $(__regtest___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -181,7 +175,7 @@ regtest_regtest.o: $(srcdir)/regtest.cpp $(CXXC) -c -o $@ $(REGTEST_CXXFLAGS) $(srcdir)/regtest.cpp regtest_regtest_rc.o: $(srcdir)/regtest.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/regtest/makefile.bcc b/samples/regtest/makefile.bcc index 48a6363518..a850a8cee0 100644 --- a/samples/regtest/makefile.bcc +++ b/samples/regtest/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/regtest/makefile.gcc b/samples/regtest/makefile.gcc index 5db13e30af..ec10368d30 100644 --- a/samples/regtest/makefile.gcc +++ b/samples/regtest/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/regtest/makefile.unx b/samples/regtest/makefile.unx index db7117e190..aa5dd57d8c 100644 --- a/samples/regtest/makefile.unx +++ b/samples/regtest/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc index 14e3a7babd..fbafd63abf 100644 --- a/samples/regtest/makefile.vc +++ b/samples/regtest/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/regtest/regtest_vc7.vcproj b/samples/regtest/regtest_vc7.vcproj index fc2a11cc8d..1303140bd4 100644 --- a/samples/regtest/regtest_vc7.vcproj +++ b/samples/regtest/regtest_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/regtest/regtest_vc8.vcproj b/samples/regtest/regtest_vc8.vcproj index 2f91af6d78..fea2603eb0 100644 --- a/samples/regtest/regtest_vc8.vcproj +++ b/samples/regtest/regtest_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/regtest/regtest_vc9.vcproj b/samples/regtest/regtest_vc9.vcproj index 1c947d03d9..400ae063cb 100644 --- a/samples/regtest/regtest_vc9.vcproj +++ b/samples/regtest/regtest_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index 8423a762a3..37e44a75c7 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -15,7 +15,6 @@ SHARED_LD_MODULE_CXX = @SHARED_LD_MODULE_CXX@ SO_SUFFIX_MODULE = @SO_SUFFIX_MODULE@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ PIC_FLAG = @PIC_FLAG@ STRIP = @STRIP@ NM = @NM@ @@ -93,20 +92,17 @@ RENDDLL_OBJECTS = \ @COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION) @COND_PLATFORM_UNIX_0@PLUGVERDELIM = @COND_PLATFORM_UNIX_1@PLUGVERDELIM = - -@COND_PLATFORM_MAC_0@__render___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__render___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL render$(EXEEXT) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___render___os2_emxbindcmd = $(NM) render$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep render$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__render___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___render___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__render___win32rc = render_sample_rc.o @COND_PLATFORM_MACOSX_1@__render_app_Contents_PkgInfo___depname \ @@ -184,8 +180,6 @@ distclean: clean render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc) $(CXX) -o $@ $(RENDER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__render___mac_setfilecmd) $(__render___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -221,7 +215,7 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc) @COND_SHARED_1@ rm -f $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) render_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include render_render.o: $(srcdir)/render.cpp $(CXXC) -c -o $@ $(RENDER_CXXFLAGS) $(srcdir)/render.cpp diff --git a/samples/render/makefile.bcc b/samples/render/makefile.bcc index 6dd40d2e90..4b69d5994e 100644 --- a/samples/render/makefile.bcc +++ b/samples/render/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc index edb342ea25..c8ad42db98 100644 --- a/samples/render/makefile.gcc +++ b/samples/render/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/render/makefile.unx b/samples/render/makefile.unx index c4c5c6447a..b0f0d0b461 100644 --- a/samples/render/makefile.unx +++ b/samples/render/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc index 57cb5d6f63..6bcbf0492e 100644 --- a/samples/render/makefile.vc +++ b/samples/render/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/render/render_vc7_renddll.vcproj b/samples/render/render_vc7_renddll.vcproj index 618238cd45..a70a5f0670 100644 --- a/samples/render/render_vc7_renddll.vcproj +++ b/samples/render/render_vc7_renddll.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/render/render_vc7_render.vcproj b/samples/render/render_vc7_render.vcproj index 5cd76b56b1..2658ccb15c 100644 --- a/samples/render/render_vc7_render.vcproj +++ b/samples/render/render_vc7_render.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/render/render_vc8_renddll.vcproj b/samples/render/render_vc8_renddll.vcproj index 88fafb9251..fef5c34f1b 100644 --- a/samples/render/render_vc8_renddll.vcproj +++ b/samples/render/render_vc8_renddll.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/render/render_vc8_render.vcproj b/samples/render/render_vc8_render.vcproj index e031097ae9..002fe88db4 100644 --- a/samples/render/render_vc8_render.vcproj +++ b/samples/render/render_vc8_render.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/render/render_vc9_renddll.vcproj b/samples/render/render_vc9_renddll.vcproj index 80e4c5d79d..2950389c48 100644 --- a/samples/render/render_vc9_renddll.vcproj +++ b/samples/render/render_vc9_renddll.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/render/render_vc9_render.vcproj b/samples/render/render_vc9_render.vcproj index bc472bd862..31d1259531 100644 --- a/samples/render/render_vc9_render.vcproj +++ b/samples/render/render_vc9_render.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ribbon/Makefile.in b/samples/ribbon/Makefile.in index e4c6770368..be77d8a2f2 100644 --- a/samples/ribbon/Makefile.in +++ b/samples/ribbon/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ RIBBON_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__ribbon___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__ribbon___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ribbon$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___ribbon___os2_emxbindcmd = $(NM) ribbon$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep ribbon$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__ribbon___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ribbon___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__ribbon_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = ribbon.app/Contents/PkgInfo @@ -159,8 +155,6 @@ distclean: clean ribbon$(EXEEXT): $(RIBBON_OBJECTS) $(__ribbon___win32rc) $(CXX) -o $@ $(RIBBON_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_RIBBON_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__ribbon___mac_setfilecmd) $(__ribbon___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@ribbon.app/Contents/PkgInfo: ribbon$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -189,7 +183,7 @@ ribbon_ribbondemo.o: $(srcdir)/ribbondemo.cpp $(CXXC) -c -o $@ $(RIBBON_CXXFLAGS) $(srcdir)/ribbondemo.cpp ribbon_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/ribbon/makefile.bcc b/samples/ribbon/makefile.bcc index aa9beb1a57..f161a7846d 100644 --- a/samples/ribbon/makefile.bcc +++ b/samples/ribbon/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ribbon/makefile.gcc b/samples/ribbon/makefile.gcc index 484a368337..ccd496dbc8 100644 --- a/samples/ribbon/makefile.gcc +++ b/samples/ribbon/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ribbon/makefile.unx b/samples/ribbon/makefile.unx index ccc6b6dc1c..6e551cd11f 100644 --- a/samples/ribbon/makefile.unx +++ b/samples/ribbon/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ribbon/makefile.vc b/samples/ribbon/makefile.vc index 9b1d958da5..fac827038b 100644 --- a/samples/ribbon/makefile.vc +++ b/samples/ribbon/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ribbon/ribbon_vc7.vcproj b/samples/ribbon/ribbon_vc7.vcproj index 57572ddf20..8b6f8ff8d5 100644 --- a/samples/ribbon/ribbon_vc7.vcproj +++ b/samples/ribbon/ribbon_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ribbon/ribbon_vc8.vcproj b/samples/ribbon/ribbon_vc8.vcproj index 4d4a530e87..a18c2ce92f 100644 --- a/samples/ribbon/ribbon_vc8.vcproj +++ b/samples/ribbon/ribbon_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/ribbon/ribbon_vc9.vcproj b/samples/ribbon/ribbon_vc9.vcproj index 9384a85b70..a3f0a8dc15 100644 --- a/samples/ribbon/ribbon_vc9.vcproj +++ b/samples/ribbon/ribbon_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in index 379cf36cda..7da332190b 100644 --- a/samples/richtext/Makefile.in +++ b/samples/richtext/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -70,25 +69,22 @@ RICHTEXT_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__richtext___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__richtext___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL richtext$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd = $(NM) richtext$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep richtext$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__richtext___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__richtext_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = richtext.app/Contents/PkgInfo @@ -166,8 +162,6 @@ distclean: clean richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc) $(CXX) -o $@ $(RICHTEXT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__richtext___mac_setfilecmd) $(__richtext___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@richtext.app/Contents/PkgInfo: richtext$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -196,7 +190,7 @@ richtext_richtext.o: $(srcdir)/richtext.cpp $(CXXC) -c -o $@ $(RICHTEXT_CXXFLAGS) $(srcdir)/richtext.cpp richtext_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/richtext/makefile.bcc b/samples/richtext/makefile.bcc index bdfc3a9cfc..20de2ba196 100644 --- a/samples/richtext/makefile.bcc +++ b/samples/richtext/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/richtext/makefile.gcc b/samples/richtext/makefile.gcc index fc8f246598..92800d9ce5 100644 --- a/samples/richtext/makefile.gcc +++ b/samples/richtext/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/richtext/makefile.unx b/samples/richtext/makefile.unx index 68a67c12b2..f7c3399b9f 100644 --- a/samples/richtext/makefile.unx +++ b/samples/richtext/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/richtext/makefile.vc b/samples/richtext/makefile.vc index a8e07dd367..39496a47e5 100644 --- a/samples/richtext/makefile.vc +++ b/samples/richtext/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/richtext/richtext_vc7.vcproj b/samples/richtext/richtext_vc7.vcproj index 9c16cc9ed1..3d125ffb41 100644 --- a/samples/richtext/richtext_vc7.vcproj +++ b/samples/richtext/richtext_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/richtext/richtext_vc8.vcproj b/samples/richtext/richtext_vc8.vcproj index e6ecf2787f..880cfde8d8 100644 --- a/samples/richtext/richtext_vc8.vcproj +++ b/samples/richtext/richtext_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/richtext/richtext_vc9.vcproj b/samples/richtext/richtext_vc9.vcproj index 1a20efc162..ba6d4e836a 100644 --- a/samples/richtext/richtext_vc9.vcproj +++ b/samples/richtext/richtext_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sample.r b/samples/sample.r deleted file mode 100644 index b670509bbe..0000000000 --- a/samples/sample.r +++ /dev/null @@ -1,2679 +0,0 @@ -type 'carb' {}; - -resource 'carb'(0) {}; - -data 'vers' (2) { -$"0100 2000 0000 0531 2E30 6430 0531 2E30" -$"6430"} ; - -data 'vers' (1) { -$"0100 2000 0000 0531 2E30 6430 0531 2E30" -$"6430"} ; - -data 'ICN#' (-16455, "Item Icon") { - $"FFFF FFFF F700 001D BB00 002B D700 0057" - $"ED00 009D BB00 0539 DD00 1261 F700 A4E1" - $"FFFE 539F 8100 A52F 8102 AED7 8105 4BAB" - $"8103 BD12 810E 4A65 8105 2492 8102 F926" - $"810B 5FA9 8114 0B7E 8108 05AC 8100 0021" - $"8100 0027 8100 0021 8100 0021 8100 0021" - $"81FF FFE1 8100 0FE1 8122 0AE1 8108 2FA1" - $"8141 0DE1 8104 0B61 8100 9DA1 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" -}; - -data 'icl4' (-16455, "Item Icon") { - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"F333 333F 0000 0000 0000 0000 0003 3E0F" - $"F333 333F 0000 0000 0000 0000 00A4 3AEF" - $"F333 333F 0000 0000 0000 0000 0DCA 3EEF" - $"F333 333F 0000 0000 0000 0000 E1C5 FE0F" - $"F333 333F 0000 0000 000C CDCB 1DEA E00F" - $"F333 333F 0000 0000 0CCC 1CB1 C3FD 000F" - $"F333 333F 0000 0000 D02C CB1D A9E0 000F" - $"FFFF FFFF FFFF FFFC C2C3 BCD3 EDDF FFFF" - $"F000 000F 0000 00CC 2DAB 02BF 2DDD 666F" - $"F000 000F 0000 0C1D BBB1 BEAB BDCB D66F" - $"F000 000F 0000 CCD4 E2CB BAEE B42C CD6F" - $"F000 000F 0000 C2BA BD2E FF3B DCC2 DCDD" - $"F000 000F 0000 D3BD D2CC 2DCD 02D0 DCEB" - $"F000 000F 0000 0EAC CDB2 CCCC 20D2 CDDB" - $"F000 000F 0000 CBBB 3AAE E2D2 CC2C C2DC" - $"F000 000F 0000 BC2E DD4A EEAE EBBB BBCD" - $"F000 000F 000C DEDD 00CD DAEA AAEF 35DC" - $"F000 000F 000B D000 0000 CCD4 DEBE EADC" - $"F000 000F 0000 0000 0000 0000 00F0 0BCD" - $"F000 000F 0000 0000 0000 0000 00F0 0FEE" - $"F000 000F 0000 0000 0000 0000 00F0 000F" - $"F000 000F 0000 0000 0000 0000 00F0 000F" - $"F000 000F 0000 0000 0000 0000 00F0 000F" - $"F000 000F FFFF FFFF FFFF FFFF FFF0 000F" - $"F000 000F 1111 1111 1111 F999 99F0 000F" - $"F000 000F 1111 1111 1111 F898 99F0 000F" - $"F000 000F 1111 1111 1111 F999 98F0 000F" - $"F000 000F 1111 1111 1111 F989 99F0 000F" - $"F000 000F 1111 1111 1111 F899 89F0 000F" - $"F000 000F 1111 1111 1111 F989 98F0 000F" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" -}; - -data 'icl8' (-16455, "Item Icon") { - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00DB 22FC 00FF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 DB21 6BDB FCFF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0081 2BDA 6BB2 FCFF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 FB03 5581 FDFB 00FF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"0000 0007 2C32 325E 0358 88DE FC00 00FF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"002B 0832 0832 5803 3988 ADFB 0000 00FF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"3208 3208 5658 0934 88AD FC00 0000 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF32" - $"0833 3964 5809 3388 AD32 FBFF FFFF FFFF" - $"FF00 0000 0000 00FF 0000 0000 0000 3208" - $"3339 8858 0934 82DF 3933 3281 D2D2 D2FF" - $"FF00 0000 0000 00FF 0000 0000 002C 0833" - $"6488 5E09 3388 B35E 6433 3233 81D2 D2FF" - $"FF00 0000 0000 00FF 0000 0000 F608 395D" - $"8858 0934 82E0 8888 5E39 332C 3281 D2FF" - $"FF00 0000 0000 00FF 0000 0000 F739 5E8E" - $"820F 5788 FFFD 645E 3357 0E32 3332 81F9" - $"FF00 0000 0000 00FF 0000 0000 3965 8833" - $"3933 3332 3357 320E 2C0E 322C 0E2D 815D" - $"FF00 0000 0000 00FF 0000 0000 F5FC 8808" - $"325D 5D34 320E 082C 0E2C 3233 3232 FA58" - $"FF00 0000 0000 00FF 0000 0000 2B58 3464" - $"88DE 8988 885E 5D33 3232 3332 335E F954" - $"FF00 0000 0000 00FF 0000 0000 5D33 5D82" - $"FA5D 8789 8EAC 89AC 885E 645E 5D64 5654" - $"FF00 0000 0000 00FF 0000 002C 8187 5756" - $"0000 F632 8189 B2DE 89B2 88AC 8888 F9F8" - $"FF00 0000 0000 00FF 0000 0081 562B 0000" - $"0000 0000 F6F7 325D 815E FB88 88FC 5656" - $"FF00 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FF00 005D 57F8" - $"FF00 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FF00 00FD AB88" - $"FF00 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FF00 0000 00FF" - $"FF00 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FF00 0000 00FF" - $"FF00 0000 0000 00FF 0505 0505 0505 0505" - $"0505 0505 FFE6 E6E6 E6E6 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0505 0505 0505 0505" - $"0505 0505 FFE5 E6E5 E6E6 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0505 0505 0505 0505" - $"0505 0505 FFE6 E6E6 E6E5 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0505 0505 0505 0505" - $"0505 0505 FFE6 E5E6 E6E6 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0505 0505 0505 0505" - $"0505 0505 FFE6 E6E6 E5E6 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0505 0505 0505 0505" - $"0505 0505 FFE5 E6E6 E6E6 FF00 0000 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" -}; - -data 'icm#' (-16455, "Item Icon") { - $"F24B D007 B028 5557 81B1 124A 8236 1005" - $"8000 1ABD 8030 557D FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" -}; - -data 'icm4' (-16455, "Item Icon") { - $"A33F CDCC DCCD CAAE A333 0000 0000 CDEE" - $"333A 0000 CCCB 2E0D EDCE CDCD DB2B DB6F" - $"D00D 00C2 BBEA BCD5 D00D 00BD 2D2D CC2D" - $"D00D 0CDC CCDB BADC D00D 0000 0000 0DCE" - $"D00D 0000 0000 0D0D D00D B1BB 1BF9 FD0D" - $"D00D 1111 1199 8D0D ECDB BB1B B1F9 FECE" -}; - -data 'icm8' (-16455, "Item Icon") { - $"DDDA DADD F8F8 F8F8 F8F8 F8F8 F864 8EAC" - $"DB23 23DC 0000 0000 0000 0000 F85C 89FB" - $"DC23 23DB 0000 0000 F608 3234 5E82 2AFA" - $"FBF8 F8FB F8F8 5633 335D 3488 575D EFF1" - $"F900 00FA 0000 2C63 5E34 FD64 5D2C 33AA" - $"FA00 00F9 0000 395E 5D5D 5733 0832 33F9" - $"F900 00FA 00F6 F92C 2B32 5D88 8888 88F8" - $"FA00 00F9 0000 0000 0000 0000 00FA F781" - $"F900 00FA 0000 0000 0000 0000 00F9 00F9" - $"FA00 00F9 3559 5335 5959 E9E7 E7FA 00FA" - $"F900 00FA 0505 0505 0505 E8E6 E6F9 00F9" - $"FBF8 F8FB 592F 5959 2F59 E9E7 E7FB F8FB" -}; - -data 'icns' (-16455, "Item Icon") { - $"6963 6E73 0000 9AB8 4943 4E23 0000 0108" - $"FFFF FFFF F700 001D BB00 002B D700 0057" - $"ED00 009D BB00 0539 DD00 1261 F700 A4E1" - $"FFFE 539F 8100 A52F 8102 AED7 8105 4BAB" - $"8103 BD12 810E 4A65 8105 2492 8102 F926" - $"810B 5FA9 8114 0B7E 8108 05AC 8100 0021" - $"8100 0027 8100 0021 8100 0021 8100 0021" - $"81FF FFE1 8100 0FE1 8122 0AE1 8108 2FA1" - $"8141 0DE1 8104 0B61 8100 9DA1 FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"6963 6C34 0000 0208 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF F333 333F 0000 0000" - $"0000 0000 0003 3E0F F333 333F 0000 0000" - $"0000 0000 00A4 3AEF F333 333F 0000 0000" - $"0000 0000 0DCA 3EEF F333 333F 0000 0000" - $"0000 0000 E1C5 FE0F F333 333F 0000 0000" - $"000C CDCB 1DEA E00F F333 333F 0000 0000" - $"0CCC 1CB1 C3FD 000F F333 333F 0000 0000" - $"D02C CB1D A9E0 000F FFFF FFFF FFFF FFFC" - $"C2C3 BCD3 EDDF FFFF F000 000F 0000 00CC" - $"2DAB 02BF 2DDD 666F F000 000F 0000 0C1D" - $"BBB1 BEAB BDCB D66F F000 000F 0000 CCD4" - $"E2CB BAEE B42C CD6F F000 000F 0000 C2BA" - $"BD2E FF3B DCC2 DCDD F000 000F 0000 D3BD" - $"D2CC 2DCD 02D0 DCEB F000 000F 0000 0EAC" - $"CDB2 CCCC 20D2 CDDB F000 000F 0000 CBBB" - $"3AAE E2D2 CC2C C2DC F000 000F 0000 BC2E" - $"DD4A EEAE EBBB BBCD F000 000F 000C DEDD" - $"00CD DAEA AAEF 35DC F000 000F 000B D000" - $"0000 CCD4 DEBE EADC F000 000F 0000 0000" - $"0000 0000 00F0 0BCD F000 000F 0000 0000" - $"0000 0000 00F0 0FEE F000 000F 0000 0000" - $"0000 0000 00F0 000F F000 000F 0000 0000" - $"0000 0000 00F0 000F F000 000F 0000 0000" - $"0000 0000 00F0 000F F000 000F FFFF FFFF" - $"FFFF FFFF FFF0 000F F000 000F 1111 1111" - $"1111 F999 99F0 000F F000 000F 1111 1111" - $"1111 F898 99F0 000F F000 000F 1111 1111" - $"1111 F999 98F0 000F F000 000F 1111 1111" - $"1111 F989 99F0 000F F000 000F 1111 1111" - $"1111 F899 89F0 000F F000 000F 1111 1111" - $"1111 F989 98F0 000F FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 6963 6C38 0000 0408" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 00DB 22FC 00FF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 DB21 6BDB FCFF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0081 2BDA 6BB2 FCFF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 FB03 5581 FDFB 00FF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"0000 0007 2C32 325E 0358 88DE FC00 00FF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"002B 0832 0832 5803 3988 ADFB 0000 00FF" - $"FF23 2323 2323 23FF 0000 0000 0000 0000" - $"3208 3208 5658 0934 88AD FC00 0000 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF32" - $"0833 3964 5809 3388 AD32 FBFF FFFF FFFF" - $"FF00 0000 0000 00FF 0000 0000 0000 3208" - $"3339 8858 0934 82DF 3933 3281 D2D2 D2FF" - $"FF00 0000 0000 00FF 0000 0000 002C 0833" - $"6488 5E09 3388 B35E 6433 3233 81D2 D2FF" - $"FF00 0000 0000 00FF 0000 0000 F608 395D" - $"8858 0934 82E0 8888 5E39 332C 3281 D2FF" - $"FF00 0000 0000 00FF 0000 0000 F739 5E8E" - $"820F 5788 FFFD 645E 3357 0E32 3332 81F9" - $"FF00 0000 0000 00FF 0000 0000 3965 8833" - $"3933 3332 3357 320E 2C0E 322C 0E2D 815D" - $"FF00 0000 0000 00FF 0000 0000 F5FC 8808" - $"325D 5D34 320E 082C 0E2C 3233 3232 FA58" - $"FF00 0000 0000 00FF 0000 0000 2B58 3464" - $"88DE 8988 885E 5D33 3232 3332 335E F954" - $"FF00 0000 0000 00FF 0000 0000 5D33 5D82" - $"FA5D 8789 8EAC 89AC 885E 645E 5D64 5654" - $"FF00 0000 0000 00FF 0000 002C 8187 5756" - $"0000 F632 8189 B2DE 89B2 88AC 8888 F9F8" - $"FF00 0000 0000 00FF 0000 0081 562B 0000" - $"0000 0000 F6F7 325D 815E FB88 88FC 5656" - $"FF00 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FF00 005D 57F8" - $"FF00 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FF00 00FD AB88" - $"FF00 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 FF00 0000 00FF" - $"FF00 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FF00 0000 00FF" - $"FF00 0000 0000 00FF 0505 0505 0505 0505" - $"0505 0505 FFE6 E6E6 E6E6 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0505 0505 0505 0505" - $"0505 0505 FFE5 E6E5 E6E6 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0505 0505 0505 0505" - $"0505 0505 FFE6 E6E6 E6E5 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0505 0505 0505 0505" - $"0505 0505 FFE6 E5E6 E6E6 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0505 0505 0505 0505" - $"0505 0505 FFE6 E6E6 E5E6 FF00 0000 00FF" - $"FF00 0000 0000 00FF 0505 0505 0505 0505" - $"0505 0505 FFE5 E6E6 E6E6 FF00 0000 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"696C 3332 0000 0670 9E00 83FF 0000 90FF" - $"058E EA44 FF00 0083 FF00 008F FF06 8FEA" - $"AB8E 4400 0083 FF00 008E FF07 5ABE AB8E" - $"4544 0000 83FF 0000 8DFF 0864 FE91 6945" - $"44FF 0000 83FF 0000 88FF 0DE2 E1CB B8A1" - $"FEB1 6245 44FF FF00 0083 FF00 0086 FF0A" - $"E2E6 E9EF B89F FEC1 6245 4480 FF01 0000" - $"83FF 0000 85FF 0AD9 E4E9 EBB8 9FFE C362" - $"4544 81FF 8D00 0BD7 E3DE BA8F A2FE C662" - $"45D0 6183 0083 FF00 0083 FF0D DAE5 D4B3" - $"679A FEC8 6245 A5C9 D361 8200 83FF 0000" - $"82FF 0FDC E2D4 A469 9EF2 C962 4579 9BC2" - $"D2D0 6181 0083 FF00 0081 FF11 E8DD D2B3" - $"6AA0 F3C7 5C1B 5D89 9CB5 CDD5 D361 8000" - $"83FF 0000 81FF 14DF C29C 657A DEB3 6A0D" - $"2082 ADBD C3D1 D5D7 D069 8800 83FF 0000" - $"81FF 14AE 8170 B9C5 C1CE C7B2 AFDA E7EA" - $"E1D9 D8D9 D469 8600 83FF 0000 81FF 14EE" - $"5C75 EBD4 9FB3 C4DE E7EC EBE3 E4DD D6CE" - $"C672 9C00 83FF 0000 81FF 14C6 A2C7 886F" - $"4D61 6F7F 9094 C1DB CCC1 C0B7 AB82 A200" - $"83FF 0000 81FF 1499 BFAE 5C8A 856D 504E" - $"5A5B 556C 8F8B 8C95 888F A400 83FF 0000" - $"80FF 15CA 667C 8C9F FFFF DCB5 8251 4A43" - $"3F4B 535E 6860 8FA6 0083 FF00 0080 FF02" - $"669F C283 FF0C DCC3 A88D 847B 686D 5A5E" - $"8FAF 0083 FF00 008F FF06 00FF FF81 8FB5" - $"0083 FF00 008F FF06 00FF FF22 4444 0083" - $"FF00 008F FF00 0081 FF01 0000 83FF 0000" - $"8FFF 0000 81FF 0100 0083 FF00 008F FF00" - $"0081 FF01 0000 83FF 9100 81FF 0100 0083" - $"FF00 0089 FF84 0081 FF01 0000 83FF 0000" - $"89FF 8400 81FF 0100 0083 FF00 0089 FF84" - $"0081 FF01 0000 83FF 0000 89FF 8400 81FF" - $"0100 0083 FF00 0089 FF84 0081 FF01 0000" - $"83FF 0000 89FF 8400 81FF 9E00 A500 90FF" - $"0301 0044 FF86 008F FF04 0900 0001 4486" - $"008E FF05 67BC 0001 1944 8600 8DFF 0666" - $"E49D 7119 44FF 8600 88FF 0BC9 BEA7 9B82" - $"E489 4419 44FF FF86 0086 FF0A CFB6 B9BB" - $"9B79 E493 4419 4480 FF86 0085 FF0A B2AC" - $"B6B5 9B7D E497 4419 4481 FF8D 000B AFAF" - $"A06E 5180 E49A 4419 9B62 8300 83FF 0000" - $"83FF 0DB2 B397 682E 76E4 9D44 1963 96A1" - $"6282 0083 FF00 0082 FF0F BEB0 9953 307E" - $"CF9C 4619 3459 8BA6 9C62 8100 83FF 0000" - $"81FF 11E0 B191 672E 7ED0 9A44 0E2A 3C55" - $"7BA0 A8A2 6280 0083 FF00 0081 FF14 C576" - $"4B2D 51B5 864F 040E 3461 818A 9FA8 A7A1" - $"687C 0083 FF00 0081 FF14 722D 3A7D 8683" - $"9998 8C85 A0B3 B9AE A9AA AAA5 687E 0083" - $"FF00 0081 FF14 E844 38B3 A962 6F7D 9DB2" - $"BEBC B5B7 AFA5 9B95 7392 0083 FF00 0081" - $"FF14 C283 9A44 3D1E 2934 4455 5C8E AC9A" - $"8B89 7D75 829A 0083 FF00 0081 FF14 6E8B" - $"8044 746B 4522 222F 302E 425C 5558 6055" - $"8E9E 0083 FF00 0080 FF15 B466 5A81 9FFF" - $"FFD6 9F5B 231B 1310 202B 333C 378E A000" - $"83FF 0000 80FF 0266 9FC2 83FF 0CD6 B692" - $"6F66 5B47 4931 3B8E A600 83FF 0000 8FFF" - $"0600 FFFF 728E AB00 83FF 0000 8FFF 0600" - $"FFFF 2244 4400 83FF 0000 8FFF 0000 81FF" - $"0100 0083 FF00 008F FF00 0081 FF01 0000" - $"83FF 0000 8FFF 0000 81FF 0100 0083 FF91" - $"0081 FF01 0000 83FF 0000 89FF 0000 827B" - $"0000 81FF 0100 0083 FF00 0089 FF00 0082" - $"7B00 0081 FF01 0000 83FF 0000 89FF 0000" - $"827B 0000 81FF 0100 0083 FF00 0089 FF00" - $"0082 7B00 0081 FF01 0000 83FF 0000 89FF" - $"0000 827B 0000 81FF 0100 0083 FF00 0089" - $"FF00 0082 7B00 0081 FF9E 00A5 0090 FF03" - $"0F43 44FF 8600 8FFF 0417 4316 0F44 8600" - $"8EFF 0565 C416 0F1A 4486 008D FF06 5567" - $"A76C 1A44 FF86 0088 FF0B BCA9 9293 3E67" - $"4D23 1A44 FFFF 8600 86FF 0AC6 9A98 9893" - $"3167 4A23 1A44 80FF 8600 85FF 0A9C 8E99" - $"9593 3767 4F23 1A44 81FF 8D00 0B92 8F86" - $"5747 3967 5223 1A7A 6183 0083 FF00 0083" - $"FF0D 9591 7C51 2A32 6753 231A 4B78 8361" - $"80FF 0100 0083 FF00 0082 FF13 A98B 7D41" - $"2C37 6353 241A 2C44 6D8A 8061 FFFF 0000" - $"83FF 0000 81FF 14DA 9278 5427 3761 5122" - $"1124 323F 6084 8D86 61FF 0000 83FF 0000" - $"81FF 14B7 5B3C 2730 5956 2A0A 0C2C 4F65" - $"6C85 8D89 8869 8800 83FF 0000 81FF 1461" - $"202F 6A76 7683 8378 748C 9A9D 918E 8E8C" - $"8869 5500 83FF 0000 81FF 14E7 2230 9694" - $"5354 5F80 95A2 9E9A 9D94 8881 7A73 4400" - $"83FF 0000 81FF 14C6 4651 3538 191F 2A36" - $"444A 7591 8173 7268 6081 FF00 83FF 0000" - $"81FF 0859 6A49 2277 683C 1A1D 8028 0838" - $"4D47 484F 478E FF00 83FF 0000 80FF 15A8" - $"654A 7F9F FFFF D39A 551C 140E 0B1B 262B" - $"3330 8E9A 0083 FF00 0080 FF02 659F C283" - $"FF0C D3B2 8E69 5F56 4243 2B35 8E9F 0083" - $"FF00 008F FF06 00FF FF6B 8EA7 0083 FF00" - $"008F FF06 00FF FF22 4444 0083 FF00 008F" - $"FF00 0081 FF01 0000 83FF 0000 8FFF 0000" - $"81FF 0100 0083 FF00 008F FF00 0081 FF01" - $"0000 83FF 9100 81FF 0100 0083 FF91 0081" - $"FF01 0000 83FF 9100 81FF 0100 0083 FF91" - $"0081 FF01 0000 83FF 9100 81FF 0100 0083" - $"FF91 0081 FF01 0000 83FF 9100 81FF 9E00" - $"6C38 6D6B 0000 0408 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 6963 6823 0000 0248" - $"FFFF FFFF FFFF FFFF FFFF FFFF F770 0000" - $"0001 EEB0 0000 0001 F5D0 0000 0001 EF70" - $"0000 0001 DBB0 0000 0001 F570 0000 0001" - $"FED0 0000 0001 D5B0 0000 0001 EF70 0000" - $"0001 FAD0 0000 0001 FFFF FFFF FFFF FFFF" - $"FFFF FFFF C010 0000 01FF C010 0000 01FF" - $"C010 0000 01EF C010 0000 01FF C010 0000" - $"01FB C010 0000 01DF C010 0000 01FF C010" - $"0000 01FF C010 0000 01FF C010 0000 0181" - $"C010 0000 0181 C010 0000 0181 C010 0000" - $"0181 C010 0000 0181 C010 0000 0181 C010" - $"0000 0181 C010 0000 0181 C010 0000 0181" - $"C010 0000 0181 C010 0000 0181 C010 0000" - $"0181 C010 0000 0181 C01F FFFF FF81 C01F" - $"FFFF FF81 C010 0003 FF81 C011 1113 D581" - $"C010 4443 6F81 C012 000B BB81 C010 8883" - $"DD81 C014 2203 6B81 C011 004B BD81 C010" - $"1103 F781 C014 0423 5B81 FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"6963 6834 0000 0488 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FF33 3333 333F 0000" - $"0000 0000 0000 0000 0000 0000 0000 000F" - $"FF33 3333 333F 0000 0000 0000 0000 0000" - $"0000 0000 0000 000F FF33 3333 333F 0000" - $"0000 0000 0000 0000 0000 0000 0000 000F" - $"FF33 3333 333F 0000 0000 0000 0000 0000" - $"0000 0000 0000 000F FF33 3333 333F 0000" - $"0000 0000 0000 0000 0000 0000 0000 000F" - $"FF33 3333 333F 0000 0000 0000 0000 0000" - $"0000 0000 0000 000F FF33 3333 333F 0000" - $"0000 0000 0000 0000 0000 0000 0000 000F" - $"FF33 3333 333F 0000 0000 0000 0000 0000" - $"0000 0000 0000 000F FF33 3333 333F 0000" - $"0000 0000 0000 0000 0000 0000 0000 000F" - $"FF33 3333 333F 0000 0000 0000 0000 0000" - $"0000 0000 0000 000F FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FF00 0000 000F 0000" - $"0000 0000 0000 0000 0000 000F F666 666F" - $"FF00 0000 000F 0000 0000 0000 0000 0000" - $"0000 000F F666 666F FF00 0000 000F 0000" - $"0000 0000 0000 0000 0000 000F F666 666F" - $"FF00 0000 000F 0000 0000 0000 0000 0000" - $"0000 000F F666 666F FF00 0000 000F 0000" - $"0000 0000 0000 0000 0000 000F F666 666F" - $"FF00 0000 000F 0000 0000 0000 0000 0000" - $"0000 000F F666 666F FF00 0000 000F 0000" - $"0000 0000 0000 0000 0000 000F F666 666F" - $"FF00 0000 000F 0000 0000 0000 0000 0000" - $"0000 000F FFFF FFFF FF00 0000 000F 0000" - $"0000 0000 0000 0000 0000 000F FFFF FFFF" - $"FF00 0000 000F 0000 0000 0000 0000 0000" - $"0000 000F F000 000F FF00 0000 000F 0000" - $"0000 0000 0000 0000 0000 000F F000 000F" - $"FF00 0000 000F 0000 0000 0000 0000 0000" - $"0000 000F F000 000F FF00 0000 000F 0000" - $"0000 0000 0000 0000 0000 000F F000 000F" - $"FF00 0000 000F 0000 0000 0000 0000 0000" - $"0000 000F F000 000F FF00 0000 000F 0000" - $"0000 0000 0000 0000 0000 000F F000 000F" - $"FF00 0000 000F 0000 0000 0000 0000 0000" - $"0000 000F F000 000F FF00 0000 000F 0000" - $"0000 0000 0000 0000 0000 000F F000 000F" - $"FF00 0000 000F 0000 0000 0000 0000 0000" - $"0000 000F F000 000F FF00 0000 000F 0000" - $"0000 0000 0000 0000 0000 000F F000 000F" - $"FF00 0000 000F 0000 0000 0000 0000 0000" - $"0000 000F F000 000F FF00 0000 000F 0000" - $"0000 0000 0000 0000 0000 000F F000 000F" - $"FF00 0000 000F 0000 0000 0000 0000 0000" - $"0000 000F F000 000F FF00 0000 000F FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF F000 000F" - $"FF00 0000 000F FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF F000 000F FF00 0000 000F 1111" - $"1111 1111 1111 11FF 9999 999F F000 000F" - $"FF00 0000 000F 1111 1111 1111 1111 11FF" - $"9989 898F F000 000F FF00 0000 000F 1111" - $"1111 1111 1111 11FF 8998 999F F000 000F" - $"FF00 0000 000F 1111 1111 1111 1111 11FF" - $"9899 989F F000 000F FF00 0000 000F 1111" - $"1111 1111 1111 11FF 9989 998F F000 000F" - $"FF00 0000 000F 1111 1111 1111 1111 11FF" - $"8999 899F F000 000F FF00 0000 000F 1111" - $"1111 1111 1111 11FF 9899 989F F000 000F" - $"FF00 0000 000F 1111 1111 1111 1111 11FF" - $"9999 899F F000 000F FF00 0000 000F 1111" - $"1111 1111 1111 11FF 8989 989F F000 000F" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF 6963 6838 0000 0908" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF 2323 2323 2323 2323 23FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF 2323 2323 2323 2323 23FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF 2323 2323 2323 2323 23FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF 2323 2323 2323 2323 23FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF 2323 2323 2323 2323 23FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF 2323 2323 2323 2323 23FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF 2323 2323 2323 2323 23FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF 2323 2323 2323 2323 23FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF 2323 2323 2323 2323 23FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF 2323 2323 2323 2323 23FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFD2 D2D2 D2D2 D2FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FFFF FFFF FFFF FFFF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0000 0000" - $"0000 0000 0000 0000 0000 0000 0000 0000" - $"0000 0000 0000 00FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0505 0505" - $"0505 0505 0505 0505 0505 0505 0505 FFFF" - $"E6E6 E6E6 E6E6 E6FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0505 0505" - $"0505 0505 0505 0505 0505 0505 0505 FFFF" - $"E6E6 E5E6 E5E6 E5FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0505 0505" - $"0505 0505 0505 0505 0505 0505 0505 FFFF" - $"E5E6 E6E6 E6E6 E6FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0505 0505" - $"0505 0505 0505 0505 0505 0505 0505 FFFF" - $"E6E6 E6E5 E6E5 E6FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0505 0505" - $"0505 0505 0505 0505 0505 0505 0505 FFFF" - $"E6E5 E6E6 E6E6 E5FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0505 0505" - $"0505 0505 0505 0505 0505 0505 0505 FFFF" - $"E6E6 E6E6 E5E6 E6FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0505 0505" - $"0505 0505 0505 0505 0505 0505 0505 FFFF" - $"E5E6 E6E6 E6E5 E6FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0505 0505" - $"0505 0505 0505 0505 0505 0505 0505 FFFF" - $"E6E6 E6E5 E6E6 E6FF FF00 0000 0000 00FF" - $"FFFF 0000 0000 0000 0000 00FF 0505 0505" - $"0505 0505 0505 0505 0505 0505 0505 FFFF" - $"E6E5 E6E6 E5E6 E6FF FF00 0000 0000 00FF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"6968 3332 0000 052A DF00 86FF 0000 A0FF" - $"8000 86FF 0000 A0FF 8000 86FF 0000 A0FF" - $"8000 86FF 0000 A0FF 8000 86FF 0000 A0FF" - $"8000 86FF 0000 A0FF 8000 86FF 0000 A0FF" - $"8000 86FF 0000 A0FF 8000 86FF 0000 A0FF" - $"8000 86FF 0000 A0FF E000 86FF 0000 98FF" - $"8800 86FF 0000 98FF 8800 86FF 0000 98FF" - $"8800 86FF 0000 98FF 8800 86FF 0000 98FF" - $"8800 86FF 0000 98FF 8800 86FF 0000 98FF" - $"8800 86FF 0000 98FF 8800 86FF 0000 98FF" - $"8800 86FF 0000 98FF 0100 0083 FF80 0086" - $"FF00 0098 FF01 0000 83FF 8000 86FF 0000" - $"98FF 0100 0083 FF80 0086 FF00 0098 FF01" - $"0000 83FF 8000 86FF 0000 98FF 0100 0083" - $"FF80 0086 FF00 0098 FF01 0000 83FF 8000" - $"86FF 0000 98FF 0100 0083 FF80 0086 FF00" - $"0098 FF01 0000 83FF 8000 86FF 0000 98FF" - $"0100 0083 FF80 0086 FF00 0098 FF01 0000" - $"83FF 8000 86FF 0000 98FF 0100 0083 FF80" - $"0086 FF00 0098 FF01 0000 83FF 8000 86FF" - $"0000 98FF 0100 0083 FF80 0086 FF9B 0083" - $"FF80 0086 FF9B 0083 FF80 0086 FF00 008F" - $"FF88 0083 FF80 0086 FF00 008F FF88 0083" - $"FF80 0086 FF00 008F FF88 0083 FF80 0086" - $"FF00 008F FF88 0083 FF80 0086 FF00 008F" - $"FF88 0083 FF80 0086 FF00 008F FF88 0083" - $"FF80 0086 FF00 008F FF88 0083 FF80 0086" - $"FF00 008F FF88 0083 FF80 0086 FF00 008F" - $"FF88 0083 FFAE 00E9 00A0 FF8A 00A0 FF8A" - $"00A0 FF8A 00A0 FF8A 00A0 FF8A 00A0 FF8A" - $"00A0 FF8A 00A0 FF8A 00A0 FF8A 00A0 FFE0" - $"0086 FF00 0098 FF88 0086 FF00 0098 FF88" - $"0086 FF00 0098 FF88 0086 FF00 0098 FF88" - $"0086 FF00 0098 FF88 0086 FF00 0098 FF88" - $"0086 FF00 0098 FF88 0086 FF00 0098 FF88" - $"0086 FF00 0098 FF88 0086 FF00 0098 FF01" - $"0000 83FF 8000 86FF 0000 98FF 0100 0083" - $"FF80 0086 FF00 0098 FF01 0000 83FF 8000" - $"86FF 0000 98FF 0100 0083 FF80 0086 FF00" - $"0098 FF01 0000 83FF 8000 86FF 0000 98FF" - $"0100 0083 FF80 0086 FF00 0098 FF01 0000" - $"83FF 8000 86FF 0000 98FF 0100 0083 FF80" - $"0086 FF00 0098 FF01 0000 83FF 8000 86FF" - $"0000 98FF 0100 0083 FF80 0086 FF00 0098" - $"FF01 0000 83FF 8000 86FF 0000 98FF 0100" - $"0083 FF80 0086 FF00 0098 FF01 0000 83FF" - $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF" - $"8000 86FF 0000 8FFF 0100 0084 7B01 0000" - $"83FF 8000 86FF 0000 8FFF 0100 0084 7B01" - $"0000 83FF 8000 86FF 0000 8FFF 0100 0084" - $"7B01 0000 83FF 8000 86FF 0000 8FFF 0100" - $"0084 7B01 0000 83FF 8000 86FF 0000 8FFF" - $"0100 0084 7B01 0000 83FF 8000 86FF 0000" - $"8FFF 0100 0084 7B01 0000 83FF 8000 86FF" - $"0000 8FFF 0100 0084 7B01 0000 83FF 8000" - $"86FF 0000 8FFF 0100 0084 7B01 0000 83FF" - $"8000 86FF 0000 8FFF 0100 0084 7B01 0000" - $"83FF AE00 E900 A0FF 8A00 A0FF 8A00 A0FF" - $"8A00 A0FF 8A00 A0FF 8A00 A0FF 8A00 A0FF" - $"8A00 A0FF 8A00 A0FF 8A00 A0FF E000 86FF" - $"0000 98FF 0100 0083 FF80 0086 FF00 0098" - $"FF01 0000 83FF 8000 86FF 0000 98FF 0100" - $"0083 FF80 0086 FF00 0098 FF01 0000 83FF" - $"8000 86FF 0000 98FF 0100 0083 FF80 0086" - $"FF00 0098 FF01 0000 83FF 8000 86FF 0000" - $"98FF 0100 0083 FF80 0086 FF00 0098 FF88" - $"0086 FF00 0098 FF88 0086 FF00 0098 FF01" - $"0000 83FF 8000 86FF 0000 98FF 0100 0083" - $"FF80 0086 FF00 0098 FF01 0000 83FF 8000" - $"86FF 0000 98FF 0100 0083 FF80 0086 FF00" - $"0098 FF01 0000 83FF 8000 86FF 0000 98FF" - $"0100 0083 FF80 0086 FF00 0098 FF01 0000" - $"83FF 8000 86FF 0000 98FF 0100 0083 FF80" - $"0086 FF00 0098 FF01 0000 83FF 8000 86FF" - $"0000 98FF 0100 0083 FF80 0086 FF00 0098" - $"FF01 0000 83FF 8000 86FF 0000 98FF 0100" - $"0083 FF80 0086 FF00 0098 FF01 0000 83FF" - $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF" - $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF" - $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF" - $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF" - $"8000 86FF 9B00 83FF 8000 86FF 9B00 83FF" - $"8000 86FF 9B00 83FF AE00 6838 6D6B 0000" - $"0908 FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF 6963 7323 0000 0048 F557 D001 700E" - $"E024 9A9B 0175 9299 0162 923E 0001 9004" - $"0000 9BBC 102C 8434 5AFD FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF 6963 7334 0000" - $"0088 AA3F DDDD DDDD DDAE A333 0000 0000" - $"0C3E 333A 0000 000C DBEC A333 0000 0CBC" - $"2A00 EDDF DDDB D2CB ECFF D00D 00CD BBBA" - $"B2D6 D00D 00B2 DDBB DCCB D00D 00D4 D2D2" - $"CC2D D00D 00BD CCE5 3EEC D00D 0C00 0000" - $"CBCB D00D 0000 0000 0D0D D00D 0000 0000" - $"0D00 D00D ABAB ABAF 9F00 D00D 1111 11B8" - $"9900 D00D 1111 1189 9F00 EDDA 8291 ABAF" - $"9FDD 6963 7338 0000 0108 DEDC DBB3 F9FA" - $"F9FA F9FA F9FA F9FA 8FFB DC23 23DB 0000" - $"0000 0000 0000 0032 6A88 DB23 23DC 0000" - $"0000 0000 F52B 3357 882B DC23 23DB 0000" - $"0000 F608 3234 33AD F600 FCFA F9AC F9FA" - $"F95D 0E5D 3457 8833 F1F2 FA00 00F9 0000" - $"0733 825E 33AD 6432 33EF F900 00FA 0000" - $"5D5E 5D33 825D 3332 2C57 FA00 00F9 0000" - $"5739 5D64 5D33 3232 335C F900 00FA 00F5" - $"5D57 F732 828E 8988 88F9 FA00 00F9 00F6" - $"F600 0000 F5F6 4F5D F85D F900 00FA 0000" - $"0000 0000 0000 00FA 0056 FA00 00FA 0000" - $"0000 0000 0000 00F9 0000 F900 00F9 8359" - $"8359 8359 ADD1 E8EA 0000 FA00 00FA 0505" - $"0505 0505 5FE5 E6E8 0000 F900 00F9 0505" - $"0505 0505 7DE6 E6D1 0000 ACF9 FAFC 8359" - $"8359 8359 ADD1 E8E9 FAF9 6973 3332 0000" - $"026C 0340 8080 4087 8005 5E51 80FF FF80" - $"86FF 06AA B457 80FF FF80 83FF 09F1 E1C1" - $"A94E D180 FFFF 8081 FF0B ECE6 DFBE BA4D" - $"D1FF 4080 8040 8080 4FA6 DCAD B3BC 65B4" - $"1900 80FF FF80 FFFF E9CF 87A7 B848 8FC6" - $"B719 80FF FF80 FFFF B58B A0C9 7D8B CFD4" - $"D89E 80FF FF80 FFFF ADAC A280 A5BE DBD4" - $"C79A 80FF FF80 FFF2 8F8E C5B4 7655 516E" - $"7A82 80FF FF80 FFD9 D880 FF09 F7DB C479" - $"B280 80FF FF80 86FF 0680 FF9A 80FF FF80" - $"86FF 0580 FFFF 80FF FF84 8000 4080 0005" - $"FFFF 80FF FF80 83FF 0080 8000 05FF FF80" - $"FFFF 8083 FF00 8080 0005 FFFF 4080 8040" - $"8380 0040 8000 0180 8081 0087 8001 0151" - $"8100 86FF 028B 0129 8100 83FF 05E2 D0B3" - $"943A D181 0081 FF0B D9BA B19E 952F D1FF" - $"4080 8040 8080 4F85 A369 8B98 378E 1900" - $"80FF FF80 FFFF D491 417F 9326 4893 9219" - $"80FF FF80 FFFF 774C 6C96 5E5A 94A0 A986" - $"80FF FF80 FFFF 9D73 7346 6589 ABA3 9280" - $"80FF FF80 FFED 6F7A BAA2 5028 253F 4A6A" - $"80FF FF80 FFD9 D880 FF09 F5D2 B569 9E73" - $"80FF FF80 86FF 0680 FF9A 80FF FF80 86FF" - $"0580 FFFF 80FF FF84 8009 403E 3E1F FFFF" - $"80FF FF80 83FF 0980 7B7B 3EFF FF80 FFFF" - $"8083 FF09 807B 7B3E FFFF 4080 8040 8380" - $"0540 3E3E 1F80 8081 0087 8001 1551 8100" - $"86FF 0290 202D 8100 83FF 05D9 C97F 6039" - $"D181 0081 FF0B CEA2 9759 4927 D1FF 4080" - $"8040 8080 4F6F 8657 474C 2976 5980 80FF" - $"FF80 FFFF C676 343F 4B1D 3977 7ED8 80FF" - $"FF80 FFFF 6540 536B 4C4E 7B85 8D79 80FF" - $"FF80 FFFF 8654 6638 5072 908A 7974 80FF" - $"FF80 FFEA 5D63 BB9E 4A20 1F36 3E65 80FF" - $"FF80 FFD9 D880 FF09 F4D0 B266 9B6F 80FF" - $"FF80 86FF 0680 FF9A 80FF FF80 86FF 0680" - $"FFFF 80FF FF80 8700 05FF FF80 FFFF 8087" - $"0005 FFFF 80FF FF80 8700 05FF FF40 8080" - $"4087 0001 8080 7338 6D6B 0000 0108 FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 6963" - $"6D23 0000 0038 F24B D007 B028 5557 81B1" - $"124A 8236 1005 8000 1ABD 8030 557D FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF 6963 6D34 0000 0068 A33F" - $"CDCC DCCD CAAE A333 0000 0000 CDEE 333A" - $"0000 CCCB 2E0D EDCE CDCD DB2B DB6F D00D" - $"00C2 BBEA BCD5 D00D 00BD 2D2D CC2D D00D" - $"0CDC CCDB BADC D00D 0000 0000 0DCE D00D" - $"0000 0000 0D0D D00D B1BB 1BF9 FD0D D00D" - $"1111 1199 8D0D ECDB BB1B B1F9 FECE 6963" - $"6D38 0000 00C8 DDDA DADD F8F8 F8F8 F8F8" - $"F8F8 F864 8EAC DB23 23DC 0000 0000 0000" - $"0000 F85C 89FB DC23 23DB 0000 0000 F608" - $"3234 5E82 2AFA FBF8 F8FB F8F8 5633 335D" - $"3488 575D EFF1 F900 00FA 0000 2C63 5E34" - $"FD64 5D2C 33AA FA00 00F9 0000 395E 5D5D" - $"5733 0832 33F9 F900 00FA 00F6 F92C 2B32" - $"5D88 8888 88F8 FA00 00F9 0000 0000 0000" - $"0000 00FA F781 F900 00FA 0000 0000 0000" - $"0000 00F9 00F9 FA00 00F9 3559 5335 5959" - $"E9E7 E7FA 00FA F900 00FA 0505 0505 0505" - $"E8E6 E6F9 00F9 FBF8 F8FB 592F 5959 2F59" - $"E9E7 E7FB F8FB 6974 3332 0000 245A 0000" - $"0000 FF00 FF00 FF00 FB00 95FF 8100 C9FF" - $"818E 81EA 8144 81FF 8500 95FF 8100 C9FF" - $"818E 81EA 8144 81FF 8500 95FF 8100 C9FF" - $"818E 81EA 8144 81FF 8500 95FF 8100 C9FF" - $"818E 81EA 8144 81FF 8500 95FF 8100 C5FF" - $"818F 81EA 81AB 818E 8144 8500 95FF 8100" - $"C5FF 818F 81EA 81AB 818E 8144 8500 95FF" - $"8100 C5FF 818F 81EA 81AB 818E 8144 8500" - $"95FF 8100 C5FF 818F 81EA 81AB 818E 8144" - $"8500 95FF 8100 C1FF 815A 81BE 81AB 818E" - $"8145 8144 8500 95FF 8100 C1FF 815A 81BE" - $"81AB 818E 8145 8144 8500 95FF 8100 C1FF" - $"815A 81BE 81AB 818E 8145 8144 8500 95FF" - $"8100 C1FF 815A 81BE 81AB 818E 8145 8144" - $"8500 95FF 8100 BDFF 8164 81FE 8191 8169" - $"8145 8144 81FF 8500 95FF 8100 BDFF 8164" - $"81FE 8191 8169 8145 8144 81FF 8500 95FF" - $"8100 BDFF 8164 81FE 8191 8169 8145 8144" - $"81FF 8500 95FF 8100 BDFF 8164 81FE 8191" - $"8169 8145 8144 81FF 8500 95FF 8100 A9FF" - $"81E2 81E1 81CB 81B8 81A1 81FE 81B1 8162" - $"8145 8144 85FF 8500 95FF 8100 A9FF 81E2" - $"81E1 81CB 81B8 81A1 81FE 81B1 8162 8145" - $"8144 85FF 8500 95FF 8100 A9FF 81E2 81E1" - $"81CB 81B8 81A1 81FE 81B1 8162 8145 8144" - $"85FF 8500 95FF 8100 A9FF 81E2 81E1 81CB" - $"81B8 81A1 81FE 81B1 8162 8145 8144 85FF" - $"8500 95FF 8100 A1FF 81E2 81E6 81E9 81EF" - $"81B8 819F 81FE 81C1 8162 8145 8144 89FF" - $"8500 95FF 8100 A1FF 81E2 81E6 81E9 81EF" - $"81B8 819F 81FE 81C1 8162 8145 8144 89FF" - $"8500 95FF 8100 A1FF 81E2 81E6 81E9 81EF" - $"81B8 819F 81FE 81C1 8162 8145 8144 89FF" - $"8500 95FF 8100 A1FF 81E2 81E6 81E9 81EF" - $"81B8 819F 81FE 81C1 8162 8145 8144 89FF" - $"8500 95FF 8100 9DFF 81D9 81E4 81E9 81EB" - $"81B8 819F 81FE 81C3 8162 8145 8144 8DFF" - $"8500 95FF 8100 9DFF 81D9 81E4 81E9 81EB" - $"81B8 819F 81FE 81C3 8162 8145 8144 8DFF" - $"8500 95FF 8100 9DFF 81D9 81E4 81E9 81EB" - $"81B8 819F 81FE 81C3 8162 8145 8144 8DFF" - $"8500 95FF 8100 9DFF 81D9 81E4 81E9 81EB" - $"81B8 819F 81FE 81C3 8162 8145 8144 8DFF" - $"BD00 81D7 81E3 81DE 81BA 818F 81A2 81FE" - $"81C6 8162 8145 81D0 8161 CD00 81D7 81E3" - $"81DE 81BA 818F 81A2 81FE 81C6 8162 8145" - $"81D0 8161 CD00 81D7 81E3 81DE 81BA 818F" - $"81A2 81FE 81C6 8162 8145 81D0 8161 CD00" - $"81D7 81E3 81DE 81BA 818F 81A2 81FE 81C6" - $"8162 8145 81D0 8161 9500 95FF 8100 95FF" - $"81DA 81E5 81D4 81B3 8167 819A 81FE 81C8" - $"8162 8145 81A5 81C9 81D3 8161 9100 95FF" - $"8100 95FF 81DA 81E5 81D4 81B3 8167 819A" - $"81FE 81C8 8162 8145 81A5 81C9 81D3 8161" - $"9100 95FF 8100 95FF 81DA 81E5 81D4 81B3" - $"8167 819A 81FE 81C8 8162 8145 81A5 81C9" - $"81D3 8161 9100 95FF 8100 95FF 81DA 81E5" - $"81D4 81B3 8167 819A 81FE 81C8 8162 8145" - $"81A5 81C9 81D3 8161 9100 95FF 8100 91FF" - $"81DC 81E2 81D4 81A4 8169 819E 81F2 81C9" - $"8162 8145 8179 819B 81C2 81D2 81D0 8161" - $"8D00 95FF 8100 91FF 81DC 81E2 81D4 81A4" - $"8169 819E 81F2 81C9 8162 8145 8179 819B" - $"81C2 81D2 81D0 8161 8D00 95FF 8100 91FF" - $"81DC 81E2 81D4 81A4 8169 819E 81F2 81C9" - $"8162 8145 8179 819B 81C2 81D2 81D0 8161" - $"8D00 95FF 8100 91FF 81DC 81E2 81D4 81A4" - $"8169 819E 81F2 81C9 8162 8145 8179 819B" - $"81C2 81D2 81D0 8161 8D00 95FF 8100 8DFF" - $"81E8 81DD 81D2 81B3 816A 81A0 81F3 81C7" - $"815C 811B 815D 8189 819C 81B5 81CD 81D5" - $"81D3 8161 8900 95FF 8100 8DFF 81E8 81DD" - $"81D2 81B3 816A 81A0 81F3 81C7 815C 811B" - $"815D 8189 819C 81B5 81CD 81D5 81D3 8161" - $"8900 95FF 8100 8DFF 81E8 81DD 81D2 81B3" - $"816A 81A0 81F3 81C7 815C 811B 815D 8189" - $"819C 81B5 81CD 81D5 81D3 8161 8900 95FF" - $"8100 8DFF 81E8 81DD 81D2 81B3 816A 81A0" - $"81F3 81C7 815C 811B 815D 8189 819C 81B5" - $"81CD 81D5 81D3 8161 8900 95FF 8100 8DFF" - $"81DF 81C2 819C 8165 817A 81DE 81B3 816A" - $"810D 8120 8182 81AD 81BD 81C3 81D1 81D5" - $"81D7 81D0 8169 8188 8100 95FF 8100 8DFF" - $"81DF 81C2 819C 8165 817A 81DE 81B3 816A" - $"810D 8120 8182 81AD 81BD 81C3 81D1 81D5" - $"81D7 81D0 8169 8188 8100 95FF 8100 8DFF" - $"81DF 81C2 819C 8165 817A 81DE 81B3 816A" - $"810D 8120 8182 81AD 81BD 81C3 81D1 81D5" - $"81D7 81D0 8169 8188 8100 95FF 8100 8DFF" - $"81DF 81C2 819C 8165 817A 81DE 81B3 816A" - $"810D 8120 8182 81AD 81BD 81C3 81D1 81D5" - $"81D7 81D0 8169 8188 8100 95FF 8100 8DFF" - $"81AE 8181 8170 81B9 81C5 81C1 81CE 81C7" - $"81B2 81AF 81DA 81E7 81EA 81E1 81D9 81D8" - $"81D9 81D4 8169 8186 8100 95FF 8100 8DFF" - $"81AE 8181 8170 81B9 81C5 81C1 81CE 81C7" - $"81B2 81AF 81DA 81E7 81EA 81E1 81D9 81D8" - $"81D9 81D4 8169 8186 8100 95FF 8100 8DFF" - $"81AE 8181 8170 81B9 81C5 81C1 81CE 81C7" - $"81B2 81AF 81DA 81E7 81EA 81E1 81D9 81D8" - $"81D9 81D4 8169 8186 8100 95FF 8100 8DFF" - $"81AE 8181 8170 81B9 81C5 81C1 81CE 81C7" - $"81B2 81AF 81DA 81E7 81EA 81E1 81D9 81D8" - $"81D9 81D4 8169 8186 8100 95FF 8100 8DFF" - $"81EE 815C 8175 81EB 81D4 819F 81B3 81C4" - $"81DE 81E7 81EC 81EB 81E3 81E4 81DD 81D6" - $"81CE 81C6 8172 819C 8100 95FF 8100 8DFF" - $"81EE 815C 8175 81EB 81D4 819F 81B3 81C4" - $"81DE 81E7 81EC 81EB 81E3 81E4 81DD 81D6" - $"81CE 81C6 8172 819C 8100 95FF 8100 8DFF" - $"81EE 815C 8175 81EB 81D4 819F 81B3 81C4" - $"81DE 81E7 81EC 81EB 81E3 81E4 81DD 81D6" - $"81CE 81C6 8172 819C 8100 95FF 8100 8DFF" - $"81EE 815C 8175 81EB 81D4 819F 81B3 81C4" - $"81DE 81E7 81EC 81EB 81E3 81E4 81DD 81D6" - $"81CE 81C6 8172 819C 8100 95FF 8100 8DFF" - $"81C6 81A2 81C7 8188 816F 814D 8161 816F" - $"817F 8190 8194 81C1 81DB 81CC 81C1 81C0" - $"81B7 81AB 8182 81A2 8100 95FF 8100 8DFF" - $"81C6 81A2 81C7 8188 816F 814D 8161 816F" - $"817F 8190 8194 81C1 81DB 81CC 81C1 81C0" - $"81B7 81AB 8182 81A2 8100 95FF 8100 8DFF" - $"81C6 81A2 81C7 8188 816F 814D 8161 816F" - $"817F 8190 8194 81C1 81DB 81CC 81C1 81C0" - $"81B7 81AB 8182 81A2 8100 95FF 8100 8DFF" - $"81C6 81A2 81C7 8188 816F 814D 8161 816F" - $"817F 8190 8194 81C1 81DB 81CC 81C1 81C0" - $"81B7 81AB 8182 81A2 8100 95FF 8100 8DFF" - $"8199 81BF 81AE 815C 818A 8185 816D 8150" - $"814E 815A 815B 8155 816C 818F 818B 818C" - $"8195 8188 818F 81A4 8100 95FF 8100 8DFF" - $"8199 81BF 81AE 815C 818A 8185 816D 8150" - $"814E 815A 815B 8155 816C 818F 818B 818C" - $"8195 8188 818F 81A4 8100 95FF 8100 8DFF" - $"8199 81BF 81AE 815C 818A 8185 816D 8150" - $"814E 815A 815B 8155 816C 818F 818B 818C" - $"8195 8188 818F 81A4 8100 95FF 8100 8DFF" - $"8199 81BF 81AE 815C 818A 8185 816D 8150" - $"814E 815A 815B 8155 816C 818F 818B 818C" - $"8195 8188 818F 81A4 8100 95FF 8100 89FF" - $"81CA 8166 817C 818C 819F 85FF 81DC 81B5" - $"8182 8151 814A 8143 813F 814B 8153 815E" - $"8168 8160 818F 81A6 8100 95FF 8100 89FF" - $"81CA 8166 817C 818C 819F 85FF 81DC 81B5" - $"8182 8151 814A 8143 813F 814B 8153 815E" - $"8168 8160 818F 81A6 8100 95FF 8100 89FF" - $"81CA 8166 817C 818C 819F 85FF 81DC 81B5" - $"8182 8151 814A 8143 813F 814B 8153 815E" - $"8168 8160 818F 81A6 8100 95FF 8100 89FF" - $"81CA 8166 817C 818C 819F 85FF 81DC 81B5" - $"8182 8151 814A 8143 813F 814B 8153 815E" - $"8168 8160 818F 81A6 8100 95FF 8100 89FF" - $"8166 819F 81C2 95FF 81DC 81C3 81A8 818D" - $"8184 817B 8168 816D 815A 815E 818F 81AF" - $"8100 95FF 8100 89FF 8166 819F 81C2 95FF" - $"81DC 81C3 81A8 818D 8184 817B 8168 816D" - $"815A 815E 818F 81AF 8100 95FF 8100 89FF" - $"8166 819F 81C2 95FF 81DC 81C3 81A8 818D" - $"8184 817B 8168 816D 815A 815E 818F 81AF" - $"8100 95FF 8100 89FF 8166 819F 81C2 95FF" - $"81DC 81C3 81A8 818D 8184 817B 8168 816D" - $"815A 815E 818F 81AF 8100 95FF 8100 C5FF" - $"8100 85FF 8181 818F 81B5 8100 95FF 8100" - $"C5FF 8100 85FF 8181 818F 81B5 8100 95FF" - $"8100 C5FF 8100 85FF 8181 818F 81B5 8100" - $"95FF 8100 C5FF 8100 85FF 8181 818F 81B5" - $"8100 95FF 8100 C5FF 8100 85FF 8122 8544" - $"8100 95FF 8100 C5FF 8100 85FF 8122 8544" - $"8100 95FF 8100 C5FF 8100 85FF 8122 8544" - $"8100 95FF 8100 C5FF 8100 85FF 8122 8544" - $"8100 95FF 8100 C5FF 8100 8DFF 8500 95FF" - $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF" - $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF" - $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF" - $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF" - $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF" - $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF" - $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF" - $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF" - $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF" - $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF" - $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF" - $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF" - $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF" - $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF" - $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF" - $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF" - $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF" - $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF" - $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF" - $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF" - $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF" - $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF" - $"8500 95FF 8100 ADFF 9900 8DFF 8500 95FF" - $"8100 ADFF 9900 8DFF 8500 95FF 8100 ADFF" - $"9900 8DFF 8500 95FF 8100 ADFF 9900 8DFF" - $"FF00 FF00 FF00 FB00 FF00 FF00 FF00 FF00" - $"9500 C9FF 8101 8100 8144 81FF A100 C9FF" - $"8101 8100 8144 81FF A100 C9FF 8101 8100" - $"8144 81FF A100 C9FF 8101 8100 8144 81FF" - $"A100 C5FF 8109 8500 8101 8144 A100 C5FF" - $"8109 8500 8101 8144 A100 C5FF 8109 8500" - $"8101 8144 A100 C5FF 8109 8500 8101 8144" - $"A100 C1FF 8167 81BC 8100 8101 8119 8144" - $"A100 C1FF 8167 81BC 8100 8101 8119 8144" - $"A100 C1FF 8167 81BC 8100 8101 8119 8144" - $"A100 C1FF 8167 81BC 8100 8101 8119 8144" - $"A100 BDFF 8166 81E4 819D 8171 8119 8144" - $"81FF A100 BDFF 8166 81E4 819D 8171 8119" - $"8144 81FF A100 BDFF 8166 81E4 819D 8171" - $"8119 8144 81FF A100 BDFF 8166 81E4 819D" - $"8171 8119 8144 81FF A100 A9FF 81C9 81BE" - $"81A7 819B 8182 81E4 8189 8144 8119 8144" - $"85FF A100 A9FF 81C9 81BE 81A7 819B 8182" - $"81E4 8189 8144 8119 8144 85FF A100 A9FF" - $"81C9 81BE 81A7 819B 8182 81E4 8189 8144" - $"8119 8144 85FF A100 A9FF 81C9 81BE 81A7" - $"819B 8182 81E4 8189 8144 8119 8144 85FF" - $"A100 A1FF 81CF 81B6 81B9 81BB 819B 8179" - $"81E4 8193 8144 8119 8144 89FF A100 A1FF" - $"81CF 81B6 81B9 81BB 819B 8179 81E4 8193" - $"8144 8119 8144 89FF A100 A1FF 81CF 81B6" - $"81B9 81BB 819B 8179 81E4 8193 8144 8119" - $"8144 89FF A100 A1FF 81CF 81B6 81B9 81BB" - $"819B 8179 81E4 8193 8144 8119 8144 89FF" - $"A100 9DFF 81B2 81AC 81B6 81B5 819B 817D" - $"81E4 8197 8144 8119 8144 8DFF A100 9DFF" - $"81B2 81AC 81B6 81B5 819B 817D 81E4 8197" - $"8144 8119 8144 8DFF A100 9DFF 81B2 81AC" - $"81B6 81B5 819B 817D 81E4 8197 8144 8119" - $"8144 8DFF A100 9DFF 81B2 81AC 81B6 81B5" - $"819B 817D 81E4 8197 8144 8119 8144 8DFF" - $"BD00 85AF 81A0 816E 8151 8180 81E4 819A" - $"8144 8119 819B 8162 CD00 85AF 81A0 816E" - $"8151 8180 81E4 819A 8144 8119 819B 8162" - $"CD00 85AF 81A0 816E 8151 8180 81E4 819A" - $"8144 8119 819B 8162 CD00 85AF 81A0 816E" - $"8151 8180 81E4 819A 8144 8119 819B 8162" - $"9500 95FF 8100 95FF 81B2 81B3 8197 8168" - $"812E 8176 81E4 819D 8144 8119 8163 8196" - $"81A1 8162 9100 95FF 8100 95FF 81B2 81B3" - $"8197 8168 812E 8176 81E4 819D 8144 8119" - $"8163 8196 81A1 8162 9100 95FF 8100 95FF" - $"81B2 81B3 8197 8168 812E 8176 81E4 819D" - $"8144 8119 8163 8196 81A1 8162 9100 95FF" - $"8100 95FF 81B2 81B3 8197 8168 812E 8176" - $"81E4 819D 8144 8119 8163 8196 81A1 8162" - $"9100 95FF 8100 91FF 81BE 81B0 8199 8153" - $"8130 817E 81CF 819C 8146 8119 8134 8159" - $"818B 81A6 819C 8162 8D00 95FF 8100 91FF" - $"81BE 81B0 8199 8153 8130 817E 81CF 819C" - $"8146 8119 8134 8159 818B 81A6 819C 8162" - $"8D00 95FF 8100 91FF 81BE 81B0 8199 8153" - $"8130 817E 81CF 819C 8146 8119 8134 8159" - $"818B 81A6 819C 8162 8D00 95FF 8100 91FF" - $"81BE 81B0 8199 8153 8130 817E 81CF 819C" - $"8146 8119 8134 8159 818B 81A6 819C 8162" - $"8D00 95FF 8100 8DFF 81E0 81B1 8191 8167" - $"812E 817E 81D0 819A 8144 810E 812A 813C" - $"8155 817B 81A0 81A8 81A2 8162 8900 95FF" - $"8100 8DFF 81E0 81B1 8191 8167 812E 817E" - $"81D0 819A 8144 810E 812A 813C 8155 817B" - $"81A0 81A8 81A2 8162 8900 95FF 8100 8DFF" - $"81E0 81B1 8191 8167 812E 817E 81D0 819A" - $"8144 810E 812A 813C 8155 817B 81A0 81A8" - $"81A2 8162 8900 95FF 8100 8DFF 81E0 81B1" - $"8191 8167 812E 817E 81D0 819A 8144 810E" - $"812A 813C 8155 817B 81A0 81A8 81A2 8162" - $"8900 95FF 8100 8DFF 81C5 8176 814B 812D" - $"8151 81B5 8186 814F 8104 810E 8134 8161" - $"8181 818A 819F 81A8 81A7 81A1 8168 817C" - $"8100 95FF 8100 8DFF 81C5 8176 814B 812D" - $"8151 81B5 8186 814F 8104 810E 8134 8161" - $"8181 818A 819F 81A8 81A7 81A1 8168 817C" - $"8100 95FF 8100 8DFF 81C5 8176 814B 812D" - $"8151 81B5 8186 814F 8104 810E 8134 8161" - $"8181 818A 819F 81A8 81A7 81A1 8168 817C" - $"8100 95FF 8100 8DFF 81C5 8176 814B 812D" - $"8151 81B5 8186 814F 8104 810E 8134 8161" - $"8181 818A 819F 81A8 81A7 81A1 8168 817C" - $"8100 95FF 8100 8DFF 8172 812D 813A 817D" - $"8186 8183 8199 8198 818C 8185 81A0 81B3" - $"81B9 81AE 81A9 85AA 81A5 8168 817E 8100" - $"95FF 8100 8DFF 8172 812D 813A 817D 8186" - $"8183 8199 8198 818C 8185 81A0 81B3 81B9" - $"81AE 81A9 85AA 81A5 8168 817E 8100 95FF" - $"8100 8DFF 8172 812D 813A 817D 8186 8183" - $"8199 8198 818C 8185 81A0 81B3 81B9 81AE" - $"81A9 85AA 81A5 8168 817E 8100 95FF 8100" - $"8DFF 8172 812D 813A 817D 8186 8183 8199" - $"8198 818C 8185 81A0 81B3 81B9 81AE 81A9" - $"85AA 81A5 8168 817E 8100 95FF 8100 8DFF" - $"81E8 8144 8138 81B3 81A9 8162 816F 817D" - $"819D 81B2 81BE 81BC 81B5 81B7 81AF 81A5" - $"819B 8195 8173 8192 8100 95FF 8100 8DFF" - $"81E8 8144 8138 81B3 81A9 8162 816F 817D" - $"819D 81B2 81BE 81BC 81B5 81B7 81AF 81A5" - $"819B 8195 8173 8192 8100 95FF 8100 8DFF" - $"81E8 8144 8138 81B3 81A9 8162 816F 817D" - $"819D 81B2 81BE 81BC 81B5 81B7 81AF 81A5" - $"819B 8195 8173 8192 8100 95FF 8100 8DFF" - $"81E8 8144 8138 81B3 81A9 8162 816F 817D" - $"819D 81B2 81BE 81BC 81B5 81B7 81AF 81A5" - $"819B 8195 8173 8192 8100 95FF 8100 8DFF" - $"81C2 8183 819A 8144 813D 811E 8129 8134" - $"8144 8155 815C 818E 81AC 819A 818B 8189" - $"817D 8175 8182 819A 8100 95FF 8100 8DFF" - $"81C2 8183 819A 8144 813D 811E 8129 8134" - $"8144 8155 815C 818E 81AC 819A 818B 8189" - $"817D 8175 8182 819A 8100 95FF 8100 8DFF" - $"81C2 8183 819A 8144 813D 811E 8129 8134" - $"8144 8155 815C 818E 81AC 819A 818B 8189" - $"817D 8175 8182 819A 8100 95FF 8100 8DFF" - $"81C2 8183 819A 8144 813D 811E 8129 8134" - $"8144 8155 815C 818E 81AC 819A 818B 8189" - $"817D 8175 8182 819A 8100 95FF 8100 8DFF" - $"816E 818B 8180 8144 8174 816B 8145 8522" - $"812F 8130 812E 8142 815C 8155 8158 8160" - $"8155 818E 819E 8100 95FF 8100 8DFF 816E" - $"818B 8180 8144 8174 816B 8145 8522 812F" - $"8130 812E 8142 815C 8155 8158 8160 8155" - $"818E 819E 8100 95FF 8100 8DFF 816E 818B" - $"8180 8144 8174 816B 8145 8522 812F 8130" - $"812E 8142 815C 8155 8158 8160 8155 818E" - $"819E 8100 95FF 8100 8DFF 816E 818B 8180" - $"8144 8174 816B 8145 8522 812F 8130 812E" - $"8142 815C 8155 8158 8160 8155 818E 819E" - $"8100 95FF 8100 89FF 81B4 8166 815A 8181" - $"819F 85FF 81D6 819F 815B 8123 811B 8113" - $"8110 8120 812B 8133 813C 8137 818E 81A0" - $"8100 95FF 8100 89FF 81B4 8166 815A 8181" - $"819F 85FF 81D6 819F 815B 8123 811B 8113" - $"8110 8120 812B 8133 813C 8137 818E 81A0" - $"8100 95FF 8100 89FF 81B4 8166 815A 8181" - $"819F 85FF 81D6 819F 815B 8123 811B 8113" - $"8110 8120 812B 8133 813C 8137 818E 81A0" - $"8100 95FF 8100 89FF 81B4 8166 815A 8181" - $"819F 85FF 81D6 819F 815B 8123 811B 8113" - $"8110 8120 812B 8133 813C 8137 818E 81A0" - $"8100 95FF 8100 89FF 8166 819F 81C2 95FF" - $"81D6 81B6 8192 816F 8166 815B 8147 8149" - $"8131 813B 818E 81A6 8100 95FF 8100 89FF" - $"8166 819F 81C2 95FF 81D6 81B6 8192 816F" - $"8166 815B 8147 8149 8131 813B 818E 81A6" - $"8100 95FF 8100 89FF 8166 819F 81C2 95FF" - $"81D6 81B6 8192 816F 8166 815B 8147 8149" - $"8131 813B 818E 81A6 8100 95FF 8100 89FF" - $"8166 819F 81C2 95FF 81D6 81B6 8192 816F" - $"8166 815B 8147 8149 8131 813B 818E 81A6" - $"8100 95FF 8100 C5FF 8100 85FF 8172 818E" - $"81AB 8100 95FF 8100 C5FF 8100 85FF 8172" - $"818E 81AB 8100 95FF 8100 C5FF 8100 85FF" - $"8172 818E 81AB 8100 95FF 8100 C5FF 8100" - $"85FF 8172 818E 81AB 8100 95FF 8100 C5FF" - $"8100 85FF 8122 8544 8100 95FF 8100 C5FF" - $"8100 85FF 8122 8544 8100 95FF 8100 C5FF" - $"8100 85FF 8122 8544 8100 95FF 8100 C5FF" - $"8100 85FF 8122 8544 8100 95FF 8100 C5FF" - $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF" - $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF" - $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF" - $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF" - $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF" - $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF" - $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF" - $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF" - $"8100 C5FF 8100 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF 8500 95FF 8100 ADFF" - $"8100 917B 8100 8DFF FF00 FF00 FF00 FB00" - $"FF00 FF00 FF00 FF00 9500 C9FF 810F 8143" - $"8144 81FF A100 C9FF 810F 8143 8144 81FF" - $"A100 C9FF 810F 8143 8144 81FF A100 C9FF" - $"810F 8143 8144 81FF A100 C5FF 8117 8143" - $"8116 810F 8144 A100 C5FF 8117 8143 8116" - $"810F 8144 A100 C5FF 8117 8143 8116 810F" - $"8144 A100 C5FF 8117 8143 8116 810F 8144" - $"A100 C1FF 8165 81C4 8116 810F 811A 8144" - $"A100 C1FF 8165 81C4 8116 810F 811A 8144" - $"A100 C1FF 8165 81C4 8116 810F 811A 8144" - $"A100 C1FF 8165 81C4 8116 810F 811A 8144" - $"A100 BDFF 8155 8167 81A7 816C 811A 8144" - $"81FF A100 BDFF 8155 8167 81A7 816C 811A" - $"8144 81FF A100 BDFF 8155 8167 81A7 816C" - $"811A 8144 81FF A100 BDFF 8155 8167 81A7" - $"816C 811A 8144 81FF A100 A9FF 81BC 81A9" - $"8192 8193 813E 8167 814D 8123 811A 8144" - $"85FF A100 A9FF 81BC 81A9 8192 8193 813E" - $"8167 814D 8123 811A 8144 85FF A100 A9FF" - $"81BC 81A9 8192 8193 813E 8167 814D 8123" - $"811A 8144 85FF A100 A9FF 81BC 81A9 8192" - $"8193 813E 8167 814D 8123 811A 8144 85FF" - $"A100 A1FF 81C6 819A 8598 8193 8131 8167" - $"814A 8123 811A 8144 89FF A100 A1FF 81C6" - $"819A 8598 8193 8131 8167 814A 8123 811A" - $"8144 89FF A100 A1FF 81C6 819A 8598 8193" - $"8131 8167 814A 8123 811A 8144 89FF A100" - $"A1FF 81C6 819A 8598 8193 8131 8167 814A" - $"8123 811A 8144 89FF A100 9DFF 819C 818E" - $"8199 8195 8193 8137 8167 814F 8123 811A" - $"8144 8DFF A100 9DFF 819C 818E 8199 8195" - $"8193 8137 8167 814F 8123 811A 8144 8DFF" - $"A100 9DFF 819C 818E 8199 8195 8193 8137" - $"8167 814F 8123 811A 8144 8DFF A100 9DFF" - $"819C 818E 8199 8195 8193 8137 8167 814F" - $"8123 811A 8144 8DFF BD00 8192 818F 8186" - $"8157 8147 8139 8167 8152 8123 811A 817A" - $"8161 CD00 8192 818F 8186 8157 8147 8139" - $"8167 8152 8123 811A 817A 8161 CD00 8192" - $"818F 8186 8157 8147 8139 8167 8152 8123" - $"811A 817A 8161 CD00 8192 818F 8186 8157" - $"8147 8139 8167 8152 8123 811A 817A 8161" - $"9500 95FF 8100 95FF 8195 8191 817C 8151" - $"812A 8132 8167 8153 8123 811A 814B 8178" - $"8183 8161 89FF 8500 95FF 8100 95FF 8195" - $"8191 817C 8151 812A 8132 8167 8153 8123" - $"811A 814B 8178 8183 8161 89FF 8500 95FF" - $"8100 95FF 8195 8191 817C 8151 812A 8132" - $"8167 8153 8123 811A 814B 8178 8183 8161" - $"89FF 8500 95FF 8100 95FF 8195 8191 817C" - $"8151 812A 8132 8167 8153 8123 811A 814B" - $"8178 8183 8161 89FF 8500 95FF 8100 91FF" - $"81A9 818B 817D 8141 812C 8137 8163 8153" - $"8124 811A 812C 8144 816D 818A 8180 8161" - $"85FF 8500 95FF 8100 91FF 81A9 818B 817D" - $"8141 812C 8137 8163 8153 8124 811A 812C" - $"8144 816D 818A 8180 8161 85FF 8500 95FF" - $"8100 91FF 81A9 818B 817D 8141 812C 8137" - $"8163 8153 8124 811A 812C 8144 816D 818A" - $"8180 8161 85FF 8500 95FF 8100 91FF 81A9" - $"818B 817D 8141 812C 8137 8163 8153 8124" - $"811A 812C 8144 816D 818A 8180 8161 85FF" - $"8500 95FF 8100 8DFF 81DA 8192 8178 8154" - $"8127 8137 8161 8151 8122 8111 8124 8132" - $"813F 8160 8184 818D 8186 8161 81FF 8500" - $"95FF 8100 8DFF 81DA 8192 8178 8154 8127" - $"8137 8161 8151 8122 8111 8124 8132 813F" - $"8160 8184 818D 8186 8161 81FF 8500 95FF" - $"8100 8DFF 81DA 8192 8178 8154 8127 8137" - $"8161 8151 8122 8111 8124 8132 813F 8160" - $"8184 818D 8186 8161 81FF 8500 95FF 8100" - $"8DFF 81DA 8192 8178 8154 8127 8137 8161" - $"8151 8122 8111 8124 8132 813F 8160 8184" - $"818D 8186 8161 81FF 8500 95FF 8100 8DFF" - $"81B7 815B 813C 8127 8130 8159 8156 812A" - $"810A 810C 812C 814F 8165 816C 8185 818D" - $"8189 8188 8169 8188 8100 95FF 8100 8DFF" - $"81B7 815B 813C 8127 8130 8159 8156 812A" - $"810A 810C 812C 814F 8165 816C 8185 818D" - $"8189 8188 8169 8188 8100 95FF 8100 8DFF" - $"81B7 815B 813C 8127 8130 8159 8156 812A" - $"810A 810C 812C 814F 8165 816C 8185 818D" - $"8189 8188 8169 8188 8100 95FF 8100 8DFF" - $"81B7 815B 813C 8127 8130 8159 8156 812A" - $"810A 810C 812C 814F 8165 816C 8185 818D" - $"8189 8188 8169 8188 8100 95FF 8100 8DFF" - $"8161 8120 812F 816A 8576 8583 8178 8174" - $"818C 819A 819D 8191 858E 818C 8188 8169" - $"8155 8100 95FF 8100 8DFF 8161 8120 812F" - $"816A 8576 8583 8178 8174 818C 819A 819D" - $"8191 858E 818C 8188 8169 8155 8100 95FF" - $"8100 8DFF 8161 8120 812F 816A 8576 8583" - $"8178 8174 818C 819A 819D 8191 858E 818C" - $"8188 8169 8155 8100 95FF 8100 8DFF 8161" - $"8120 812F 816A 8576 8583 8178 8174 818C" - $"819A 819D 8191 858E 818C 8188 8169 8155" - $"8100 95FF 8100 8DFF 81E7 8122 8130 8196" - $"8194 8153 8154 815F 8180 8195 81A2 819E" - $"819A 819D 8194 8188 8181 817A 8173 8144" - $"8100 95FF 8100 8DFF 81E7 8122 8130 8196" - $"8194 8153 8154 815F 8180 8195 81A2 819E" - $"819A 819D 8194 8188 8181 817A 8173 8144" - $"8100 95FF 8100 8DFF 81E7 8122 8130 8196" - $"8194 8153 8154 815F 8180 8195 81A2 819E" - $"819A 819D 8194 8188 8181 817A 8173 8144" - $"8100 95FF 8100 8DFF 81E7 8122 8130 8196" - $"8194 8153 8154 815F 8180 8195 81A2 819E" - $"819A 819D 8194 8188 8181 817A 8173 8144" - $"8100 95FF 8100 8DFF 81C6 8146 8151 8135" - $"8138 8119 811F 812A 8136 8144 814A 8175" - $"8191 8181 8173 8172 8168 8160 8181 81FF" - $"8100 95FF 8100 8DFF 81C6 8146 8151 8135" - $"8138 8119 811F 812A 8136 8144 814A 8175" - $"8191 8181 8173 8172 8168 8160 8181 81FF" - $"8100 95FF 8100 8DFF 81C6 8146 8151 8135" - $"8138 8119 811F 812A 8136 8144 814A 8175" - $"8191 8181 8173 8172 8168 8160 8181 81FF" - $"8100 95FF 8100 8DFF 81C6 8146 8151 8135" - $"8138 8119 811F 812A 8136 8144 814A 8175" - $"8191 8181 8173 8172 8168 8160 8181 81FF" - $"8100 95FF 8100 8DFF 8159 816A 8149 8122" - $"8177 8168 813C 811A 811D 8928 8138 814D" - $"8147 8148 814F 8147 818E 81FF 8100 95FF" - $"8100 8DFF 8159 816A 8149 8122 8177 8168" - $"813C 811A 811D 8928 8138 814D 8147 8148" - $"814F 8147 818E 81FF 8100 95FF 8100 8DFF" - $"8159 816A 8149 8122 8177 8168 813C 811A" - $"811D 8928 8138 814D 8147 8148 814F 8147" - $"818E 81FF 8100 95FF 8100 8DFF 8159 816A" - $"8149 8122 8177 8168 813C 811A 811D 8928" - $"8138 814D 8147 8148 814F 8147 818E 81FF" - $"8100 95FF 8100 89FF 81A8 8165 814A 817F" - $"819F 85FF 81D3 819A 8155 811C 8114 810E" - $"810B 811B 8126 812B 8133 8130 818E 819A" - $"8100 95FF 8100 89FF 81A8 8165 814A 817F" - $"819F 85FF 81D3 819A 8155 811C 8114 810E" - $"810B 811B 8126 812B 8133 8130 818E 819A" - $"8100 95FF 8100 89FF 81A8 8165 814A 817F" - $"819F 85FF 81D3 819A 8155 811C 8114 810E" - $"810B 811B 8126 812B 8133 8130 818E 819A" - $"8100 95FF 8100 89FF 81A8 8165 814A 817F" - $"819F 85FF 81D3 819A 8155 811C 8114 810E" - $"810B 811B 8126 812B 8133 8130 818E 819A" - $"8100 95FF 8100 89FF 8165 819F 81C2 95FF" - $"81D3 81B2 818E 8169 815F 8156 8142 8143" - $"812B 8135 818E 819F 8100 95FF 8100 89FF" - $"8165 819F 81C2 95FF 81D3 81B2 818E 8169" - $"815F 8156 8142 8143 812B 8135 818E 819F" - $"8100 95FF 8100 89FF 8165 819F 81C2 95FF" - $"81D3 81B2 818E 8169 815F 8156 8142 8143" - $"812B 8135 818E 819F 8100 95FF 8100 89FF" - $"8165 819F 81C2 95FF 81D3 81B2 818E 8169" - $"815F 8156 8142 8143 812B 8135 818E 819F" - $"8100 95FF 8100 C5FF 8100 85FF 816B 818E" - $"81A7 8100 95FF 8100 C5FF 8100 85FF 816B" - $"818E 81A7 8100 95FF 8100 C5FF 8100 85FF" - $"816B 818E 81A7 8100 95FF 8100 C5FF 8100" - $"85FF 816B 818E 81A7 8100 95FF 8100 C5FF" - $"8100 85FF 8122 8544 8100 95FF 8100 C5FF" - $"8100 85FF 8122 8544 8100 95FF 8100 C5FF" - $"8100 85FF 8122 8544 8100 95FF 8100 C5FF" - $"8100 85FF 8122 8544 8100 95FF 8100 C5FF" - $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF" - $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF" - $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF" - $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF" - $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF" - $"8100 C5FF 8100 8DFF 8500 95FF 8100 C5FF" - $"8100 8DFF 8500 95FF 8100 C5FF 8100 8DFF" - $"8500 95FF 8100 C5FF 8100 8DFF 8500 95FF" - $"8100 C5FF 8100 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF 8500 95FF CD00 8DFF" - $"8500 95FF CD00 8DFF FF00 FF00 FF00 FB00" - $"7438 6D6B 0000 4008 FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF" -}; - -data 'ics#' (-16455, "Item Icon") { - $"F557 D001 700E E024 9A9B 0175 9299 0162" - $"923E 0001 9004 0000 9BBC 102C 8434 5AFD" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" - $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" -}; - -data 'ics4' (-16455, "Item Icon") { - $"AA3F DDDD DDDD DDAE A333 0000 0000 0C3E" - $"333A 0000 000C DBEC A333 0000 0CBC 2A00" - $"EDDF DDDB D2CB ECFF D00D 00CD BBBA B2D6" - $"D00D 00B2 DDBB DCCB D00D 00D4 D2D2 CC2D" - $"D00D 00BD CCE5 3EEC D00D 0C00 0000 CBCB" - $"D00D 0000 0000 0D0D D00D 0000 0000 0D00" - $"D00D ABAB ABAF 9F00 D00D 1111 11B8 9900" - $"D00D 1111 1189 9F00 EDDA 8291 ABAF 9FDD" -}; - -data 'ics8' (-16455, "Item Icon") { - $"DEDC DBB3 F9FA F9FA F9FA F9FA F9FA 8FFB" - $"DC23 23DB 0000 0000 0000 0000 0032 6A88" - $"DB23 23DC 0000 0000 0000 F52B 3357 882B" - $"DC23 23DB 0000 0000 F608 3234 33AD F600" - $"FCFA F9AC F9FA F95D 0E5D 3457 8833 F1F2" - $"FA00 00F9 0000 0733 825E 33AD 6432 33EF" - $"F900 00FA 0000 5D5E 5D33 825D 3332 2C57" - $"FA00 00F9 0000 5739 5D64 5D33 3232 335C" - $"F900 00FA 00F5 5D57 F732 828E 8988 88F9" - $"FA00 00F9 00F6 F600 0000 F5F6 4F5D F85D" - $"F900 00FA 0000 0000 0000 0000 00FA 0056" - $"FA00 00FA 0000 0000 0000 0000 00F9 0000" - $"F900 00F9 8359 8359 8359 ADD1 E8EA 0000" - $"FA00 00FA 0505 0505 0505 5FE5 E6E8 0000" - $"F900 00F9 0505 0505 0505 7DE6 E6D1 0000" - $"ACF9 FAFC 8359 8359 8359 ADD1 E8E9 FAF9" -}; - diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index 130d5480c2..4033955004 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ SASHTEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__sashtest___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__sashtest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL sashtest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___sashtest___os2_emxbindcmd = $(NM) sashtest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep sashtest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__sashtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___sashtest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__sashtest_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = sashtest.app/Contents/PkgInfo @@ -156,8 +152,6 @@ distclean: clean sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc) $(CXX) -o $@ $(SASHTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__sashtest___mac_setfilecmd) $(__sashtest___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -186,7 +180,7 @@ sashtest_sashtest.o: $(srcdir)/sashtest.cpp $(CXXC) -c -o $@ $(SASHTEST_CXXFLAGS) $(srcdir)/sashtest.cpp sashtest_sashtest_rc.o: $(srcdir)/sashtest.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/sashtest/makefile.bcc b/samples/sashtest/makefile.bcc index c3af5203d9..397573c108 100644 --- a/samples/sashtest/makefile.bcc +++ b/samples/sashtest/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sashtest/makefile.gcc b/samples/sashtest/makefile.gcc index b5a53007ee..9ad5b6e05c 100644 --- a/samples/sashtest/makefile.gcc +++ b/samples/sashtest/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sashtest/makefile.unx b/samples/sashtest/makefile.unx index a42af2e0c0..17165987d7 100644 --- a/samples/sashtest/makefile.unx +++ b/samples/sashtest/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc index 677194bdf6..f7985f46e5 100644 --- a/samples/sashtest/makefile.vc +++ b/samples/sashtest/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sashtest/sashtest_vc7.vcproj b/samples/sashtest/sashtest_vc7.vcproj index bde6493610..8ba24e88cf 100644 --- a/samples/sashtest/sashtest_vc7.vcproj +++ b/samples/sashtest/sashtest_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sashtest/sashtest_vc8.vcproj b/samples/sashtest/sashtest_vc8.vcproj index 3dcd947bbf..1432a23847 100644 --- a/samples/sashtest/sashtest_vc8.vcproj +++ b/samples/sashtest/sashtest_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sashtest/sashtest_vc9.vcproj b/samples/sashtest/sashtest_vc9.vcproj index ce19a40bcb..97f416ff78 100644 --- a/samples/sashtest/sashtest_vc9.vcproj +++ b/samples/sashtest/sashtest_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index 7c1884e645..5e2528809b 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ SCROLL_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__scroll___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__scroll___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL scroll$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___scroll___os2_emxbindcmd = $(NM) scroll$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep scroll$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__scroll___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___scroll___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__scroll___win32rc = scroll_sample_rc.o @COND_PLATFORM_MACOSX_1@__scroll_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc) $(CXX) -o $@ $(SCROLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__scroll___mac_setfilecmd) $(__scroll___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc) @COND_PLATFORM_MACOSX_1@scroll_bundle: $(____scroll_BUNDLE_TGT_REF_DEP) scroll_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include scroll_scroll.o: $(srcdir)/scroll.cpp $(CXXC) -c -o $@ $(SCROLL_CXXFLAGS) $(srcdir)/scroll.cpp diff --git a/samples/scroll/makefile.bcc b/samples/scroll/makefile.bcc index 1aac8b902f..e5fcf6ace4 100644 --- a/samples/scroll/makefile.bcc +++ b/samples/scroll/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/scroll/makefile.gcc b/samples/scroll/makefile.gcc index 920c99b617..18e377a155 100644 --- a/samples/scroll/makefile.gcc +++ b/samples/scroll/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/scroll/makefile.unx b/samples/scroll/makefile.unx index 6a61f5b00b..00bf5d2df6 100644 --- a/samples/scroll/makefile.unx +++ b/samples/scroll/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc index cef7b7e632..28b57c5564 100644 --- a/samples/scroll/makefile.vc +++ b/samples/scroll/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/scroll/scroll_vc7.vcproj b/samples/scroll/scroll_vc7.vcproj index d55034fafc..dc205803f3 100644 --- a/samples/scroll/scroll_vc7.vcproj +++ b/samples/scroll/scroll_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/scroll/scroll_vc8.vcproj b/samples/scroll/scroll_vc8.vcproj index 02f8f7d43f..d8b9189e79 100644 --- a/samples/scroll/scroll_vc8.vcproj +++ b/samples/scroll/scroll_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/scroll/scroll_vc9.vcproj b/samples/scroll/scroll_vc9.vcproj index b5d0f35e02..93f51c4f5d 100644 --- a/samples/scroll/scroll_vc9.vcproj +++ b/samples/scroll/scroll_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/secretstore/Makefile.in b/samples/secretstore/Makefile.in index 2447373889..ebbf20f0d4 100644 --- a/samples/secretstore/Makefile.in +++ b/samples/secretstore/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,6 @@ exec_prefix = @exec_prefix@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ -SETFILE = @SETFILE@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -61,9 +60,6 @@ SECRETSTORE_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__secretstore___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__secretstore___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL secretstore$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS @@ -116,8 +112,6 @@ distclean: clean secretstore$(EXEEXT): $(SECRETSTORE_OBJECTS) $(CXX) -o $@ $(SECRETSTORE_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__secretstore___mac_setfilecmd) secretstore_secretstore.o: $(srcdir)/secretstore.cpp $(CXXC) -c -o $@ $(SECRETSTORE_CXXFLAGS) $(srcdir)/secretstore.cpp diff --git a/samples/secretstore/makefile.bcc b/samples/secretstore/makefile.bcc index 8ccb0bd09d..00bc5570df 100644 --- a/samples/secretstore/makefile.bcc +++ b/samples/secretstore/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/secretstore/makefile.gcc b/samples/secretstore/makefile.gcc index c806930475..aa8346da6a 100644 --- a/samples/secretstore/makefile.gcc +++ b/samples/secretstore/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/secretstore/makefile.unx b/samples/secretstore/makefile.unx index 603b4c00fd..7acaf41777 100644 --- a/samples/secretstore/makefile.unx +++ b/samples/secretstore/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/secretstore/makefile.vc b/samples/secretstore/makefile.vc index 4744406c77..9f6df9d6cc 100644 --- a/samples/secretstore/makefile.vc +++ b/samples/secretstore/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/secretstore/secretstore_vc7.vcproj b/samples/secretstore/secretstore_vc7.vcproj index e5f52be240..205e638c59 100644 --- a/samples/secretstore/secretstore_vc7.vcproj +++ b/samples/secretstore/secretstore_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/secretstore/secretstore_vc8.vcproj b/samples/secretstore/secretstore_vc8.vcproj index e23377b9d8..655541f976 100644 --- a/samples/secretstore/secretstore_vc8.vcproj +++ b/samples/secretstore/secretstore_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/secretstore/secretstore_vc9.vcproj b/samples/secretstore/secretstore_vc9.vcproj index d8b5a55dc5..aee7577d9a 100644 --- a/samples/secretstore/secretstore_vc9.vcproj +++ b/samples/secretstore/secretstore_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index 88228d637c..4cc2f8ca00 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ SHAPED_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__shaped___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL shaped$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd = $(NM) shaped$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep shaped$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__shaped___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__shaped___win32rc = shaped_sample_rc.o @COND_PLATFORM_MACOSX_1@__shaped_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc) $(CXX) -o $@ $(SHAPED_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__shaped___mac_setfilecmd) $(__shaped___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -190,7 +184,7 @@ data: done shaped_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include shaped_shaped.o: $(srcdir)/shaped.cpp $(CXXC) -c -o $@ $(SHAPED_CXXFLAGS) $(srcdir)/shaped.cpp diff --git a/samples/shaped/makefile.bcc b/samples/shaped/makefile.bcc index a1a11fdf87..d9364280c1 100644 --- a/samples/shaped/makefile.bcc +++ b/samples/shaped/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc index 8944ca97de..b99bd96405 100644 --- a/samples/shaped/makefile.gcc +++ b/samples/shaped/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/shaped/makefile.unx b/samples/shaped/makefile.unx index b51c6d6247..edf767754d 100644 --- a/samples/shaped/makefile.unx +++ b/samples/shaped/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc index 6039899af9..ba76e6583f 100644 --- a/samples/shaped/makefile.vc +++ b/samples/shaped/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/shaped/shaped_vc7.vcproj b/samples/shaped/shaped_vc7.vcproj index 9e78b12270..4769e7abc9 100644 --- a/samples/shaped/shaped_vc7.vcproj +++ b/samples/shaped/shaped_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/shaped/shaped_vc8.vcproj b/samples/shaped/shaped_vc8.vcproj index e6e9de3117..ccae656953 100644 --- a/samples/shaped/shaped_vc8.vcproj +++ b/samples/shaped/shaped_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/shaped/shaped_vc9.vcproj b/samples/shaped/shaped_vc9.vcproj index 075fdb4df8..7d10f6e850 100644 --- a/samples/shaped/shaped_vc9.vcproj +++ b/samples/shaped/shaped_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index 92d7fcb7c2..6da585a47a 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -87,9 +86,6 @@ BASESERVER_OBJECTS = \ @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_USE_GUI_1@__client___depname = client$(EXEEXT) -@COND_PLATFORM_MAC_0@__client___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL client$(EXEEXT) COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep client$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__client___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___client___os2_emxbindcmd) @@ -108,9 +104,6 @@ COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep @COND_TOOLKIT_OSX_IPHONE@____client_BUNDLE_TGT_REF_DEP \ @COND_TOOLKIT_OSX_IPHONE@ = $(__client_app_Contents_PkgInfo___depname) @COND_USE_GUI_1@__server___depname = server$(EXEEXT) -@COND_PLATFORM_MAC_0@__server___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL server$(EXEEXT) COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep server$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__server___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___server___os2_emxbindcmd) @@ -128,13 +121,7 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep @COND_TOOLKIT_OSX_COCOA@ = $(__server_app_Contents_PkgInfo___depname) @COND_TOOLKIT_OSX_IPHONE@____server_BUNDLE_TGT_REF_DEP \ @COND_TOOLKIT_OSX_IPHONE@ = $(__server_app_Contents_PkgInfo___depname) -@COND_PLATFORM_MAC_0@__baseclient___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__baseclient___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL baseclient$(EXEEXT) @COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) -@COND_PLATFORM_MAC_0@__baseserver___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__baseserver___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL baseserver$(EXEEXT) @COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0 @@ -207,8 +194,6 @@ distclean: clean @COND_USE_GUI_1@client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc) @COND_USE_GUI_1@ $(CXX) -o $@ $(CLIENT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_GUI_1@ -@COND_USE_GUI_1@ $(__client___mac_setfilecmd) @COND_USE_GUI_1@ $(__client___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1_USE_GUI_1@client.app/Contents/PkgInfo: $(__client___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -235,8 +220,6 @@ distclean: clean @COND_USE_GUI_1@server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) @COND_USE_GUI_1@ $(CXX) -o $@ $(SERVER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_GUI_1@ -@COND_USE_GUI_1@ $(__server___mac_setfilecmd) @COND_USE_GUI_1@ $(__server___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1_USE_GUI_1@server.app/Contents/PkgInfo: $(__server___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -263,13 +246,9 @@ distclean: clean baseclient$(EXEEXT): $(BASECLIENT_OBJECTS) $(CXX) -o $@ $(BASECLIENT_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__baseclient___mac_setfilecmd) baseserver$(EXEEXT): $(BASESERVER_OBJECTS) $(CXX) -o $@ $(BASESERVER_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__baseserver___mac_setfilecmd) client_sample_rc.o: $(srcdir)/../../samples/sample.rc $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include diff --git a/samples/sockets/makefile.bcc b/samples/sockets/makefile.bcc index 23eba08a88..5696d7a4c6 100644 --- a/samples/sockets/makefile.bcc +++ b/samples/sockets/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc index d5a20949a3..acfb41723e 100644 --- a/samples/sockets/makefile.gcc +++ b/samples/sockets/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sockets/makefile.unx b/samples/sockets/makefile.unx index c6b8688940..0285911fa5 100644 --- a/samples/sockets/makefile.unx +++ b/samples/sockets/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc index 6020097e37..86e525e11c 100644 --- a/samples/sockets/makefile.vc +++ b/samples/sockets/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sockets/sockets_vc7_baseclient.vcproj b/samples/sockets/sockets_vc7_baseclient.vcproj index 0a5bcae99d..3c482586be 100644 --- a/samples/sockets/sockets_vc7_baseclient.vcproj +++ b/samples/sockets/sockets_vc7_baseclient.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sockets/sockets_vc7_baseserver.vcproj b/samples/sockets/sockets_vc7_baseserver.vcproj index 8947489b23..0ce3d83f90 100644 --- a/samples/sockets/sockets_vc7_baseserver.vcproj +++ b/samples/sockets/sockets_vc7_baseserver.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sockets/sockets_vc7_client.vcproj b/samples/sockets/sockets_vc7_client.vcproj index 7f8e982db2..11a7c7bf37 100644 --- a/samples/sockets/sockets_vc7_client.vcproj +++ b/samples/sockets/sockets_vc7_client.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sockets/sockets_vc7_server.vcproj b/samples/sockets/sockets_vc7_server.vcproj index 376337fc6f..2cb9eeee72 100644 --- a/samples/sockets/sockets_vc7_server.vcproj +++ b/samples/sockets/sockets_vc7_server.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sockets/sockets_vc8_baseclient.vcproj b/samples/sockets/sockets_vc8_baseclient.vcproj index 996cab6f35..e7ff7350b1 100644 --- a/samples/sockets/sockets_vc8_baseclient.vcproj +++ b/samples/sockets/sockets_vc8_baseclient.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sockets/sockets_vc8_baseserver.vcproj b/samples/sockets/sockets_vc8_baseserver.vcproj index ca0c7c5e74..0268349352 100644 --- a/samples/sockets/sockets_vc8_baseserver.vcproj +++ b/samples/sockets/sockets_vc8_baseserver.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sockets/sockets_vc8_client.vcproj b/samples/sockets/sockets_vc8_client.vcproj index 5558259347..d578a5296d 100644 --- a/samples/sockets/sockets_vc8_client.vcproj +++ b/samples/sockets/sockets_vc8_client.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sockets/sockets_vc8_server.vcproj b/samples/sockets/sockets_vc8_server.vcproj index 8b07212cec..dd50f41a54 100644 --- a/samples/sockets/sockets_vc8_server.vcproj +++ b/samples/sockets/sockets_vc8_server.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sockets/sockets_vc9_baseclient.vcproj b/samples/sockets/sockets_vc9_baseclient.vcproj index e725400f2d..1fd68d781b 100644 --- a/samples/sockets/sockets_vc9_baseclient.vcproj +++ b/samples/sockets/sockets_vc9_baseclient.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sockets/sockets_vc9_baseserver.vcproj b/samples/sockets/sockets_vc9_baseserver.vcproj index 148dc6d011..78390b341b 100644 --- a/samples/sockets/sockets_vc9_baseserver.vcproj +++ b/samples/sockets/sockets_vc9_baseserver.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sockets/sockets_vc9_client.vcproj b/samples/sockets/sockets_vc9_client.vcproj index 1f4f7e91f0..21714da40e 100644 --- a/samples/sockets/sockets_vc9_client.vcproj +++ b/samples/sockets/sockets_vc9_client.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sockets/sockets_vc9_server.vcproj b/samples/sockets/sockets_vc9_server.vcproj index c5e29e9b34..36d946157e 100644 --- a/samples/sockets/sockets_vc9_server.vcproj +++ b/samples/sockets/sockets_vc9_server.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in index a6bb76437b..5ccb10fc8c 100644 --- a/samples/sound/Makefile.in +++ b/samples/sound/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ SOUND_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__sound___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__sound___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL sound$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___sound___os2_emxbindcmd = $(NM) sound$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep sound$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__sound___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___sound___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__sound_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = sound.app/Contents/PkgInfo @@ -156,8 +152,6 @@ distclean: clean sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc) $(CXX) -o $@ $(SOUND_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__sound___mac_setfilecmd) $(__sound___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -198,7 +192,7 @@ sound_sound.o: $(srcdir)/sound.cpp $(CXXC) -c -o $@ $(SOUND_CXXFLAGS) $(srcdir)/sound.cpp sound_sound_rc.o: $(srcdir)/sound.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/sound/makefile.bcc b/samples/sound/makefile.bcc index d05e21faf9..a73f1639ec 100644 --- a/samples/sound/makefile.bcc +++ b/samples/sound/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc index e83ac0423e..fd3c557e99 100644 --- a/samples/sound/makefile.gcc +++ b/samples/sound/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sound/makefile.unx b/samples/sound/makefile.unx index 76b5c4c3cb..2bdd2fdc03 100644 --- a/samples/sound/makefile.unx +++ b/samples/sound/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc index 7017c04076..9fccb5e58b 100644 --- a/samples/sound/makefile.vc +++ b/samples/sound/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/sound/sound_vc7.vcproj b/samples/sound/sound_vc7.vcproj index efb54d1003..eef40e9c82 100644 --- a/samples/sound/sound_vc7.vcproj +++ b/samples/sound/sound_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sound/sound_vc8.vcproj b/samples/sound/sound_vc8.vcproj index 4c0c8f93fb..a98b25295e 100644 --- a/samples/sound/sound_vc8.vcproj +++ b/samples/sound/sound_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/sound/sound_vc9.vcproj b/samples/sound/sound_vc9.vcproj index ce1706cb60..6555230b2e 100644 --- a/samples/sound/sound_vc9.vcproj +++ b/samples/sound/sound_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in index 8f4f81708f..26784b4954 100644 --- a/samples/splash/Makefile.in +++ b/samples/splash/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -70,25 +69,22 @@ SPLASH_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__splash___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__splash___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL splash$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___splash___os2_emxbindcmd = $(NM) splash$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep splash$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__splash___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___splash___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__splash_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = splash.app/Contents/PkgInfo @@ -160,8 +156,6 @@ distclean: clean splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc) $(CXX) -o $@ $(SPLASH_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__splash___mac_setfilecmd) $(__splash___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -202,7 +196,7 @@ splash_splash.o: $(srcdir)/splash.cpp $(CXXC) -c -o $@ $(SPLASH_CXXFLAGS) $(srcdir)/splash.cpp splash_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/splash/makefile.bcc b/samples/splash/makefile.bcc index 1c302017b2..95bf06b0de 100644 --- a/samples/splash/makefile.bcc +++ b/samples/splash/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/splash/makefile.gcc b/samples/splash/makefile.gcc index a23fb5a96d..23d1f222ef 100644 --- a/samples/splash/makefile.gcc +++ b/samples/splash/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/splash/makefile.unx b/samples/splash/makefile.unx index 7c74c23d3f..ae5785ebbf 100644 --- a/samples/splash/makefile.unx +++ b/samples/splash/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/splash/makefile.vc b/samples/splash/makefile.vc index f63fd6b5ae..265cc07fdb 100644 --- a/samples/splash/makefile.vc +++ b/samples/splash/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/splash/splash_vc7.vcproj b/samples/splash/splash_vc7.vcproj index c2825cf11b..de13a4c95e 100644 --- a/samples/splash/splash_vc7.vcproj +++ b/samples/splash/splash_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/splash/splash_vc8.vcproj b/samples/splash/splash_vc8.vcproj index b0cbf3728f..05547cb88b 100644 --- a/samples/splash/splash_vc8.vcproj +++ b/samples/splash/splash_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/splash/splash_vc9.vcproj b/samples/splash/splash_vc9.vcproj index 154a1b357b..6da4fb53d6 100644 --- a/samples/splash/splash_vc9.vcproj +++ b/samples/splash/splash_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index 9c97295b95..c8aa349cc5 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ SPLITTER_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__splitter___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__splitter___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL splitter$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd = $(NM) splitter$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep splitter$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__splitter___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__splitter___win32rc = splitter_sample_rc.o @COND_PLATFORM_MACOSX_1@__splitter_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc) $(CXX) -o $@ $(SPLITTER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__splitter___mac_setfilecmd) $(__splitter___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc) @COND_PLATFORM_MACOSX_1@splitter_bundle: $(____splitter_BUNDLE_TGT_REF_DEP) splitter_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include splitter_splitter.o: $(srcdir)/splitter.cpp $(CXXC) -c -o $@ $(SPLITTER_CXXFLAGS) $(srcdir)/splitter.cpp diff --git a/samples/splitter/makefile.bcc b/samples/splitter/makefile.bcc index 01d84c8b2b..2d323f3d25 100644 --- a/samples/splitter/makefile.bcc +++ b/samples/splitter/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc index ef88612ba7..4725d12e8b 100644 --- a/samples/splitter/makefile.gcc +++ b/samples/splitter/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/splitter/makefile.unx b/samples/splitter/makefile.unx index 19636482da..dc507458a8 100644 --- a/samples/splitter/makefile.unx +++ b/samples/splitter/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc index f9e2e690ee..6d535edeaf 100644 --- a/samples/splitter/makefile.vc +++ b/samples/splitter/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/splitter/splitter_vc7.vcproj b/samples/splitter/splitter_vc7.vcproj index 47a8060c50..77e0c1d168 100644 --- a/samples/splitter/splitter_vc7.vcproj +++ b/samples/splitter/splitter_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/splitter/splitter_vc8.vcproj b/samples/splitter/splitter_vc8.vcproj index 41bf81b05a..8ff45d20d2 100644 --- a/samples/splitter/splitter_vc8.vcproj +++ b/samples/splitter/splitter_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/splitter/splitter_vc9.vcproj b/samples/splitter/splitter_vc9.vcproj index cdaed2985b..717811435c 100644 --- a/samples/splitter/splitter_vc9.vcproj +++ b/samples/splitter/splitter_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index 8a9b4f3fff..99889a53f5 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ STATBAR_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__statbar___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__statbar___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL statbar$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd = $(NM) statbar$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep statbar$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__statbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar_sample_rc.o @COND_PLATFORM_MACOSX_1@__statbar_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc) $(CXX) -o $@ $(STATBAR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__statbar___mac_setfilecmd) $(__statbar___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc) @COND_PLATFORM_MACOSX_1@statbar_bundle: $(____statbar_BUNDLE_TGT_REF_DEP) statbar_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include statbar_statbar.o: $(srcdir)/statbar.cpp $(CXXC) -c -o $@ $(STATBAR_CXXFLAGS) $(srcdir)/statbar.cpp diff --git a/samples/statbar/makefile.bcc b/samples/statbar/makefile.bcc index 328abf3c49..bbc6801397 100644 --- a/samples/statbar/makefile.bcc +++ b/samples/statbar/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/statbar/makefile.gcc b/samples/statbar/makefile.gcc index b711f522e0..087cdb66ec 100644 --- a/samples/statbar/makefile.gcc +++ b/samples/statbar/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/statbar/makefile.unx b/samples/statbar/makefile.unx index 8a08cdcc11..5af244e1da 100644 --- a/samples/statbar/makefile.unx +++ b/samples/statbar/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc index cafbb3b3f6..0d15c56226 100644 --- a/samples/statbar/makefile.vc +++ b/samples/statbar/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/statbar/statbar_vc7.vcproj b/samples/statbar/statbar_vc7.vcproj index 478569eb5a..8f16b161f1 100644 --- a/samples/statbar/statbar_vc7.vcproj +++ b/samples/statbar/statbar_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/statbar/statbar_vc8.vcproj b/samples/statbar/statbar_vc8.vcproj index d08212ba5c..52c3117613 100644 --- a/samples/statbar/statbar_vc8.vcproj +++ b/samples/statbar/statbar_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/statbar/statbar_vc9.vcproj b/samples/statbar/statbar_vc9.vcproj index 5f356ce92d..591b3ad86b 100644 --- a/samples/statbar/statbar_vc9.vcproj +++ b/samples/statbar/statbar_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index 55716ba0ac..25b329d010 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ STCTEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__stctest___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL stctest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep stctest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__stctest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__stctest___win32rc = stctest_sample_rc.o @COND_PLATFORM_MACOSX_1@__stctest_app_Contents_PkgInfo___depname \ @@ -156,8 +152,6 @@ distclean: clean stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) $(CXX) -o $@ $(STCTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__stctest___mac_setfilecmd) $(__stctest___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -195,7 +189,7 @@ data: done stctest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include stctest_stctest.o: $(srcdir)/stctest.cpp $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $(srcdir)/stctest.cpp diff --git a/samples/stc/makefile.bcc b/samples/stc/makefile.bcc index 1377ef86e0..2c0471f390 100644 --- a/samples/stc/makefile.bcc +++ b/samples/stc/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc index d4e54ced57..7068cc1c28 100644 --- a/samples/stc/makefile.gcc +++ b/samples/stc/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/stc/makefile.unx b/samples/stc/makefile.unx index 50b39b6f76..e5543bf78d 100644 --- a/samples/stc/makefile.unx +++ b/samples/stc/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc index 136a80bb38..5419220a81 100644 --- a/samples/stc/makefile.vc +++ b/samples/stc/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/stc/stctest_vc7.vcproj b/samples/stc/stctest_vc7.vcproj index 8531e1409c..f2bb0fcf3f 100644 --- a/samples/stc/stctest_vc7.vcproj +++ b/samples/stc/stctest_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/stc/stctest_vc8.vcproj b/samples/stc/stctest_vc8.vcproj index afc5e21204..e6f664727e 100644 --- a/samples/stc/stctest_vc8.vcproj +++ b/samples/stc/stctest_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/stc/stctest_vc9.vcproj b/samples/stc/stctest_vc9.vcproj index 2d2dd12689..716f996847 100644 --- a/samples/stc/stctest_vc9.vcproj +++ b/samples/stc/stctest_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index ec270ac6d2..eac153827b 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ SVGTEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__svgtest___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL svgtest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___svgtest___os2_emxbindcmd = $(NM) svgtest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep svgtest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__svgtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___svgtest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__svgtest___win32rc = svgtest_sample_rc.o @COND_PLATFORM_MACOSX_1@__svgtest_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc) $(CXX) -o $@ $(SVGTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__svgtest___mac_setfilecmd) $(__svgtest___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc) @COND_PLATFORM_MACOSX_1@svgtest_bundle: $(____svgtest_BUNDLE_TGT_REF_DEP) svgtest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include svgtest_svgtest.o: $(srcdir)/svgtest.cpp $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $(srcdir)/svgtest.cpp diff --git a/samples/svg/makefile.bcc b/samples/svg/makefile.bcc index 156894cdb6..5a8fb3416a 100644 --- a/samples/svg/makefile.bcc +++ b/samples/svg/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/svg/makefile.gcc b/samples/svg/makefile.gcc index 96539fc73b..7a43007ef0 100644 --- a/samples/svg/makefile.gcc +++ b/samples/svg/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/svg/makefile.unx b/samples/svg/makefile.unx index 2837be667d..2d84546faf 100644 --- a/samples/svg/makefile.unx +++ b/samples/svg/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc index 8ff0d487e0..faff21d270 100644 --- a/samples/svg/makefile.vc +++ b/samples/svg/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/svg/svgtest_vc7.vcproj b/samples/svg/svgtest_vc7.vcproj index 7a2d010670..d1416ed89e 100644 --- a/samples/svg/svgtest_vc7.vcproj +++ b/samples/svg/svgtest_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/svg/svgtest_vc8.vcproj b/samples/svg/svgtest_vc8.vcproj index d60b0358d5..8094af58b9 100644 --- a/samples/svg/svgtest_vc8.vcproj +++ b/samples/svg/svgtest_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/svg/svgtest_vc9.vcproj b/samples/svg/svgtest_vc9.vcproj index 8bac7edfba..3cae9fc57f 100644 --- a/samples/svg/svgtest_vc9.vcproj +++ b/samples/svg/svgtest_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in index 48f7196e5d..f55d03aa5e 100644 --- a/samples/taborder/Makefile.in +++ b/samples/taborder/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ TABORDER_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__taborder___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__taborder___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL taborder$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___taborder___os2_emxbindcmd = $(NM) taborder$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep taborder$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__taborder___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___taborder___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__taborder___win32rc = taborder_sample_rc.o @COND_PLATFORM_MACOSX_1@__taborder_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean taborder$(EXEEXT): $(TABORDER_OBJECTS) $(__taborder___win32rc) $(CXX) -o $@ $(TABORDER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__taborder___mac_setfilecmd) $(__taborder___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@taborder.app/Contents/PkgInfo: taborder$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ taborder$(EXEEXT): $(TABORDER_OBJECTS) $(__taborder___win32rc) @COND_PLATFORM_MACOSX_1@taborder_bundle: $(____taborder_BUNDLE_TGT_REF_DEP) taborder_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include taborder_taborder.o: $(srcdir)/taborder.cpp $(CXXC) -c -o $@ $(TABORDER_CXXFLAGS) $(srcdir)/taborder.cpp diff --git a/samples/taborder/makefile.bcc b/samples/taborder/makefile.bcc index 738749cae7..40072d3ec1 100644 --- a/samples/taborder/makefile.bcc +++ b/samples/taborder/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taborder/makefile.gcc b/samples/taborder/makefile.gcc index e20215de72..20dee394ad 100644 --- a/samples/taborder/makefile.gcc +++ b/samples/taborder/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taborder/makefile.unx b/samples/taborder/makefile.unx index 8692c44253..2d37f83aae 100644 --- a/samples/taborder/makefile.unx +++ b/samples/taborder/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taborder/makefile.vc b/samples/taborder/makefile.vc index 865c37f291..1ab0ef60c8 100644 --- a/samples/taborder/makefile.vc +++ b/samples/taborder/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taborder/taborder_vc7.vcproj b/samples/taborder/taborder_vc7.vcproj index 3e2708335d..4851e59543 100644 --- a/samples/taborder/taborder_vc7.vcproj +++ b/samples/taborder/taborder_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/taborder/taborder_vc8.vcproj b/samples/taborder/taborder_vc8.vcproj index 721309ec60..0dcbcdf606 100644 --- a/samples/taborder/taborder_vc8.vcproj +++ b/samples/taborder/taborder_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/taborder/taborder_vc9.vcproj b/samples/taborder/taborder_vc9.vcproj index 6c8bd8ea2f..115bd2b87a 100644 --- a/samples/taborder/taborder_vc9.vcproj +++ b/samples/taborder/taborder_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index b0d8d974cf..8d0d647533 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ TASKBAR_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__taskbar___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__taskbar___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL taskbar$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd = $(NM) taskbar$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep taskbar$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__taskbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_sample_rc.o @COND_PLATFORM_MACOSX_1@__taskbar_app_Contents_PkgInfo___depname \ @@ -156,8 +152,6 @@ distclean: clean taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) $(CXX) -o $@ $(TASKBAR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__taskbar___mac_setfilecmd) $(__taskbar___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -183,7 +177,7 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) @COND_PLATFORM_MACOSX_1@taskbar_bundle: $(____taskbar_BUNDLE_TGT_REF_DEP) taskbar_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include taskbar_tbtest.o: $(srcdir)/tbtest.cpp $(CXXC) -c -o $@ $(TASKBAR_CXXFLAGS) $(srcdir)/tbtest.cpp diff --git a/samples/taskbar/makefile.bcc b/samples/taskbar/makefile.bcc index 8cc26262a5..92c5d070d5 100644 --- a/samples/taskbar/makefile.bcc +++ b/samples/taskbar/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taskbar/makefile.gcc b/samples/taskbar/makefile.gcc index 17500b9bae..26ff3a160b 100644 --- a/samples/taskbar/makefile.gcc +++ b/samples/taskbar/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taskbar/makefile.unx b/samples/taskbar/makefile.unx index 6c2121c9be..d7f7918006 100644 --- a/samples/taskbar/makefile.unx +++ b/samples/taskbar/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc index f23f6d4d8f..6eae691da5 100644 --- a/samples/taskbar/makefile.vc +++ b/samples/taskbar/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taskbar/taskbar_vc7.vcproj b/samples/taskbar/taskbar_vc7.vcproj index b27b95cf27..3f52070250 100644 --- a/samples/taskbar/taskbar_vc7.vcproj +++ b/samples/taskbar/taskbar_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/taskbar/taskbar_vc8.vcproj b/samples/taskbar/taskbar_vc8.vcproj index 9361de879d..d5e8d34133 100644 --- a/samples/taskbar/taskbar_vc8.vcproj +++ b/samples/taskbar/taskbar_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/taskbar/taskbar_vc9.vcproj b/samples/taskbar/taskbar_vc9.vcproj index 526f10b50f..4c330e9e06 100644 --- a/samples/taskbar/taskbar_vc9.vcproj +++ b/samples/taskbar/taskbar_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/taskbarbutton/Makefile.in b/samples/taskbarbutton/Makefile.in index d081682b4c..d8cbb67131 100644 --- a/samples/taskbarbutton/Makefile.in +++ b/samples/taskbarbutton/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,26 +68,23 @@ TASKBARBUTTON_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__taskbarbutton___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__taskbarbutton___mac_setfilecmd \ -@COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL taskbarbutton$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___taskbarbutton___os2_emxbindcmd = $(NM) \ taskbarbutton$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ taskbarbutton$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__taskbarbutton___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___taskbarbutton___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__taskbarbutton___win32rc = \ @COND_PLATFORM_WIN32_1@ taskbarbutton_sample_rc.o @@ -162,8 +158,6 @@ distclean: clean taskbarbutton$(EXEEXT): $(TASKBARBUTTON_OBJECTS) $(__taskbarbutton___win32rc) $(CXX) -o $@ $(TASKBARBUTTON_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__taskbarbutton___mac_setfilecmd) $(__taskbarbutton___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@taskbarbutton.app/Contents/PkgInfo: taskbarbutton$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -189,7 +183,7 @@ taskbarbutton$(EXEEXT): $(TASKBARBUTTON_OBJECTS) $(__taskbarbutton___win32rc) @COND_PLATFORM_MACOSX_1@taskbarbutton_bundle: $(____taskbarbutton_BUNDLE_TGT_REF_DEP) taskbarbutton_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include taskbarbutton_taskbarbutton.o: $(srcdir)/taskbarbutton.cpp $(CXXC) -c -o $@ $(TASKBARBUTTON_CXXFLAGS) $(srcdir)/taskbarbutton.cpp diff --git a/samples/taskbarbutton/makefile.bcc b/samples/taskbarbutton/makefile.bcc index 807fef34a8..9530d7d3cb 100644 --- a/samples/taskbarbutton/makefile.bcc +++ b/samples/taskbarbutton/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taskbarbutton/makefile.gcc b/samples/taskbarbutton/makefile.gcc index 04f39c9d94..a1a1aec807 100644 --- a/samples/taskbarbutton/makefile.gcc +++ b/samples/taskbarbutton/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taskbarbutton/makefile.unx b/samples/taskbarbutton/makefile.unx index 732e1ad5af..7b404e3979 100644 --- a/samples/taskbarbutton/makefile.unx +++ b/samples/taskbarbutton/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taskbarbutton/makefile.vc b/samples/taskbarbutton/makefile.vc index 16bb38b876..cb322b2c15 100644 --- a/samples/taskbarbutton/makefile.vc +++ b/samples/taskbarbutton/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/taskbarbutton/taskbarbutton_vc7.vcproj b/samples/taskbarbutton/taskbarbutton_vc7.vcproj index b2d9e8d984..3216d7e353 100644 --- a/samples/taskbarbutton/taskbarbutton_vc7.vcproj +++ b/samples/taskbarbutton/taskbarbutton_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/taskbarbutton/taskbarbutton_vc8.vcproj b/samples/taskbarbutton/taskbarbutton_vc8.vcproj index 0c7549f464..d680daab17 100644 --- a/samples/taskbarbutton/taskbarbutton_vc8.vcproj +++ b/samples/taskbarbutton/taskbarbutton_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/taskbarbutton/taskbarbutton_vc9.vcproj b/samples/taskbarbutton/taskbarbutton_vc9.vcproj index 178fcc0365..0ba2abc45b 100644 --- a/samples/taskbarbutton/taskbarbutton_vc9.vcproj +++ b/samples/taskbarbutton/taskbarbutton_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index 8f9a8ff3e6..486c22bc2e 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ TEXT_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__text___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__text___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL text$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___text___os2_emxbindcmd = $(NM) text$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep text$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__text___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___text___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__text___win32rc = text_sample_rc.o @COND_PLATFORM_MACOSX_1@__text_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc) $(CXX) -o $@ $(TEXT_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__text___mac_setfilecmd) $(__text___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc) @COND_PLATFORM_MACOSX_1@text_bundle: $(____text_BUNDLE_TGT_REF_DEP) text_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include text_text.o: $(srcdir)/text.cpp $(CXXC) -c -o $@ $(TEXT_CXXFLAGS) $(srcdir)/text.cpp diff --git a/samples/text/makefile.bcc b/samples/text/makefile.bcc index ef4c217d5c..4b5068058f 100644 --- a/samples/text/makefile.bcc +++ b/samples/text/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/text/makefile.gcc b/samples/text/makefile.gcc index 495a9b9ad7..b4c631ce3d 100644 --- a/samples/text/makefile.gcc +++ b/samples/text/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/text/makefile.unx b/samples/text/makefile.unx index b87ac0c402..cde0c7af62 100644 --- a/samples/text/makefile.unx +++ b/samples/text/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc index 9766db61d8..a26977ab6b 100644 --- a/samples/text/makefile.vc +++ b/samples/text/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/text/text_vc7.vcproj b/samples/text/text_vc7.vcproj index 594b5f91d8..98fc3959a2 100644 --- a/samples/text/text_vc7.vcproj +++ b/samples/text/text_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/text/text_vc8.vcproj b/samples/text/text_vc8.vcproj index d89be3696f..6508c78a79 100644 --- a/samples/text/text_vc8.vcproj +++ b/samples/text/text_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/text/text_vc9.vcproj b/samples/text/text_vc9.vcproj index 8f665585c0..2add5b74b6 100644 --- a/samples/text/text_vc9.vcproj +++ b/samples/text/text_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index ed28d96a09..7a5aa27d9e 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ THREAD_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__thread___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__thread___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL thread$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___thread___os2_emxbindcmd = $(NM) thread$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep thread$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__thread___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___thread___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__thread___win32rc = thread_sample_rc.o @COND_PLATFORM_MACOSX_1@__thread_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc) $(CXX) -o $@ $(THREAD_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__thread___mac_setfilecmd) $(__thread___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc) @COND_PLATFORM_MACOSX_1@thread_bundle: $(____thread_BUNDLE_TGT_REF_DEP) thread_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include thread_thread.o: $(srcdir)/thread.cpp $(CXXC) -c -o $@ $(THREAD_CXXFLAGS) $(srcdir)/thread.cpp diff --git a/samples/thread/makefile.bcc b/samples/thread/makefile.bcc index e6807cbcfe..9e2777c994 100644 --- a/samples/thread/makefile.bcc +++ b/samples/thread/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/thread/makefile.gcc b/samples/thread/makefile.gcc index 96046100ae..c54db207d9 100644 --- a/samples/thread/makefile.gcc +++ b/samples/thread/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/thread/makefile.unx b/samples/thread/makefile.unx index 10bf83b69c..a956465fe7 100644 --- a/samples/thread/makefile.unx +++ b/samples/thread/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc index 2c21330632..38a311ddcd 100644 --- a/samples/thread/makefile.vc +++ b/samples/thread/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/thread/thread_vc7.vcproj b/samples/thread/thread_vc7.vcproj index ee47e03459..b803128723 100644 --- a/samples/thread/thread_vc7.vcproj +++ b/samples/thread/thread_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/thread/thread_vc8.vcproj b/samples/thread/thread_vc8.vcproj index 03ebeaeb97..46613b421d 100644 --- a/samples/thread/thread_vc8.vcproj +++ b/samples/thread/thread_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/thread/thread_vc9.vcproj b/samples/thread/thread_vc9.vcproj index dd17c5c9da..c1a89e8872 100644 --- a/samples/thread/thread_vc9.vcproj +++ b/samples/thread/thread_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index 9f0816b102..24b87fca63 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ TOOLBAR_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__toolbar___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__toolbar___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL toolbar$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___toolbar___os2_emxbindcmd = $(NM) toolbar$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep toolbar$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__toolbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___toolbar___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__toolbar_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = toolbar.app/Contents/PkgInfo @@ -151,8 +147,6 @@ distclean: clean toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc) $(CXX) -o $@ $(TOOLBAR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__toolbar___mac_setfilecmd) $(__toolbar___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -181,7 +175,7 @@ toolbar_toolbar.o: $(srcdir)/toolbar.cpp $(CXXC) -c -o $@ $(TOOLBAR_CXXFLAGS) $(srcdir)/toolbar.cpp toolbar_toolbar_rc.o: $(srcdir)/toolbar.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/toolbar/makefile.bcc b/samples/toolbar/makefile.bcc index eab6320e35..ee4d43b3e2 100644 --- a/samples/toolbar/makefile.bcc +++ b/samples/toolbar/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/toolbar/makefile.gcc b/samples/toolbar/makefile.gcc index 05626425e2..b24e9c9255 100644 --- a/samples/toolbar/makefile.gcc +++ b/samples/toolbar/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/toolbar/makefile.unx b/samples/toolbar/makefile.unx index 263a0accb3..09b53851ea 100644 --- a/samples/toolbar/makefile.unx +++ b/samples/toolbar/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc index 79e83da11c..35635eddae 100644 --- a/samples/toolbar/makefile.vc +++ b/samples/toolbar/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/toolbar/toolbar_vc7.vcproj b/samples/toolbar/toolbar_vc7.vcproj index 785638bde6..f0c97af4fb 100644 --- a/samples/toolbar/toolbar_vc7.vcproj +++ b/samples/toolbar/toolbar_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/toolbar/toolbar_vc8.vcproj b/samples/toolbar/toolbar_vc8.vcproj index 7417356541..1a7434dd05 100644 --- a/samples/toolbar/toolbar_vc8.vcproj +++ b/samples/toolbar/toolbar_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/toolbar/toolbar_vc9.vcproj b/samples/toolbar/toolbar_vc9.vcproj index 09257d422f..6214ae1af2 100644 --- a/samples/toolbar/toolbar_vc9.vcproj +++ b/samples/toolbar/toolbar_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index 678aa8d3fe..7097dd464e 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ TREECTRL_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__treectrl___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL treectrl$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd = $(NM) treectrl$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep treectrl$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__treectrl___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__treectrl_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = treectrl.app/Contents/PkgInfo @@ -151,8 +147,6 @@ distclean: clean treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc) $(CXX) -o $@ $(TREECTRL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__treectrl___mac_setfilecmd) $(__treectrl___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -181,7 +175,7 @@ treectrl_treetest.o: $(srcdir)/treetest.cpp $(CXXC) -c -o $@ $(TREECTRL_CXXFLAGS) $(srcdir)/treetest.cpp treectrl_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/treectrl/makefile.bcc b/samples/treectrl/makefile.bcc index 3d608d36d4..3020dc0bce 100644 --- a/samples/treectrl/makefile.bcc +++ b/samples/treectrl/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/treectrl/makefile.gcc b/samples/treectrl/makefile.gcc index ed54130552..fcb94c13a7 100644 --- a/samples/treectrl/makefile.gcc +++ b/samples/treectrl/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/treectrl/makefile.unx b/samples/treectrl/makefile.unx index 10a20d7db7..2cce470317 100644 --- a/samples/treectrl/makefile.unx +++ b/samples/treectrl/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc index 719fc72cdc..e691d5349b 100644 --- a/samples/treectrl/makefile.vc +++ b/samples/treectrl/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/treectrl/treectrl_vc7.vcproj b/samples/treectrl/treectrl_vc7.vcproj index ce9037a619..2637af44e8 100644 --- a/samples/treectrl/treectrl_vc7.vcproj +++ b/samples/treectrl/treectrl_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/treectrl/treectrl_vc8.vcproj b/samples/treectrl/treectrl_vc8.vcproj index 450910d87d..d7297037a5 100644 --- a/samples/treectrl/treectrl_vc8.vcproj +++ b/samples/treectrl/treectrl_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/treectrl/treectrl_vc9.vcproj b/samples/treectrl/treectrl_vc9.vcproj index 6b570aad06..ba4165089f 100644 --- a/samples/treectrl/treectrl_vc9.vcproj +++ b/samples/treectrl/treectrl_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/treelist/Makefile.in b/samples/treelist/Makefile.in index 041747bfba..790684107b 100644 --- a/samples/treelist/Makefile.in +++ b/samples/treelist/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ TREELIST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__treelist___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__treelist___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL treelist$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___treelist___os2_emxbindcmd = $(NM) treelist$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep treelist$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__treelist___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___treelist___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__treelist___win32rc = treelist_sample_rc.o @COND_PLATFORM_MACOSX_1@__treelist_app_Contents_PkgInfo___depname \ @@ -156,8 +152,6 @@ distclean: clean treelist$(EXEEXT): $(TREELIST_OBJECTS) $(__treelist___win32rc) $(CXX) -o $@ $(TREELIST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__treelist___mac_setfilecmd) $(__treelist___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@treelist.app/Contents/PkgInfo: treelist$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -183,7 +177,7 @@ treelist$(EXEEXT): $(TREELIST_OBJECTS) $(__treelist___win32rc) @COND_PLATFORM_MACOSX_1@treelist_bundle: $(____treelist_BUNDLE_TGT_REF_DEP) treelist_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include treelist_treelist.o: $(srcdir)/treelist.cpp $(CXXC) -c -o $@ $(TREELIST_CXXFLAGS) $(srcdir)/treelist.cpp diff --git a/samples/treelist/makefile.bcc b/samples/treelist/makefile.bcc index 2715b35b2a..71c88403ae 100644 --- a/samples/treelist/makefile.bcc +++ b/samples/treelist/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/treelist/makefile.gcc b/samples/treelist/makefile.gcc index e4bc9c1240..a7532b5e63 100644 --- a/samples/treelist/makefile.gcc +++ b/samples/treelist/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/treelist/makefile.unx b/samples/treelist/makefile.unx index ee7e095856..60b3d0bc45 100644 --- a/samples/treelist/makefile.unx +++ b/samples/treelist/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/treelist/makefile.vc b/samples/treelist/makefile.vc index 6df94c4ef8..86773f771c 100644 --- a/samples/treelist/makefile.vc +++ b/samples/treelist/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/treelist/treelist_vc7.vcproj b/samples/treelist/treelist_vc7.vcproj index 42821b8572..d3d28d4b6d 100644 --- a/samples/treelist/treelist_vc7.vcproj +++ b/samples/treelist/treelist_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/treelist/treelist_vc8.vcproj b/samples/treelist/treelist_vc8.vcproj index d1f2b8a4ec..3e22ddbc9b 100644 --- a/samples/treelist/treelist_vc8.vcproj +++ b/samples/treelist/treelist_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/treelist/treelist_vc9.vcproj b/samples/treelist/treelist_vc9.vcproj index e18ced3f2b..74ad08f507 100644 --- a/samples/treelist/treelist_vc9.vcproj +++ b/samples/treelist/treelist_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 04d9a836fb..237e8c78bd 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ TYPETEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__typetest___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__typetest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL typetest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd = $(NM) typetest$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep typetest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__typetest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__typetest___win32rc = typetest_sample_rc.o @COND_PLATFORM_MACOSX_1@__typetest_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc) $(CXX) -o $@ $(TYPETEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__typetest___mac_setfilecmd) $(__typetest___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc) @COND_PLATFORM_MACOSX_1@typetest_bundle: $(____typetest_BUNDLE_TGT_REF_DEP) typetest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include typetest_typetest.o: $(srcdir)/typetest.cpp $(CXXC) -c -o $@ $(TYPETEST_CXXFLAGS) $(srcdir)/typetest.cpp diff --git a/samples/typetest/makefile.bcc b/samples/typetest/makefile.bcc index 7f47eb3247..55cb5a25f9 100644 --- a/samples/typetest/makefile.bcc +++ b/samples/typetest/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc index 43bf11f529..4324575635 100644 --- a/samples/typetest/makefile.gcc +++ b/samples/typetest/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/typetest/makefile.unx b/samples/typetest/makefile.unx index 18f6ad62e6..49a1e378aa 100644 --- a/samples/typetest/makefile.unx +++ b/samples/typetest/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc index 950660d783..d6adc9a2b2 100644 --- a/samples/typetest/makefile.vc +++ b/samples/typetest/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/typetest/typetest_vc7.vcproj b/samples/typetest/typetest_vc7.vcproj index 15b5d8f092..406c07aeb0 100644 --- a/samples/typetest/typetest_vc7.vcproj +++ b/samples/typetest/typetest_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/typetest/typetest_vc8.vcproj b/samples/typetest/typetest_vc8.vcproj index 0af50d7dcc..fb3aefddcf 100644 --- a/samples/typetest/typetest_vc8.vcproj +++ b/samples/typetest/typetest_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/typetest/typetest_vc9.vcproj b/samples/typetest/typetest_vc9.vcproj index ff6bd79e68..a659959dfe 100644 --- a/samples/typetest/typetest_vc9.vcproj +++ b/samples/typetest/typetest_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/uiaction/Makefile.in b/samples/uiaction/Makefile.in index f4ee1918ca..b496b815d7 100644 --- a/samples/uiaction/Makefile.in +++ b/samples/uiaction/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ UIACTION_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__uiaction___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__uiaction___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL uiaction$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___uiaction___os2_emxbindcmd = $(NM) uiaction$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep uiaction$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__uiaction___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___uiaction___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__uiaction___win32rc = uiaction_sample_rc.o @COND_PLATFORM_MACOSX_1@__uiaction_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean uiaction$(EXEEXT): $(UIACTION_OBJECTS) $(__uiaction___win32rc) $(CXX) -o $@ $(UIACTION_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__uiaction___mac_setfilecmd) $(__uiaction___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@uiaction.app/Contents/PkgInfo: uiaction$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ uiaction$(EXEEXT): $(UIACTION_OBJECTS) $(__uiaction___win32rc) @COND_PLATFORM_MACOSX_1@uiaction_bundle: $(____uiaction_BUNDLE_TGT_REF_DEP) uiaction_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include uiaction_uiaction.o: $(srcdir)/uiaction.cpp $(CXXC) -c -o $@ $(UIACTION_CXXFLAGS) $(srcdir)/uiaction.cpp diff --git a/samples/uiaction/makefile.bcc b/samples/uiaction/makefile.bcc index eed76e2757..6d784b19ea 100644 --- a/samples/uiaction/makefile.bcc +++ b/samples/uiaction/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/uiaction/makefile.gcc b/samples/uiaction/makefile.gcc index d44d875480..34c20d5f88 100644 --- a/samples/uiaction/makefile.gcc +++ b/samples/uiaction/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/uiaction/makefile.unx b/samples/uiaction/makefile.unx index 86e947b7f6..8b71749627 100644 --- a/samples/uiaction/makefile.unx +++ b/samples/uiaction/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/uiaction/makefile.vc b/samples/uiaction/makefile.vc index bdfde5b243..d0ccea5ae9 100644 --- a/samples/uiaction/makefile.vc +++ b/samples/uiaction/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/uiaction/uiaction_vc7.vcproj b/samples/uiaction/uiaction_vc7.vcproj index 05f53f4250..6103cf6d6c 100644 --- a/samples/uiaction/uiaction_vc7.vcproj +++ b/samples/uiaction/uiaction_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/uiaction/uiaction_vc8.vcproj b/samples/uiaction/uiaction_vc8.vcproj index 8714265499..fb59c676dc 100644 --- a/samples/uiaction/uiaction_vc8.vcproj +++ b/samples/uiaction/uiaction_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/uiaction/uiaction_vc9.vcproj b/samples/uiaction/uiaction_vc9.vcproj index e014c8ee77..1048b0f99c 100644 --- a/samples/uiaction/uiaction_vc9.vcproj +++ b/samples/uiaction/uiaction_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index 0ea4ad22a4..494bb84317 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ VALIDATE_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__validate___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__validate___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL validate$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___validate___os2_emxbindcmd = $(NM) validate$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep validate$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__validate___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___validate___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__validate_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = validate.app/Contents/PkgInfo @@ -151,8 +147,6 @@ distclean: clean validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc) $(CXX) -o $@ $(VALIDATE_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__validate___mac_setfilecmd) $(__validate___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -181,7 +175,7 @@ validate_validate.o: $(srcdir)/validate.cpp $(CXXC) -c -o $@ $(VALIDATE_CXXFLAGS) $(srcdir)/validate.cpp validate_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/validate/makefile.bcc b/samples/validate/makefile.bcc index 84df3bc99c..772e235411 100644 --- a/samples/validate/makefile.bcc +++ b/samples/validate/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/validate/makefile.gcc b/samples/validate/makefile.gcc index bd1494cf63..f399ef8643 100644 --- a/samples/validate/makefile.gcc +++ b/samples/validate/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/validate/makefile.unx b/samples/validate/makefile.unx index e2690fed85..0c8a264748 100644 --- a/samples/validate/makefile.unx +++ b/samples/validate/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc index 26664be6b6..9e4ef3a0a9 100644 --- a/samples/validate/makefile.vc +++ b/samples/validate/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/validate/validate_vc7.vcproj b/samples/validate/validate_vc7.vcproj index 290c437a8d..e7ee1b066b 100644 --- a/samples/validate/validate_vc7.vcproj +++ b/samples/validate/validate_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/validate/validate_vc8.vcproj b/samples/validate/validate_vc8.vcproj index b3b3ced30d..343f7f9c08 100644 --- a/samples/validate/validate_vc8.vcproj +++ b/samples/validate/validate_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/validate/validate_vc9.vcproj b/samples/validate/validate_vc9.vcproj index c2e5cd355a..4f352858cd 100644 --- a/samples/validate/validate_vc9.vcproj +++ b/samples/validate/validate_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index 093e3cc862..fabe61116d 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ VSTEST_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__vstest___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__vstest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL vstest$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___vstest___os2_emxbindcmd = $(NM) vstest$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep vstest$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__vstest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___vstest___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__vstest___win32rc = vstest_sample_rc.o @COND_PLATFORM_MACOSX_1@__vstest_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc) $(CXX) -o $@ $(VSTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__vstest___mac_setfilecmd) $(__vstest___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc) @COND_PLATFORM_MACOSX_1@vstest_bundle: $(____vstest_BUNDLE_TGT_REF_DEP) vstest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include vstest_vstest.o: $(srcdir)/vstest.cpp $(CXXC) -c -o $@ $(VSTEST_CXXFLAGS) $(srcdir)/vstest.cpp diff --git a/samples/vscroll/makefile.bcc b/samples/vscroll/makefile.bcc index 5514d2857c..6789e6409f 100644 --- a/samples/vscroll/makefile.bcc +++ b/samples/vscroll/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/vscroll/makefile.gcc b/samples/vscroll/makefile.gcc index 615abf9658..bcab66cd7a 100644 --- a/samples/vscroll/makefile.gcc +++ b/samples/vscroll/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/vscroll/makefile.unx b/samples/vscroll/makefile.unx index bd8b58f29a..e21a748269 100644 --- a/samples/vscroll/makefile.unx +++ b/samples/vscroll/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc index d2fb175489..d69b6c4227 100644 --- a/samples/vscroll/makefile.vc +++ b/samples/vscroll/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/vscroll/vscroll_vc7.vcproj b/samples/vscroll/vscroll_vc7.vcproj index 6ac95a1036..d675603a16 100644 --- a/samples/vscroll/vscroll_vc7.vcproj +++ b/samples/vscroll/vscroll_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/vscroll/vscroll_vc8.vcproj b/samples/vscroll/vscroll_vc8.vcproj index 71e5aebaaa..6fb5c994ca 100644 --- a/samples/vscroll/vscroll_vc8.vcproj +++ b/samples/vscroll/vscroll_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/vscroll/vscroll_vc9.vcproj b/samples/vscroll/vscroll_vc9.vcproj index 007fd699c1..6cce64702b 100644 --- a/samples/vscroll/vscroll_vc9.vcproj +++ b/samples/vscroll/vscroll_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/webview/Makefile.in b/samples/webview/Makefile.in index 644ebbdfa6..06f5ceab20 100644 --- a/samples/webview/Makefile.in +++ b/samples/webview/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -70,25 +69,22 @@ WEBVIEW_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__webview___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__webview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL webview$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___webview___os2_emxbindcmd = $(NM) webview$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep webview$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__webview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___webview___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__webview_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = webview.app/Contents/PkgInfo @@ -163,8 +159,6 @@ distclean: clean webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc) $(CXX) -o $@ $(WEBVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__webview___mac_setfilecmd) $(__webview___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@webview.app/Contents/PkgInfo: webview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -193,7 +187,7 @@ webview_webview.o: $(srcdir)/webview.cpp $(CXXC) -c -o $@ $(WEBVIEW_CXXFLAGS) $(srcdir)/webview.cpp webview_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/webview/makefile.bcc b/samples/webview/makefile.bcc index 99c79bf40b..8981245443 100644 --- a/samples/webview/makefile.bcc +++ b/samples/webview/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/webview/makefile.gcc b/samples/webview/makefile.gcc index d0cfd1ecdb..57a7588fe2 100644 --- a/samples/webview/makefile.gcc +++ b/samples/webview/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/webview/makefile.unx b/samples/webview/makefile.unx index d9cd9dab06..36fd59098c 100644 --- a/samples/webview/makefile.unx +++ b/samples/webview/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/webview/makefile.vc b/samples/webview/makefile.vc index b7c227b493..617fc4d53e 100644 --- a/samples/webview/makefile.vc +++ b/samples/webview/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/webview/webview_vc7.vcproj b/samples/webview/webview_vc7.vcproj index 6aa2c08ee9..6024f1b796 100644 --- a/samples/webview/webview_vc7.vcproj +++ b/samples/webview/webview_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/webview/webview_vc8.vcproj b/samples/webview/webview_vc8.vcproj index 4521f2fd4b..318b964df0 100644 --- a/samples/webview/webview_vc8.vcproj +++ b/samples/webview/webview_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/webview/webview_vc9.vcproj b/samples/webview/webview_vc9.vcproj index 6652bc5b9b..27f8798ec6 100644 --- a/samples/webview/webview_vc9.vcproj +++ b/samples/webview/webview_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index e51b00adce..91b090a826 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -106,25 +105,22 @@ WIDGETS_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__widgets___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__widgets___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL widgets$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___widgets___os2_emxbindcmd = $(NM) widgets$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep widgets$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__widgets___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___widgets___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__widgets_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = widgets.app/Contents/PkgInfo @@ -195,8 +191,6 @@ distclean: clean widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc) $(CXX) -o $@ $(WIDGETS_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__widgets___mac_setfilecmd) $(__widgets___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -321,7 +315,7 @@ widgets_widgets.o: $(srcdir)/widgets.cpp $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/widgets.cpp widgets_sample_rc.o: $(srcdir)/../sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc index 03fdfd2a7e..eed63ce521 100644 --- a/samples/widgets/makefile.bcc +++ b/samples/widgets/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc index 78baa41de7..3976414ba5 100644 --- a/samples/widgets/makefile.gcc +++ b/samples/widgets/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/widgets/makefile.unx b/samples/widgets/makefile.unx index 08b3bfe112..c6196e4418 100644 --- a/samples/widgets/makefile.unx +++ b/samples/widgets/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc index f8e6539de0..ee16a9db85 100644 --- a/samples/widgets/makefile.vc +++ b/samples/widgets/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/widgets/widgets_vc7.vcproj b/samples/widgets/widgets_vc7.vcproj index f721fb2ba1..e62f948a6f 100644 --- a/samples/widgets/widgets_vc7.vcproj +++ b/samples/widgets/widgets_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/widgets/widgets_vc8.vcproj b/samples/widgets/widgets_vc8.vcproj index 0eaddea77e..6cd09d5112 100644 --- a/samples/widgets/widgets_vc8.vcproj +++ b/samples/widgets/widgets_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/widgets/widgets_vc9.vcproj b/samples/widgets/widgets_vc9.vcproj index d3743d808e..dd56926639 100644 --- a/samples/widgets/widgets_vc9.vcproj +++ b/samples/widgets/widgets_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index deaf11aca9..eae057bf0d 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ WIZARD_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__wizard___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__wizard___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wizard$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___wizard___os2_emxbindcmd = $(NM) wizard$(EXEEXT) | if grep \ -q pmwin.763 ; then emxbind -ep wizard$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__wizard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wizard___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__wizard___win32rc = wizard_sample_rc.o @COND_PLATFORM_MACOSX_1@__wizard_app_Contents_PkgInfo___depname \ @@ -156,8 +152,6 @@ distclean: clean wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc) $(CXX) -o $@ $(WIZARD_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__wizard___mac_setfilecmd) $(__wizard___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -183,7 +177,7 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc) @COND_PLATFORM_MACOSX_1@wizard_bundle: $(____wizard_BUNDLE_TGT_REF_DEP) wizard_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include wizard_wizard.o: $(srcdir)/wizard.cpp $(CXXC) -c -o $@ $(WIZARD_CXXFLAGS) $(srcdir)/wizard.cpp diff --git a/samples/wizard/makefile.bcc b/samples/wizard/makefile.bcc index 8139c82f06..525e01c33a 100644 --- a/samples/wizard/makefile.bcc +++ b/samples/wizard/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc index 61b7c0f320..8af250f323 100644 --- a/samples/wizard/makefile.gcc +++ b/samples/wizard/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/wizard/makefile.unx b/samples/wizard/makefile.unx index 3c158653b2..555ccabd60 100644 --- a/samples/wizard/makefile.unx +++ b/samples/wizard/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc index 0a703dab94..492defa559 100644 --- a/samples/wizard/makefile.vc +++ b/samples/wizard/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/wizard/wizard_vc7.vcproj b/samples/wizard/wizard_vc7.vcproj index e06a128bb9..8b9cb223ec 100644 --- a/samples/wizard/wizard_vc7.vcproj +++ b/samples/wizard/wizard_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/wizard/wizard_vc8.vcproj b/samples/wizard/wizard_vc8.vcproj index 7b6613ea3e..c167b8bf2e 100644 --- a/samples/wizard/wizard_vc8.vcproj +++ b/samples/wizard/wizard_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/wizard/wizard_vc9.vcproj b/samples/wizard/wizard_vc9.vcproj index d01cd3f200..11087c5ffd 100644 --- a/samples/wizard/wizard_vc9.vcproj +++ b/samples/wizard/wizard_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in index 5d05e54fc4..a815d5d4ec 100644 --- a/samples/wrapsizer/Makefile.in +++ b/samples/wrapsizer/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -67,25 +66,22 @@ WRAPSIZER_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__wrapsizer___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__wrapsizer___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wrapsizer$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___wrapsizer___os2_emxbindcmd = $(NM) wrapsizer$(EXEEXT) | \ if grep -q pmwin.763 ; then emxbind -ep wrapsizer$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__wrapsizer___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wrapsizer___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__wrapsizer___win32rc = wrapsizer_sample_rc.o @COND_PLATFORM_MACOSX_1@__wrapsizer_app_Contents_PkgInfo___depname \ @@ -151,8 +147,6 @@ distclean: clean wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc) $(CXX) -o $@ $(WRAPSIZER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__wrapsizer___mac_setfilecmd) $(__wrapsizer___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@wrapsizer.app/Contents/PkgInfo: wrapsizer$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -178,7 +172,7 @@ wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc) @COND_PLATFORM_MACOSX_1@wrapsizer_bundle: $(____wrapsizer_BUNDLE_TGT_REF_DEP) wrapsizer_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include wrapsizer_wrapsizer.o: $(srcdir)/wrapsizer.cpp $(CXXC) -c -o $@ $(WRAPSIZER_CXXFLAGS) $(srcdir)/wrapsizer.cpp diff --git a/samples/wrapsizer/makefile.bcc b/samples/wrapsizer/makefile.bcc index b8c29cc36d..b96d7e2c41 100644 --- a/samples/wrapsizer/makefile.bcc +++ b/samples/wrapsizer/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/wrapsizer/makefile.gcc b/samples/wrapsizer/makefile.gcc index d29b17f5d9..23a2e4452d 100644 --- a/samples/wrapsizer/makefile.gcc +++ b/samples/wrapsizer/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/wrapsizer/makefile.unx b/samples/wrapsizer/makefile.unx index 181705ee37..723b7cbf3a 100644 --- a/samples/wrapsizer/makefile.unx +++ b/samples/wrapsizer/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/wrapsizer/makefile.vc b/samples/wrapsizer/makefile.vc index bed86e7ae6..e5224ee19c 100644 --- a/samples/wrapsizer/makefile.vc +++ b/samples/wrapsizer/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/wrapsizer/wrapsizer_vc7.vcproj b/samples/wrapsizer/wrapsizer_vc7.vcproj index 189678151e..033ed73e1d 100644 --- a/samples/wrapsizer/wrapsizer_vc7.vcproj +++ b/samples/wrapsizer/wrapsizer_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/wrapsizer/wrapsizer_vc8.vcproj b/samples/wrapsizer/wrapsizer_vc8.vcproj index 244f3600b9..d7de14bf9f 100644 --- a/samples/wrapsizer/wrapsizer_vc8.vcproj +++ b/samples/wrapsizer/wrapsizer_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/wrapsizer/wrapsizer_vc9.vcproj b/samples/wrapsizer/wrapsizer_vc9.vcproj index cb68ca3f91..85535ef728 100644 --- a/samples/wrapsizer/wrapsizer_vc9.vcproj +++ b/samples/wrapsizer/wrapsizer_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index 4305cf661a..fd51ebff1a 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -74,25 +73,22 @@ XRCDEMO_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__xrcdemo___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL xrcdemo$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd = $(NM) xrcdemo$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep xrcdemo$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__xrcdemo___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__xrcdemo___win32rc = xrcdemo_sample_rc.o @COND_PLATFORM_MACOSX_1@__xrcdemo_app_Contents_PkgInfo___depname \ @@ -176,8 +172,6 @@ distclean: clean xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) $(CXX) -o $@ $(XRCDEMO_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_RIBBON_p) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__xrcdemo___mac_setfilecmd) $(__xrcdemo___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -215,7 +209,7 @@ data: done xrcdemo_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $(srcdir)/xrcdemo.cpp diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc index 2fe996d968..f4303d6c86 100644 --- a/samples/xrc/makefile.bcc +++ b/samples/xrc/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc index 76bfd498d1..90f58ce2dc 100644 --- a/samples/xrc/makefile.gcc +++ b/samples/xrc/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/xrc/makefile.unx b/samples/xrc/makefile.unx index 1740628611..9eda9a8ead 100644 --- a/samples/xrc/makefile.unx +++ b/samples/xrc/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc index 3308b94c66..628899a517 100644 --- a/samples/xrc/makefile.vc +++ b/samples/xrc/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/xrc/xrcdemo_vc7.vcproj b/samples/xrc/xrcdemo_vc7.vcproj index 0e4c5ccf5d..df5b63fab9 100644 --- a/samples/xrc/xrcdemo_vc7.vcproj +++ b/samples/xrc/xrcdemo_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/xrc/xrcdemo_vc8.vcproj b/samples/xrc/xrcdemo_vc8.vcproj index 0e5260c9cf..0fedf2ab64 100644 --- a/samples/xrc/xrcdemo_vc8.vcproj +++ b/samples/xrc/xrcdemo_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/xrc/xrcdemo_vc9.vcproj b/samples/xrc/xrcdemo_vc9.vcproj index 8c8ba4d354..31e61dd9b8 100644 --- a/samples/xrc/xrcdemo_vc9.vcproj +++ b/samples/xrc/xrcdemo_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/xti/Makefile.in b/samples/xti/Makefile.in index 369bfe905f..59822f1256 100644 --- a/samples/xti/Makefile.in +++ b/samples/xti/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -69,25 +68,22 @@ XTI_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__xti___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__xti___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL xti$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___xti___os2_emxbindcmd = $(NM) xti$(EXEEXT) | if grep -q \ pmwin.763 ; then emxbind -ep xti$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__xti___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___xti___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__xti___win32rc = xti_sample_rc.o @COND_PLATFORM_MACOSX_1@__xti_app_Contents_PkgInfo___depname \ @@ -156,8 +152,6 @@ distclean: clean xti$(EXEEXT): $(XTI_OBJECTS) $(__xti___win32rc) $(CXX) -o $@ $(XTI_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__xti___mac_setfilecmd) $(__xti___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@xti.app/Contents/PkgInfo: xti$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -183,7 +177,7 @@ xti$(EXEEXT): $(XTI_OBJECTS) $(__xti___win32rc) @COND_PLATFORM_MACOSX_1@xti_bundle: $(____xti_BUNDLE_TGT_REF_DEP) xti_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include xti_xti.o: $(srcdir)/xti.cpp $(CXXC) -c -o $@ $(XTI_CXXFLAGS) $(srcdir)/xti.cpp diff --git a/samples/xti/makefile.bcc b/samples/xti/makefile.bcc index 43d1ce9df4..179381e49c 100644 --- a/samples/xti/makefile.bcc +++ b/samples/xti/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/xti/makefile.gcc b/samples/xti/makefile.gcc index 582d50c325..5afbb6a398 100644 --- a/samples/xti/makefile.gcc +++ b/samples/xti/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/xti/makefile.unx b/samples/xti/makefile.unx index de967c8139..99aa61103a 100644 --- a/samples/xti/makefile.unx +++ b/samples/xti/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/xti/makefile.vc b/samples/xti/makefile.vc index 85b41c10e0..5afc9db9c6 100644 --- a/samples/xti/makefile.vc +++ b/samples/xti/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/xti/xti_vc7.vcproj b/samples/xti/xti_vc7.vcproj index 6c4f32317f..6868ec0abe 100644 --- a/samples/xti/xti_vc7.vcproj +++ b/samples/xti/xti_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/xti/xti_vc8.vcproj b/samples/xti/xti_vc8.vcproj index 4e004fc76d..d13d2c6e29 100644 --- a/samples/xti/xti_vc8.vcproj +++ b/samples/xti/xti_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/samples/xti/xti_vc9.vcproj b/samples/xti/xti_vc9.vcproj index 8025a54912..2c988f4a30 100644 --- a/samples/xti/xti_vc9.vcproj +++ b/samples/xti/xti_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 51ac921d50..7f32cdbafb 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -15,7 +15,6 @@ SHARED_LD_MODULE_CXX = @SHARED_LD_MODULE_CXX@ SO_SUFFIX_MODULE = @SO_SUFFIX_MODULE@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ PIC_FLAG = @PIC_FLAG@ ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@ BK_DEPS = @BK_DEPS@ @@ -279,9 +278,6 @@ TEST_GUI_ODEP = $(_____pch_testprec_test_gui_testprec_h_gch___depname) @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__test___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test$(EXEEXT) @COND_GCC_PCH_1@__test_PCH_INC = -I./.pch/testprec_test @COND_ICC_PCH_1@__test_PCH_INC = $(ICC_PCH_USE_SWITCH) \ @COND_ICC_PCH_1@ ./.pch/testprec_test/testprec.h.gch @@ -289,9 +285,6 @@ TEST_GUI_ODEP = $(_____pch_testprec_test_gui_testprec_h_gch___depname) @COND_USE_PCH_1@ = ./.pch/testprec_test/testprec.h.gch @COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) @COND_USE_GUI_1@__test_drawing___depname = test_drawing$(EXEEXT) -@COND_PLATFORM_MAC_0@__test_drawing___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__test_drawing___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test_drawing$(EXEEXT) @COND_GCC_PCH_1@__test_drawing_PCH_INC = -I./.pch/testprec_test_drawing @COND_ICC_PCH_1@__test_drawing_PCH_INC = \ @COND_ICC_PCH_1@ $(ICC_PCH_USE_SWITCH) \ @@ -302,16 +295,13 @@ TEST_GUI_ODEP = $(_____pch_testprec_test_gui_testprec_h_gch___depname) @COND_SHARED_1_USE_GUI_1@ = \ @COND_SHARED_1_USE_GUI_1@ $(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE) @COND_USE_GUI_1@__test_gui___depname = test_gui$(EXEEXT) -@COND_PLATFORM_MAC_0@__test_gui___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__test_gui___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test_gui$(EXEEXT) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_9 = --define __WXUNIVERSAL__ -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_9 = --define wxDEBUG_LEVEL=0 -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_9 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p_9 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p_9 = --define wxNO_THREADS -@COND_SHARED_1@__DLLFLAG_p_9 = --define WXUSINGDLL -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__ +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_6 = --define wxDEBUG_LEVEL=0 +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_6 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p_6 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p_6 = --define wxNO_THREADS +@COND_SHARED_1@__DLLFLAG_p_6 = --define WXUSINGDLL +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__test_gui___win32rc = test_gui_sample_rc.o @COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_gui_app_Contents_PkgInfo___depname \ @@ -416,16 +406,12 @@ distclean: clean test$(EXEEXT): $(TEST_OBJECTS) $(CXX) -o $@ $(TEST_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__test___mac_setfilecmd) @COND_USE_PCH_1@./.pch/testprec_test/testprec.h.gch: @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS) @COND_USE_GUI_1@test_drawing$(EXEEXT): $(TEST_DRAWING_OBJECTS) @COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_DRAWING_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_GUI_1@ -@COND_USE_GUI_1@ $(__test_drawing___mac_setfilecmd) @COND_USE_PCH_1@./.pch/testprec_test_drawing/testprec.h.gch: @COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test_drawing/testprec.h.gch testprec.h $(CXX) $(TEST_DRAWING_CXXFLAGS) @@ -435,8 +421,6 @@ test$(EXEEXT): $(TEST_OBJECTS) @COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc) @COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_GUI_1@ -@COND_USE_GUI_1@ $(__test_gui___mac_setfilecmd) @COND_PLATFORM_MACOSX_1_USE_GUI_1@test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p test_gui.app/Contents @@ -785,7 +769,7 @@ test_drawingplugin_pluginsample.o: $(srcdir)/drawing/pluginsample.cpp $(CXXC) -c -o $@ $(TEST_DRAWINGPLUGIN_CXXFLAGS) $(srcdir)/drawing/pluginsample.cpp test_gui_sample_rc.o: $(srcdir)/../samples/sample.rc $(TEST_GUI_ODEP) - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_9) $(__DEBUG_DEFINE_p_9) $(__EXCEPTIONS_DEFINE_p_9) $(__RTTI_DEFINE_p_9) $(__THREAD_DEFINE_p_9) --include-dir $(srcdir) $(__DLLFLAG_p_9) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) $(__DEBUG_DEFINE_p_6) $(__EXCEPTIONS_DEFINE_p_6) $(__RTTI_DEFINE_p_6) $(__THREAD_DEFINE_p_6) --include-dir $(srcdir) $(__DLLFLAG_p_6) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include test_gui_asserthelper.o: $(srcdir)/asserthelper.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/asserthelper.cpp diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in index a7dfd1fdd1..4f498bfd88 100644 --- a/tests/benchmarks/Makefile.in +++ b/tests/benchmarks/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -89,17 +88,11 @@ BENCH_GRAPHICS_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__bench___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__bench___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL bench$(EXEEXT) COND_MONOLITHIC_0___WXLIB_NET_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p) @COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p) @COND_USE_GUI_1@__bench_gui___depname = bench_gui$(EXEEXT) -@COND_PLATFORM_MAC_0@__bench_gui___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__bench_gui___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL bench_gui$(EXEEXT) @COND_PLATFORM_WIN32_1@__bench_gui___win32rc = bench_gui_sample_rc.o @COND_PLATFORM_MACOSX_1_USE_GUI_1@__bench_gui_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ = bench_gui.app/Contents/PkgInfo @@ -116,9 +109,6 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \ @COND_TOOLKIT_OSX_IPHONE@____bench_gui_BUNDLE_TGT_REF_DEP \ @COND_TOOLKIT_OSX_IPHONE@ = $(__bench_gui_app_Contents_PkgInfo___depname) @COND_USE_GUI_1@__bench_graphics___depname = bench_graphics$(EXEEXT) -@COND_PLATFORM_MAC_0@__bench_graphics___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__bench_graphics___mac_setfilecmd \ -@COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL bench_graphics$(EXEEXT) @COND_PLATFORM_WIN32_1@__bench_graphics___win32rc = \ @COND_PLATFORM_WIN32_1@ bench_graphics_sample_rc.o @COND_PLATFORM_MACOSX_1_USE_GUI_1@__bench_graphics_app_Contents_PkgInfo___depname \ @@ -205,8 +195,6 @@ distclean: clean bench$(EXEEXT): $(BENCH_OBJECTS) $(CXX) -o $@ $(BENCH_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__bench___mac_setfilecmd) data: @mkdir -p . @@ -222,8 +210,6 @@ data: @COND_USE_GUI_1@bench_gui$(EXEEXT): $(BENCH_GUI_OBJECTS) $(__bench_gui___win32rc) @COND_USE_GUI_1@ $(CXX) -o $@ $(BENCH_GUI_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_GUI_1@ -@COND_USE_GUI_1@ $(__bench_gui___mac_setfilecmd) @COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_gui.app/Contents/PkgInfo: $(__bench_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p bench_gui.app/Contents @@ -249,8 +235,6 @@ data: @COND_USE_GUI_1@bench_graphics$(EXEEXT): $(BENCH_GRAPHICS_OBJECTS) $(__bench_graphics___win32rc) @COND_USE_GUI_1@ $(CXX) -o $@ $(BENCH_GRAPHICS_OBJECTS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_GUI_1@ -@COND_USE_GUI_1@ $(__bench_graphics___mac_setfilecmd) @COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_graphics.app/Contents/PkgInfo: $(__bench_graphics___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p bench_graphics.app/Contents diff --git a/tests/benchmarks/bench_vc7.sln b/tests/benchmarks/bench_vc7.sln index 63981a6ce3..01e7f8a42b 100644 --- a/tests/benchmarks/bench_vc7.sln +++ b/tests/benchmarks/bench_vc7.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc7_bench.vcproj", "{737049A0-9449-5B95-B173-0C906929CCD3}" EndProject diff --git a/tests/benchmarks/bench_vc7_bench.vcproj b/tests/benchmarks/bench_vc7_bench.vcproj index 6fd409f514..aef1c2d838 100644 --- a/tests/benchmarks/bench_vc7_bench.vcproj +++ b/tests/benchmarks/bench_vc7_bench.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/benchmarks/bench_vc7_bench_graphics.vcproj b/tests/benchmarks/bench_vc7_bench_graphics.vcproj index 881aeeebba..a23a30d68f 100644 --- a/tests/benchmarks/bench_vc7_bench_graphics.vcproj +++ b/tests/benchmarks/bench_vc7_bench_graphics.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/benchmarks/bench_vc7_bench_gui.vcproj b/tests/benchmarks/bench_vc7_bench_gui.vcproj index 9658710909..6556d7d2cf 100644 --- a/tests/benchmarks/bench_vc7_bench_gui.vcproj +++ b/tests/benchmarks/bench_vc7_bench_gui.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/benchmarks/bench_vc8.sln b/tests/benchmarks/bench_vc8.sln index 564fa22394..226cc6641d 100644 --- a/tests/benchmarks/bench_vc8.sln +++ b/tests/benchmarks/bench_vc8.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc8_bench.vcproj", "{6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}" diff --git a/tests/benchmarks/bench_vc8_bench.vcproj b/tests/benchmarks/bench_vc8_bench.vcproj index de3587bfa2..afb19698a6 100644 --- a/tests/benchmarks/bench_vc8_bench.vcproj +++ b/tests/benchmarks/bench_vc8_bench.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/benchmarks/bench_vc8_bench_graphics.vcproj b/tests/benchmarks/bench_vc8_bench_graphics.vcproj index e4921e1c4b..1b2143b81b 100644 --- a/tests/benchmarks/bench_vc8_bench_graphics.vcproj +++ b/tests/benchmarks/bench_vc8_bench_graphics.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/benchmarks/bench_vc8_bench_gui.vcproj b/tests/benchmarks/bench_vc8_bench_gui.vcproj index 0593340bb7..323f786d9f 100644 --- a/tests/benchmarks/bench_vc8_bench_gui.vcproj +++ b/tests/benchmarks/bench_vc8_bench_gui.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/benchmarks/bench_vc9.sln b/tests/benchmarks/bench_vc9.sln index 5930f48250..0ffd485b69 100644 --- a/tests/benchmarks/bench_vc9.sln +++ b/tests/benchmarks/bench_vc9.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc9_bench.vcproj", "{B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}" diff --git a/tests/benchmarks/bench_vc9_bench.vcproj b/tests/benchmarks/bench_vc9_bench.vcproj index 90257c794b..37905a516b 100644 --- a/tests/benchmarks/bench_vc9_bench.vcproj +++ b/tests/benchmarks/bench_vc9_bench.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/benchmarks/bench_vc9_bench_graphics.vcproj b/tests/benchmarks/bench_vc9_bench_graphics.vcproj index 098d1b00b7..4273383b1d 100644 --- a/tests/benchmarks/bench_vc9_bench_graphics.vcproj +++ b/tests/benchmarks/bench_vc9_bench_graphics.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/benchmarks/bench_vc9_bench_gui.vcproj b/tests/benchmarks/bench_vc9_bench_gui.vcproj index 4e9e8c20a3..45fc9f54ac 100644 --- a/tests/benchmarks/bench_vc9_bench_gui.vcproj +++ b/tests/benchmarks/bench_vc9_bench_gui.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc index d001095479..5924b9092a 100644 --- a/tests/benchmarks/makefile.bcc +++ b/tests/benchmarks/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc index 5a1fe832cb..661f02003a 100644 --- a/tests/benchmarks/makefile.gcc +++ b/tests/benchmarks/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc index 25cff3ebe4..e9b27f0ac3 100644 --- a/tests/benchmarks/makefile.vc +++ b/tests/benchmarks/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/tests/makefile.bcc b/tests/makefile.bcc index 21ef16db3c..5d6aca86cd 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 1815a4936b..bd91129c22 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/tests/makefile.vc b/tests/makefile.vc index f1498e3ad1..fe5a56af8d 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj index 98d687cf2f..d9eebe5e98 100644 --- a/tests/test_vc7_test.vcproj +++ b/tests/test_vc7_test.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/test_vc7_test_drawing.vcproj b/tests/test_vc7_test_drawing.vcproj index e92b5855d0..8bce8a5530 100644 --- a/tests/test_vc7_test_drawing.vcproj +++ b/tests/test_vc7_test_drawing.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/test_vc7_test_drawingplugin.vcproj b/tests/test_vc7_test_drawingplugin.vcproj index c9ac2627d1..4a08f79121 100644 --- a/tests/test_vc7_test_drawingplugin.vcproj +++ b/tests/test_vc7_test_drawingplugin.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj index 8086ea6e90..707c471f01 100644 --- a/tests/test_vc7_test_gui.vcproj +++ b/tests/test_vc7_test_gui.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/test_vc8_test.vcproj b/tests/test_vc8_test.vcproj index 818a01c6fb..66df7cf1b6 100644 --- a/tests/test_vc8_test.vcproj +++ b/tests/test_vc8_test.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/test_vc8_test_drawing.vcproj b/tests/test_vc8_test_drawing.vcproj index d2d1b208c8..f15ece8fdb 100644 --- a/tests/test_vc8_test_drawing.vcproj +++ b/tests/test_vc8_test_drawing.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/test_vc8_test_drawingplugin.vcproj b/tests/test_vc8_test_drawingplugin.vcproj index 95d5f9a649..f2dff049bb 100644 --- a/tests/test_vc8_test_drawingplugin.vcproj +++ b/tests/test_vc8_test_drawingplugin.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj index dd860bb8dc..609d8d81b5 100644 --- a/tests/test_vc8_test_gui.vcproj +++ b/tests/test_vc8_test_gui.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj index 2ad0146489..35d0ddfa2e 100644 --- a/tests/test_vc9_test.vcproj +++ b/tests/test_vc9_test.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/test_vc9_test_drawing.vcproj b/tests/test_vc9_test_drawing.vcproj index 47ab708c96..0864af96b6 100644 --- a/tests/test_vc9_test_drawing.vcproj +++ b/tests/test_vc9_test_drawing.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/test_vc9_test_drawingplugin.vcproj b/tests/test_vc9_test_drawingplugin.vcproj index 39f5d7defb..a418a9934e 100644 --- a/tests/test_vc9_test_drawingplugin.vcproj +++ b/tests/test_vc9_test_drawingplugin.vcproj @@ -2,7 +2,7 @@ diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj index 9518494ceb..408625e136 100644 --- a/tests/test_vc9_test_gui.vcproj +++ b/tests/test_vc9_test_gui.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/Makefile.in b/utils/Makefile.in index 62d2c611b2..23b09f3249 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in index 1ae45b1888..b6048096b9 100644 --- a/utils/emulator/src/Makefile.in +++ b/utils/emulator/src/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ NM = @NM@ BK_DEPS = @BK_DEPS@ srcdir = @srcdir@ @@ -64,25 +63,22 @@ WXEMULATOR_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__wxemulator___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__wxemulator___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxemulator$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___wxemulator___os2_emxbindcmd = $(NM) wxemulator$(EXEEXT) \ | if grep -q pmwin.763 ; then emxbind -ep wxemulator$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__wxemulator___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxemulator___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__wxemulator___win32rc = wxemulator_sample_rc.o COND_MONOLITHIC_0___WXLIB_CORE_p = \ @@ -134,8 +130,6 @@ distclean: clean wxemulator$(EXEEXT): $(WXEMULATOR_OBJECTS) $(__wxemulator___win32rc) $(CXX) -o $@ $(WXEMULATOR_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__wxemulator___mac_setfilecmd) $(__wxemulator___os2_emxbindcmd) data: @@ -151,7 +145,7 @@ data: done wxemulator_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include wxemulator_emulator.o: $(srcdir)/emulator.cpp $(CXXC) -c -o $@ $(WXEMULATOR_CXXFLAGS) $(srcdir)/emulator.cpp diff --git a/utils/emulator/src/emulator_vc7.vcproj b/utils/emulator/src/emulator_vc7.vcproj index 8cf1538da6..0409bcc249 100644 --- a/utils/emulator/src/emulator_vc7.vcproj +++ b/utils/emulator/src/emulator_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/emulator/src/emulator_vc8.vcproj b/utils/emulator/src/emulator_vc8.vcproj index 73b8e1abe9..26a9b19b8b 100644 --- a/utils/emulator/src/emulator_vc8.vcproj +++ b/utils/emulator/src/emulator_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/emulator/src/emulator_vc9.vcproj b/utils/emulator/src/emulator_vc9.vcproj index 65ea632c71..025e6060f2 100644 --- a/utils/emulator/src/emulator_vc9.vcproj +++ b/utils/emulator/src/emulator_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/emulator/src/makefile.bcc b/utils/emulator/src/makefile.bcc index 49d9ba07d2..2c94394082 100644 --- a/utils/emulator/src/makefile.bcc +++ b/utils/emulator/src/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc index dac2233745..0caef3596f 100644 --- a/utils/emulator/src/makefile.gcc +++ b/utils/emulator/src/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/emulator/src/makefile.vc b/utils/emulator/src/makefile.vc index d26be924c8..0552bbc65e 100644 --- a/utils/emulator/src/makefile.vc +++ b/utils/emulator/src/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/execmon/Makefile.in b/utils/execmon/Makefile.in index e69f6b7269..407ecaef22 100644 --- a/utils/execmon/Makefile.in +++ b/utils/execmon/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,6 @@ exec_prefix = @exec_prefix@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ -SETFILE = @SETFILE@ STRIP = @STRIP@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DIR = @INSTALL_DIR@ @@ -62,9 +61,6 @@ EXECMON_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_USE_XRC_1@__execmon___depname = execmon$(EXEEXT) -@COND_PLATFORM_MAC_0@__execmon___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__execmon___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL execmon$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS @@ -112,8 +108,6 @@ distclean: clean @COND_USE_XRC_1@execmon$(EXEEXT): $(EXECMON_OBJECTS) @COND_USE_XRC_1@ $(CXX) -o $@ $(EXECMON_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_XRC_1@ -@COND_USE_XRC_1@ $(__execmon___mac_setfilecmd) @COND_USE_XRC_1@install_execmon: $(__execmon___depname) @COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) diff --git a/utils/execmon/execmon_vc7.sln b/utils/execmon/execmon_vc7.sln index b87de82d94..b2839241a7 100644 --- a/utils/execmon/execmon_vc7.sln +++ b/utils/execmon/execmon_vc7.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execmon", "execmon_vc7.vcproj", "{C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}" EndProject diff --git a/utils/execmon/execmon_vc7.vcproj b/utils/execmon/execmon_vc7.vcproj index 9b8dfec50b..561758c19d 100644 --- a/utils/execmon/execmon_vc7.vcproj +++ b/utils/execmon/execmon_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/execmon/execmon_vc8.sln b/utils/execmon/execmon_vc8.sln index 852bbd62d8..f0ca1183b3 100644 --- a/utils/execmon/execmon_vc8.sln +++ b/utils/execmon/execmon_vc8.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execmon", "execmon_vc8.vcproj", "{77853792-0C62-5E96-A5B5-BA0F518B7572}" diff --git a/utils/execmon/execmon_vc8.vcproj b/utils/execmon/execmon_vc8.vcproj index e2ce59a1a8..3e27e7b4de 100644 --- a/utils/execmon/execmon_vc8.vcproj +++ b/utils/execmon/execmon_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/execmon/execmon_vc9.sln b/utils/execmon/execmon_vc9.sln index e5ed11e5f5..3f0d647c1e 100644 --- a/utils/execmon/execmon_vc9.sln +++ b/utils/execmon/execmon_vc9.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execmon", "execmon_vc9.vcproj", "{8AF5279F-6710-5392-A32E-993D957C55F8}" diff --git a/utils/execmon/execmon_vc9.vcproj b/utils/execmon/execmon_vc9.vcproj index 033bdfe16b..a605523aef 100644 --- a/utils/execmon/execmon_vc9.vcproj +++ b/utils/execmon/execmon_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/execmon/makefile.bcc b/utils/execmon/makefile.bcc index f51ebcf562..2574f751d1 100644 --- a/utils/execmon/makefile.bcc +++ b/utils/execmon/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/execmon/makefile.gcc b/utils/execmon/makefile.gcc index 07015ca56a..6a478494f8 100644 --- a/utils/execmon/makefile.gcc +++ b/utils/execmon/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/execmon/makefile.vc b/utils/execmon/makefile.vc index 4caf33e08e..bab5d5c126 100644 --- a/utils/execmon/makefile.vc +++ b/utils/execmon/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in index 8fe60a1e34..8c35d14378 100644 --- a/utils/helpview/src/Makefile.in +++ b/utils/helpview/src/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ STRIP = @STRIP@ NM = @NM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -71,25 +70,22 @@ HELPVIEW_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__helpview___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL helpview$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd = $(NM) helpview$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep helpview$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__helpview___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__helpview_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = helpview.app/Contents/PkgInfo @@ -162,8 +158,6 @@ distclean: clean helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) $(CXX) -o $@ $(HELPVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__helpview___mac_setfilecmd) $(__helpview___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -211,7 +205,7 @@ helpview_helpview.o: $(srcdir)/helpview.cpp $(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $(srcdir)/helpview.cpp helpview_helpview_rc.o: $(srcdir)/helpview.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/utils/helpview/src/helpview-docicon.r b/utils/helpview/src/helpview-docicon.r deleted file mode 100644 index 89125ed030..0000000000 --- a/utils/helpview/src/helpview-docicon.r +++ /dev/null @@ -1,138 +0,0 @@ -data 'icl4' (129, "Item Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 DDDD DDDF 0000 0000" /* ............ */ - $"0000 0000 0000 0DDD CCCC CCCD F000 0000" /* .......... */ - $"0000 000C DDDD DFCC C0C0 000C F000 0000" /* ......... */ - $"0000 00DC 0C0C 0DCC 0C0C 0000 DF00 0000" /* ............. */ - $"00CD CDC0 C0C0 C0DC C0C0 C000 0F00 0000" /* ...... */ - $"006C 0C0C 0C00 00FC CC0C 0000 0CF0 0000" /* .l........... */ - $"000F C0C0 C0C0 000D CCC0 C000 00F0 0000" /* ........ */ - $"0006 0C0C 0C00 000F DC0C 0C00 00CF 0000" /* .............. */ - $"000C F0C0 C0C0 0000 DCC0 C0C0 000D F000" /* ....... */ - $"000C 6C0C 0C0C 0000 FCCC 0C00 0000 F000" /* ..l.......... */ - $"0000 CFC0 C0C0 C000 0DCC C0CC 000C CF00" /* ....... */ - $"0000 C60C 0C0C 0000 0FCD 0CDD DCCC F600" /* .......... */ - $"0000 0CF0 C0C0 C00C CCFC CFFF FFFF 6F00" /* ....o. */ - $"0000 00C6 0C0C 0CDC DCFF F6F6 F6F6 FD00" /* ....... */ - $"0000 00CF C0C0 CDCF FF6F 6BDD DDD0 0000" /* ...ok.. */ - $"0000 000C 6C0C FFF6 F6B6 0000 0000 0000" /* ....l....... */ - $"0000 000C F0FF 6F6B DD00 0000 0000 0000" /* ....ok....... */ - $"0000 0000 C6F6 BDD0 0000 0000 0000 0000" /* ............ */ - $"0000 0000 CFDD 0000 0000 0000 0000 0000" /* .............. */ - $"0000 0000 0CD0 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ -}; - -data 'ICN#' (129, "Item Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 FF00 0007 FF80" /* ............. */ - $"01FF FF80 03FF FFC0 3FFF FFC0 3FFF FFE0" /* ..?? */ - $"1FFF FFE0 1FFF FFF0 1FFF FFF8 1FFF FFF8" /* .... */ - $"0FFF FFFC 0FFF FFFC 07FF FFFC 03FF FFFC" /* .... */ - $"03FF FFE0 01FF F000 01FF C000 00FE 0000" /* ........ */ - $"00F0 0000 0060 0000 0000 0000 0000 0000" /* ....`.......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ -}; - -data 'ics4' (129, "Item Icon") { - $"0000 000F F000 0000 0000 0FFF 6F00 0000" /* ..........o... */ - $"000F F6F6 F6F0 0000 0FFF 6F66 6F6F 0000" /* .....ofoo.. */ - $"FC66 F6FF 66F6 F000 F6CF 66F6 6F6F 6F00" /* ff.fooo. */ - $"FF6C F66F F6F6 F6F0 F6F6 CF6F 666F 6FFF" /* loofoo */ - $"F6F6 6CF6 F6F6 FFD0 0F6F 6FC6 6FFF D0D0" /* l.ooo */ - $"00F6 F6FC FFD0 0CFF 000F 6F6F D000 CFF0" /* ....oo. */ - $"0000 F6FF C0CF F000 0000 0F6F CFF0 0000" /* ......o.. */ - $"0000 00FF F000 0000 0000 0000 0000 0000" /* .............. */ -}; - -data 'ics#' (129, "Item Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0180 07C0 1FE0 7FF0 FFF8 FFFC FFFE FFFF" /* .... */ - $"FFFF 7FFF 3FFF 1FFE 0FF8 07E0 0380 0000" /* .?...... */ -}; - -data 'icns' (129, "Item Icon") { - $"6963 6E73 0000 03E8 4943 4E23 0000 0108" /* icns...ICN#.... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 FF00 0007 FF80" /* ............. */ - $"01FF FF80 03FF FFC0 3FFF FFC0 3FFF FFE0" /* ..?? */ - $"1FFF FFE0 1FFF FFF0 1FFF FFF8 1FFF FFF8" /* .... */ - $"0FFF FFFC 0FFF FFFC 07FF FFFC 03FF FFFC" /* .... */ - $"03FF FFE0 01FF F000 01FF C000 00FE 0000" /* ........ */ - $"00F0 0000 0060 0000 0000 0000 0000 0000" /* ....`.......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"6963 6C34 0000 0208 0000 0000 0000 0000" /* icl4............ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"DDDD DDDF 0000 0000 0000 0000 0000 0DDD" /* ........... */ - $"CCCC CCCD F000 0000 0000 000C DDDD DFCC" /* ....... */ - $"C0C0 000C F000 0000 0000 00DC 0C0C 0DCC" /* ........... */ - $"0C0C 0000 DF00 0000 00CD CDC0 C0C0 C0DC" /* ........ */ - $"C0C0 C000 0F00 0000 006C 0C0C 0C00 00FC" /* ......l..... */ - $"CC0C 0000 0CF0 0000 000F C0C0 C0C0 000D" /* .......... */ - $"CCC0 C000 00F0 0000 0006 0C0C 0C00 000F" /* ............ */ - $"DC0C 0C00 00CF 0000 000C F0C0 C0C0 0000" /* .......... */ - $"DCC0 C0C0 000D F000 000C 6C0C 0C0C 0000" /* .....l..... */ - $"FCCC 0C00 0000 F000 0000 CFC0 C0C0 C000" /* ........ */ - $"0DCC C0CC 000C CF00 0000 C60C 0C0C 0000" /* ........... */ - $"0FCD 0CDD DCCC F600 0000 0CF0 C0C0 C00C" /* ....... */ - $"CCFC CFFF FFFF 6F00 0000 00C6 0C0C 0CDC" /* o....... */ - $"DCFF F6F6 F6F6 FD00 0000 00CF C0C0 CDCF" /* .... */ - $"FF6F 6BDD DDD0 0000 0000 000C 6C0C FFF6" /* ok......l. */ - $"F6B6 0000 0000 0000 0000 000C F0FF 6F6B" /* ..........ok */ - $"DD00 0000 0000 0000 0000 0000 C6F6 BDD0" /* ........... */ - $"0000 0000 0000 0000 0000 0000 CFDD 0000" /* .............. */ - $"0000 0000 0000 0000 0000 0000 0CD0 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 6963 7323 0000 0048" /* ........ics#...H */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0180 07C0 1FE0 7FF0 FFF8 FFFC FFFE FFFF" /* .... */ - $"FFFF 7FFF 3FFF 1FFE 0FF8 07E0 0380 0000" /* .?...... */ - $"6963 7334 0000 0088 0000 000F F000 0000" /* ics4.......... */ - $"0000 0FFF 6F00 0000 000F F6F6 F6F0 0000" /* ...o....... */ - $"0FFF 6F66 6F6F 0000 FC66 F6FF 66F6 F000" /* .ofoo..ff. */ - $"F6CF 66F6 6F6F 6F00 FF6C F66F F6F6 F6F0" /* fooo.lo */ - $"F6F6 CF6F 666F 6FFF F6F6 6CF6 F6F6 FFD0" /* ofool */ - $"0F6F 6FC6 6FFF D0D0 00F6 F6FC FFD0 0CFF" /* .ooo.. */ - $"000F 6F6F D000 CFF0 0000 F6FF C0CF F000" /* ..oo.... */ - $"0000 0F6F CFF0 0000 0000 00FF F000 0000" /* ...o........ */ - $"0000 0000 0000 0000" /* ........ */ -}; - diff --git a/utils/helpview/src/helpview-icon.r b/utils/helpview/src/helpview-icon.r deleted file mode 100644 index bbf451bd1e..0000000000 --- a/utils/helpview/src/helpview-icon.r +++ /dev/null @@ -1,138 +0,0 @@ -data 'icl4' (128, "Item Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 DDDD DDDF 0000 0000" /* ............ */ - $"0000 0000 0000 0DDD CCCC CCCD F000 0000" /* .......... */ - $"0000 000C DDDD DFCC C0C0 000C F000 0000" /* ......... */ - $"0000 00DC 0C0C 0DCC 0C0C 0000 DF00 0000" /* ............. */ - $"00CD CDC0 C0C0 C0DC C0C0 C000 0F00 0000" /* ...... */ - $"006C 0C0C 0C00 00FC CC0C 0000 0CF0 0000" /* .l........... */ - $"000F C0C0 C0C0 000D CCC0 C000 00F0 0000" /* ........ */ - $"0006 0C0C 0C00 000F DC0C 0C00 00CF 0000" /* .............. */ - $"000C F0C0 C0C0 0000 DCC0 C0C0 000D F000" /* ....... */ - $"000C 6C0C 0C0C 0000 FCCC 0C00 0000 F000" /* ..l.......... */ - $"0000 CFC0 C0C0 C000 0DCC C0CC 000C CF00" /* ....... */ - $"0000 C60C 0C0C 0000 0FCD 0CDD DCCC F600" /* .......... */ - $"0000 0CF0 C0C0 C00C CCFC CFFF FFFF 6F00" /* ....o. */ - $"0000 00C6 0C0C 0CDC DCFF F6F6 F6F6 FD00" /* ....... */ - $"0000 00CF C0C0 CDCF FF6F 6BDD DDD0 0000" /* ...ok.. */ - $"0000 000C 6C0C FFF6 F6B6 0000 0000 0000" /* ....l....... */ - $"0000 000C F0FF 6F6B DD00 0000 0000 0000" /* ....ok....... */ - $"0000 0000 C6F6 BDD0 0000 0000 0000 0000" /* ............ */ - $"0000 0000 CFDD 0000 0000 0000 0000 0000" /* .............. */ - $"0000 0000 0CD0 0000 0000 0000 0000 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ -}; - -data 'ICN#' (128, "Item Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 FF00 0007 FF80" /* ............. */ - $"01FF FF80 03FF FFC0 3FFF FFC0 3FFF FFE0" /* ..?? */ - $"1FFF FFE0 1FFF FFF0 1FFF FFF8 1FFF FFF8" /* .... */ - $"0FFF FFFC 0FFF FFFC 07FF FFFC 03FF FFFC" /* .... */ - $"03FF FFE0 01FF F000 01FF C000 00FE 0000" /* ........ */ - $"00F0 0000 0060 0000 0000 0000 0000 0000" /* ....`.......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ -}; - -data 'ics4' (128, "Item Icon") { - $"0000 000F F000 0000 0000 0FFF 6F00 0000" /* ..........o... */ - $"000F F6F6 F6F0 0000 0FFF 6F66 6F6F 0000" /* .....ofoo.. */ - $"FC66 F6FF 66F6 F000 F6CF 66F6 6F6F 6F00" /* ff.fooo. */ - $"FF6C F66F F6F6 F6F0 F6F6 CF6F 666F 6FFF" /* loofoo */ - $"F6F6 6CF6 F6F6 FFD0 0F6F 6FC6 6FFF D0D0" /* l.ooo */ - $"00F6 F6FC FFD0 0CFF 000F 6F6F D000 CFF0" /* ....oo. */ - $"0000 F6FF C0CF F000 0000 0F6F CFF0 0000" /* ......o.. */ - $"0000 00FF F000 0000 0000 0000 0000 0000" /* .............. */ -}; - -data 'ics#' (128, "Item Icon") { - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0180 07C0 1FE0 7FF0 FFF8 FFFC FFFE FFFF" /* .... */ - $"FFFF 7FFF 3FFF 1FFE 0FF8 07E0 0380 0000" /* .?...... */ -}; - -data 'icns' (128, "Item Icon") { - $"6963 6E73 0000 03E8 4943 4E23 0000 0108" /* icns...ICN#.... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 FF00 0007 FF80" /* ............. */ - $"01FF FF80 03FF FFC0 3FFF FFC0 3FFF FFE0" /* ..?? */ - $"1FFF FFE0 1FFF FFF0 1FFF FFF8 1FFF FFF8" /* .... */ - $"0FFF FFFC 0FFF FFFC 07FF FFFC 03FF FFFC" /* .... */ - $"03FF FFE0 01FF F000 01FF C000 00FE 0000" /* ........ */ - $"00F0 0000 0060 0000 0000 0000 0000 0000" /* ....`.......... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"6963 6C34 0000 0208 0000 0000 0000 0000" /* icl4............ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"DDDD DDDF 0000 0000 0000 0000 0000 0DDD" /* ........... */ - $"CCCC CCCD F000 0000 0000 000C DDDD DFCC" /* ....... */ - $"C0C0 000C F000 0000 0000 00DC 0C0C 0DCC" /* ........... */ - $"0C0C 0000 DF00 0000 00CD CDC0 C0C0 C0DC" /* ........ */ - $"C0C0 C000 0F00 0000 006C 0C0C 0C00 00FC" /* ......l..... */ - $"CC0C 0000 0CF0 0000 000F C0C0 C0C0 000D" /* .......... */ - $"CCC0 C000 00F0 0000 0006 0C0C 0C00 000F" /* ............ */ - $"DC0C 0C00 00CF 0000 000C F0C0 C0C0 0000" /* .......... */ - $"DCC0 C0C0 000D F000 000C 6C0C 0C0C 0000" /* .....l..... */ - $"FCCC 0C00 0000 F000 0000 CFC0 C0C0 C000" /* ........ */ - $"0DCC C0CC 000C CF00 0000 C60C 0C0C 0000" /* ........... */ - $"0FCD 0CDD DCCC F600 0000 0CF0 C0C0 C00C" /* ....... */ - $"CCFC CFFF FFFF 6F00 0000 00C6 0C0C 0CDC" /* o....... */ - $"DCFF F6F6 F6F6 FD00 0000 00CF C0C0 CDCF" /* .... */ - $"FF6F 6BDD DDD0 0000 0000 000C 6C0C FFF6" /* ok......l. */ - $"F6B6 0000 0000 0000 0000 000C F0FF 6F6B" /* ..........ok */ - $"DD00 0000 0000 0000 0000 0000 C6F6 BDD0" /* ........... */ - $"0000 0000 0000 0000 0000 0000 CFDD 0000" /* .............. */ - $"0000 0000 0000 0000 0000 0000 0CD0 0000" /* ............... */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 6963 7323 0000 0048" /* ........ics#...H */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ - $"0180 07C0 1FE0 7FF0 FFF8 FFFC FFFE FFFF" /* .... */ - $"FFFF 7FFF 3FFF 1FFE 0FF8 07E0 0380 0000" /* .?...... */ - $"6963 7334 0000 0088 0000 000F F000 0000" /* ics4.......... */ - $"0000 0FFF 6F00 0000 000F F6F6 F6F0 0000" /* ...o....... */ - $"0FFF 6F66 6F6F 0000 FC66 F6FF 66F6 F000" /* .ofoo..ff. */ - $"F6CF 66F6 6F6F 6F00 FF6C F66F F6F6 F6F0" /* fooo.lo */ - $"F6F6 CF6F 666F 6FFF F6F6 6CF6 F6F6 FFD0" /* ofool */ - $"0F6F 6FC6 6FFF D0D0 00F6 F6FC FFD0 0CFF" /* .ooo.. */ - $"000F 6F6F D000 CFF0 0000 F6FF C0CF F000" /* ..oo.... */ - $"0000 0F6F CFF0 0000 0000 00FF F000 0000" /* ...o........ */ - $"0000 0000 0000 0000" /* ........ */ -}; - diff --git a/utils/helpview/src/helpview.r b/utils/helpview/src/helpview.r deleted file mode 100644 index fa16b7b799..0000000000 --- a/utils/helpview/src/helpview.r +++ /dev/null @@ -1,37 +0,0 @@ -#include "Types.r" - -resource 'BNDL' (128) { - 'HTBA', - 0, - { /* array TypeArray: 2 elements */ - /* [1] */ - 'ICN#', - { /* array IDArray: 2 elements */ - /* [1] */ - 0, 128, - /* [2] */ - 1, 129, - }, - /* [2] */ - 'FREF', - { /* array IDArray: 2 elements */ - /* [1] */ - 0, 128, - /* [2] */ - 1, 129, - } - } -}; - -resource 'FREF' (128) { - 'APPL', - 0, - "" -}; - -resource 'FREF' (129) { - 'HTBD', - 1, - "" -}; - diff --git a/utils/helpview/src/helpview_vc7.vcproj b/utils/helpview/src/helpview_vc7.vcproj index 4c1ae56d42..81dfff2587 100644 --- a/utils/helpview/src/helpview_vc7.vcproj +++ b/utils/helpview/src/helpview_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/helpview/src/helpview_vc8.vcproj b/utils/helpview/src/helpview_vc8.vcproj index 299056715c..034ef913ff 100644 --- a/utils/helpview/src/helpview_vc8.vcproj +++ b/utils/helpview/src/helpview_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/helpview/src/helpview_vc9.vcproj b/utils/helpview/src/helpview_vc9.vcproj index fdba839f4f..87329c0e90 100644 --- a/utils/helpview/src/helpview_vc9.vcproj +++ b/utils/helpview/src/helpview_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/helpview/src/makefile.bcc b/utils/helpview/src/makefile.bcc index 9a020e7d43..5ae7fc971e 100644 --- a/utils/helpview/src/makefile.bcc +++ b/utils/helpview/src/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/helpview/src/makefile.gcc b/utils/helpview/src/makefile.gcc index f1ce3fd215..22bafa48f7 100644 --- a/utils/helpview/src/makefile.gcc +++ b/utils/helpview/src/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc index 7efafd8bd1..4be4de1b6d 100644 --- a/utils/helpview/src/makefile.vc +++ b/utils/helpview/src/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in index 8235665139..b43603062b 100644 --- a/utils/hhp2cached/Makefile.in +++ b/utils/hhp2cached/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ STRIP = @STRIP@ NM = @NM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -69,25 +68,22 @@ HHP2CACHED_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__hhp2cached___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__hhp2cached___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL hhp2cached$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___hhp2cached___os2_emxbindcmd = $(NM) hhp2cached$(EXEEXT) \ | if grep -q pmwin.763 ; then emxbind -ep hhp2cached$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__hhp2cached___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___hhp2cached___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__hhp2cached___win32rc = hhp2cached_hhp2cached_rc.o COND_MONOLITHIC_0___WXLIB_HTML_p = \ @@ -143,8 +139,6 @@ distclean: clean hhp2cached$(EXEEXT): $(HHP2CACHED_OBJECTS) $(__hhp2cached___win32rc) $(CXX) -o $@ $(HHP2CACHED_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__hhp2cached___mac_setfilecmd) $(__hhp2cached___os2_emxbindcmd) install_hhp2cached: hhp2cached$(EXEEXT) @@ -158,7 +152,7 @@ hhp2cached_hhp2cached.o: $(srcdir)/hhp2cached.cpp $(CXXC) -c -o $@ $(HHP2CACHED_CXXFLAGS) $(srcdir)/hhp2cached.cpp hhp2cached_hhp2cached_rc.o: $(srcdir)/hhp2cached.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/utils/hhp2cached/hhp2cached_vc7.vcproj b/utils/hhp2cached/hhp2cached_vc7.vcproj index d5a2650377..fca628d2b5 100644 --- a/utils/hhp2cached/hhp2cached_vc7.vcproj +++ b/utils/hhp2cached/hhp2cached_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/hhp2cached/hhp2cached_vc8.vcproj b/utils/hhp2cached/hhp2cached_vc8.vcproj index 00caf6ae48..76991fd854 100644 --- a/utils/hhp2cached/hhp2cached_vc8.vcproj +++ b/utils/hhp2cached/hhp2cached_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/hhp2cached/hhp2cached_vc9.vcproj b/utils/hhp2cached/hhp2cached_vc9.vcproj index 48dc05bae8..7107fe4a5b 100644 --- a/utils/hhp2cached/hhp2cached_vc9.vcproj +++ b/utils/hhp2cached/hhp2cached_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/hhp2cached/makefile.bcc b/utils/hhp2cached/makefile.bcc index f821ef368d..48fddafef1 100644 --- a/utils/hhp2cached/makefile.bcc +++ b/utils/hhp2cached/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/hhp2cached/makefile.gcc b/utils/hhp2cached/makefile.gcc index 53cb841fd3..627964f550 100644 --- a/utils/hhp2cached/makefile.gcc +++ b/utils/hhp2cached/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc index e64c8c9a26..e7d7322688 100644 --- a/utils/hhp2cached/makefile.vc +++ b/utils/hhp2cached/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/ifacecheck/src/Makefile.in b/utils/ifacecheck/src/Makefile.in index 849c51a043..0ce9d67282 100644 --- a/utils/ifacecheck/src/Makefile.in +++ b/utils/ifacecheck/src/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -12,7 +12,6 @@ exec_prefix = @exec_prefix@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ -SETFILE = @SETFILE@ STRIP = @STRIP@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DIR = @INSTALL_DIR@ @@ -62,9 +61,6 @@ IFACECHECK_OBJECTS = \ @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) -@COND_PLATFORM_MAC_0@__ifacecheck___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__ifacecheck___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ifacecheck$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS @@ -113,8 +109,6 @@ distclean: clean ifacecheck$(EXEEXT): $(IFACECHECK_OBJECTS) $(CXX) -o $@ $(IFACECHECK_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__ifacecheck___mac_setfilecmd) install_ifacecheck: ifacecheck$(EXEEXT) $(INSTALL_DIR) $(DESTDIR)$(bindir) diff --git a/utils/ifacecheck/src/ifacecheck_vc7.sln b/utils/ifacecheck/src/ifacecheck_vc7.sln index a1303d0599..11aa24b474 100644 --- a/utils/ifacecheck/src/ifacecheck_vc7.sln +++ b/utils/ifacecheck/src/ifacecheck_vc7.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc7.vcproj", "{355B6651-9A8E-5D72-A3E9-DAB21650C0FC}" EndProject diff --git a/utils/ifacecheck/src/ifacecheck_vc7.vcproj b/utils/ifacecheck/src/ifacecheck_vc7.vcproj index 9888191eba..7d4543e3f2 100644 --- a/utils/ifacecheck/src/ifacecheck_vc7.vcproj +++ b/utils/ifacecheck/src/ifacecheck_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/ifacecheck/src/ifacecheck_vc8.sln b/utils/ifacecheck/src/ifacecheck_vc8.sln index eb9535b30b..a9891b82e7 100644 --- a/utils/ifacecheck/src/ifacecheck_vc8.sln +++ b/utils/ifacecheck/src/ifacecheck_vc8.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc8.vcproj", "{82C85703-712C-59F7-9E08-9F8EDE5D9DDF}" diff --git a/utils/ifacecheck/src/ifacecheck_vc8.vcproj b/utils/ifacecheck/src/ifacecheck_vc8.vcproj index f54865af9a..83eb2ceb0f 100644 --- a/utils/ifacecheck/src/ifacecheck_vc8.vcproj +++ b/utils/ifacecheck/src/ifacecheck_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/ifacecheck/src/ifacecheck_vc9.sln b/utils/ifacecheck/src/ifacecheck_vc9.sln index c9ade910ea..4c83dfdc9a 100644 --- a/utils/ifacecheck/src/ifacecheck_vc9.sln +++ b/utils/ifacecheck/src/ifacecheck_vc9.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc9.vcproj", "{C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}" diff --git a/utils/ifacecheck/src/ifacecheck_vc9.vcproj b/utils/ifacecheck/src/ifacecheck_vc9.vcproj index 069dd71604..5e5b58de0b 100644 --- a/utils/ifacecheck/src/ifacecheck_vc9.vcproj +++ b/utils/ifacecheck/src/ifacecheck_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/ifacecheck/src/makefile.bcc b/utils/ifacecheck/src/makefile.bcc index b41888b75f..a68e7d71e6 100644 --- a/utils/ifacecheck/src/makefile.bcc +++ b/utils/ifacecheck/src/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/ifacecheck/src/makefile.gcc b/utils/ifacecheck/src/makefile.gcc index fdf7df0b5a..20e01304a6 100644 --- a/utils/ifacecheck/src/makefile.gcc +++ b/utils/ifacecheck/src/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/ifacecheck/src/makefile.vc b/utils/ifacecheck/src/makefile.vc index 4135452217..0968928785 100644 --- a/utils/ifacecheck/src/makefile.vc +++ b/utils/ifacecheck/src/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/makefile.bcc b/utils/makefile.bcc index 63fddc9d64..b0caedf1a0 100644 --- a/utils/makefile.bcc +++ b/utils/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/makefile.gcc b/utils/makefile.gcc index ce47c21df0..404db3f011 100644 --- a/utils/makefile.gcc +++ b/utils/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/makefile.vc b/utils/makefile.vc index 9954f30da3..bc46ede14b 100644 --- a/utils/makefile.vc +++ b/utils/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/screenshotgen/src/Makefile.in b/utils/screenshotgen/src/Makefile.in index 9ff0ea6ddf..97ca5a34a1 100644 --- a/utils/screenshotgen/src/Makefile.in +++ b/utils/screenshotgen/src/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ -SETFILE = @SETFILE@ STRIP = @STRIP@ NM = @NM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -78,26 +77,23 @@ SCREENSHOTGEN_OBJECTS = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__screenshotgen___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__screenshotgen___mac_setfilecmd \ -@COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL screenshotgen$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL COND_PLATFORM_OS2_1___screenshotgen___os2_emxbindcmd = $(NM) \ screenshotgen$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ screenshotgen$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__screenshotgen___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___screenshotgen___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_MACOSX_1@__screenshotgen_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = screenshotgen.app/Contents/PkgInfo @@ -184,8 +180,6 @@ distclean: clean screenshotgen$(EXEEXT): $(SCREENSHOTGEN_OBJECTS) $(__screenshotgen___win32rc) $(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(HEADER_PAD_OPTION) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - - $(__screenshotgen___mac_setfilecmd) $(__screenshotgen___os2_emxbindcmd) @COND_PLATFORM_MACOSX_1@screenshotgen.app/Contents/PkgInfo: screenshotgen$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @@ -257,7 +251,7 @@ screenshotgen_autocapture.o: $(srcdir)/autocapture.cpp $(CXXC) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(srcdir)/autocapture.cpp screenshotgen_screenshotgen_rc.o: $(srcdir)/screenshotgen.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include # Include dependency info, if present: diff --git a/utils/screenshotgen/src/makefile.bcc b/utils/screenshotgen/src/makefile.bcc index d987c4a759..d8e7165904 100644 --- a/utils/screenshotgen/src/makefile.bcc +++ b/utils/screenshotgen/src/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/screenshotgen/src/makefile.gcc b/utils/screenshotgen/src/makefile.gcc index c1a6676b9d..bd76ffc614 100644 --- a/utils/screenshotgen/src/makefile.gcc +++ b/utils/screenshotgen/src/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc index 213a448d2d..46b1eea93f 100644 --- a/utils/screenshotgen/src/makefile.vc +++ b/utils/screenshotgen/src/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/screenshotgen/src/screenshotgen_vc7.sln b/utils/screenshotgen/src/screenshotgen_vc7.sln index 49b7a098da..23192e80f1 100644 --- a/utils/screenshotgen/src/screenshotgen_vc7.sln +++ b/utils/screenshotgen/src/screenshotgen_vc7.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshotgen_vc7.vcproj", "{65A1C4C8-E1D5-5972-8550-0F5631031FBB}" EndProject diff --git a/utils/screenshotgen/src/screenshotgen_vc7.vcproj b/utils/screenshotgen/src/screenshotgen_vc7.vcproj index ccc11c3a2f..182e38984b 100644 --- a/utils/screenshotgen/src/screenshotgen_vc7.vcproj +++ b/utils/screenshotgen/src/screenshotgen_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/screenshotgen/src/screenshotgen_vc8.sln b/utils/screenshotgen/src/screenshotgen_vc8.sln index 6babb1d418..cffabc4ab7 100644 --- a/utils/screenshotgen/src/screenshotgen_vc8.sln +++ b/utils/screenshotgen/src/screenshotgen_vc8.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshotgen_vc8.vcproj", "{D36F115C-330D-5EAE-B66F-885D6BE20540}" diff --git a/utils/screenshotgen/src/screenshotgen_vc8.vcproj b/utils/screenshotgen/src/screenshotgen_vc8.vcproj index 17589b3fce..8cba0cc184 100644 --- a/utils/screenshotgen/src/screenshotgen_vc8.vcproj +++ b/utils/screenshotgen/src/screenshotgen_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/screenshotgen/src/screenshotgen_vc9.sln b/utils/screenshotgen/src/screenshotgen_vc9.sln index 583ccd5715..7ccd9d4584 100644 --- a/utils/screenshotgen/src/screenshotgen_vc9.sln +++ b/utils/screenshotgen/src/screenshotgen_vc9.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshotgen_vc9.vcproj", "{820F5E3E-095B-580D-AE31-7E492C647B90}" diff --git a/utils/screenshotgen/src/screenshotgen_vc9.vcproj b/utils/screenshotgen/src/screenshotgen_vc9.vcproj index 2576771365..837c4ff4bb 100644 --- a/utils/screenshotgen/src/screenshotgen_vc9.vcproj +++ b/utils/screenshotgen/src/screenshotgen_vc9.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in index df3ddb7c0f..aa56bf06be 100644 --- a/utils/wxrc/Makefile.in +++ b/utils/wxrc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,6 @@ datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ LN_S = @LN_S@ -SETFILE = @SETFILE@ STRIP = @STRIP@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DIR = @INSTALL_DIR@ @@ -63,9 +62,6 @@ WXRC_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_USE_XRC_1@__wxrc___depname = wxrc$(EXEEXT) -@COND_PLATFORM_MAC_0@__wxrc___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxrc$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS @@ -116,8 +112,6 @@ distclean: clean @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS) @COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -@COND_USE_XRC_1@ -@COND_USE_XRC_1@ $(__wxrc___mac_setfilecmd) @COND_USE_XRC_1@install_wxrc: $(__wxrc___depname) @COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) diff --git a/utils/wxrc/makefile.bcc b/utils/wxrc/makefile.bcc index 80de2ecd1b..54e69ddced 100644 --- a/utils/wxrc/makefile.bcc +++ b/utils/wxrc/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/wxrc/makefile.gcc b/utils/wxrc/makefile.gcc index 0f567c1b9b..e16e5df9ab 100644 --- a/utils/wxrc/makefile.gcc +++ b/utils/wxrc/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc index 3f70f1020e..b21c00f1ed 100644 --- a/utils/wxrc/makefile.vc +++ b/utils/wxrc/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) +# Bakefile 0.2.11 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/wxrc/wxrc_vc7.vcproj b/utils/wxrc/wxrc_vc7.vcproj index 53b7451232..ae5276ad9d 100644 --- a/utils/wxrc/wxrc_vc7.vcproj +++ b/utils/wxrc/wxrc_vc7.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/wxrc/wxrc_vc8.vcproj b/utils/wxrc/wxrc_vc8.vcproj index 87779cc695..929f44932f 100644 --- a/utils/wxrc/wxrc_vc8.vcproj +++ b/utils/wxrc/wxrc_vc8.vcproj @@ -2,7 +2,7 @@ diff --git a/utils/wxrc/wxrc_vc9.vcproj b/utils/wxrc/wxrc_vc9.vcproj index dbc6d55c8e..2f14f43961 100644 --- a/utils/wxrc/wxrc_vc9.vcproj +++ b/utils/wxrc/wxrc_vc9.vcproj @@ -2,7 +2,7 @@