diff options
| -rw-r--r-- | Repository.mk | 6 | ||||
| -rw-r--r-- | canvas/Module_canvas.mk | 2 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 22 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 2 |
5 files changed, 5 insertions, 28 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 \ diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk index 5d72e9c79d0d..d2df13d92cf2 100644 --- a/canvas/Module_canvas.mk +++ b/canvas/Module_canvas.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_targets,canvas,\ )) endif -ifneq ($(ENABLE_DIRECTX),) +ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,canvas,\ Library_directx9canvas \ Library_gdipluscanvas \ diff --git a/config_host.mk.in b/config_host.mk.in index 98d3edc06be6..e175ecd76b66 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -122,7 +122,6 @@ export ENABLE_DBUS=@ENABLE_DBUS@ export ENABLE_DCONF=@ENABLE_DCONF@ export ENABLE_DEBUG=@ENABLE_DEBUG@ export ENABLE_DEBUGINFO_FOR=@ENABLE_DEBUGINFO_FOR@ -export ENABLE_DIRECTX=@ENABLE_DIRECTX@ export ENABLE_EOT=@ENABLE_EOT@ export ENABLE_EVOAB2=@ENABLE_EVOAB2@ export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@ diff --git a/configure.ac b/configure.ac index f0c09476b7b2..c68105505bfa 100644 --- a/configure.ac +++ b/configure.ac @@ -1116,13 +1116,6 @@ libo_FUZZ_ARG_ENABLE(evolution2, enabled.]) ) -libo_FUZZ_ARG_ENABLE(directx, - AS_HELP_STRING([--disable-directx], - [Remove DirectX implementation for the new XCanvas interface. - The DirectX support requires more stuff installed on Windows to - compile. (DirectX SDK, GDI+ libs)]) -) - AC_ARG_ENABLE(avahi, AS_HELP_STRING([--enable-avahi], [Determines whether to use Avahi to advertise Impress to remote controls.]) @@ -3632,21 +3625,6 @@ MSPDB_PATH="$formatted_path" AC_SUBST(MSVC_CXX) AC_SUBST(SHOWINCLUDES_PREFIX) -if test "$_os" = "WINNT"; then - AC_MSG_CHECKING([whether to use DirectX]) - if test "$enable_directx" = "yes" -o "$enable_directx" = ""; then - ENABLE_DIRECTX="TRUE" - AC_MSG_RESULT([yes]) - else - ENABLE_DIRECTX="" - AC_MSG_RESULT([no]) - fi -else - ENABLE_DIRECTX="" -fi - -AC_SUBST(ENABLE_DIRECTX) - # # unowinreg.dll # diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 96b8680cced5..2c6fa74574e1 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -191,7 +191,7 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(ENABLE_CAIRO_CANVAS), \ canvas/source/cairo/cairocanvas \ ) \ - $(if $(ENABLE_DIRECTX), \ + $(if $(filter WNT,$(OS)), \ canvas/source/directx/directx9canvas \ canvas/source/directx/gdipluscanvas \ ) \ |