diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-17 14:21:19 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-17 14:21:19 +0000 |
| commit | e015abd6d279e260c1f69a984fdf3b35f11b01ed (patch) | |
| tree | 4e500be1f0440e10e1319a5e563d5705025be2d5 /slideshow/test | |
| parent | 2a3375801af63bc0097b1428204b960ac6c293a5 (diff) | |
INTEGRATION: CWS presfixes12 (1.2.12); FILE MERGED
2007/02/10 23:23:53 thb 1.2.12.2: #i37778# Renamed setMouseCursor() to setCursorShape() at View interface (name clash with API method otherwise); added LayerManager/Layer unit tests; fixed a bunch of bugs/glitches found during unit testing
2007/01/31 11:25:19 thb 1.2.12.1: #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
Diffstat (limited to 'slideshow/test')
| -rw-r--r-- | slideshow/test/makefile.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk index 8de923a416e2..f4090685dda7 100644 --- a/slideshow/test/makefile.mk +++ b/slideshow/test/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: kz $ $Date: 2006-12-13 16:09:11 $ +# last change: $Author: obo $ $Date: 2007-07-17 15:21:19 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,12 +45,16 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Common ---------------------------------------------------------- # BEGIN target1 ------------------------------------------------------- SHL1OBJS= \ - $(SLO)$/views.obj + $(SLO)$/views.obj \ + $(SLO)$/slidetest.obj \ + $(SLO)$/testshape.obj \ + $(SLO)$/testview.obj SHL1TARGET= tests SHL1STDLIBS= $(SALLIB) \ @@ -64,7 +68,7 @@ SHL1STDLIBS= $(SALLIB) \ .IF "$(OS)"=="WNT" SHL1STDLIBS+=$(LIBPRE) islideshowtest.lib .ELSE - SHL1STDLIBS+=-lslideshowtest$(OFFICEUPD)$(DLLPOSTFIX) + SHL1STDLIBS+=-lslideshowtest$(UPD)$(DLLPOSTFIX) .ENDIF SHL1IMPLIB= i$(SHL1TARGET) |