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/samples/opengl/Makefile.in
+++ b/samples/opengl/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.9 (http://www.bakefile.org)
+#     Bakefile 0.2.11 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

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

@@ -13,7 +13,6 @@ datarootdir = @datarootdir@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 WINDRES = @WINDRES@
-SETFILE = @SETFILE@
 NM = @NM@
 BK_DEPS = @BK_DEPS@
 srcdir = @srcdir@
@@ -69,25 +68,22 @@ CUBE_OBJECTS =  \
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
@COND_USE_OPENGL_1@__cube___depname = cube$(EXEEXT)
-@COND_PLATFORM_MAC_0@__cube___mac_setfilecmd = @true
-@COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL cube$(EXEEXT)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL
 COND_PLATFORM_OS2_1___cube___os2_emxbindcmd = $(NM) cube$(EXEEXT) | if grep -q \
 	pmwin.763 ; then emxbind -ep cube$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__cube___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___cube___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
@COND_PLATFORM_WIN32_1@__cube___win32rc = cube_sample_rc.o
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__cube_app_Contents_PkgInfo___depname \
@@ -153,8 +149,6 @@ distclean: clean

@COND_USE_OPENGL_1@cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc)
@COND_USE_OPENGL_1@	$(CXX) -o $@ $(CUBE_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
-@COND_USE_OPENGL_1@	
-@COND_USE_OPENGL_1@	$(__cube___mac_setfilecmd)
@COND_USE_OPENGL_1@	$(__cube___os2_emxbindcmd)

@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
@@ -180,7 +174,7 @@ distclean: clean
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube_bundle: $(____cube_BUNDLE_TGT_REF_DEP)

 cube_sample_rc.o: $(srcdir)/../../../samples/sample.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)  --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

 cube_cube.o: $(srcdir)/cube.cpp
 	$(CXXC) -c -o $@ $(CUBE_CXXFLAGS) $(srcdir)/cube.cpp
