Updated makefiles etc. for 2.5.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -53,7 +53,7 @@ PLOTLIB_CXXFLAGS = $(__plotlib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
|
||||
$(CXXFLAGS)
|
||||
PLOTLIB_OBJECTS = \
|
||||
plotlib_plot.o
|
||||
WX_VERSION = 2.5.0
|
||||
WX_VERSION = 2.5.1
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@@ -70,7 +70,7 @@ WX_VERSION = 2.5.0
|
||||
@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
|
||||
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
|
||||
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
|
||||
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250
|
||||
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)251
|
||||
@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
|
||||
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
|
||||
@COND_UNICODE_1@WXUNICODEFLAG = u
|
||||
@@ -144,14 +144,14 @@ COND_USE_SOVERSOLARIS_1___plotdll___soname_flags = \
|
||||
$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
|
||||
@COND_USE_SOVERSOLARIS_1@__plotdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___plotdll___soname_flags)
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__plotdll___targetsuf2 \
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).1
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf2 \
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.$(SO_SUFFIX)
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.$(SO_SUFFIX)
|
||||
@COND_USE_SOVERSION_0@__plotdll___targetsuf2 = .$(SO_SUFFIX)
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__plotdll___targetsuf3 \
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).1.0.0
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf3 \
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX)
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX)
|
||||
@COND_USE_SOVERSION_0@__plotdll___targetsuf3 = .$(SO_SUFFIX)
|
||||
@COND_GCC_PCH_1@__plotlib_PCH_DEP = .pch/wxprec_plotlib/wx/wxprec.h.gch
|
||||
@COND_GCC_PCH_1@__plotlib_PCH_INC = -I.pch/wxprec_plotlib
|
||||
@@ -203,7 +203,8 @@ install-strip: install
|
||||
@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a $(libdir)
|
||||
|
||||
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(__plotdll_PCH_DEP) $(PLOTDLL_OBJECTS)
|
||||
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(__plotdll___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@ $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(__plotdll___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@
|
||||
@COND_SHARED_1@ $(__plotdll___so_symlinks_cmd)
|
||||
|
||||
plotdll_plot.o: $(srcdir)/plot.cpp
|
||||
|
||||
Reference in New Issue
Block a user