feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Yes another attempt to fix the 64-bit paths issue.

Browse Source 
Refs #4864.

[SVN r66699]
This commit is contained in:
John Maddock
2010-11-23 13:09:08 +00:00
parent dd9d022d7c
commit b60171bdcf
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
build/Jamfile.v2
View File

@ -12,18 +12,17 @@ project : requirements
local disable-icu = [ MATCH (--disable-icu) : [ modules.peek : ARGV ] ] ; local disable-icu = [ MATCH (--disable-icu) : [ modules.peek : ARGV ] ] ;
rule dll-path_options ( properties * ) rule path_options ( properties * )
{ {
local result ; local result ;
if <address-model>64 in $(properties) if <address-model>64 in $(properties)
{ {
result = <dll-path>$(ICU_PATH)/bin64 ; result = <search>$(ICU_PATH)/bin64 <search>$(ICU_PATH)/lib64 ;
} }
else else
{ {
result = <dll-path>$(ICU_PATH)/bin ; result = <search>$(ICU_PATH)/bin <search>$(ICU_PATH)/lib ;
} }
ECHO $(result) ;
return $(result) ; return $(result) ;
} }
@ -49,24 +48,17 @@ if ! $(disable-icu)
} }
else else
{ {
lib icuuc : : <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ; lib icuuc : : <link>shared <runtime-link>shared <conditional>@path_options ;
lib icuuc : : <address-model>64 <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ; lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <link>shared <runtime-link>shared <conditional>@path_options ;
lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
lib icuuc : : <address-model>64 <toolset>msvc <variant>debug <name>icuucd <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
lib icuuc : : <name>this_is_an_invalid_library_name ; lib icuuc : : <name>this_is_an_invalid_library_name ;
lib icudt : : <search>$(ICU_PATH)/lib <name>icudata <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ; lib icudt : : <name>icudata <link>shared <runtime-link>shared <conditional>@path_options ;
lib icudt : : <address-model>64 <search>$(ICU_PATH)/lib64 <name>icudata <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ; lib icudt : : <name>icudt <toolset>msvc <link>shared <runtime-link>shared <conditional>@path_options ;
lib icudt : : <search>$(ICU_PATH)/lib <name>icudt <toolset>msvc <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
lib icudt : : <address-model>64 <search>$(ICU_PATH)/lib64 <name>icudt <toolset>msvc <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
lib icudt : : <name>this_is_an_invalid_library_name ; lib icudt : : <name>this_is_an_invalid_library_name ;
lib icuin : : <search>$(ICU_PATH)/lib <name>icui18n <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ; lib icuin : : <name>icui18n <link>shared <runtime-link>shared <conditional>@path_options ;
lib icuin : : <address-model>64 <search>$(ICU_PATH)/lib64 <name>icui18n <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ; lib icuin : : <toolset>msvc <variant>debug <name>icuind <link>shared <runtime-link>shared <conditional>@path_options ;
lib icuin : : <toolset>msvc <variant>debug <name>icuind <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ; lib icuin : : <toolset>msvc <variant>release <name>icuin <link>shared <runtime-link>shared <conditional>@path_options ;
lib icuin : : <address-model>64 <toolset>msvc <variant>debug <name>icuind <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
lib icuin : : <toolset>msvc <variant>release <name>icuin <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
lib icuin : : <address-model>64 <toolset>msvc <variant>release <name>icuin <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
lib icuin : : <name>this_is_an_invalid_library_name ; lib icuin : : <name>this_is_an_invalid_library_name ;
if $(ICU_PATH) if $(ICU_PATH)
@ -106,7 +98,6 @@ if ! $(disable-icu)
<library>icudt/<link>shared/<runtime-link>shared <library>icudt/<link>shared/<runtime-link>shared
<library>icuin/<link>shared/<runtime-link>shared <library>icuin/<link>shared/<runtime-link>shared
<define>BOOST_HAS_ICU=1 <define>BOOST_HAS_ICU=1
<dll-path>$(ICU_PATH)/bin
<runtime-link>shared <runtime-link>shared
<toolset>msvc:<linkflags>/delayload:$(icuucd_name:B).dll <toolset>msvc:<linkflags>/delayload:$(icuucd_name:B).dll
<toolset>msvc:<linkflags>/delayload:$(icuuc_name:B).dll <toolset>msvc:<linkflags>/delayload:$(icuuc_name:B).dll