X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69199aad025095def4b42214f7b44829397caf52..16bf3190407e402c8c40d3eed43c42f52f297684:/samples/config/Makefile.in?ds=sidebyside diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 049777d275..caf47add90 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.0 (http://bakefile.sourceforge.net) +# Bakefile 0.2.3 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -9,6 +9,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ WINDRES = @WINDRES@ @@ -31,6 +32,7 @@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +CXXWARNINGS = @CXXWARNINGS@ HOST_SUFFIX = @HOST_SUFFIX@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ @@ -39,12 +41,13 @@ wx_top_builddir = @wx_top_builddir@ ### Variables: ### DESTDIR = -WX_RELEASE = 2.7 -WX_VERSION = $(WX_RELEASE).2 +WX_RELEASE = 2.9 +WX_VERSION = $(WX_RELEASE).0 LIBDIRNAME = $(wx_top_builddir)/lib CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ + $(CPPFLAGS) $(CXXFLAGS) CONFTEST_OBJECTS = \ $(__conftest_os2_lib_res) \ conftest_conftest.o \ @@ -65,6 +68,7 @@ CONFTEST_OBJECTS = \ @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_0@__conftest___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C conftest$(EXEEXT) @COND_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @@ -92,11 +96,13 @@ COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd = $(NM) conftest$(EXEEXT) | if \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_OS2_1@__conftest_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res +@COND_PLATFORM_MACOSX_1@__conftest_app_Contents_PkgInfo___depname \ +@COND_PLATFORM_MACOSX_1@ = conftest.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__conftest_bundle___depname = conftest_bundle @COND_TOOLKIT_COCOA@____conftest_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_COCOA@ conftest.app/Contents/PkgInfo +@COND_TOOLKIT_COCOA@ $(__conftest_app_Contents_PkgInfo___depname) @COND_TOOLKIT_MAC@____conftest_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_MAC@ conftest.app/Contents/PkgInfo +@COND_TOOLKIT_MAC@ $(__conftest_app_Contents_PkgInfo___depname) COND_MONOLITHIC_0___WXLIB_CORE_p = \ -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) @@ -118,8 +124,6 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @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)$(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) @@ -152,31 +156,31 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc) - $(CXX) -o $@ $(CONFTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) + $(CXX) -o $@ $(CONFTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__conftest___mac_rezcmd) $(__conftest___mac_setfilecmd) $(__conftest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns - mkdir -p conftest.app/Contents - mkdir -p conftest.app/Contents/MacOS - mkdir -p conftest.app/Contents/Resources - - - sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ - -e "s/EXECUTABLE/conftest/" \ - -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/carbon/Info.plist.in >conftest.app/Contents/Info.plist - - - echo -n "APPL????" >conftest.app/Contents/PkgInfo - - - ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest - - - cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns conftest.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@ mkdir -p conftest.app/Contents +@COND_PLATFORM_MACOSX_1@ mkdir -p conftest.app/Contents/MacOS +@COND_PLATFORM_MACOSX_1@ mkdir -p conftest.app/Contents/Resources +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ +@COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/conftest/" \ +@COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >conftest.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >conftest.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns conftest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@conftest_bundle: $(____conftest_BUNDLE_TGT_REF_DEP) @@ -184,7 +188,7 @@ conftest_conftest.o: $(srcdir)/conftest.cpp $(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $(srcdir)/conftest.cpp conftest_conftest_rc.o: $(srcdir)/conftest.rc - $(WINDRES) -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 $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + $(WINDRES) -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 $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include # Include dependency info, if present: