X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7714864e2f21ef69ef273f3a7c58456e365539b9..3285ee538be44537a0d4e43252db18f5e7362782:/contrib/src/deprecated/Makefile.in diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in index fdb4d16885..97e206de30 100644 --- a/contrib/src/deprecated/Makefile.in +++ b/contrib/src/deprecated/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! # ========================================================================= @@ -16,6 +16,7 @@ LIBPREFIX = @LIBPREFIX@ SO_SUFFIX = @SO_SUFFIX@ DLLIMP_SUFFIX = @DLLIMP_SUFFIX@ LN_S = @LN_S@ +RESCOMP = @RESCOMP@ PIC_FLAG = @PIC_FLAG@ SONAME_FLAG = @SONAME_FLAG@ STRIP = @STRIP@ @@ -49,18 +50,20 @@ HOST_SUFFIX = @HOST_SUFFIX@ ### Variables: ### DESTDIR = -WX_RELEASE = 2.5 -WX_RELEASE_NODOT = 25 -WX_VERSION = $(WX_RELEASE).3 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_RELEASE = 2.6 +WX_RELEASE_NODOT = 26 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(top_builddir)lib DEPRECATEDDLL_CFLAGS = $(__deprecateddll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ -DWXMAKINGDLL_DEPRECATED -I$(srcdir) $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) DEPRECATEDDLL_CXXFLAGS = $(__deprecateddll_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \ -DWXMAKINGDLL_DEPRECATED -I$(srcdir) $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) DEPRECATEDDLL_OBJECTS = \ + $(__deprecateddll___win32rc) \ deprecateddll_prop.o \ deprecateddll_propform.o \ deprecateddll_proplist.o \ @@ -72,10 +75,12 @@ DEPRECATEDDLL_OBJECTS = \ DEPRECATEDDLL_ODEP = \ $(___pch_wxprec_deprecateddll_wx_wxprec_h_gch___depname) DEPRECATEDLIB_CFLAGS = $(__deprecatedlib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CPPFLAGS) \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CPPFLAGS) \ $(CFLAGS) DEPRECATEDLIB_CXXFLAGS = $(__deprecatedlib_PCH_INC) -D__WX$(TOOLKIT)__ \ - $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CPPFLAGS) \ + $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CPPFLAGS) \ $(CXXFLAGS) DEPRECATEDLIB_OBJECTS = \ deprecatedlib_prop.o \ @@ -107,12 +112,20 @@ DEPRECATEDLIB_ODEP = \ @COND_WXUNIV_1@WXUNIVNAME = univ @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \ -@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT) +@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT) @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE) @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@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_SHARED_1___deprecateddll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) @COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___depname) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS @COND_SHARED_1@__install_deprecateddll___depname = install_deprecateddll COND_PLATFORM_MACOSX_1___deprecateddll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) @@ -127,14 +140,14 @@ COND_PLATFORM_WIN32_1___deprecateddll___importlib = \ @COND_GCC_PCH_1@___pch_wxprec_deprecateddll_wx_wxprec_h_gch___depname \ @COND_GCC_PCH_1@ = .pch/wxprec_deprecateddll/wx/wxprec.h.gch @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__deprecateddll___targetsuf2 \ -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).3 +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf2 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .3.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__deprecateddll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__deprecateddll___targetsuf3 \ -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).3.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .3.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__deprecateddll___targetsuf3 = .$(SO_SUFFIX) COND_USE_SOVERLINUX_1___deprecateddll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) @@ -166,6 +179,8 @@ COND_USE_SOSYMLINKS_1___deprecateddll___so_symlinks_inst_cmd = rm -f \ @COND_PLATFORM_MACOSX_1@__deprecateddll___macver = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ @COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) +@COND_PLATFORM_WIN32_1@__deprecateddll___win32rc = \ +@COND_PLATFORM_WIN32_1@ deprecateddll_version_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -201,6 +216,9 @@ COND_SHARED_0___deprecatedlib___depname = \ @COND_GCC_PCH_1@___pch_wxprec_deprecatedlib_wx_wxprec_h_gch___depname \ @COND_GCC_PCH_1@ = .pch/wxprec_deprecatedlib/wx/wxprec.h.gch @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS ### Targets: ### @@ -229,10 +247,10 @@ clean: rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) 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 -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(__deprecateddll___macver) $(__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) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(__deprecateddll___macver) $(__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) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ @COND_SHARED_1@ $(__deprecateddll___so_symlinks_cmd) @@ -257,53 +275,56 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_deprecatedlib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_deprecatedlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDLIB_CXXFLAGS) +deprecateddll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(DEPRECATEDDLL_ODEP) + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include + deprecateddll_prop.o: $(srcdir)/prop.cpp $(DEPRECATEDDLL_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/prop.cpp deprecateddll_propform.o: $(srcdir)/propform.cpp $(DEPRECATEDDLL_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/propform.cpp deprecateddll_proplist.o: $(srcdir)/proplist.cpp $(DEPRECATEDDLL_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/proplist.cpp deprecateddll_resource.o: $(srcdir)/resource.cpp $(DEPRECATEDDLL_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/resource.cpp deprecateddll_tbarsmpl.o: $(srcdir)/tbarsmpl.cpp $(DEPRECATEDDLL_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/tbarsmpl.cpp deprecateddll_treelay.o: $(srcdir)/treelay.cpp $(DEPRECATEDDLL_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/treelay.cpp deprecateddll_wxexpr.o: $(srcdir)/wxexpr.cpp $(DEPRECATEDDLL_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(srcdir)/wxexpr.cpp deprecateddll_dosyacc.o: $(srcdir)/dosyacc.c $(DEPRECATEDDLL_ODEP) - $(CCC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $< + $(CCC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $(srcdir)/dosyacc.c deprecatedlib_prop.o: $(srcdir)/prop.cpp $(DEPRECATEDLIB_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/prop.cpp deprecatedlib_propform.o: $(srcdir)/propform.cpp $(DEPRECATEDLIB_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/propform.cpp deprecatedlib_proplist.o: $(srcdir)/proplist.cpp $(DEPRECATEDLIB_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/proplist.cpp deprecatedlib_resource.o: $(srcdir)/resource.cpp $(DEPRECATEDLIB_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/resource.cpp deprecatedlib_tbarsmpl.o: $(srcdir)/tbarsmpl.cpp $(DEPRECATEDLIB_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/tbarsmpl.cpp deprecatedlib_treelay.o: $(srcdir)/treelay.cpp $(DEPRECATEDLIB_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/treelay.cpp deprecatedlib_wxexpr.o: $(srcdir)/wxexpr.cpp $(DEPRECATEDLIB_ODEP) - $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< + $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(srcdir)/wxexpr.cpp deprecatedlib_dosyacc.o: $(srcdir)/dosyacc.c $(DEPRECATEDLIB_ODEP) - $(CCC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $< + $(CCC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $(srcdir)/dosyacc.c # Include dependency info, if present: