Backported support for VLS CVS with regards to A/52 streams. Also

[vlc] / Makefile.opts.in

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 8a5ba96190f4c0875e97d8d05c37c81defe20b1e..908fa1ce79a6c38d6266e71bd8d0c9a025d3b24e 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -10,21 +10,7 @@ HAVE_MAKEFILE_OPTS = 1
 ###############################################################################
 
 # 
-# Plugins to build
-# WARNING: if you do not have a dynamic loader on your platform, remove
-# the plugins in this line and put them as built-ins, otherwise your
-# application won't be able to load them.
-# 
-PLUGINS :=@PLUGINS@
-
-# 
-# Built-in modules to build
-# WARNING: do NOT put gtk and gnome together in this rule.
-# 
-BUILTINS :=@BUILTINS@
-
-# 
-# Additional build options
+# Build options
 # 
 SYS = @SYS@
 ALIASES =@ALIASES@
@@ -70,9 +56,11 @@ vlc_CFLAGS = @vlc_CFLAGS@
 plugins_CFLAGS := @plugins_CFLAGS@
 builtins_CFLAGS := @builtins_CFLAGS@
 
+a52_CFLAGS = @a52_CFLAGS@
 arts_CFLAGS = @arts_CFLAGS@
 dvd_CFLAGS = @dvd_CFLAGS@
 dvdread_CFLAGS = @dvdread_CFLAGS@
+mpeg_ts_dvbpsi_CFLAGS = @mpeg_ts_dvbpsi_CFLAGS@
 directx_CFLAGS = @directx_CFLAGS@
 esd_CFLAGS = @esd_CFLAGS@
 ffmpeg_CFLAGS = @ffmpeg_CFLAGS@
@@ -81,7 +69,6 @@ gnome_CFLAGS = @gnome_CFLAGS@
 gtk_CFLAGS = @gtk_CFLAGS@
 kde_CFLAGS = @kde_CFLAGS@
 idctaltivec_CFLAGS = @idctaltivec_CFLAGS@
-macosx_CFLAGS = @macosx_CFLAGS@
 mad_CFLAGS = @mad_CFLAGS@
 memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@
 motionaltivec_CFLAGS = @motionaltivec_CFLAGS@
@@ -107,6 +94,7 @@ directx_LDFLAGS = @directx_LDFLAGS@
 dsp_LDFLAGS = @dsp_LDFLAGS@
 dvd_LDFLAGS = @dvd_LDFLAGS@
 dvdread_LDFLAGS = @dvdread_LDFLAGS@
+mpeg_ts_dvbpsi_LDFLAGS = @mpeg_ts_dvbpsi_LDFLAGS@
 esd_LDFLAGS = @esd_LDFLAGS@
 filter_distort_LDFLAGS = @filter_distort_LDFLAGS@
 ffmpeg_LDFLAGS = @ffmpeg_LDFLAGS@
@@ -114,11 +102,13 @@ ggi_LDFLAGS = @ggi_LDFLAGS@
 glide_LDFLAGS = @glide_LDFLAGS@
 gnome_LDFLAGS = @gnome_LDFLAGS@
 gtk_LDFLAGS = @gtk_LDFLAGS@
+http_LDFLAGS = @http_LDFLAGS@
 idctaltivec_LDFLAGS = @idctaltivec_LDFLAGS@
 imdct_LDFLAGS = @imdct_LDFLAGS@
 imdct3dn_LDFLAGS = @imdct3dn_LDFLAGS@
 imdctsse_LDFLAGS = @imdctsse_LDFLAGS@
 ipv4_LDFLAGS = @ipv4_LDFLAGS@
+ipv6_LDFLAGS = @ipv6_LDFLAGS@
 kde_LDFLAGS = @kde_LDFLAGS@
 lirc_LDFLAGS = @lirc_LDFLAGS@
 macosx_LDFLAGS = @macosx_LDFLAGS@
@@ -251,8 +241,9 @@ endif
 #
 # C compiler flags: plugins and builtins compilation
 #
-plugins_CFLAGS += -DPLUGIN -I../../include -I../../extras
-builtins_CFLAGS += -DBUILTIN -I../../include -I../../extras
+vlc_CFLAGS += -D__VLC__
+plugins_CFLAGS += -D__VLC__ -D__PLUGIN__ -I../../include -I../../extras
+builtins_CFLAGS += -D__VLC__ -D__BUILTIN__ -I../../include -I../../extras
 
 #
 # Linker flags: plugins and builtins linking