diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 18:24:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 18:24:56 +0000 |
| commit | e5e0131e86e074af1b46a611008e6ef151ae7444 (patch) | |
| tree | 124018bc6f318d2d88d6ea652bb19442b9d30147 /slideshow/util | |
| parent | 1a9c332960fe0508d958f7125b53a69c1d8dc0ff (diff) | |
INTEGRATION: CWS presentationengine01 (1.2.2); FILE MERGED
2004/10/19 22:12:04 thb 1.2.2.4: #110496#, #i35043#, #i35133#: Chose some more speaking names for some Shape methods; added GIF animation support; corrected a few slide transitions
2004/08/05 20:01:51 thb 1.2.2.3: #110496# Added transitions subdir, therefore had to move headers out of source/engine into source/inc
2004/07/27 16:28:16 thb 1.2.2.2: #110496# Added generic export filter
2004/04/05 16:06:11 thb 1.2.2.1: Resync with canvas01 changes
Diffstat (limited to 'slideshow/util')
| -rw-r--r-- | slideshow/util/makefile.mk | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk index 3cc043914..675aa200f 100644 --- a/slideshow/util/makefile.mk +++ b/slideshow/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: thb $ $Date: 2004-03-18 10:44:39 $ +# last change: $Author: rt $ $Date: 2004-11-26 19:24:56 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -79,19 +79,34 @@ CDEFS+= -DVERBOSE LIB1TARGET=$(SLB)$/$(TARGET).lib LIB1FILES=\ - $(SLB)$/engine.lib \ + $(SLB)$/transitions.lib \ + $(SLB)$/engine.lib \ $(SLB)$/api.lib SHL1TARGET=$(TARGET).uno -SHL1STDLIBS= $(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(CPPCANVASLIB) - -#SHL1VERSIONMAP=$(TARGET).map +SHL1STDLIBS= $(TOOLSLIB) \ + $(CPPULIB) \ + $(SALLIB) \ + $(VCLLIB) \ + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(BASEGFXLIB) \ + $(CANVASTOOLSLIB) \ + $(CPPCANVASLIB) \ + $(UNOTOOLSLIB) \ + $(GOODIESLIB) \ + $(TKLIB) SHL1IMPLIB=i$(TARGET) SHL1LIBS=$(SLB)$/$(TARGET).lib SHL1DEF=$(MISC)$/$(SHL1TARGET).def +.IF "$(OS)"=="MACOSX" +.ELSE +SHL1VERSIONMAP=exports.map +.ENDIF + DEF1NAME=$(SHL1TARGET) DEF1EXPORTFILE=exports.dxp |