diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-03-24 11:56:29 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-03-24 11:56:29 +0000 |
| commit | 7e99702f8e6a692ff8bcbfcfc1d81d2bd784584b (patch) | |
| tree | 28b05f25877a4c2a545f1c23139c911e9f83fb00 /icu/makefile.mk | |
| parent | eff57ef93e3d0d08eb19ff50440e05d6224a85a5 (diff) | |
CWS-TOOLING: integrate CWS obo36
2009-03-19 14:29:45 +0100 obo r269745 : #i71528#,#i96957# new build process for windows
2009-01-23 10:47:46 +0100 obo r266788 : CWS-TOOLING: rebase CWS obo36 to trunk@266428 (milestone: DEV300:m39)
Diffstat (limited to 'icu/makefile.mk')
| -rw-r--r-- | icu/makefile.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index da0836955c36..7c82f5c99013 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ icu_CFLAGS+=-I$(SYSBASE)$/usr$/include .IF "$(COMNAME)"=="sunpro5" icu_CFLAGS+=$(C_RESTRICTIONFLAGS) .ENDIF # "$(COMNAME)"=="sunpro5" -# add SYSBASE libraries and make certain that they are found *after* the +# add SYSBASE libraries and make certain that they are found *after* the # icu build internal libraries - in case that icu is available in SYSBASE # as well icu_LDFLAGS+= -L../../lib -L../../stubdata -L$(SYSBASE)$/usr$/lib @@ -209,12 +209,12 @@ ICU_BUILD_VERSION=Release ICU_BUILD_LIBPOST= .ENDIF -CONFIGURE_ACTION+= $(COPY:s/+//) ..$/..$/..$/..$/..$/makefiles.zip . $(BUILD_ACTION_SEP) unzip makefiles.zip +CONFIGURE_ACTION+= $(PERL) ..$/..$/..$/..$/..$/createmak.pl ..$/..$/..$/..$/..$/createmak.cfg . .IF "$(CCNUMVER)"<="001400000000" -BUILD_ACTION=cd allinone && nmake /f all.mak CFG="all - Win32 Release" EXFLAGS="-EHsc" && cd ..$/.. +BUILD_ACTION=cd allinone && nmake /f all.mak EXFLAGS="-EHsc" && cd ..$/.. .ELSE -BUILD_ACTION=cd allinone && nmake /f all.mak CFG="all - Win32 Release" EXFLAGS="-EHa -Zc:wchar_t-" && cd ..$/.. +BUILD_ACTION=cd allinone && nmake /f all.mak EXFLAGS="-EHa -Zc:wchar_t-" && cd ..$/.. .ENDIF OUT2LIB= \ |