X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4818141bb228bbb59df63de12a5ea31801314b57..7f47faf4f2fb142f715e3e47ed6f25a002d7a5d2:/samples/keyboard/Makefile.in?ds=sidebyside

diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index 9422bf11d0..78dd50c3e7 100644
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/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@
 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).2
 LIBDIRNAME = $(top_builddir)lib
 KEYBOARD_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 keyboard$(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 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
 	$(__keyboard___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p keyboard.app/Contents
 	mkdir -p keyboard.app/Contents/MacOS
 	mkdir -p keyboard.app/Contents/Resources
@@ -169,7 +168,6 @@ keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
 	ln -f keyboard$(EXEEXT) keyboard.app/Contents/MacOS/keyboard
 	
 	
-	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc keyboard.app/Contents/Resources/keyboard.rsrc
 	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns keyboard.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@keyboard_bundle: $(____keyboard_BUNDLE_TGT_REF_DEP)
@@ -178,7 +176,7 @@ keyboard_keyboard.o: $(srcdir)/keyboard.cpp
 	$(CXXC) -c -o $@ $(KEYBOARD_CXXFLAGS) $(srcdir)/keyboard.cpp
 
 keyboard_keyboard_rc.o: $(srcdir)/keyboard.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
 
 
 # Include dependency info, if present: