Documentation updates.

[vlc] / Makefile.opts.in

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 1ddfcbc16a8abe840f4dfc14333b54d35018bce1..af18bbc449478ce13402081d8a4b9ffc94ca9e2a 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -35,11 +35,12 @@ ARCH = @ARCH@
 # Compilation options
 #
 DEBUG = @DEBUG@
-STATS = @STATS@
 TRACE = @TRACE@
 CPROF = @CPROF@
 GPROF = @GPROF@
 OPTIMS = @OPTIMS@
+TUNING = @TUNING@
+RELEASE = @RELEASE@
 
 # 
 # Build environment
@@ -65,6 +66,7 @@ includedir = @includedir@
 # Libraries for special cases
 #
 LIB_ALSA = @LIB_ALSA@
+LIB_ALTIVEC = @LIB_ALTIVEC@
 LIB_BEOS = @LIB_BEOS@
 LIB_DARWIN = @LIB_DARWIN@
 LIB_DVD = @LIB_DVD@
@@ -90,6 +92,7 @@ LIB_YUV = @LIB_YUV@
 #
 # CFLAGS for special cases
 #
+CFLAGS_ALTIVEC = @CFLAGS_ALTIVEC@
 CFLAGS_DVD = @CFLAGS_DVD@
 CFLAGS_LIBDVDCSS = @CFLAGS_LIBDVDCSS@
 CFLAGS_GTK = @CFLAGS_GTK@
@@ -130,10 +133,6 @@ ifeq ($(GPROF),1)
 PROGRAM_OPTIONS += GPROF
 DEFINE += -DGPROF
 endif
-ifeq ($(STATS),1)
-PROGRAM_OPTIONS += STATS
-DEFINE += -DSTATS
-endif
 
 # PROGRAM_BUILD is a complete identification of the build
 # (we can't use fancy options with date since OSes like Solaris
@@ -171,6 +170,9 @@ INCLUDE += -Iinclude -Iextras
 #
 # Libraries needed by built-in modules
 #
+# Let's go for a crude hack !
+LIB_MOTIONALTIVEC := $(LIB_ALTIVEC)
+LIB_IDCTALTIVEC := $(LIB_ALTIVEC)
 ifneq (,$(BUILTINS))
 LIB_BUILTINS := $(shell for i in ${BUILTINS} ; do echo $$i | tr '[a-z]' '[A-Z]' | sed -e 's/.*/$$LIB_&/' ; done)
 LIB += $(LIB_BUILTINS)
@@ -183,7 +185,7 @@ ifneq (,$(findstring mingw32,$(SYS)))
 LIB += -lws2_32 -lnetapi32
 endif
 
-LIB += -L/usr/local/lib @LIB@
+LIB += @LIB@
 
 #
 # C compiler flags: mainstream compilation
@@ -195,13 +197,17 @@ CFLAGS += -pipe
 CFLAGS += -D_REENTRANT
 CFLAGS += -D_GNU_SOURCE
 
+ifeq ($(RELEASE),1)
+CFLAGS += -DRELEASE
+endif
+
 # flags needed for clean beos compilation
 ifeq ($(SYS),beos)
 CFLAGS += -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual
 endif
 
 ifneq (,$(findstring darwin,$(SYS)))
-CFLAGS += -traditional-cpp
+CFLAGS += -no-cpp-precomp
 endif
 
 ifneq (,$(findstring mingw32,$(SYS)))
@@ -224,24 +230,25 @@ endif
 endif
 endif
 
-# Optimizations for x86 familiy
-ifneq (,$(findstring 86,$(ARCH)))
-# Optional Pentium Pro optimizations
-ifneq (,$(findstring ppro,$(ARCH)))
-CFLAGS += -march=pentiumpro -mcpu=pentiumpro
-else
-CFLAGS += -march=pentium -mcpu=pentium
-endif
-endif
-
-# Optimizations for PowerPC
 ifneq (,$(findstring powerpc,$(ARCH)))
-CFLAGS += -mmultiple -mhard-float -mstring -Wa,-m7400
+# Optimizations for PowerPC
+CFLAGS += -mmultiple -mhard-float -mstring -mcpu=powerpc
+ifneq (,$(TUNING))
+CFLAGS += -mtune=$(TUNING)
 endif
-
-# Optimizations for Sparc
+else
 ifneq (,$(findstring sparc,$(ARCH)))
+# Optimizations for Sparc
 CFLAGS += -mhard-float
+ifneq (,$(TUNING))
+CFLAGS += -mcpu=$(TUNING)
+endif
+else
+# Generic optimizations
+ifneq (,$(TUNING))
+CFLAGS += -mcpu=$(TUNING)
+endif
+endif
 endif
 
 #end of optimisations
@@ -258,7 +265,13 @@ DCFLAGS += -MM
 #
 LCFLAGS += @LCFLAGS@ $(LIB)
 LCFLAGS += -Wall
+ifneq ($(DEBUG),1)
+ifneq ($(GPROF),1)
+ifneq ($(CPROF),1)
 #LCFLAGS += -s
+endif
+endif
+endif
 ifneq (,$(findstring mingw32,$(SYS)))
 LCFLAGS += -mwindows -Xlinker --force-exe-suffix
 endif
@@ -266,7 +279,7 @@ endif
 #
 # C compiler and linker flags: setting soname
 #
-SOFLAGS += @SOFLAGS@
+SOFLAGS = @SOFLAGS@
 
 #
 # C compiler flags: plugin compilation