X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4818141bb228bbb59df63de12a5ea31801314b57..5f7348ce627157e21bec507623ebd31c1e9dc762:/samples/memcheck/Makefile.in

diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index 37f8582ba6..c43bf452d8 100644
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -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@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -37,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.6
-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).1
 LIBDIRNAME = $(top_builddir)lib
 MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -122,7 +121,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 memcheck$(EXEEXT) \
-	Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+	Carbon.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -151,7 +150,7 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc)
 	$(__memcheck___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p memcheck.app/Contents
 	mkdir -p memcheck.app/Contents/MacOS
 	mkdir -p memcheck.app/Contents/Resources
@@ -169,7 +168,6 @@ memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
 	ln -f memcheck$(EXEEXT) memcheck.app/Contents/MacOS/memcheck
 	
 	
-	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc memcheck.app/Contents/Resources/memcheck.rsrc
 	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns memcheck.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@memcheck_bundle: $(____memcheck_BUNDLE_TGT_REF_DEP)