X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e3165d72520d7d642640ed57c58c620884848fc..dcb39c53303d1ec6884f7bcd7bc9dc101e560e62:/contrib/samples/gizmos/dynsash/Makefile.in

diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in
index 214c46e5df..f5880e5f08 100644
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ b/contrib/samples/gizmos/dynsash/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -38,10 +38,11 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).5
 LIBDIRNAME = $(top_builddir)lib
-DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-	$(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
+DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
 	-I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
 DYNSASH_OBJECTS =  \
 	$(__dynsash___win32rc) \
@@ -69,6 +70,15 @@ DYNSASH_OBJECTS =  \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
@@ -114,10 +124,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+	__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 -i \
 	$(srcdir)/../../../include -o dynsash$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
+	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -137,7 +148,7 @@ clean:
 	rm -rf dynsash.app
 
 distclean: clean
-	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc)
 	$(CXX) -o $@ $(DYNSASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
@@ -146,7 +157,7 @@ dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc)
 	$(__dynsash___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p dynsash.app/Contents
 	mkdir -p dynsash.app/Contents/MacOS
 	mkdir -p dynsash.app/Contents/Resources
@@ -164,16 +175,16 @@ dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
 	ln -f dynsash$(EXEEXT) dynsash.app/Contents/MacOS/dynsash
 	
 	
-	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc dynsash.app/Contents/Resources/dynsash.rsrc
+	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc dynsash.app/Contents/Resources/dynsash.rsrc
 	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dynsash.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dynsash_bundle: $(____dynsash_BUNDLE_TGT_REF_DEP)
 
 dynsash_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
-	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_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
 
 dynsash_dynsash.o: $(srcdir)/dynsash.cpp
-	$(CXXC) -c -o $@ $(DYNSASH_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(DYNSASH_CXXFLAGS) $(srcdir)/dynsash.cpp
 
 
 # Include dependency info, if present: