| OLD | NEW |
| 1 ## -*-makefile-*- | 1 ## -*-makefile-*- |
| 2 ## Cygwin-specific setup | 2 ## Cygwin64-specific setup |
| 3 ## Copyright (c) 2001-2010, International Business Machines Corporation and | 3 ## Copyright (c) 2014, International Business Machines Corporation and |
| 4 ## others. All Rights Reserved. | 4 ## others. All Rights Reserved. |
| 5 | 5 |
| 6 ## Commands to generate dependency files | 6 ## Commands to generate dependency files |
| 7 GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) | 7 GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) |
| 8 GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) | 8 GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) |
| 9 | 9 |
| 10 ## Flags to create/use a static library | 10 ## Flags to create/use a static library |
| 11 ifneq ($(ENABLE_SHARED),YES) | 11 ifneq ($(ENABLE_SHARED),YES) |
| 12 ## Make sure that the static libraries can be built and used | 12 ## Make sure that the static libraries can be built and used |
| 13 CPPFLAGS += -DU_STATIC_IMPLEMENTATION | 13 CPPFLAGS += -DU_STATIC_IMPLEMENTATION |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 # LDflags that pkgdata will use | 109 # LDflags that pkgdata will use |
| 110 BIR_LDFLAGS= -Wl,-Bsymbolic | 110 BIR_LDFLAGS= -Wl,-Bsymbolic |
| 111 | 111 |
| 112 # Dependencies [i.e. map files] for the final library | 112 # Dependencies [i.e. map files] for the final library |
| 113 BIR_DEPS= | 113 BIR_DEPS= |
| 114 | 114 |
| 115 # Environment variable to set a runtime search path | 115 # Environment variable to set a runtime search path |
| 116 LDLIBRARYPATH_ENVVAR = PATH | 116 LDLIBRARYPATH_ENVVAR = PATH |
| 117 | 117 |
| 118 # The type of assembly to write for generating an object file | 118 # The type of assembly to write for generating an object file |
| 119 GENCCODE_ASSEMBLY=-a gcc-cygwin | 119 GENCCODE_ASSEMBLY=-a gcc-mingw64 |
| 120 | 120 |
| 121 # put this here again so it gets cyguc... | 121 # put this here again so it gets cyguc... |
| 122 | 122 |
| 123 #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.$
{SO}" | 123 #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.$
{SO}" |
| 124 | 124 |
| 125 # for icu-config | 125 # for icu-config |
| 126 | 126 |
| 127 #SH### copied from Makefile.inc | 127 #SH### copied from Makefile.inc |
| 128 #SH#ICULIBS_COMMON="-l${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" | 128 #SH#ICULIBS_COMMON="-l${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" |
| 129 #SH#ICULIBS_DATA="-l${LIBICU}${DATA_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSI
ON}" | 129 #SH#ICULIBS_DATA="-l${LIBICU}${DATA_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSI
ON}" |
| 130 #SH#ICULIBS_I18N="-l${LIBICU}${I18N_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSI
ON}" | 130 #SH#ICULIBS_I18N="-l${LIBICU}${I18N_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSI
ON}" |
| 131 #SH#ICULIBS_TOOLUTIL="-l${LIBICU}tu${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" | 131 #SH#ICULIBS_TOOLUTIL="-l${LIBICU}tu${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" |
| 132 #SH#ICULIBS_CTESTFW="-l${LIBICU}ctestfw${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" | 132 #SH#ICULIBS_CTESTFW="-l${LIBICU}ctestfw${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" |
| 133 #SH#ICULIBS_ICUIO="-l${LIBICU}io${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" | 133 #SH#ICULIBS_ICUIO="-l${LIBICU}io${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" |
| 134 #SH#ICULIBS_OBSOLETE="-l${LIBICU}obsolete${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" | 134 #SH#ICULIBS_OBSOLETE="-l${LIBICU}obsolete${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" |
| 135 #SH#ICULIBS_LAYOUT="-l${LIBICU}le${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" | 135 #SH#ICULIBS_LAYOUT="-l${LIBICU}le${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" |
| 136 #SH#ICULIBS_LAYOUTEX="-l${LIBICU}lx${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" | 136 #SH#ICULIBS_LAYOUTEX="-l${LIBICU}lx${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}" |
| 137 #SH#ICULIBS_BASE="${LIBS} -L${libdir}" | 137 #SH#ICULIBS_BASE="${LIBS} -L${libdir}" |
| 138 #SH#ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA}" | 138 #SH#ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA}" |
| 139 | 139 |
| 140 ## End Cygwin-specific setup | 140 ## End Cygwin-specific setup |
| 141 | 141 |
| OLD | NEW |