From f0bc6d38f9393e863bbc6a314461971153c0caf8 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Thu, 26 Feb 2009 09:29:57 +0000 Subject: [PATCH] update for 2.8.10-rcX with bakefile 0.2.5 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@59155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- demos/Makefile.in | 6 +++--- demos/makefile.bcc | 2 +- demos/makefile.gcc | 2 +- demos/makefile.vc | 2 +- demos/makefile.wat | 6 +++++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/demos/Makefile.in b/demos/Makefile.in index 648e8bd199..c7f893fc67 100644 --- a/demos/Makefile.in +++ b/demos/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.5 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -23,7 +23,7 @@ DESTDIR = all: bombs dbbrowse forty fractal life poem -install: all +install: uninstall: @@ -68,6 +68,6 @@ poem: # Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d +@IF_GNU_MAKE@-include ./.deps/*.d .PHONY: all install uninstall clean distclean bombs dbbrowse forty fractal life poem diff --git a/demos/makefile.bcc b/demos/makefile.bcc index fd11c0428e..8754a1c8d5 100644 --- a/demos/makefile.bcc +++ b/demos/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.5 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/makefile.gcc b/demos/makefile.gcc index a1d6bca93d..a5b2a3782f 100644 --- a/demos/makefile.gcc +++ b/demos/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.5 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/makefile.vc b/demos/makefile.vc index 5700dfe9a7..d2351af988 100644 --- a/demos/makefile.vc +++ b/demos/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.5 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/makefile.wat b/demos/makefile.wat index 5d0e6e79ca..403c480b76 100644 --- a/demos/makefile.wat +++ b/demos/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) +# Bakefile 0.2.5 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif