blob: cd02f742e93bfc936b7a0b029a9103d0baf242fe (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
---
libs/locale/build/Jamfile.v2 | 63 ++++++--------------------------------
libs/locale/build/has_icu_test.cpp | 4 ---
libs/regex/build/Jamfile.v2 | 47 +++++++---------------------
3 files changed, 20 insertions(+), 94 deletions(-)
diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2
index 578e722..5f25917 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -70,62 +70,17 @@ if $(ICU_LINK)
}
else
{
- searched-lib icuuc : : <name>icuuc
- <search>$(ICU_PATH)/lib
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuuc : : <toolset>msvc
- <variant>debug
- <name>icuucd
- <search>$(ICU_PATH)/lib
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuuc : : <name>this_is_an_invalid_library_name ;
-
- searched-lib icudt : : <search>$(ICU_PATH)/lib
- <name>icudata
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icudt : : <search>$(ICU_PATH)/lib
- <name>icudt
- <toolset>msvc
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icudt : : <name>this_is_an_invalid_library_name ;
-
- searched-lib icuin : : <search>$(ICU_PATH)/lib
- <name>icui18n
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuin : : <toolset>msvc
- <variant>debug
- <name>icuind
- <search>$(ICU_PATH)/lib
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuin : : <toolset>msvc
- <variant>release
- <name>icuin
- <search>$(ICU_PATH)/lib
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuin : : <name>this_is_an_invalid_library_name ;
-
- explicit icuuc icudt icuin ;
+ alias icuuc : /user-config//icuuc ;
+ alias icuin : /user-config//icuin ;
+ alias icudt : /user-config//icudt ;
+
+ explicit icuuc icuin icudt ;
ICU_OPTS = <include>$(ICU_PATH)/include
- <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
- <runtime-link>shared ;
+ <library>icuuc
+ <library>icuin
+ <library>icudt
+ <dll-path>$(ICU_PATH)/bin ;
diff --git a/libs/locale/build/has_icu_test.cpp b/libs/locale/build/has_icu_test.cpp
index 9419b30..ed9be05 100644
--- a/build/has_icu_test.cpp
+++ b/build/has_icu_test.cpp
@@ -15,10 +15,6 @@
#include <unicode/uchar.h>
#include <unicode/coll.h>
-#if defined(_MSC_VER) && !defined(_DLL)
-#error "Mixing ICU with a static runtime doesn't work"
-#endif
-
int main()
{
icu::Locale loc;
--
2.12.2.windows.2
|
