X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c9f8f91cd62335261ee29762747218f28d129de..ccdd4b0b4213a247e61c81718be7483074a9c0b4:/contrib/src/svg/Makefile.in diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in index 0e3e795cfe..a985d40c3e 100644 --- a/contrib/src/svg/Makefile.in +++ b/contrib/src/svg/Makefile.in @@ -48,10 +48,9 @@ HOST_SUFFIX = @HOST_SUFFIX@ ### Variables: ### DESTDIR = -WX_RELEASE = 2.5 -WX_RELEASE_NODOT = 25 -WX_VERSION = $(WX_RELEASE).5 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5 +WX_RELEASE = 2.6 +WX_RELEASE_NODOT = 26 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(top_builddir)lib SVGDLL_CXXFLAGS = $(__svgdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ @@ -84,7 +83,7 @@ SVGLIB_ODEP = $(___pch_wxprec_svglib_wx_wxprec_h_gch___depname) @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) @@ -112,14 +111,14 @@ COND_PLATFORM_WIN32_1___svgdll___importlib = \ @COND_GCC_PCH_1@___pch_wxprec_svgdll_wx_wxprec_h_gch___depname \ @COND_GCC_PCH_1@ = .pch/wxprec_svgdll/wx/wxprec.h.gch @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__svgdll___targetsuf2 \ -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).5 +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__svgdll___targetsuf2 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .5.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__svgdll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__svgdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).5.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__svgdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .5.0.0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__svgdll___targetsuf3 = .$(SO_SUFFIX) COND_USE_SOVERLINUX_1___svgdll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf2) @@ -245,7 +244,7 @@ distclean: clean @COND_GCC_PCH_1@.pch/wxprec_svglib/wx/wxprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_svglib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(SVGLIB_CXXFLAGS) -svgdll_version_rc.o: $(srcdir)/src/msw/version.rc $(SVGDLL_ODEP) +svgdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(SVGDLL_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)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include svgdll_dcsvg.o: $(srcdir)/dcsvg.cpp $(SVGDLL_ODEP)