mirror of
https://github.com/boostorg/build.git
synced 2026-02-15 13:02:11 +00:00
more STLPort toolsets' fixes
[SVN r25485]
This commit is contained in:
@@ -7,9 +7,11 @@
|
||||
# The following #// line will be used by the regression test table generation
|
||||
# program as the column heading for HTML tables. Must not include version number.
|
||||
#//<a href="http://developer.intel.com/software/products/compilers/">Intel<br>C++</a><br><a href="http://www.stlport.org/">STLport</a>
|
||||
|
||||
STLPORT_LIB_BASE_NAME ?= stlport_icl ;
|
||||
|
||||
{
|
||||
local INTEL_BASE_MSVC_TOOLSET = msvc-stlport ;
|
||||
STLPORT_LIB_BASE_NAME = stlport_icl ;
|
||||
extends-toolset intel-win32 ;
|
||||
|
||||
# Intel's compiler doesn't seem to encode the path to the STLPort
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
extends-toolset msvc ;
|
||||
|
||||
CURR_TOOLSET = msvc-stlport ;
|
||||
STLPORT_LIB_BASE_NAME = stlport_vc6 ;
|
||||
STLPORT_LIB_BASE_NAME ?= stlport_vc6 ;
|
||||
STLPORT_LIB_STATIC_SUFFIX ?= _static ;
|
||||
|
||||
# bring in the STLPort configuration
|
||||
SEARCH on stlport.jam = $(BOOST_BUILD_PATH) ;
|
||||
|
||||
@@ -31,6 +31,8 @@ STLPORT_VERSIONS ?= 4.6 4.5.3 4.5 ;
|
||||
feature stlport-version : [ unique $(STLPORT_VERSION) $(STLPORT_VERSIONS) ] ;
|
||||
flags $(CURR_TOOLSET) STLPORT_VERSION_RELEVANT_FEATURE <stlport-version> ;
|
||||
|
||||
STLPORT_LIB_DEBUG_SUFFIX ?= _stldebug ;
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton STLPORT_INCLUDE_DIRECTORY STLPORT_LIB_DIRECTORY STLPORT_PATH STLPORT_ROOT ;
|
||||
|
||||
@@ -103,5 +105,7 @@ flags $(CURR_TOOLSET) DEFINES <stlport-debug-alloc>on : _STLP_DEBUG_ALLOC=1 ;
|
||||
flags $(CURR_TOOLSET) DEFINES <runtime-build>debug : _STLP_DEBUG=1 _STLP_DEBUG_UNINITIALIZED=1 ;
|
||||
flags $(CURR_TOOLSET) DEFINES <runtime-link>dynamic : _STLP_USE_DYNAMIC_LIB=1 ;
|
||||
|
||||
flags $(CURR_TOOLSET) FINDLIBS <stlport-iostream>on/<runtime-build>debug : $(STLPORT_LIB_BASE_NAME)_stldebug ;
|
||||
flags $(CURR_TOOLSET) FINDLIBS <stlport-iostream>on/<runtime-build>release : $(STLPORT_LIB_BASE_NAME) ;
|
||||
flags $(CURR_TOOLSET) FINDLIBS <stlport-iostream>on/<runtime-build>debug/<runtime-link>static : $(STLPORT_LIB_BASE_NAME)$(STLPORT_LIB_DEBUG_SUFFIX)$(STLPORT_LIB_STATIC_SUFFIX) ;
|
||||
flags $(CURR_TOOLSET) FINDLIBS <stlport-iostream>on/<runtime-build>debug/<runtime-link>dynamic : $(STLPORT_LIB_BASE_NAME)$(STLPORT_LIB_DEBUG_SUFFIX) ;
|
||||
flags $(CURR_TOOLSET) FINDLIBS <stlport-iostream>on/<runtime-build>release/<runtime-link>static : $(STLPORT_LIB_BASE_NAME)$(STLPORT_LIB_STATIC_SUFFIX) ;
|
||||
flags $(CURR_TOOLSET) FINDLIBS <stlport-iostream>on/<runtime-build>release/<runtime-link>dynamic : $(STLPORT_LIB_BASE_NAME) ;
|
||||
|
||||
Reference in New Issue
Block a user