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.
2017-10-21 17:42:30 +02:00
parent 5ba7a1d166
commit 0d394eec9c
1031 changed files with 1846 additions and 2624 deletions
--- 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!
 # =========================================================================

--- 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:
--- a/demos/bombs/bombs_vc7.vcproj
+++ b/demos/bombs/bombs_vc7.vcproj
@@ -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!

 -->
--- a/demos/bombs/bombs_vc8.vcproj
+++ b/demos/bombs/bombs_vc8.vcproj
@@ -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!

 -->
--- a/demos/bombs/bombs_vc9.vcproj
+++ b/demos/bombs/bombs_vc9.vcproj
@@ -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!

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

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

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

--- 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:
--- a/demos/forty/forty_vc7.vcproj
+++ b/demos/forty/forty_vc7.vcproj
@@ -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!

 -->
--- a/demos/forty/forty_vc8.vcproj
+++ b/demos/forty/forty_vc8.vcproj
@@ -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!

 -->
--- a/demos/forty/forty_vc9.vcproj
+++ b/demos/forty/forty_vc9.vcproj
@@ -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!

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

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

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

--- 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:
--- a/demos/fractal/fractal_vc7.vcproj
+++ b/demos/fractal/fractal_vc7.vcproj
@@ -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!

 -->
--- a/demos/fractal/fractal_vc8.vcproj
+++ b/demos/fractal/fractal_vc8.vcproj
@@ -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!

 -->
--- a/demos/fractal/fractal_vc9.vcproj
+++ b/demos/fractal/fractal_vc9.vcproj
@@ -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!

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

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

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

--- 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:
--- a/demos/life/life_vc7.vcproj
+++ b/demos/life/life_vc7.vcproj
@@ -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!

 -->
--- a/demos/life/life_vc8.vcproj
+++ b/demos/life/life_vc8.vcproj
@@ -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!

 -->
--- a/demos/life/life_vc9.vcproj
+++ b/demos/life/life_vc9.vcproj
@@ -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!

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

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

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

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

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

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

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

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

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

--- a/demos/poem/poem_vc7.vcproj
+++ b/demos/poem/poem_vc7.vcproj
@@ -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!

 -->
--- a/demos/poem/poem_vc8.vcproj
+++ b/demos/poem/poem_vc8.vcproj
@@ -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!

 -->
--- a/demos/poem/poem_vc9.vcproj
+++ b/demos/poem/poem_vc9.vcproj
@@ -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!

 -->