diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-06-01 08:04:58 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-06-01 08:04:58 +0000 |
| commit | 960ceb5caff91fa75a7e454680bac93328454f69 (patch) | |
| tree | 183f512316edb52b0ed32b26db876d9478d682e0 /stoc | |
| parent | 1c13c37726156d059e7014a422aec67b37aa233d (diff) | |
INTEGRATION: CWS jl6 (1.16.60); FILE MERGED
2004/05/03 10:39:18 jl 1.16.60.3: #i20052#
2004/04/28 10:59:27 jl 1.16.60.2: #i20052#
2004/02/19 09:47:18 jl 1.16.60.1: #1150008#
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/javavm/makefile.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk index fc65afcc460e..20a48924f482 100644 --- a/stoc/source/javavm/makefile.mk +++ b/stoc/source/javavm/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: rt $ $Date: 2003-04-23 16:10:41 $ +# last change: $Author: obo $ $Date: 2004-06-01 09:04:58 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -87,7 +87,7 @@ CDEFS += -D__SGI_STL_BOOL_H SLOFILES= \ $(SLO)$/javavm.obj \ $(SLO)$/jvmargs.obj \ - $(SLO)$/interact.obj + $(SLO)$/interact.obj .IF "$(COM)"=="C52" # Code generation bug in conjunction with exception handling @@ -105,7 +105,8 @@ SHL1STDLIBS= \ $(UNOLIB) \ $(SALLIB) \ $(JVMACCESSLIB) \ - $(SALHELPERLIB) + $(SALHELPERLIB) \ + $(JVMFWKLIB) .IF "$(GUI)"=="WNT" SHL1STDLIBS += advapi32.lib |