diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-03-25 13:56:35 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-03-25 13:56:35 +0000 |
| commit | b08c7dea320f1bbd624fb524291ff3ac5dd66067 (patch) | |
| tree | c77f5c32966e107b73f912302e5dd67d6ed9772a /sj2 | |
| parent | a14ca2917b69b221c2956efc0eca04e842bdcf24 (diff) | |
INTEGRATION: CWS jl3 (1.6.32); FILE MERGED
2003/11/20 16:40:30 jl 1.6.32.1: #111907# replace TKTThreadAttach by jvmaccess::VirtualMachine, directory source/java is now empty
Diffstat (limited to 'sj2')
| -rw-r--r-- | sj2/util/makefile.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sj2/util/makefile.mk b/sj2/util/makefile.mk index 26856f78fb64..28b6bd8bec2d 100644 --- a/sj2/util/makefile.mk +++ b/sj2/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: vg $ $Date: 2003-04-15 13:43:54 $ +# last change: $Author: kz $ $Date: 2004-03-25 14:56:35 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -74,7 +74,6 @@ TARGETTYPE=GUI LIB1TARGET= $(SLB)$/$(TARGET).lib LIB1FILES= \ - $(SLB)$/java.lib \ $(SLB)$/jscpp.lib SHL1DEPN= $(L)$/itools.lib $(SVLIBDEPEND) $(LIB1TARGET) @@ -83,11 +82,13 @@ SHL1TARGET= j$(UPD)$(DLLPOSTFIX)_g SHL1IMPLIB= $(TARGET) SHL1STDLIBS= \ - $(VCLLIB) \ + $(VCLLIB) \ $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ + $(TOOLSLIB) \ $(CPPULIB) \ - $(SALLIB) + $(SALLIB) \ + $(JVMACCESSLIB) + SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def |