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

View File

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

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,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}"

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,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}"

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