X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.opts.in;h=8606424850bb3f72a39dba18a2f2333bb2cc2e3f;hb=3f421de703a5b37448f289de203fbcc639818ba1;hp=52241d7238cade30407b2fc8acba3941df58ffb5;hpb=62ba06e09fc94d25cbcc7f51e7bf1e82b4567d22;p=vlc

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 52241d7238..8606424850 100644
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -40,6 +40,7 @@ CPROF = @CPROF@
 GPROF = @GPROF@
 OPTIMS = @OPTIMS@
 TUNING = @TUNING@
+RELEASE = @RELEASE@
 
 # 
 # Build environment
@@ -50,6 +51,7 @@ SHELL = @SHELL@
 RANLIB = @RANLIB@
 WINDRES = @WINDRES@
 MOC = @MOC@
+DLL_PATH = @DLL_PATH@
 
 # 
 # Installation environment
@@ -65,44 +67,69 @@ includedir = @includedir@
 # Libraries for special cases
 #
 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_ESD = @LIB_ESD@
+LIB_FILTER_DISTORT = @LIB_FILTER_DISTORT@
 LIB_GGI = @LIB_GGI@
 LIB_GLIDE = @LIB_GLIDE@
 LIB_GNOME = @LIB_GNOME@
 LIB_GTK = @LIB_GTK@
-LIB_LIBDVDCSS = @LIB_LIBDVDCSS@
+LIB_IDCTALTIVEC = @LIB_IDCTALTIVEC@
+LIB_IMDCT = @LIB_IMDCT@
+LIB_IMDCT3DN = @LIB_IMDCT3DN@
+LIB_IMDCTSSE = @LIB_IMDCTSSE@
 LIB_KDE = @LIB_KDE@
+LIB_A52 = @LIB_A52@
+LIB_LIBDVDCSS = @LIB_LIBDVDCSS@
+LIB_LIBDVDREAD = @LIB_LIBDVDREAD@
+LIB_LIRC = @LIB_LIRC@
 LIB_MACOSX = @LIB_MACOSX@
-LIB_QNX = @LIB_QNX@
+LIB_MAD = @LIB_MAD@
+LIB_MOTIONALTIVEC = @LIB_MOTIONALTIVEC@
+LIB_MPEG_TS = @LIB_MPEG_TS@
 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_WAVEOUT = @LIB_WAVEOUT@
+LIB_WIN32 = @LIB_WIN32@
 LIB_X11 = @LIB_X11@
 LIB_XVIDEO = @LIB_XVIDEO@
-LIB_YUV = @LIB_YUV@
 
 #
 # CFLAGS for special cases
 #
-CFLAGS_ALTIVEC = @CFLAGS_ALTIVEC@
+CFLAGS_VLC = @CFLAGS_VLC@
+CFLAGS_ARTS = @CFLAGS_ARTS@
 CFLAGS_DVD = @CFLAGS_DVD@
-CFLAGS_LIBDVDCSS = @CFLAGS_LIBDVDCSS@
+CFLAGS_DVDREAD = @CFLAGS_DVDREAD@
+CFLAGS_ESD = @CFLAGS_ESD@
+CFLAGS_GLIDE = @CFLAGS_GLIDE@
+CFLAGS_GNOME = @CFLAGS_GNOME@
 CFLAGS_GTK = @CFLAGS_GTK@
+CFLAGS_KDE = @CFLAGS_KDE@
+CFLAGS_IDCTALTIVEC = @CFLAGS_IDCTALTIVEC@
+CFLAGS_LIBDVDCSS = @CFLAGS_LIBDVDCSS@
+CFLAGS_MACOSX = @CFLAGS_MACOSX@
+CFLAGS_MAD = @CFLAGS_MAD@
+CFLAGS_MOTIONALTIVEC = @CFLAGS_MOTIONALTIVEC@
+CFLAGS_QT = @CFLAGS_QT@
 CFLAGS_SDL = @CFLAGS_SDL@