--- a/samples/opengl/cube/cube_vc7.vcproj
+++ b/samples/opengl/cube/cube_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/samples/opengl/cube/cube_vc8.vcproj
+++ b/samples/opengl/cube/cube_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/samples/opengl/cube/cube_vc9.vcproj
+++ b/samples/opengl/cube/cube_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/samples/opengl/cube/makefile.bcc
+++ b/samples/opengl/cube/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.9 (http://www.bakefile.org)
+#     Bakefile 0.2.11 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

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

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

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

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

@@ -13,7 +13,6 @@ datarootdir = @datarootdir@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 WINDRES = @WINDRES@
-SETFILE = @SETFILE@
 NM = @NM@
 BK_DEPS = @BK_DEPS@
 srcdir = @srcdir@
@@ -69,25 +68,22 @@ ISOSURF_OBJECTS =  \
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
@COND_USE_OPENGL_1@__isosurf___depname = isosurf$(EXEEXT)
-@COND_PLATFORM_MAC_0@__isosurf___mac_setfilecmd = @true
-@COND_PLATFORM_MAC_1@__isosurf___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL isosurf$(EXEEXT)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL
 COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd = $(NM) isosurf$(EXEEXT) | if \
 	grep -q pmwin.763 ; then emxbind -ep isosurf$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__isosurf___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
@COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_sample_rc.o
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__isosurf_app_Contents_PkgInfo___depname \
@@ -154,8 +150,6 @@ distclean: clean

@COND_USE_OPENGL_1@isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc)
@COND_USE_OPENGL_1@	$(CXX) -o $@ $(ISOSURF_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
-@COND_USE_OPENGL_1@	
-@COND_USE_OPENGL_1@	$(__isosurf___mac_setfilecmd)
@COND_USE_OPENGL_1@	$(__isosurf___os2_emxbindcmd)

@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
@@ -193,7 +187,7 @@ data:
 	done

 isosurf_sample_rc.o: $(srcdir)/../../../samples/sample.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)  --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

 isosurf_isosurf.o: $(srcdir)/isosurf.cpp
 	$(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $(srcdir)/isosurf.cpp
--- a/samples/opengl/isosurf/isosurf_vc7.vcproj
+++ b/samples/opengl/isosurf/isosurf_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/samples/opengl/isosurf/isosurf_vc8.vcproj
+++ b/samples/opengl/isosurf/isosurf_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/samples/opengl/isosurf/isosurf_vc9.vcproj
+++ b/samples/opengl/isosurf/isosurf_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/samples/opengl/isosurf/makefile.bcc
+++ b/samples/opengl/isosurf/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.9 (http://www.bakefile.org)
+#     Bakefile 0.2.11 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

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

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

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

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

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

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

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

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

@@ -13,7 +13,6 @@ datarootdir = @datarootdir@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 WINDRES = @WINDRES@
-SETFILE = @SETFILE@
 NM = @NM@
 BK_DEPS = @BK_DEPS@
 srcdir = @srcdir@
@@ -79,25 +78,22 @@ PENGUIN_OBJECTS =  \
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
@COND_USE_OPENGL_1@__penguin___depname = penguin$(EXEEXT)
-@COND_PLATFORM_MAC_0@__penguin___mac_setfilecmd = @true
-@COND_PLATFORM_MAC_1@__penguin___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL penguin$(EXEEXT)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL
 COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd = $(NM) penguin$(EXEEXT) | if \
 	grep -q pmwin.763 ; then emxbind -ep penguin$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__penguin___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
@COND_PLATFORM_WIN32_1@__penguin___win32rc = penguin_sample_rc.o
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__penguin_app_Contents_PkgInfo___depname \
@@ -164,8 +160,6 @@ distclean: clean

@COND_USE_OPENGL_1@penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc)
@COND_USE_OPENGL_1@	$(CXX) -o $@ $(PENGUIN_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
-@COND_USE_OPENGL_1@	
-@COND_USE_OPENGL_1@	$(__penguin___mac_setfilecmd)
@COND_USE_OPENGL_1@	$(__penguin___os2_emxbindcmd)

@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
@@ -203,7 +197,7 @@ data:
 	done

 penguin_sample_rc.o: $(srcdir)/../../../samples/sample.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)  --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

 penguin_penguin.o: $(srcdir)/penguin.cpp
 	$(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $(srcdir)/penguin.cpp
--- a/samples/opengl/penguin/makefile.bcc
+++ b/samples/opengl/penguin/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.9 (http://www.bakefile.org)
+#     Bakefile 0.2.11 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

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

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

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

--- a/samples/opengl/penguin/penguin_vc7.vcproj
+++ b/samples/opengl/penguin/penguin_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/samples/opengl/penguin/penguin_vc8.vcproj
+++ b/samples/opengl/penguin/penguin_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/samples/opengl/penguin/penguin_vc9.vcproj
+++ b/samples/opengl/penguin/penguin_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/samples/opengl/pyramid/Makefile.in
+++ b/samples/opengl/pyramid/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.9 (http://www.bakefile.org)
+#     Bakefile 0.2.11 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

@@ -13,7 +13,6 @@ datarootdir = @datarootdir@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 WINDRES = @WINDRES@
-SETFILE = @SETFILE@
 NM = @NM@
 BK_DEPS = @BK_DEPS@
 srcdir = @srcdir@
@@ -72,25 +71,22 @@ PYRAMID_OBJECTS =  \
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
@COND_USE_OPENGL_1@__pyramid___depname = pyramid$(EXEEXT)
-@COND_PLATFORM_MAC_0@__pyramid___mac_setfilecmd = @true
-@COND_PLATFORM_MAC_1@__pyramid___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL pyramid$(EXEEXT)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
-@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_1 = --define WXUSINGDLL
 COND_PLATFORM_OS2_1___pyramid___os2_emxbindcmd = $(NM) pyramid$(EXEEXT) | if \
 	grep -q pmwin.763 ; then emxbind -ep pyramid$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__pyramid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___pyramid___os2_emxbindcmd)
-@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
@COND_PLATFORM_WIN32_1@__pyramid___win32rc = pyramid_sample_rc.o
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__pyramid_app_Contents_PkgInfo___depname \
@@ -157,8 +153,6 @@ distclean: clean

@COND_USE_OPENGL_1@pyramid$(EXEEXT): $(PYRAMID_OBJECTS) $(__pyramid___win32rc)
@COND_USE_OPENGL_1@	$(CXX) -o $@ $(PYRAMID_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
-@COND_USE_OPENGL_1@	
-@COND_USE_OPENGL_1@	$(__pyramid___mac_setfilecmd)
@COND_USE_OPENGL_1@	$(__pyramid___os2_emxbindcmd)

@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@pyramid.app/Contents/PkgInfo: $(__pyramid___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
@@ -184,7 +178,7 @@ distclean: clean
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@pyramid_bundle: $(____pyramid_BUNDLE_TGT_REF_DEP)

 pyramid_sample_rc.o: $(srcdir)/../../../samples/sample.rc
-	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)  --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --include-dir $(srcdir) $(__DLLFLAG_p_1) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

 pyramid_pyramid.o: $(srcdir)/pyramid.cpp
 	$(CXXC) -c -o $@ $(PYRAMID_CXXFLAGS) $(srcdir)/pyramid.cpp
--- a/samples/opengl/pyramid/makefile.bcc
+++ b/samples/opengl/pyramid/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.9 (http://www.bakefile.org)
+#     Bakefile 0.2.11 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

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

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

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

--- a/samples/opengl/pyramid/pyramid_vc7.vcproj
+++ b/samples/opengl/pyramid/pyramid_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/samples/opengl/pyramid/pyramid_vc8.vcproj
+++ b/samples/opengl/pyramid/pyramid_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/samples/opengl/pyramid/pyramid_vc9.vcproj
+++ b/samples/opengl/pyramid/pyramid_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!

 -->