diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-17 14:22:33 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-17 14:22:33 +0000 |
| commit | c93f6ad6446ec2d27fa0005d246f86582632243c (patch) | |
| tree | f566d32c848f0be41d736c0338fcf943a191f6e4 /slideshow/util | |
| parent | 6bee0dc16efd4ee5a4345a3f2f3dd4194affef26 (diff) | |
INTEGRATION: CWS presfixes12 (1.6.76); FILE MERGED
2007/02/21 15:03:16 thb 1.6.76.5: RESYNC: (1.6-1.7); FILE MERGED
2007/01/31 11:47:28 thb 1.6.76.4: #i74053# Using SHLxDLLPRE now, to build both UNO and normal lib
2007/01/31 11:25:19 thb 1.6.76.3: #i37778# Added prefetch to Animation interface (to facilitate prefetching - nice for slide transitions, which otherwise lag noticeably while generating the slide bitmap); brought tests up to par, re-enabling unit tests and demo show
2007/01/29 16:29:32 thb 1.6.76.2: #i37778# Build fixes for msvc; added shapes lib to util link line
2007/01/29 14:02:34 thb 1.6.76.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
Diffstat (limited to 'slideshow/util')
| -rw-r--r-- | slideshow/util/makefile.mk | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk index e552cb4010d5..57ed08b45000 100644 --- a/slideshow/util/makefile.mk +++ b/slideshow/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: rt $ $Date: 2007-01-31 08:44:38 $ +# last change: $Author: obo $ $Date: 2007-07-17 15:22:33 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -42,7 +42,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------------- .INCLUDE : settings.mk -DLLPRE = # --- Common ---------------------------------------------------------- @@ -50,11 +49,14 @@ DLLPRE = CDEFS+= -DVERBOSE .ENDIF +SHL1DLLPRE= LIB1TARGET=$(SLB)$/$(TARGET).lib LIB1FILES=\ $(SLB)$/transitions.lib \ $(SLB)$/activities.lib \ $(SLB)$/animationnodes.lib \ + $(SLB)$/shapes.lib \ + $(SLB)$/slide.lib \ $(SLB)$/engine.lib .IF "$(debug)"!="" || "$(DEBUG)"!="" @@ -87,4 +89,28 @@ DEF1EXPORTFILE=exports.dxp # ========================================================================== +TARGET2=slideshowtest +LIB2TARGET=$(SLB)$/$(TARGET2).lib +LIB2FILES=$(LIB1FILES) + +SHL2TARGET=$(TARGET2)$(UPD)$(DLLPOSTFIX) +SHL2IMPLIB=i$(TARGET2) +SHL2STDLIBS= $(SHL1STDLIBS) + +SHL2DEF=$(MISC)$/$(SHL2TARGET).def +SHL2LIBS=$(SLB)$/$(TARGET2).lib + +DEF2NAME =$(SHL2TARGET) +DEF2LIBNAME = $(TARGET2) +DEF2DEPN =$(MISC)$/$(SHL2TARGET).flt + +DEF2DES =SlideShowTest + +# ========================================================================== + .INCLUDE : target.mk + +$(MISC)$/$(SHL2TARGET).flt: makefile.mk \ + $(TARGET2).flt + +$(TYPE) $(TARGET2).flt > $@ + |