* Mandatory step for video output IV and the audio output quality

[vlc] / Makefile.opts.in

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 7121e6db94e2d67565813c4d8ddfb394ae9efda2..eb4d17dadde8dbed344ca188a0b6fe0e5d8f872e 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -7,27 +7,45 @@
 # Configuration
 ###############################################################################
 
+# 
+# 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
+# 
+SYS = @SYS@
+ALIASES =@ALIASES@
+INSTALL = @INSTALL@
+ARCH = @ARCH@
+
 #
 # Compilation options
 #
 DEBUG = @DEBUG@
 STATS = @STATS@
+TRACE = @TRACE@
 OPTIMS = @OPTIMS@
 GETOPT = @GETOPT@
 
-PLUGINS := @PLUGINS@
-BUILTINS := @BUILTINS@
-
-SYS = @SYS@
-ALIASES =@ALIASES@
-INSTALL = @INSTALL@
-ARCH = @ARCH@
-
 # 
 # Build environment
 # 
 CC = @CC@
+CFLAGS = @CFLAGS@
 SHELL = @SHELL@
+RANLIB = @RANLIB@
+MOC = @MOC@
 
 # 
 # Installation environment
@@ -59,6 +77,12 @@ LIB_X11 = @LIB_X11@
 LIB_XVIDEO = @LIB_XVIDEO@
 LIB_YUV = @LIB_YUV@
 
+#
+# CFLAGS for special cases
+#
+CFLAGS_GTK = @CFLAGS_GTK@
+CFLAGS_X11 = @CFLAGS_X11@
+
 ###############################################################################
 # Configuration pre-processing
 ###############################################################################
@@ -69,8 +93,12 @@ ifeq ($(DEBUG),1)
 PROGRAM_OPTIONS += DEBUG
 DEFINE += -DDEBUG
 endif
+ifeq ($(TRACE),1)
+PROGRAM_OPTIONS += TRACE
+DEFINE += -DTRACE
+endif
 ifeq ($(STATS),1)
-PROGRAM_OPTIONS += DEBUG
+PROGRAM_OPTIONS += STATS
 DEFINE += -DSTATS
 endif
 
@@ -89,7 +117,7 @@ PROGRAM_VERSION=@VLC_VERSION@
 
 # DEFINE will contain some of the constants definitions decided in Makefile, 
 # including SYS_xx. It will be passed to C compiler.
-DEFINE += -DSYS_$(shell echo $(SYS) | sed 's/-.*//' | tr '[a-z].' '[A-Z]_')
+DEFINE += -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_')
 
 # On Linux activate 64-bit off_t (by default under BSD)
 ifneq (,$(findstring linux,$(SYS)))
@@ -112,14 +140,21 @@ INCLUDE += -Iinclude -Iextras -I/usr/local/include
 #
 LIB += @LIB@ -L/usr/local/lib
 
+ifneq (,$(findstring mingw32,$(SYS)))
+LIB += -lws2_32
+endif
+
 #
 # Libraries needed by built-in modules
 #
-LIB += $(shell for i in ${BUILTINS} ; do echo $$i | tr '[a-z]' '[A-Z]' | sed 's/.*/$$LIB_&/' ; done)
+ifneq (,$(BUILTINS))
+LIB += $(shell for i in ${BUILTINS} ; do echo $$i | tr '[a-z]' '[A-Z]' | sed -e 's/.*/$$LIB_&/' ; done)
+endif
 
 #
 # C compiler flags: mainstream compilation
 #
+DEFINE += @DEFINE@
 CFLAGS += $(DEFINE) $(INCLUDE)
 CFLAGS += -Wall -Winline
 CFLAGS += -D_REENTRANT
@@ -138,7 +173,9 @@ endif
 ifeq ($(OPTIMS),1)
 CFLAGS += -O3
 CFLAGS += -ffast-math -funroll-loops
+ifneq ($(DEBUG),1)
 CFLAGS += -fomit-frame-pointer
+endif
 
 # Optimizations for x86 familiy
 ifneq (,$(findstring 86,$(ARCH)))
@@ -196,9 +233,9 @@ endif
 endif
 
 #
-# Debugging and profiling support (unless optimisations are active)
+# Debugging and profiling support
 #
-ifneq ($(OPTIMS),1)
+ifeq ($(DEBUG),1)
 CFLAGS += -g
 endif