diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:41:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:41:41 +0000 |
| commit | 1835de0ba3e976bd5c1ce3ea9f90ab9b27145cad (patch) | |
| tree | 968eb2fe5a06a65689c9981ef1588fdd04424aed /icu | |
| parent | af8d0f0d861a60604b340b81e3c359359942a26b (diff) | |
INTEGRATION: CWS mingwport03 (1.29.20); FILE MERGED
2007/03/19 15:35:19 vg 1.29.20.4: RESYNC: (1.31-1.33); FILE MERGED
2007/01/08 20:04:10 vg 1.29.20.3: RESYNC: (1.30-1.31); FILE MERGED
2006/11/08 11:36:15 vg 1.29.20.2: RESYNC: (1.29-1.30); FILE MERGED
2006/09/13 14:49:23 vg 1.29.20.1: #i53572# MinGW port
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index cb65bb6b7b24..9739d44e54bc 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.34 $ +# $Revision: 1.35 $ # -# last change: $Author: ihi $ $Date: 2007-03-26 12:25:49 $ +# last change: $Author: vg $ $Date: 2007-03-26 13:41:41 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -127,6 +127,49 @@ OUT2BIN= \ .IF "$(GUI)"=="WNT" CONFIGURE_DIR=source +.IF "$(COM)"=="GCC" +CONFIGURE_ACTION=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(SOLARLIB) -L$(COMPATH)$/lib" LIBS="-lmingwthrd" ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no' + +#CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no +CONFIGURE_FLAGS= + +# Use of +# CONFIGURE_ACTION=sh -c 'CFLAGS=-O CXXFLAGS=-O ./configure' +# CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no +# doesn't work as it would result in +# sh -c 'CFLAGS=-O CXXFLAGS=-O ./configure' --enable-layout ... +# note the position of the single quotes. + +BUILD_DIR=$(CONFIGURE_DIR) +BUILD_ACTION=$(GNUMAKE) +OUT2LIB= \ + $(BUILD_DIR)$/data$/out$/libicudata_static.a \ + $(BUILD_DIR)$/common$/libicuuc_static.a \ + $(BUILD_DIR)$/i18n$/libicui18n_static.a \ + $(BUILD_DIR)$/layout$/libicule_static.a \ + $(BUILD_DIR)$/tools$/toolutil$/libicutoolutil_static.a + +OUT2BIN= \ + $(BUILD_DIR)$/data$/out$/libicudata26.0$(DLLPOST) \ + $(BUILD_DIR)$/data$/out$/libicudata26$(DLLPOST) \ + $(BUILD_DIR)$/data$/out$/libicudata$(DLLPOST) \ + $(BUILD_DIR)$/common$/libicuuc26.0$(DLLPOST) \ + $(BUILD_DIR)$/common$/libicuuc26$(DLLPOST) \ + $(BUILD_DIR)$/common$/libicuuc$(DLLPOST) \ + $(BUILD_DIR)$/i18n$/libicui18n26.0$(DLLPOST) \ + $(BUILD_DIR)$/i18n$/libicui18n26$(DLLPOST) \ + $(BUILD_DIR)$/i18n$/libicui18n$(DLLPOST) \ + $(BUILD_DIR)$/layout$/libicule26.0$(DLLPOST) \ + $(BUILD_DIR)$/layout$/libicule26$(DLLPOST) \ + $(BUILD_DIR)$/layout$/libicule$(DLLPOST) \ + $(BUILD_DIR)$/tools$/toolutil$/libicutoolutil26.0$(DLLPOST) \ + $(BUILD_DIR)$/tools$/toolutil$/libicutoolutil26$(DLLPOST) \ + $(BUILD_DIR)$/tools$/toolutil$/libicutoolutil$(DLLPOST) \ + $(BUILD_DIR)$/tools$/genccode$/genccode.exe \ + $(BUILD_DIR)$/tools$/genbrk$/genbrk.exe \ + $(BUILD_DIR)$/tools$/gencmn$/gencmn.exe + +.ELSE .IF "$(USE_SHELL)"=="4nt" BUILD_ACTION_SEP=^ .ELSE # "$(USE_SHELL)"=="4nt" @@ -184,6 +227,7 @@ OUT2BIN= \ $(BUILD_DIR)$/..$/bin$/genbrk.exe \ $(BUILD_DIR)$/..$/bin$/gencmn.exe +.ENDIF .ENDIF # "$(GUI)"=="WNT" # --- Targets ------------------------------------------------------ |