vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 11:43:13 2012 +0300| [1000e8fa00dcfb40748216eb4ecec42529254efc] | committer: Rémi Denis-Courmont
Remove recursion into modules/access/screen/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1000e8fa00dcfb40748216eb4ecec42529254efc --- configure.ac | 4 ---- modules/access/Modules.am | 15 ++++++++++++++- modules/access/screen/Modules.am | 12 ------------ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 8bfbdda..569e211 100644 --- a/configure.ac +++ b/configure.ac @@ -1911,9 +1911,6 @@ if test "${enable_screen}" != "no"; then VLC_ADD_LIBS([screen],[-Wl,-framework,OpenGL,-framework,ApplicationServices]) ]) ]) - elif test "${SYS}" = "mingw32"; then - VLC_ADD_PLUGIN([screen]) - VLC_ADD_LIBS([screen],[-lgdi32]) fi fi @@ -4135,7 +4132,6 @@ AC_CONFIG_FILES([ modules/access/rtp/Makefile modules/access/vcd/Makefile modules/access/vcdx/Makefile - modules/access/screen/Makefile modules/access/zip/Makefile modules/access/zip/unzip/Makefile modules/access_output/Makefile diff --git a/modules/access/Modules.am b/modules/access/Modules.am index 4420c2c..3f48099 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -1,4 +1,4 @@ -SUBDIRS = mms rtp screen vcd vcdx zip +SUBDIRS = mms rtp vcd vcdx zip libfilesystem_plugin_la_SOURCES = \ fs.h \ @@ -145,6 +145,19 @@ if HAVE_XCB libvlc_LTLIBRARIES += libxcb_screen_plugin.la endif +libscreen_plugin_la_SOURCES = screen/screen.c screen/screen.h +libscreen_plugin_la_CFLAGS = $(AM_CFLAGS) +libscreen_plugin_la_LIBADD = $(AM_LIBADD) +if HAVE_WIN32 +libscreen_plugin_la_SOURCES += screen/win32.c +libscreen_plugin_la_LIBADD += -lgdi32 +libvlc_LTLIBRARIES += libscreen_plugin.la +endif +if HAVE_DARWIN +libscreen_plugin_la_SOURCES += screen/mac.c +libvlc_LTLIBRARIES += $(LTLIBscreen) +endif + ### Optical media ### diff --git a/modules/access/screen/Modules.am b/modules/access/screen/Modules.am deleted file mode 100644 index 19bbdcf..0000000 --- a/modules/access/screen/Modules.am +++ /dev/null @@ -1,12 +0,0 @@ -if HAVE_WIN32 -screen_extra = win32.c -else -if HAVE_DARWIN -screen_extra = mac.c -endif -endif -SOURCES_screen = \ - screen.c \ - screen.h \ - $(screen_extra) \ - $(NULL) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
