diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 20:22:44 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 20:22:44 +0000 |
| commit | 011d6da4d7677f1236705f682ac357b378238fbe (patch) | |
| tree | 35913d1eada46cf8df8bcf0ac84aa97989de881b /sc/util | |
| parent | 27c2928516060abdbf2f3d03c6f5a6f7257845db (diff) | |
#i10000#: fix link problems due to CWS frmdlg
Diffstat (limited to 'sc/util')
| -rw-r--r-- | sc/util/makefile.mk | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 58fa4574ff76..63251c7d8f35 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -99,19 +99,10 @@ SHL1STDLIBS= \ $(SOTLIB) \ $(XMLOFFLIB) \ $(DBTOOLSLIB) \ - $(AVMEDIALIB) + $(AVMEDIALIB) \ + $(FORLIB) \ + $(FORUILIB) -.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" -SHL1STDLIBS+= \ - -lfor$(DLLPOSTFIX) \ - -lforui$(DLLPOSTFIX) -.ELSE -SHL1STDLIBS+= \ - ifor.lib \ - iforui.lib -.ENDIF - - SHL1LIBS=$(LIB3TARGET) $(LIB4TARGET) SHL1DEF=$(MISC)$/$(SHL1TARGET).def @@ -215,7 +206,8 @@ SHL6STDLIBS= \ $(DBTOOLSLIB) \ $(AVMEDIALIB) \ $(OOXLIB) \ - $(SAXLIB) + $(SAXLIB) \ + $(FORLIB) # add for scui SHL8TARGET= scui$(DLLPOSTFIX) @@ -320,15 +312,7 @@ SHL9STDLIBS= \ $(ISCLIB) \ $(VCLLIB) \ $(TKLIB) \ - - -.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" -SHL9STDLIBS+= \ - -lfor$(DLLPOSTFIX) -.ELSE -SHL9STDLIBS+= \ - ifor.lib -.ENDIF + $(FORLIB) SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN) SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib |