summaryrefslogtreecommitdiffstats
path: root/icu/makefile.mk
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2009-01-20 16:36:21 +0000
committerVladimir Glazounov <vg@openoffice.org>2009-01-20 16:36:21 +0000
commitb38a5bc3e85aa1bef61cb4cafd58ba1c09c752e3 (patch)
tree03b2d6aa211d4dc61baa0253469de158628215c2 /icu/makefile.mk
parentCWS-TOOLING: integrate CWS cloph12 (diff)
downloadcore-b38a5bc3e85aa1bef61cb4cafd58ba1c09c752e3.tar.gz
core-b38a5bc3e85aa1bef61cb4cafd58ba1c09c752e3.zip
CWS-TOOLING: integrate CWS mingwport16
2009-01-15 13:11:20 +0100 releng r266363 : tidy-up tabs 2008-11-28 15:33:23 +0100 tono r264557 : i95203: mingw build without stlport 2008-11-22 07:19:50 +0100 tono r264180 : i96436: make mingw bridge conform with reg-struct-return 2008-11-22 05:14:58 +0100 tono r264179 : i96436: make mingw bridge conform with reg-struct-return 2008-11-21 17:09:04 +0100 tono r264153 : i95203: mingw build without stlport 2008-11-21 16:59:55 +0100 tono r264152 : i96436: make mingw bridge conform with reg-struct-return 2008-11-21 16:59:18 +0100 tono r264151 : i96436: make mingw bridge conform with reg-struct-return 2008-11-21 16:57:01 +0100 tono r264150 : i96436: make mingw bridge conform with reg-struct-return 2008-11-21 16:53:19 +0100 tono r264149 : i96100: mingw port for icu 4.0 2008-11-13 13:41:13 +0100 tono r263643 : i95203: mingw: Build without stlport 2008-11-13 13:29:38 +0100 tono r263640 : i96100: MinGW port for icu 4.0 2008-11-13 13:17:10 +0100 tono r263634 : i96098: MinGW port fix for new Windows API 2008-11-09 15:22:59 +0100 tono r263497 : i95198: mingwport do not interfere with Cygwin 2008-11-09 14:44:54 +0100 tono r263496 : i95190: mingwport avoid use of MS assembler 2008-11-09 14:32:26 +0100 tono r263495 : i95190: mingwport trivial build fixes
Diffstat (limited to 'icu/makefile.mk')
-rw-r--r--icu/makefile.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 5a1a1d258f63..b042ede5a29e 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -144,10 +144,11 @@ OUT2BIN= \
.IF "$(GUI)"=="WNT"
CONFIGURE_DIR=source
.IF "$(COM)"=="GCC"
+CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ;
.IF "$(USE_MINGW)"=="cygwin"
-CONFIGURE_ACTION=+sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api -L$(COMPATH)$/lib" LIBS="-lmingwthrd" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
+CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api -L$(COMPATH)$/lib" LIBS="-lmingwthrd" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
.ELSE
-CONFIGURE_ACTION=+sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="-L$(COMPATH)$/lib" LIBS="-lmingwthrd" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
+CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="-L$(COMPATH)$/lib" LIBS="-lmingwthrd" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
.ENDIF
#CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no