[vlc-commits] Remove recursion into modules/video_output/msw/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 12:53:10 2012 +0300| [bb8711bab06f0af01b401b27176f6e694ce3c49d] | committer: Rémi Denis-Courmont

Remove recursion into modules/video_output/msw/

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bb8711bab06f0af01b401b27176f6e694ce3c49d
---

 configure.ac                        |   50 +++++++-------------------------
 modules/video_output/Modules.am     |   42 ++++++++++++++++++++++++++-
 modules/video_output/msw/Modules.am |   54 -----------------------------------
 3 files changed, 51 insertions(+), 95 deletions(-)

diff --git a/configure.ac b/configure.ac
index cff9f90..30d7cd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3188,51 +3188,22 @@ AS_IF([test "${enable_directx}" != "no"], [
   dnl OpenGL
   AC_CHECK_HEADERS(GL/wglew.h, [
     VLC_ADD_PLUGIN([glwin32])
-    VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32])
-   ],, [
-     #include <windows.h>
-     #include <GL/gl.h>
-   ])
-
-   dnl Direct3D
-   AC_CHECK_HEADERS(d3d9.h, [
-     VLC_ADD_PLUGIN([direct3d])
-     VLC_ADD_LIBS([direct3d],[-lgdi32])
-   ])
-   VLC_ADD_LIBS([direct3d glwin32],[-lole32 -luuid])
-])
-AM_CONDITIONAL([HAVE_DIRECTX], [test "$have_directx" = "yes"])
+  ],, [
+    #include <windows.h>
+    #include <GL/gl.h>
+  ])
 
-dnl
-dnl  Windows Direct2D plugin
-dnl
-AC_ARG_ENABLE(direct2d,
-  [  --enable-direct2d       Win7/VistaPU Direct2D support (default auto on Win32)],, [
-  AS_IF([test "${SYS}" != "mingw32"], [
-    enable_direct2d="no"
+  dnl Direct3D
+  AC_CHECK_HEADERS(d3d9.h, [
+    VLC_ADD_PLUGIN([direct3d])
   ])
-])
-AS_IF([test "${enable_direct2d}" != "no"], [
+
+  dnl Direct2D
   AC_CHECK_HEADERS(d2d1.h, [
     VLC_ADD_PLUGIN([direct2d])
-    VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32 -luuid])
-  ], [
-    AC_MSG_WARN([Cannot find Direct2D headers!])
   ])
 ])
-
-dnl
-dnl  win32 GDI plugin
-dnl
-AC_ARG_ENABLE(wingdi,
-  [  --enable-wingdi         Win32 GDI module (default enabled on Win32)])
-if test "${enable_wingdi}" != "no"; then
-  if test "${SYS}" = "mingw32"; then
-    VLC_ADD_PLUGIN([wingdi])
-    VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32 -luuid])
-  fi
-fi
-
+AM_CONDITIONAL([HAVE_DIRECTX], [test "$have_directx" = "yes"])
 
 dnl
 dnl  Linux framebuffer module
@@ -4167,7 +4138,6 @@ AC_CONFIG_FILES([
   modules/video_filter/Makefile
   modules/video_filter/dynamicoverlay/Makefile
   modules/video_output/Makefile
-  modules/video_output/msw/Makefile
   modules/visualization/Makefile
   modules/mmx/Makefile
   modules/sse2/Makefile
diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index f73e6fb..06a6e69 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -1,4 +1,3 @@
-SUBDIRS = msw
 # Automake forgets to add a proper tag to libtool with Objective-C files.
 # Moreocer Libtool should default tag to CC when none is specified but
 # obviously does not. Here is a fix for that.
@@ -92,6 +91,47 @@ libvlc_LTLIBRARIES += \
 	$(LTLIBxcb_glx)
 
 ### Win32 ###
+libdirect2d_plugin_la_SOURCES = msw/direct2d.c \
+	msw/common.c msw/common.h msw/events.c msw/events.h
+libdirect2d_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdirect2d_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
+libvlc_LTLIBRARIES += $(LTLIBdirect2d)
+EXTRA_LTLIBRARIES += libdirect2d_plugin.la
+
+libdirect3d_plugin_la_SOURCES = msw/direct3d.c \
+	msw/common.c msw/common.h msw/events.c msw/events.h
+libdirect3d_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdirect3d_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
+libvlc_LTLIBRARIES += $(LTLIBdirect3d)
+EXTRA_LTLIBRARIES += libdirect3d_plugin.la
+
+libdirectdraw_plugin_la_SOURCES = msw/directx.c \
+	msw/common.c msw/common.h msw/events.c msw/events.h
+libdirectdraw_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdirectdraw_plugin_la_LIBADD = $(AM_LIBADD) -luser32 -lgdi32 -lole32 -luuid
+
+if HAVE_DIRECTX
+libvlc_LTLIBRARIES += libdirectdraw_plugin.la
+endif
+
+libglwin32_plugin_la_SOURCES = msw/glwin32.c opengl.c opengl.h \
+	msw/common.c msw/common.h msw/events.c msw/events.h
+libglwin32_plugin_la_CFLAGS = $(AM_CFLAGS)
+libglwin32_plugin_la_LIBADD = $(AM_LIBADD) -lopengl32 -lgdi32 -lole32 -luuid
+libvlc_LTLIBRARIES += $(LTLIBglwin32)
+EXTRA_LTLIBRARIES += libglwin32_plugin.la
+
+libwingdi_plugin_la_SOURCES = msw/wingdi.c \
+	msw/common.c msw/common.h msw/events.c msw/events.h
+libwingdi_plugin_la_CFLAGS = $(AM_CFLAGS)
+libwingdi_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
+if HAVE_WIN32
+libvlc_LTLIBRARIES += libwingdi_plugin.la
+endif
+
+SOURCES_wingapi = msw/wingdi.c \
+	msw/common.c msw/common.h msw/events.c msw/events.h
+
 libdrawable_plugin_la_SOURCES = drawable.c
 libdrawable_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdrawable_plugin_la_LIBADD = $(AM_LIBADD)
diff --git a/modules/video_output/msw/Modules.am b/modules/video_output/msw/Modules.am
deleted file mode 100644
index 132d9a5..0000000
--- a/modules/video_output/msw/Modules.am
+++ /dev/null
@@ -1,54 +0,0 @@
-SOURCES_direct2d = \
-        direct2d.c \
-        common.h \
-        events.h \
-        events.c \
-        common.c \
-        $(NULL)
-
-libdirectdraw_plugin_la_SOURCES = \
-	directx.c \
-	common.h \
-	events.h \
-	events.c \
-	common.c \
-	$(NULL)
-libdirectdraw_plugin_la_CFLAGS = $(AM_CFLAGS)
-libdirectdraw_plugin_la_LIBADD = $(AM_LIBADD) -luser32 -lgdi32 -lole32 -luuid
-if HAVE_DIRECTX
-libvlc_LTLIBRARIES += libdirectdraw_plugin.la
-endif
-
-SOURCES_direct3d = \
-	direct3d.c \
-	common.h \
-	events.h \
-	events.c \
-	common.c \
-	$(NULL)
-
-SOURCES_glwin32 = \
-	glwin32.c \
-	../opengl.h \
-	common.h \
-	events.h \
-	events.c \
-	common.c \
-	../opengl.c \
-	$(NULL)
-
-SOURCES_wingdi = \
-	wingdi.c \
-	common.h \
-	events.h \
-	events.c \
-	common.c \
-	$(NULL)
-
-SOURCES_wingapi = \
-	wingdi.c \
-	common.h \
-	events.h \
-	events.c \
-	common.c \
-	$(NULL)