* 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 1d99da02aa3bbd33123cfac99bc326c90b85e343..eb4d17dadde8dbed344ca188a0b6fe0e5d8f872e 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -13,13 +13,13 @@
 # the plugins in this line and put them as built-ins, otherwise your
 # application won't be able to load them.
 # 
-PLUGINS := @PLUGINS@
+PLUGINS :=@PLUGINS@
 
 # 
 # Built-in modules to build
 # WARNING: do NOT put gtk and gnome together in this rule.
 # 
-BUILTINS := @BUILTINS@
+BUILTINS :=@BUILTINS@
 
 # 
 # Additional build options
@@ -34,6 +34,7 @@ ARCH = @ARCH@
 #
 DEBUG = @DEBUG@
 STATS = @STATS@
+TRACE = @TRACE@
 OPTIMS = @OPTIMS@
 GETOPT = @GETOPT@
 
@@ -41,7 +42,10 @@ GETOPT = @GETOPT@
 # Build environment
 # 
 CC = @CC@
+CFLAGS = @CFLAGS@
 SHELL = @SHELL@
+RANLIB = @RANLIB@
+MOC = @MOC@
 
 # 
 # Installation environment
@@ -89,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
 
@@ -132,6 +140,10 @@ 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
 #
@@ -161,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)))
@@ -219,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