X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c9f8f91cd62335261ee29762747218f28d129de..6ba5438dda164146bf36ca729f8328332fae36b7:/samples/opengl/isosurf/Makefile.in diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index bec1370213..d40f9941ad 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.8 (http://bakefile.sourceforge.net) +# Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@ @@ -37,8 +36,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ ### Variables: ### DESTDIR = -WX_RELEASE = 2.5 -WX_VERSION = $(WX_RELEASE).5 +WX_RELEASE = 2.6 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(top_builddir)lib ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ @@ -125,7 +124,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o isosurf$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -154,7 +153,7 @@ distclean: clean @COND_USE_OPENGL_1@ $(__isosurf___os2_emxbindcmd) @COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK) -isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p isosurf.app/Contents mkdir -p isosurf.app/Contents/MacOS mkdir -p isosurf.app/Contents/Resources @@ -172,7 +171,6 @@ isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/mac/carbo ln -f isosurf$(EXEEXT) isosurf.app/Contents/MacOS/isosurf - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc isosurf.app/Contents/Resources/isosurf.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns isosurf.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@isosurf_bundle: $(____isosurf_BUNDLE_TGT_REF_DEP) @@ -180,7 +178,7 @@ isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/mac/carbo data: @mkdir -p . @for f in isosurf.dat.gz; do \ - if test ! -e ./$$f ; \ + if test ! -f ./$$f -a ! -d ./$$f ; \ then x=yep ; \ else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \ fi; \ @@ -190,7 +188,7 @@ data: done isosurf_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_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 --include-dir $(top_srcdir)/include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_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 --include-dir $(top_srcdir)/include isosurf_isosurf.o: $(srcdir)/isosurf.cpp $(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $(srcdir)/isosurf.cpp