Changeset 66659


Ignore:
Timestamp:
Nov 21, 2010, 6:40:59 PM (7 years ago)
Author:
John Maddock
Message:

Another attempt at fixing 64-bit ICU support.
dll-path for 64-bit builds still isn't set correctly.
Refs #4864.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/libs/regex/build/Jamfile.v2

    r66640 r66659  
    1212
    1313local disable-icu = [ MATCH (--disable-icu) : [ modules.peek : ARGV ] ] ;
     14
     15rule dll-path_options ( properties * )
     16{
     17    local result ;
     18    if <address-model>64 in $(properties)
     19    {
     20        result = <dll-path>$(ICU_PATH)/bin64 ;
     21    }
     22    else
     23    {
     24        result = <dll-path>$(ICU_PATH)/bin ;
     25    }
     26    ECHO $(result) ;
     27    return $(result) ;
     28}
     29
    1430
    1531#
     
    3450   else
    3551   {
    36       lib icuuc : : <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
    37       lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
     52      lib icuuc : :                   <search>$(ICU_PATH)/lib   <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
     53      lib icuuc : : <address-model>64 <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
     54      lib icuuc : :                   <toolset>msvc <variant>debug <name>icuucd <search>$(ICU_PATH)/lib   <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
     55      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 ;
    3856      lib icuuc : : <name>this_is_an_invalid_library_name ;
    39       lib icudt : : <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <name>icudata <link>shared <runtime-link>shared ;
    40       lib icudt : : <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <name>icudt <toolset>msvc <link>shared <runtime-link>shared ;
     57
     58      lib icudt : :                   <search>$(ICU_PATH)/lib   <name>icudata <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
     59      lib icudt : : <address-model>64 <search>$(ICU_PATH)/lib64 <name>icudata <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
     60      lib icudt : :                   <search>$(ICU_PATH)/lib   <name>icudt <toolset>msvc <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
     61      lib icudt : : <address-model>64 <search>$(ICU_PATH)/lib64 <name>icudt <toolset>msvc <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
    4162      lib icudt : : <name>this_is_an_invalid_library_name ;
    42       lib icuin : : <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <name>icui18n <link>shared <runtime-link>shared ;
    43       lib icuin : : <toolset>msvc <variant>debug <name>icuind <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
    44       lib icuin : : <toolset>msvc <variant>release <name>icuin <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
     63
     64      lib icuin : :                   <search>$(ICU_PATH)/lib   <name>icui18n <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
     65      lib icuin : : <address-model>64 <search>$(ICU_PATH)/lib64 <name>icui18n <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
     66      lib icuin : :                   <toolset>msvc <variant>debug <name>icuind <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
     67      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 ;
     68      lib icuin : :                   <toolset>msvc <variant>release <name>icuin <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
     69      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 ;
    4570      lib icuin : : <name>this_is_an_invalid_library_name ;
    4671
     
    81106         <library>icudt/<link>shared/<runtime-link>shared
    82107         <library>icuin/<link>shared/<runtime-link>shared
    83          <dll-path>$(ICU_PATH)/bin
    84108         <define>BOOST_HAS_ICU=1
     109         <dll-path>$(ICU_PATH)/bin
    85110         <runtime-link>shared
    86111         <toolset>msvc:<linkflags>/delayload:$(icuucd_name:B).dll
     
    133158
    134159
     160
     161
     162
Note: See TracChangeset for help on using the changeset viewer.