X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ceec2216bd3c65103e51a4ed9927f90fc1291d9c..3285ee538be44537a0d4e43252db18f5e7362782:/contrib/samples/gizmos/multicell/Makefile.in diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in index 5e8fe131f0..c2d4283c6e 100644 --- a/contrib/samples/gizmos/multicell/Makefile.in +++ b/contrib/samples/gizmos/multicell/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! # ========================================================================= @@ -22,25 +22,25 @@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ +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@ -WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ ### Variables: ### DESTDIR = -WX_VERSION = 2.5.2 -WX_RELEASE = 2.5 +WX_RELEASE = 2.6 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(top_builddir)lib -MTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ - $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ +MTEST_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) MTEST_OBJECTS = \ $(__mtest___win32rc) \ @@ -58,12 +58,25 @@ MTEST_OBJECTS = \ @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ +@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) +@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI) +@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) +@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_1@__mtest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C mtest$(EXEEXT) @COND_PLATFORM_MAC_1@__mtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @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 @@ -78,13 +91,13 @@ COND_PLATFORM_OS2_1___mtest___os2_emxbindcmd = $(NM) mtest$(EXEEXT) | if grep -q @COND_TOOLKIT_COCOA@ mtest.app/Contents/PkgInfo @COND_TOOLKIT_MAC@____mtest_BUNDLE_TGT_REF_DEP = mtest.app/Contents/PkgInfo COND_MONOLITHIC_0___WXLIB_CORE_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-2.5$(HOST_SUFFIX) + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) COND_MONOLITHIC_0___WXLIB_BASE_p = \ - -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX) + -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) COND_MONOLITHIC_1___WXLIB_MONO_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX) + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ @@ -98,17 +111,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ -@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(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 mtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r + $(srcdir)/../../../include -o mtest$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -128,16 +141,16 @@ clean: rm -rf mtest.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 mtest$(EXEEXT): $(MTEST_OBJECTS) $(__mtest___win32rc) - $(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-2.5$(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) $(EXTRALIBS_GUI) + $(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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) $(__mtest___mac_rezcmd) $(__mtest___mac_setfilecmd) $(__mtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p mtest.app/Contents mkdir -p mtest.app/Contents/MacOS mkdir -p mtest.app/Contents/Resources @@ -155,16 +168,15 @@ mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli ln -f mtest$(EXEEXT) mtest.app/Contents/MacOS/mtest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc mtest.app/Contents/Resources/mtest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mtest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@mtest_bundle: $(____mtest_BUNDLE_TGT_REF_DEP) mtest_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 mtest_mtest.o: $(srcdir)/mtest.cpp - $(CXXC) -c -o $@ $(MTEST_CXXFLAGS) $< + $(CXXC) -c -o $@ $(MTEST_CXXFLAGS) $(srcdir)/mtest.cpp # Include dependency info, if present: