Update to bakefile 0.2.11 and rebake everything

The main/only change in this version is the removal of automatic rules
using old Carbon Rez/DeRez/SetFile tools.
This commit is contained in:
Vadim Zeitlin
2017-10-21 17:42:30 +02:00
parent 5ba7a1d166
commit 0d394eec9c
1031 changed files with 1846 additions and 2624 deletions

View File

@@ -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

View File

@@ -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=""

View File

@@ -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

View File

@@ -397,7 +397,6 @@ to run the tests, include CppUnit library here.
<!-- ================================================================== -->
<if cond="FORMAT=='autoconf'">
<option name="DEREZ"/>
<option name="TOOLKIT"/>
<option name="TOOLKIT_LOWERCASE"/>
<option name="TOOLKIT_VERSION"/>

View File

@@ -150,29 +150,6 @@
<linguas>it</linguas>
<install-to>$(LOCALEDIR)</install-to>
</gettext-catalogs>
<!-- Mac OS X resources: -->
<set var="MACOS_R">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r</set>
<set var="MACOS_RSRC">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).rsrc</set>
<action id="cocoa-res" cond="TOOLKIT=='COCOA'">
<dependency-of>all</dependency-of>
<set var="__targetname">$(MACOS_R)</set>
<command>
$(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)
$(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R)
</command>
<clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
</action>
<action id="cocoa-res-install" cond="TOOLKIT=='COCOA'">
<dependency-of>install</dependency-of>
<depends>cocoa-res</depends>
<command>
$(INSTALL_DATA) $(MACOS_R) $(LIBDIR)
$(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
</command>
</action>
</if>

View File

@@ -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!
# =========================================================================

View File

@@ -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!
# =========================================================================

View File

@@ -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!
# =========================================================================

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.9 (http://www.bakefile.org)
# Bakefile 0.2.11 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.9 (http://www.bakefile.org)
# Bakefile 0.2.11 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.9 (http://www.bakefile.org)
# Bakefile 0.2.11 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.9 (http://www.bakefile.org)
# Bakefile 0.2.11 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# 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:

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.9 (http://www.bakefile.org)
# Bakefile 0.2.11 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.9 (http://www.bakefile.org)
# Bakefile 0.2.11 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.9 (http://www.bakefile.org)
# Bakefile 0.2.11 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# 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:

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.9 (http://www.bakefile.org)
# Bakefile 0.2.11 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.9 (http://www.bakefile.org)
# Bakefile 0.2.11 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.9 (http://www.bakefile.org)
# Bakefile 0.2.11 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# 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:

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.9 (http://www.bakefile.org)
Bakefile 0.2.11 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.9 (http://www.bakefile.org)
# Bakefile 0.2.11 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================

Some files were not shown because too many files have changed in this diff Show More