blob: ee175be6951f4177da363683b005b9c2ade04100 (
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
|
We don't want this for TeX Live cross compilation.
*** source/config/mh-mingw~ Mon Oct 1 15:39:56 2018
--- source/config/mh-mingw Tue Jan 8 10:16:08 2019
***************
*** 71,95 ****
STATIC_O = ao
- ifeq ($(ENABLE_SHARED),YES)
- SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR)
- else
- SO_TARGET_VERSION_SUFFIX =
- endif
-
- # Static library prefix and file extension
- LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
- A = a
-
## An import library is needed for z/OS and MSVC
IMPORT_LIB_EXT = .dll.a
- LIBPREFIX=lib
-
- # Change the stubnames so that poorly working FAT disks and installation programs can work.
- # This is also for backwards compatibility.
- DATA_STUBNAME = dt
- I18N_STUBNAME = in
- LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
-
#SH### copied from Makefile.inc
#SH## for icu-config to test with
--- 71,77 ----
--- source/i18n/unicode/numberrangeformatter.h (revision 49992)
+++ source/i18n/unicode/numberrangeformatter.h (working copy)
@@ -185,7 +185,7 @@
* Export an explicit template instantiation. See datefmt.h
* (When building DLLs for Windows this is required.)
*/
-#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM <= U_PF_CYGWIN && !defined(U_IN_DOXYGEN)
+#if U_PF_WINDOWS <= U_PLATFORM && U_PLATFORM < U_PF_MINGW && !defined(U_IN_DOXYGEN) && defined(X)
template struct U_I18N_API std::atomic<impl::NumberRangeFormatterImpl*>;
#endif
/** \endcond */
|