diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-16 16:21:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-16 16:56:42 +0200 |
| commit | 3f405b1af38b810a6ae1089138637d7947ce4f82 (patch) | |
| tree | 1aeab7b1b65c78c59ebbd1c83534aa7fbe823932 /Repository.mk | |
| parent | e5772fbc810a4c76da2a200db70e7acd776bc30b (diff) | |
configure: remove --enable-directx
This used to require extra SDKs in days of yore but now just always build
those libraries on WNT.
Change-Id: I92c0a35917df42e136c022c762f0333f657a9ec6
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk index 4854e1e01999..41269ac22fc0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -336,7 +336,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ $(if $(USING_X11),desktop_detector) \ $(call gb_Helper_optional,SCRIPTING,dlgprov) \ - $(if $(ENABLE_DIRECTX),directx9canvas) \ + $(if $(filter WNT,$(OS)),directx9canvas) \ $(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \ drawinglayer \ editeng \ @@ -357,7 +357,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ fwk \ fwl \ fwm \ - $(if $(ENABLE_DIRECTX),gdipluscanvas) \ + $(if $(filter WNT,$(OS)),gdipluscanvas) \ guesslang \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ i18npool \ @@ -569,7 +569,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(ENABLE_VLC),avmediavlc) \ $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \ $(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \ - $(if $(ENABLE_DIRECTX),avmediawin) \ + $(if $(filter WNT,$(OS)),avmediawin) \ cached1 \ collator_data \ comphelper \ |