diff options
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/prj/d.lst | 3 | ||||
| -rw-r--r-- | cppu/util/extra.mk | 4 | ||||
| -rw-r--r-- | cppu/util/makefile.mk | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst index f019d78ad661..3355b6dc2c52 100644 --- a/cppu/prj/d.lst +++ b/cppu/prj/d.lst @@ -59,7 +59,7 @@ mkdir: %_DEST%\inc%_EXT%\uno ..\%__SRC%\lib\ipurpenvhelper* %_DEST%\lib%_EXT%\* ..\%__SRC%\bin\purpe*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\lib\libuno_purpenvhelper* %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib%_EXT%\* ..\%__SRC%\bin\unsafe_u*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\libunsafe_uno_uno.* %_DEST%\lib%_EXT%\* @@ -68,3 +68,4 @@ mkdir: %_DEST%\inc%_EXT%\uno ..\%__SRC%\lib\libaffine_uno_uno.* %_DEST%\lib%_EXT%\* linklib: libuno_cppu.*.* +linklib: libuno_purpenvhelper*.*.* diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk index cc18523b92b9..dc06e9284e72 100644 --- a/cppu/util/extra.mk +++ b/cppu/util/extra.mk @@ -46,7 +46,7 @@ USE_DEFFILE :=TRUE SHL3TARGET := unsafe_uno_uno SHL3IMPLIB := i$(SHL3TARGET) -SHL3STDLIBS := $(purpenv_helper_LIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) +SHL3STDLIBS := $(purpenv_helper_LIB) $(SALLIB) SHL3OBJS := $(SLO)$/UnsafeBridge.obj .IF "$(GUI)"=="OS2" SHL3VERSIONMAP=unsafe_os2.map @@ -60,7 +60,7 @@ SHL3RPATH := URELIB SHL4TARGET := affine_uno_uno SHL4IMPLIB := i$(SHL4TARGET) -SHL4STDLIBS := $(purpenv_helper_LIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) +SHL4STDLIBS := $(purpenv_helper_LIB) $(SALLIB) SHL4OBJS := $(SLO)$/AffineBridge.obj .IF "$(GUI)"=="OS2" SHL4VERSIONMAP=unsafe_os2.map diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index 8264639311b8..d9c80645d29b 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -60,7 +60,7 @@ SHL1TARGET=$(TARGET)$(UDK_MAJOR) SHL1TARGET= uno_$(TARGET) .ENDIF -SHL1STDLIBS = $(SALLIB) $(SALHELPERLIB) +SHL1STDLIBS = $(SALLIB) SHL1DEPN= SHL1IMPLIB=i$(TARGET) @@ -85,7 +85,7 @@ SHL2VERSIONMAP:=$(SHL2TARGET).map .ENDIF # "$(GUI)$(COM)"=="WNTGCC" SHL2DEF := $(MISC)$/$(SHL2TARGET).def SHL2IMPLIB := i$(SHL2TARGET) -SHL2STDLIBS := $(CPPULIB) $(SALHELPERLIB) $(SALLIB) +SHL2STDLIBS := $(CPPULIB) $(SALLIB) SHL2RPATH := URELIB SHL2OBJS := \ $(SLO)$/helper_purpenv_Environment.obj \ |