diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:32:20 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:32:20 +0000 |
| commit | 9d635de144f1bfdf30d658233d05d865e6574eb2 (patch) | |
| tree | e32554d69cead6dd04ec194e5beeacd55176bd6d /jvmfwk/source | |
| parent | 8ffff706ae7457a363eb40c35151c64be0bb3e42 (diff) | |
INTEGRATION: CWS os2port01 (1.9.70); FILE MERGED
2007/07/17 10:37:41 obr 1.9.70.2: RESYNC: (1.9-1.11); FILE MERGED
2006/12/28 15:00:58 ydario 1.9.70.1: OS/2 initial import.
Diffstat (limited to 'jvmfwk/source')
| -rw-r--r-- | jvmfwk/source/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk index 58cd9025098d..d3880cae021b 100644 --- a/jvmfwk/source/makefile.mk +++ b/jvmfwk/source/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: vg $ $Date: 2007-03-26 13:17:50 $ +# last change: $Author: vg $ $Date: 2007-09-20 14:32:20 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -39,7 +39,7 @@ FRAMEWORKLIB=jvmfwk TARGET = $(FRAMEWORKLIB) ENABLE_EXCEPTIONS = TRUE -.IF "$(OS)" != "WNT" +.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2" UNIXVERSIONNAMES = UDK .ENDIF # WNT @@ -83,7 +83,7 @@ DEF1NAME = $(SHL1TARGET) .IF "$(GUI)"=="UNX" RCFILE=$(BIN)$/jvmfwk3rc -.ELIF "$(GUI)"=="WNT" +.ELIF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" RCFILE=$(BIN)$/jvmfwk3.ini .END |