X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e3165d72520d7d642640ed57c58c620884848fc..94709f191133613e115fdbf913eba5a81ddd207e:/contrib/samples/foldbar/foldpanelbar/Makefile.in diff --git a/contrib/samples/foldbar/foldpanelbar/Makefile.in b/contrib/samples/foldbar/foldpanelbar/Makefile.in index 022d548b2e..960369807c 100644 --- a/contrib/samples/foldbar/foldpanelbar/Makefile.in +++ b/contrib/samples/foldbar/foldpanelbar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.4 (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@ @@ -36,11 +35,12 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ ### Variables: ### DESTDIR = -WX_RELEASE = 2.5 -WX_VERSION = $(WX_RELEASE).3 +WX_RELEASE = 2.6 +WX_VERSION = $(WX_RELEASE).2 LIBDIRNAME = $(top_builddir)lib -FOLDTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ - $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ +FOLDTEST_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) FOLDTEST_OBJECTS = \ $(__foldtest_os2_lib_res) \ @@ -71,6 +71,15 @@ FOLDTEST_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 +123,10 @@ 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 foldtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r + $(srcdir)/../../../include -o foldtest$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -137,7 +146,7 @@ clean: rm -rf foldtest.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 foldtest$(EXEEXT): $(FOLDTEST_OBJECTS) $(__foldtest___win32rc) $(CXX) -o $@ $(FOLDTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX) $(__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 +155,7 @@ foldtest$(EXEEXT): $(FOLDTEST_OBJECTS) $(__foldtest___win32rc) $(__foldtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -foldtest.app/Contents/PkgInfo: foldtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +foldtest.app/Contents/PkgInfo: foldtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p foldtest.app/Contents mkdir -p foldtest.app/Contents/MacOS mkdir -p foldtest.app/Contents/Resources @@ -164,25 +173,24 @@ foldtest.app/Contents/PkgInfo: foldtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f foldtest$(EXEEXT) foldtest.app/Contents/MacOS/foldtest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc foldtest.app/Contents/Resources/foldtest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns foldtest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@foldtest_bundle: $(____foldtest_BUNDLE_TGT_REF_DEP) foldtest_foldpanelbartest.o: $(srcdir)/foldpanelbartest.cpp - $(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $< + $(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $(srcdir)/foldpanelbartest.cpp foldtest_foldtestpanel.o: $(srcdir)/foldtestpanel.cpp - $(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $< + $(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $(srcdir)/foldtestpanel.cpp foldtest_layouttest.o: $(srcdir)/layouttest.cpp - $(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $< + $(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $(srcdir)/layouttest.cpp foldtest_test.o: $(srcdir)/test.cpp - $(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $< + $(CXXC) -c -o $@ $(FOLDTEST_CXXFLAGS) $(srcdir)/test.cpp foldtest_foldpanelbartest_rc.o: $(srcdir)/foldpanelbartest.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 --include-dir $(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-dir $(srcdir)/../../../include # Include dependency info, if present: