boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-20 15:52:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change PDF URL to SF download page.

Browse Source 
Merge 64-bit ICU Jamfile patch.

[SVN r67531]
This commit is contained in:
John Maddock
2011-01-01 13:08:10 +00:00
parent 7170423870
commit ec3dbbf5d6
83 changed files with 761 additions and 1049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
build/Jamfile.v2
View File

@ -12,6 +12,21 @@ project : requirements
local disable-icu = [ MATCH (--disable-icu) : [ modules.peek : ARGV ] ] ;
rule path_options ( properties * )
{
local result ;
if <address-model>64 in $(properties)
{
result = <search>$(ICU_PATH)/bin64 <search>$(ICU_PATH)/lib64 ;
}
else
{
result = <search>$(ICU_PATH)/bin <search>$(ICU_PATH)/lib ;
}
return $(result) ;
}
#
# ICU configuration:
#
@ -33,24 +48,46 @@ if ! $(disable-icu)
}
else
{
lib icuuc : : <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
lib icuuc : : <link>shared <runtime-link>shared <conditional>@path_options ;
lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <link>shared <runtime-link>shared <conditional>@path_options ;
lib icuuc : : <name>this_is_an_invalid_library_name ;
lib icudt : : <search>$(ICU_PATH)/lib <name>icudata <link>shared <runtime-link>shared ;
lib icudt : : <search>$(ICU_PATH)/lib <name>icudt <toolset>msvc <link>shared <runtime-link>shared ;
lib icudt : : <name>icudata <link>shared <runtime-link>shared <conditional>@path_options ;
lib icudt : : <name>icudt <toolset>msvc <link>shared <runtime-link>shared <conditional>@path_options ;
lib icudt : : <name>this_is_an_invalid_library_name ;
lib icuin : : <search>$(ICU_PATH)/lib <name>icui18n <link>shared <runtime-link>shared ;
lib icuin : : <toolset>msvc <variant>debug <name>icuind <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
lib icuin : : <toolset>msvc <variant>release <name>icuin <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
lib icuin : : <name>icui18n <link>shared <runtime-link>shared <conditional>@path_options ;
lib icuin : : <toolset>msvc <variant>debug <name>icuind <link>shared <runtime-link>shared <conditional>@path_options ;
lib icuin : : <toolset>msvc <variant>release <name>icuin <link>shared <runtime-link>shared <conditional>@path_options ;
lib icuin : : <name>this_is_an_invalid_library_name ;
if $(ICU_PATH)
{
icuucd_name = [ GLOB $(ICU_PATH)/bin : icuuc??d.dll ] ;
if ! $(icuucd_name)
{
icuucd_name = [ GLOB $(ICU_PATH)/bin64 : icuuc??d.dll ] ;
}
icuuc_name = [ GLOB $(ICU_PATH)/bin : icuuc??.dll ] ;
if ! $(icuuc_name)
{
icuuc_name = [ GLOB $(ICU_PATH)/bin64 : icuuc??.dll ] ;
}
icudt_name = [ GLOB $(ICU_PATH)/bin : icudt??.dll ] ;
if ! $(icudt_name)
{
icudt_name = [ GLOB $(ICU_PATH)/bin64 : icudt??.dll ] ;
}
icuin_name = [ GLOB $(ICU_PATH)/bin : icuin??.dll ] ;
if ! $(icuin_name)
{
icuin_name = [ GLOB $(ICU_PATH)/bin64 : icuin??.dll ] ;
}
icuind_name = [ GLOB $(ICU_PATH)/bin : icuin??d.dll ] ;
if ! $(icuind_name)
{
icuind_name = [ GLOB $(ICU_PATH)/bin64 : icuin??d.dll ] ;
}
#ECHO $(icuucd_name:B) $(icuuc_name:B) $(icudt_name:B) $(icuin_name:B) $(icuind_name:B) ;
}
@ -60,7 +97,6 @@ if ! $(disable-icu)
<library>icuuc/<link>shared/<runtime-link>shared
<library>icudt/<link>shared/<runtime-link>shared
<library>icuin/<link>shared/<runtime-link>shared
<dll-path>$(ICU_PATH)/bin
<define>BOOST_HAS_ICU=1
<runtime-link>shared
<toolset>msvc:<linkflags>/delayload:$(icuucd_name:B).dll
@ -112,3 +148,6 @@ boost-install boost_regex ;