ICU-66108.tar.gz

[apple/icu.git] / icuSources / config / mh-mingw64

diff --git a/icuSources/config/mh-mingw64 b/icuSources/config/mh-mingw64
index 188d2aa7482e2ded434e3032e41ea4bd527dc0d7..456997a5e949f8da2bc5d0cfe70137f021d1a82b 100644 (file)
--- a/icuSources/config/mh-mingw64
+++ b/icuSources/config/mh-mingw64
@@ -28,6 +28,10 @@ else
 STATICCPPFLAGS = -DU_STATIC_IMPLEMENTATION
 endif
 
+## ICU requires a minimum target of Windows 7, and MinGW does not set this by default.
+## https://msdn.microsoft.com/en-us/library/aa383745.aspx
+CPPFLAGS += -DWINVER=0x0601 -D_WIN32_WINNT=0x0601
+
 ## Flags for position independent code
 SHAREDLIBCFLAGS = 
 SHAREDLIBCXXFLAGS = 
@@ -38,6 +42,11 @@ THREADSCFLAGS = -mthreads
 THREADSCXXFLAGS = -mthreads
 LIBCPPFLAGS =
 
+## Add 'd' suffix to the names of binary files with Debug configuration
+ifeq ($(ENABLE_DEBUG),1)
+ICULIBSUFFIX:=$(ICULIBSUFFIX)d#M#
+endif
+
 # Commands to link. Link with C++ in case static libraries are used.
 LINK.c=       $(CXX) $(CXXFLAGS) $(LDFLAGS)
 #LINK.cc=      $(CXX) $(CXXFLAGS) $(LDFLAGS)
@@ -94,13 +103,29 @@ LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
 #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. 
 #SH#ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
 
-# The #M# is used to delete lines for icu-config
-# Current full path directory.
-#CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS
-CURR_FULL_DIR?=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
-# Current full path directory for use in source code in a -D compiler option.
-#CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS
-CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
+# Note: The #M# is used to delete lines for icu-config
+MSYS_VERSION ?= $(if $(findstring Msys, $(shell uname -o)),$(word 1, $(subst ., ,$(shell uname -r))),0)#M#
+$(info Detected MSYS version: $(MSYS_VERSION))
+
+ifeq ($(MSYS_VERSION),$(filter $(MSYS_VERSION),0 1))
+       # Older versions of MSYS don't have cygpath by default. #M#
+       
+       # Current full path directory. #M#
+       #CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS
+       CURR_FULL_DIR?=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell 
+
+       # Current full path directory for use in source code in a -D compiler option. #M#
+       #CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS
+       CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
+else
+       # MSYS2 and up have cygpath by default #M#
+
+       # Current full path directory. #M#
+       CURR_FULL_DIR?=$(shell cygpath . -a -m)#M#
+
+       # Current full path directory for use in source code in a -D compiler option. #M#
+       CURR_SRCCODE_FULL_DIR=$(shell cygpath . -a -m)#M#
+endif
 
 ## Compilation rules
 %.$(STATIC_O): $(srcdir)/%.c