[Libreoffice-commits] .: Branch 'libreoffice-3-3' - avmedia/source

Tor Lillqvist tml at kemper.freedesktop.org
Mon Feb 7 01:26:04 PST 2011


 avmedia/source/win/makefile.mk |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 4c00e2b2d1f4c1b9aaa049ee3bd99bab99d5b3e5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jan 27 02:36:52 2011 +0200

    We don't need ddraw.lib which doesn't even exist in the current DX SDK
    
    (cherry picked from commit 7bc42b864b22fd8e0b159dfec212abaf989ff9aa)
    
    Signed-off-by: Noel Power <nopower at novell.com>

diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk
index b70841e..7fdb923 100644
--- a/avmedia/source/win/makefile.mk
+++ b/avmedia/source/win/makefile.mk
@@ -48,8 +48,7 @@ SLOFILES= \
         $(SLO)$/manager.obj     \
         $(SLO)$/window.obj      \
         $(SLO)$/player.obj      \
-        $(SLO)$/framegrabber.obj    
-        
+        $(SLO)$/framegrabber.obj
 
 EXCEPTIONSFILES= \
         $(SLO)$/winuno.obj      \
@@ -67,7 +66,6 @@ DEF1EXPORTFILE=exports.dxp
 SHL1STDLIBS += $(OLE32LIB)
 SHL1STDLIBS += $(OLEAUT32LIB)
 SHL1STDLIBS += $(GDI32LIB)
-SHL1STDLIBS += $(DDRAWLIB)
 
 .IF "$(COM)"=="GCC"
 SHL1STDLIBS += $(PSDK_HOME)$/lib$/strmiids.lib


More information about the Libreoffice-commits mailing list