organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-10731 Fix import library name when building data on mingw

Browse source 
X-SVN-Rev: 36922
This commit is contained in:
Michael Ow 2015-01-06 23:08:18 +00:00
parent 179ab63238
commit bcdcc4dc67
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4c/source/data/Makefile.in
View file

@ -1,5 +1,5 @@
## Makefile.in for ICU data
## Copyright (c) 1999-2014, International Business Machines Corporation and
## Copyright (c) 1999-2015, International Business Machines Corporation and
## others. All Rights Reserved.
## Source directory information
@ -152,7 +152,7 @@ cleanfiles:
cleanpackage:
$(RMV) $(OUTDIR)
$(RMV) $(LIBDIR)/$(LIB_ICUDATA_NAME)*.$(SO)* $(LIBDIR)/$(LIB_STATIC_ICUDATA_NAME).$(A)
$(RMV) $(LIBDIR)/*$(LIB_ICUDATA_NAME)*.$(SO)* $(LIBDIR)/$(LIB_STATIC_ICUDATA_NAME).$(A)
check-local:

5
icu4c/source/tools/pkgdata/pkgdata.cpp
View file

@ -1,5 +1,5 @@
/******************************************************************************
* Copyright (C) 2000-2014, International Business Machines
* Copyright (C) 2000-2015, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
* file name: pkgdata.cpp
@ -888,7 +888,8 @@ static void createFileNames(UPKGOptions *o, const char mode, const char *version
}
#if U_PLATFORM == U_PF_MINGW
sprintf(libFileNames[LIB_FILE_MINGW], "%s%s.lib", pkgDataFlags[LIBPREFIX], libName);
// Name the import library lib*.dll.a
sprintf(libFileNames[LIB_FILE_MINGW], "lib%s.dll.a", libName);
#elif U_PLATFORM == U_PF_CYGWIN
sprintf(libFileNames[LIB_FILE_CYGWIN], "cyg%s%s%s",
libName,