strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DirectShow moved from DirectX to the Windows API

Browse source 
at least 10 years ago, so don't require DirectX
to build the avmediawin library which uses DirectShow.

Patch by: me

(cherry picked from commit 8a8dd41ed0bc8c9ecf1faa27761a56b5a8fedcc2)

Change-Id: I10926cb3c34bf3986c0341c1151360f1dfd5a21e
Reviewed-on: https://gerrit.libreoffice.org/32411
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Damjan Jovanovic 2016-12-18 21:16:34 +00:00 committed by Caolán McNamara
parent 3910364daa
commit 4550d0f964
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
avmedia/Module_avmedia.mk
View file

@ -51,7 +51,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\
))
endif
ifneq ($(ENABLE_DIRECTX),)
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediawin \
))

2
postprocess/Rdb_services.mk
View file

@ -137,6 +137,7 @@ $(eval $(call gb_Rdb_add_components,services,\
vcl/vcl.macosx \
) \
$(if $(filter WNT,$(OS)), \
avmedia/source/win/avmediawin \
dtrans/source/generic/dtrans \
dtrans/util/dnd \
dtrans/util/ftransl \
@ -188,7 +189,6 @@ $(eval $(call gb_Rdb_add_components,services,\
canvas/source/cairo/cairocanvas \
) \
$(if $(ENABLE_DIRECTX), \
avmedia/source/win/avmediawin \
canvas/source/directx/directx9canvas \
canvas/source/directx/gdipluscanvas \
) \