Author: damjan
Date: Sun Dec 18 21:16:34 2016
New Revision: 1774961
URL: http://svn.apache.org/viewvc?rev=1774961&view=rev
Log:
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
Modified:
openoffice/trunk/main/avmedia/Module_avmedia.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
Modified: openoffice/trunk/main/avmedia/Module_avmedia.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Module_avmedia.mk?rev=1774961&r1=1774960&r2=1774961&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/Module_avmedia.mk (original)
+++ openoffice/trunk/main/avmedia/Module_avmedia.mk Sun Dec 18 21:16:34 2016
@@ -50,12 +50,10 @@ $(eval $(call gb_Module_add_targets,avme
endif
ifeq ($(GUI),WNT)
-ifneq ($(strip $(ENABLE_DIRECTX)),)
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediawin \
))
endif
-endif
ifeq ($(GUIBASE),aqua)
$(eval $(call gb_Module_add_targets,avmedia,\
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1774961&r1=1774960&r2=1774961&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Sun Dec 18
21:16:34 2016
@@ -326,6 +326,7 @@ my_components += \
.IF "$(OS)" == "WNT"
my_components += \
ado \
+ component/avmedia/source/win/avmediawin \
component/dtrans/source/generic/dtrans \
component/dtrans/util/dnd \
component/dtrans/util/ftransl \
@@ -352,7 +353,6 @@ my_components += \
.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
my_components += \
- component/avmedia/source/win/avmediawin \
component/canvas/source/directx/directx9canvas \
component/canvas/source/directx/gdipluscanvas
.END
