diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2011-11-03 16:09:19 +0000 |
|---|---|---|
| committer | Jürgen Schmidt <jsc@apache.org> | 2011-11-03 16:09:19 +0000 |
| commit | 5ab33b480f64ca1d6c51977bca4ad9317838eecc (patch) | |
| tree | 2f1268d4320bdccffae8018bef5519b49d6c6c94 /avmedia | |
| parent | 9ba1b7ddc9b5c05912f3f7d60be5b6d4ea3d912a (diff) | |
118570, apply patch, improve configure to detect latest DirectX correctly, adapt depending modules, thanks to Andre Fischer (af)
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/win/makefile.mk | 4 | ||||
| -rw-r--r-- | avmedia/util/makefile.mk | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk index 37db25b6a8b7..ff90d267617d 100644 --- a/avmedia/source/win/makefile.mk +++ b/avmedia/source/win/makefile.mk @@ -49,7 +49,7 @@ SLOFILES= \ $(SLO)$/window.obj \ $(SLO)$/player.obj \ $(SLO)$/framegrabber.obj - + EXCEPTIONSFILES= \ $(SLO)$/winuno.obj \ @@ -67,13 +67,11 @@ DEF1EXPORTFILE=exports.dxp SHL1STDLIBS += $(OLE32LIB) SHL1STDLIBS += $(OLEAUT32LIB) SHL1STDLIBS += $(GDI32LIB) -SHL1STDLIBS += $(DDRAWLIB) .IF "$(COM)"=="GCC" SHL1STDLIBS += $(PSDK_HOME)$/lib$/strmiids.lib .ELSE SHL1STDLIBS += strmiids.lib -SHL1STDLIBS += dxguid.lib .ENDIF .ENDIF diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk index a0712204bec1..9249c99448e8 100644 --- a/avmedia/util/makefile.mk +++ b/avmedia/util/makefile.mk @@ -49,7 +49,7 @@ LIB1TARGET=$(SLB)$/$(TARGET).lib LIB1FILES=\ $(SLB)$/viewer.lib \ $(SLB)$/framework.lib - + # ========================================================================== SHL1TARGET=$(TARGET)$(DLLPOSTFIX) |