Ran bakefile -f autoconf and autoconf.
Some missing headers have been added, the *NODOT variables were added to samples makefiles and the version changed from 2.6.2 to 2.7.0. Generated configure now includes "OS/2" fixes per wxAutohacks. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -48,8 +48,9 @@ HOST_SUFFIX = @HOST_SUFFIX@
|
||||
### Variables: ###
|
||||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.6
|
||||
WX_RELEASE_NODOT = 26
|
||||
WX_RELEASE = 2.7
|
||||
WX_RELEASE_NODOT = 27
|
||||
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
PLOTDLL_CXXFLAGS = $(__plotdll_PCH_INC) -D__WX$(TOOLKIT)__ \
|
||||
$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
|
||||
@@ -71,7 +72,7 @@ PLOTLIB_ODEP = $(___pch_wxprec_plotlib_wx_wxprec_h_gch___depname)
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
|
||||
@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
|
||||
@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0
|
||||
@COND_PLATFORM_MACOSX_1@ -compatibility_version 0.0 -current_version 0.0
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@@ -84,7 +85,7 @@ PLOTLIB_ODEP = $(___pch_wxprec_plotlib_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_RELEASE_NODOT)
|
||||
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
|
||||
@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
|
||||
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
|
||||
@@ -118,9 +119,9 @@ COND_WINDOWS_IMPLIB_1___plotdll___importlib = \
|
||||
@COND_USE_SOVERSION_0@__plotdll___targetsuf2 = .$(SO_SUFFIX)
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__plotdll___targetsuf3 \
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.2.0
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf3 \
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.2.0.$(SO_SUFFIX)
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX)
|
||||
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__plotdll___targetsuf3 \
|
||||
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -0.$(SO_SUFFIX)
|
||||
@COND_USE_SOVERSION_0@__plotdll___targetsuf3 = .$(SO_SUFFIX)
|
||||
|
||||
Reference in New Issue
Block a user