diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-01-15 12:41:46 +0100 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-01-15 12:41:46 +0100 |
| commit | 08b211692c10f69c1eba69b7ee290744d96c5cbb (patch) | |
| tree | e571fae45bf8d831c0079ce25b31053ddcdb8218 /sc/util | |
| parent | e0bff7cc71affce1166c09d7c95958dd1e2c4687 (diff) | |
| parent | a15b7f802db8a2286ce59f325d50b2db29743171 (diff) | |
dr74: merge with DEV300_m69
Diffstat (limited to 'sc/util')
| -rw-r--r-- | sc/util/makefile.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index c06071ff6324..3c51d15634de 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -41,10 +41,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(OS)"=="IRIX" -LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=30 -.ENDIF - # --- Resourcen ---------------------------------------------------- RESLIB1LIST=\ @@ -78,6 +74,7 @@ SHL1IMPLIB= sci # dynamic libraries SHL1STDLIBS= \ + $(VBAHELPERLIB) \ $(BASICLIB) \ $(SFXLIB) \ $(SVTOOLLIB) \ @@ -189,7 +186,7 @@ SHL6STDLIBS= \ $(SVTOOLLIB) \ $(SVLLIB) \ $(SVXCORELIB) \ - $(SVXMSFILTERLIB) \ + $(MSFILTERLIB) \ $(SVXLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ @@ -229,8 +226,9 @@ SHL8STDLIBS= \ $(I18NISOLANGLIB) \ $(COMPHELPERLIB) \ $(CPPULIB) \ - $(SALLIB) - + $(SALLIB) \ + $(FORLIB) \ + $(FORUILIB) .IF "$(ENABLE_LAYOUT)" == "TRUE" SHL8STDLIBS+=$(TKLIB) .ENDIF # ENABLE_LAYOUT == TRUE @@ -300,6 +298,7 @@ SHL9RPATH=OOO .ENDIF SHL9STDLIBS= \ + $(VBAHELPERLIB) \ $(CPPUHELPERLIB) \ $(VCLLIB) \ $(CPPULIB) \ @@ -315,6 +314,7 @@ SHL9STDLIBS= \ $(ISCLIB) \ $(VCLLIB) \ $(TKLIB) \ + $(SVXMSFILTERLIB) \ $(FORLIB) SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN) |