* Fixed potential compilation issues under eg. BSD/OS.

[vlc] / Makefile.opts.in

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 52241d7238cade30407b2fc8acba3941df58ffb5..92aaee7cdbc9737060695d3733ed241f4b26ec64 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -40,6 +40,7 @@ CPROF = @CPROF@
 GPROF = @GPROF@
 OPTIMS = @OPTIMS@
 TUNING = @TUNING@
+RELEASE = @RELEASE@
 
 # 
 # Build environment
@@ -66,24 +67,32 @@ includedir = @includedir@
 #
 LIB_ALSA = @LIB_ALSA@
 LIB_ALTIVEC = @LIB_ALTIVEC@
+LIB_ARTS = @LIB_ARTS@
 LIB_BEOS = @LIB_BEOS@
 LIB_DARWIN = @LIB_DARWIN@
+LIB_DIRECTX = @LIB_DIRECTX@
 LIB_DVD = @LIB_DVD@
 LIB_DVD_PLUGIN = @LIB_DVD_PLUGIN@
+LIB_DVDREAD = @LIB_DVDREAD@
+LIB_DVDREAD_PLUGIN = @LIB_DVDREAD_PLUGIN@
 LIB_ESD = @LIB_ESD@
 LIB_GGI = @LIB_GGI@
 LIB_GLIDE = @LIB_GLIDE@
 LIB_GNOME = @LIB_GNOME@
 LIB_GTK = @LIB_GTK@
-LIB_LIBDVDCSS = @LIB_LIBDVDCSS@
+LIB_IMDCT = @LIB_IMDCT@
+LIB_IMDCT3DN = @LIB_IMDCT3DN@
+LIB_IMDCTSSE = @LIB_IMDCTSSE@
 LIB_KDE = @LIB_KDE@
+LIB_LIBDVDCSS = @LIB_LIBDVDCSS@
 LIB_MACOSX = @LIB_MACOSX@
-LIB_QNX = @LIB_QNX@
+LIB_MAD = @LIB_MAD@
 LIB_NCURSES = @LIB_NCURSES@
+LIB_QNX = @LIB_QNX@
 LIB_QT = @LIB_QT@
-LIB_TS = @LIB_TS@
+LIB_RC = @LIB_RC@
 LIB_SDL = @LIB_SDL@
-LIB_DIRECTX = @LIB_DIRECTX@
+LIB_TS = @LIB_TS@
 LIB_X11 = @LIB_X11@
 LIB_XVIDEO = @LIB_XVIDEO@
 LIB_YUV = @LIB_YUV@
@@ -93,8 +102,13 @@ LIB_YUV = @LIB_YUV@
 #
 CFLAGS_ALTIVEC = @CFLAGS_ALTIVEC@
 CFLAGS_DVD = @CFLAGS_DVD@
+CFLAGS_DVDREAD = @CFLAGS_DVDREAD@
+CFLAGS_ARTS = @CFLAGS_ARTS@
+CFLAGS_ESD = @CFLAGS_ESD@
 CFLAGS_LIBDVDCSS = @CFLAGS_LIBDVDCSS@
+CFLAGS_ESD = @CFLAGS_ESD@
 CFLAGS_GTK = @CFLAGS_GTK@
+CFLAGS_MAD = @CFLAGS_MAD@
 CFLAGS_SDL = @CFLAGS_SDL@
 CFLAGS_X11 = @CFLAGS_X11@
 
@@ -196,13 +210,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)))
@@ -225,20 +243,25 @@ endif
 endif
 endif
 
-# Optimizations for x86 familiy
-ifneq (,$(findstring 86,$(ARCH)))
-CFLAGS += -mcpu=$(TUNING)
-endif
-
-# Optimizations for PowerPC
 ifneq (,$(findstring powerpc,$(ARCH)))
+# 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