diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 11:30:48 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 11:30:48 +0000 |
| commit | 8a02c06f0e933ed5cbf520ceb9e5b7420abb8d07 (patch) | |
| tree | e5f05d0edc27537a8aa993fa63686142c89dbe77 /avmedia | |
| parent | fe2349d44a62a10ad7506e24c73b008a64de4cda (diff) | |
INTEGRATION: CWS jmf5 (1.2.10); FILE MERGED
2005/01/20 15:20:05 ka 1.2.10.2: #i37255#: added FrameGrabber implementation
2005/01/19 16:08:40 ka 1.2.10.1: Syntax
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/win/makefile.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk index 293d84026638..cac9988833b4 100644 --- a/avmedia/source/win/makefile.mk +++ b/avmedia/source/win/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: ka $ $Date: 2004-08-27 13:34:23 $ +# last change: $Author: vg $ $Date: 2005-03-23 12:30:48 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -82,13 +82,16 @@ SLOFILES= \ $(SLO)$/winuno.obj \ $(SLO)$/manager.obj \ $(SLO)$/window.obj \ - $(SLO)$/player.obj + $(SLO)$/player.obj \ + $(SLO)$/framegrabber.obj + EXCEPTIONSFILES= \ - $(SLO)$/winuno.obj + $(SLO)$/winuno.obj \ + $(SLO)$/framegrabber.obj SHL1TARGET=$(TARGET) -SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) +SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(UNOTOOLSLIB) $(TOOLSLIB) $(VCLLIB) SHL1IMPLIB=i$(TARGET) SHL1LIBS=$(SLB)$/$(TARGET).lib SHL1DEF=$(MISC)$/$(SHL1TARGET).def @@ -98,6 +101,7 @@ DEF1EXPORTFILE=exports.dxp SHL1STDLIBS += strmiids.lib SHL1STDLIBS += ole32.lib +SHL1STDLIBS += oleaut32.lib SHL1STDLIBS += gdi32.lib SHL1STDLIBS += ddraw.lib SHL1STDLIBS += dxguid.lib |