diff options
| author | Damjan Jovanovic <damjan@apache.org> | 2016-12-18 21:16:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-27 16:19:51 +0000 |
| commit | 4550d0f96435051156d17b7c31b02b22d269fd08 (patch) | |
| tree | a38a336415f8ce107097b1aff7428b9c62fff8fa | |
| parent | 3910364daa0706b2648b9feaf759dcaac83e2bb5 (diff) | |
DirectShow moved from DirectX to the Windows API
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>
| -rw-r--r-- | avmedia/Module_avmedia.mk | 2 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index 3aebcab202ac..d7625c86447c 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -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 \ )) diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 597245826dee..e999d053bade 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -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 \ ) \ |