diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:00:31 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:00:31 +0000 |
| commit | 75fa944e86b69cb04f84df28501f310440feed7d (patch) | |
| tree | 294b47b3caff370691941948933b495c44e87cb3 /icu/makefile.mk | |
| parent | f1322352cc9f219bcb7b4c06d14a165fdc301d18 (diff) | |
INTEGRATION: CWS obo05 (1.29.10); FILE MERGED
2006/09/19 14:28:12 vq 1.29.10.4: #i69592# Remove $(EMQ)s again.
2006/09/19 08:54:34 obo 1.29.10.3: #i53611#,#i69592# buildable for 4nt and w32 bash
2006/09/16 17:29:21 vq 1.29.10.2: #i69592# Quote " for bash/tcsh.
2006/08/31 11:44:03 obo 1.29.10.1: #i53611# build 2003+2005
Diffstat (limited to 'icu/makefile.mk')
| -rw-r--r-- | icu/makefile.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index d84f429ae66e..82f40d3457ef 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.29 $ +# $Revision: 1.30 $ # -# last change: $Author: rt $ $Date: 2006-03-07 17:08:03 $ +# last change: $Author: vg $ $Date: 2006-09-25 13:00:31 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -152,8 +152,14 @@ ICU_BUILD_LIBPOST=d ICU_BUILD_VERSION=Release ICU_BUILD_LIBPOST= .ENDIF + CONFIGURE_ACTION+= $(COPY) ..$/..$/..$/..$/..$/makefiles.zip . $(BUILD_ACTION_SEP) unzip makefiles.zip -BUILD_ACTION=cd allinone$/all && cmd /c nmake /f all.mak CFG="all - Win32 Release" && cd ..$/.. + +.IF "$(CCNUMVER)"<="001400000000" +BUILD_ACTION=cd allinone$/all && cmd /c nmake /f all.mak CFG="all - Win32 Release" EXCEPTIONSWITCH="-EHsc" && cd ..$/.. +.ELSE +BUILD_ACTION=cd allinone$/all && cmd /c nmake /f all.mak CFG="all - Win32 Release" EXCEPTIONSWITCH="-EHa -Zc:wchar_t-" && cd ..$/.. +.ENDIF OUT2LIB= \ $(BUILD_DIR)$/..$/lib$/icudata.lib \ |