diff options
| author | Joachim Lingner <jl@openoffice.org> | 2004-04-20 09:01:50 +0000 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2004-04-20 09:01:50 +0000 |
| commit | 6d849f1c9a8248f06367dcb4860243be5e1b012b (patch) | |
| tree | 2057c50fbfb778b7b8fc8949db6d9084fb870925 /jvmfwk | |
| parent | #i20025# (diff) | |
| download | core-6d849f1c9a8248f06367dcb4860243be5e1b012b.tar.gz core-6d849f1c9a8248f06367dcb4860243be5e1b012b.zip | |
#i20025#
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/prj/d.lst | 2 | ||||
| -rw-r--r-- | jvmfwk/source/framework.map | 2 | ||||
| -rw-r--r-- | jvmfwk/source/makefile.mk | 12 |
3 files changed, 12 insertions, 4 deletions
diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst index 7ab4e6e7f427..9372c9b84c33 100644 --- a/jvmfwk/prj/d.lst +++ b/jvmfwk/prj/d.lst @@ -3,4 +3,6 @@ mkdir: %_DEST%\inc%_EXT%\jvmaccess ..\inc\jvmfwk\vendorplugin.h %_DEST%\inc%_EXT%\jvmfwk\vendorplugin.h ..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib%_EXT%\ijvmfwk.lib ..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin%_EXT%\* +..\%__SRC%\bin\sunjavaplugin*.dll %_DEST%\bin%_EXT%\* +linklib: libjvmfwk*.so.*.*.* diff --git a/jvmfwk/source/framework.map b/jvmfwk/source/framework.map index db811ecaecc8..d311ed7110a7 100644 --- a/jvmfwk/source/framework.map +++ b/jvmfwk/source/framework.map @@ -1,4 +1,4 @@ -UDK_3.1 { +UDK_3_0_0 { global: # jvmfwk/framework.h: jfw_freeJavaInfo; diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk index 48232f16a775..e9582e10ff56 100644 --- a/jvmfwk/source/makefile.mk +++ b/jvmfwk/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: jl $ $Date: 2004-04-20 08:58:53 $ +# last change: $Author: jl $ $Date: 2004-04-20 10:01:50 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -87,7 +87,13 @@ SLOFILES = \ #LIB1TARGET=$(SLB)$/$(FRAMEWORKLIB).lib -SHL1TARGET=$(FRAMEWORKLIB) +.IF "$(UNIXVERSIONNAMES)" == "" +SHL1TARGET = $(FRAMEWORKLIB)$(UDK_MAJOR) +.ELSE # UNIXVERSIONNAMES +SHL1TARGET = $(FRAMEWORKLIB) +.ENDIF # UNIXVERSIONNAMES + +#SHL1TARGET=$(FRAMEWORKLIB) SHL1DEPN= SHL1IMPLIB = i$(FRAMEWORKLIB) SHL1LIBS = $(SLB)$/$(TARGET).lib |