mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-25 10:57:56 +08:00
101 lines
3.2 KiB
Diff
101 lines
3.2 KiB
Diff
|
---
|
||
|
|
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
|
||
|
|
|