diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-12 09:33:09 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-12 09:33:09 +0000 |
| commit | aa277a6c50354445a8733d63764ec2689378c6e1 (patch) | |
| tree | 6671c3bc4916fcc42bdf5595d4b97f7027686159 /icu | |
| parent | 7f214d00c8b5baf2a83c0bee739271dd191f99cb (diff) | |
INTEGRATION: CWS mh11rc (1.10.14); FILE MERGED
2003/06/06 09:19:21 mh 1.10.14.1: join: from beta2
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 691e3bdc0bb7..3fda20ba81a1 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: vg $ $Date: 2003-06-04 10:41:41 $ +# last change: $Author: vg $ $Date: 2003-06-12 10:33:09 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -129,13 +129,16 @@ OUT2LIB= \ .IF "$(GUI)"=="WNT" CONFIGURE_DIR=source .IF "$(USE_SHELL)"=="4nt" +BUILD_ACTION_SEP=^ CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.bat .ELSE # "$(USE_SHELL)"=="4nt" +BUILD_ACTION_SEP=; CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.sh .ENDIF # "$(USE_SHELL)"=="4nt" BUILD_DIR=source .IF "$(COMEX)"=="8" -BUILD_ACTION=wdevenv allinone$/allinone Release +CONFIGURE_ACTION+= $(BUILD_ACTION_SEP) wdevenv allinone$/allinone Release +BUILD_ACTION=devenv allinone$/allinone.sln /build Release /project all /useenv .ELSE BUILD_ACTION=msdev allinone$/allinone.dsw /useenv /MAKE "all - Win32 Release" .ENDIF |