+CFLAGS_WIN32 = @CFLAGS_WIN32@
 CFLAGS_X11 = @CFLAGS_X11@
+CFLAGS_XVIDEO = @CFLAGS_XVIDEO@
 
 #
 # Additional objects
 #
-OBJ_DVD = @OBJ_DVD@
-OBJ_LIBDVDCSS = @OBJ_LIBDVDCSS@
+SRC_DVD_EXTRA = @SRC_DVD_EXTRA@
+SRC_DVDCSS_EXTRA = @SRC_DVDCSS_EXTRA@
 
 #
 # Other special cases
@@ -149,11 +176,18 @@ LIBDVDCSS_VERSION=@LIBDVDCSS_VERSION@
 
 # DEFINE will contain some of the constants definitions decided in Makefile, 
 # including SYS_xx. It will be passed to C compiler.
-DEFINE_CONSTANTS := -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_')
-DEFINE += $(DEFINE_CONSTANTS)
+DEFINE_SYS := -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_')
+DEFINE += $(DEFINE_SYS)
 
 # On Linux and Solaris, activate 64-bit off_t (by default under BSD)
-DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98
+DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE
+
+# Gettext support
+DEFINE += -DLOCALEDIR=\"$(datadir)/locale\"
+
+# Data and plugin location
+DEFINE += -DDATA_PATH=\"@prefix@/share/videolan\"
+DEFINE += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\"
 
 ###############################################################################
 # Tuning and other variables - do not change anything except if you know
@@ -169,13 +203,8 @@ 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_BUILTINS := $(patsubst %,$$LIB_%,$(shell echo $(BUILTINS) | tr '[a-z]' '[A-Z]'))
 LIB += $(LIB_BUILTINS)
-endif
 
 #
 # Libraries
@@ -189,20 +218,21 @@ LIB += @LIB@
 #
 # C compiler flags: mainstream compilation
 #
-DEFINE += @DEFINE@
 CFLAGS += $(DEFINE) $(INCLUDE)
-CFLAGS += -Wall -Winline
-CFLAGS += -pipe
 CFLAGS += -D_REENTRANT
 CFLAGS += -D_GNU_SOURCE
 
+ifeq ($(RELEASE),1)
+CFLAGS += -DHAVE_RELEASE
+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)))
@@ -215,30 +245,34 @@ endif
 
 # Optimizations : don't compile debug versions with them
 ifeq ($(OPTIMS),1)
-CFLAGS += -O3
-CFLAGS += -ffast-math -funroll-loops
+CFLAGS += @CFLAGS_OPTIM@
 ifneq ($(DEBUG),1)
 ifneq ($(GPROF),1)
 ifneq ($(CPROF),1)
-CFLAGS += -fomit-frame-pointer
-endif
+CFLAGS += @CFLAGS_OPTIM_NODEBUG@
 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
@@ -248,22 +282,23 @@ endif
 # C compiler flags: dependancies
 #
 DCFLAGS += $(INCLUDE)
-DCFLAGS += -MM
+DCFLAGS += -M
 
 #
 # C compiler flags: linking
 #
-LCFLAGS += @LCFLAGS@ $(LIB)
-LCFLAGS += -Wall
+LDFLAGS += @LDFLAGS@
+LDFLAGS += $(LIB)
+LDFLAGS += -Wall
 ifneq ($(DEBUG),1)
 ifneq ($(GPROF),1)
 ifneq ($(CPROF),1)
-#LCFLAGS += -s
+#LDFLAGS += -s
 endif
 endif
 endif
 ifneq (,$(findstring mingw32,$(SYS)))
-LCFLAGS += -mwindows -Xlinker --force-exe-suffix
+LDFLAGS += -mwindows -Xlinker --force-exe-suffix
 endif
 
 #
@@ -283,7 +318,7 @@ endif
 #
 # C compiler flags: plugin linking
 #
-PLCFLAGS += @PLCFLAGS@
+PLDFLAGS += @PLDFLAGS@
 
 #
 # Debugging and profiling support