]> git.sesse.net Git - vlc/blobdiff - Makefile
La plupart des causes de segfault de la video ont �t� �limin�es, les messages
[vlc] / Makefile
index bd4cf192ba1355a13cb5995f1dd8b17c418bf9bb..01373b35358bf5cc8740154c06e2b7e7219c5b02 100644 (file)
--- a/Makefile
+++ b/Makefile
 # Configuration
 ################################################################################
 
-#CC = gcc
-#SHELL = /bin/sh
+# Environment
+CC=egcc
+SHELL=/bin/sh
+
+# Audio output settings
+AUDIO = dsp
+# Not yet supported
+#AUDIO += esd
+# Fallback method that should always work
+AUDIO += dummy
+
+# Video output settings
+VIDEO = x11
+VIDEO += fb
+#VIDEO += ggi
+#VIDEO += glide
+# Not yet supported
+#VIDEO += beos
+#VIDEO += dga
+# Fallback method that should always work
+VIDEO += dummy
+
+# Target architecture
+ARCH=X86
+#ARCH=PPC
+#ARCH=SPARC
+
+# Target operating system
+SYS=LINUX
+#SYS=BSD
+#SYS=BEOS
+
+# For x86 architecture, choose MMX support
+MMX=YES
+#MMX=NO
+
+# Decoder choice - ?? old decoder will be removed soon
+#DECODER=old
+DECODER=new
+
+# Debugging mode on or off (set to 1 to activate)
+DEBUG=1
+
+#----------------- do not change anything below this line ----------------------
 
 ################################################################################
-# Settings and other variables
+# Configuration pre-processing
+################################################################################
+
+# Program version - may only be changed by the project leader
+PROGRAM_VERSION = 0.95.0
+
+# audio options
+audio := $(shell echo $(AUDIO) | tr 'A-Z' 'a-z')
+AUDIO := $(shell echo $(AUDIO) | tr 'a-z' 'A-Z')
+DEFINE += $(AUDIO:%=-DAUDIO_%)
+
+# video options
+video := $(shell echo $(VIDEO) | tr 'A-Z' 'a-z')
+VIDEO := $(shell echo $(VIDEO) | tr 'a-z' 'A-Z')
+DEFINE += $(VIDEO:%=-DVIDEO_%)
+
+# PROGRAM_OPTIONS is an identification string of the compilation options
+PROGRAM_OPTIONS = $(ARCH) $(SYS)
+ifeq ($(DEBUG),1)
+PROGRAM_OPTIONS += DEBUG
+endif
+
+# PROGRAM_BUILD is a complete identification of the build
+PROGRAM_BUILD = `date -R` $(USER)@`hostname`
+
+# DEFINE will contain some of the constants definitions decided in Makefile, 
+# including ARCH_xx and SYS_xx. It will be passed to C compiler.
+DEFINE += -DARCH_$(ARCH)
+DEFINE += -DSYS_$(SYS)
+DEFINE += -DAUDIO_OPTIONS="\"$(audio)\""
+DEFINE += -DVIDEO_OPTIONS="\"$(video)\""
+DEFINE += -DPROGRAM_VERSION="\"$(PROGRAM_VERSION)\""
+DEFINE += -DPROGRAM_OPTIONS="\"$(PROGRAM_OPTIONS)\""
+DEFINE += -DPROGRAM_BUILD="\"$(PROGRAM_BUILD)\""
+ifeq ($(DEBUG),1)
+DEFINE += -DDEBUG
+endif
+
+################################################################################
+# Tuning and other variables - do not change anything except if you know
+# exactly what you are doing
 ################################################################################
 
 #
 # C headers directories
 #
 INCLUDE += -Iinclude
-INCLUDE += -I/usr/X11R6/include/X11
+
+ifneq (,$(findstring x11,$(video)))
+INCLUDE += -I/usr/X11R6/include
+endif
+
+ifneq (,$(findstring glide,$(video)))
+INCLUDE += -I/usr/include/glide
+endif
 
 #
 # Libraries
 #
+LIB += -lpthread
+LIB += -lm
+
+ifneq (,$(findstring x11,$(video)))
 LIB += -L/usr/X11R6/lib
 LIB += -lX11
 LIB += -lXext 
-LIB += -lpthread
-LIB += -lXpm
+endif
+ifneq (,$(findstring ggi,$(video)))
+LIB += -lggi
+endif
+ifneq (,$(findstring glide,$(video)))
+LIB += -lglide2x
+endif
 
 #
 # C compiler flags: compilation
 #
-CCFLAGS += $(INCLUDE)
+CCFLAGS += $(DEFINE) $(INCLUDE)
 CCFLAGS += -Wall
 CCFLAGS += -D_REENTRANT
 CCFLAGS += -D_GNU_SOURCE
 
 # Optimizations : don't compile debug versions with them
-#CCFLAGS += -O8
-#CCFLAGS += -s -fargument-noalias-global -fexpensive-optimizations -ffast-math -funroll-loops -fomit-frame-pointer #-march=pentiumpro
-#(Uncomment -march=pentiumpro if it applies)
-
+CCFLAGS += -O6
+CCFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
+#CCFLAGS += -fomit-frame-pointer
+
+# Optimizations for x86 familiy
+ifeq ($(ARCH),X86)
+CCFLAGS += -malign-double
+CCFLAGS += -march=pentiumpro
+#CCFLAGS += -march=pentium
+endif
+
+# Optimizations for PowerPC
+ifeq ($(ARCH),PPC)
+CCFLAGS += -mcpu=604e -mmultiple -mhard-float -mstring
+endif
+
+# Optimizations for Sparc
+ifeq ($(ARCH),SPARC)
+CCFLAGS += -mhard-float
+endif
 
 #
 # C compiler flags: dependancies
@@ -56,48 +170,35 @@ DCFLAGS += -MM
 #
 LCFLAGS += $(LIB)
 LCFLAGS += -Wall
-
-#
-# C compiler flags: functions flow
-#
-FCFLAGS += $(INCLUDE)
-FCFLAGS += -A
-FCFLAGS += -P
-FCFLAGS += -v
-FCFLAGS        += -a
-FCFLAGS += -X errno.h
-FCFLAGS += -X fcntl.h
-FCFLAGS += -X signal.h
-FCFLAGS += -X stdio.h
-FCFLAGS += -X stdlib.h
-FCFLAGS += -X string.h
-FCFLAGS += -X unistd.h
-FCFLAGS += -X sys/ioctl.h
-FCFLAGS += -X sys/stat.h
-FCFLAGS += -X X11/Xlib.h
-FFILTER = grep -v "intf_.*Msg.*\.\.\."
+#LCFLAGS += -s
 
 #
 # C compiler flags: common flags
 #
-# CFLAGS
+
+# Eventual MMX optimizations for x86
+ifeq ($(ARCH),X86)
+ifeq ($(MMX), YES) # MMX is YES or AUTO
+CFLAGS += -DHAVE_MMX
+endif
+endif
 
 #
 # Additionnal debugging flags
 #
-# Debugging settings: electric fence, debuging symbols and profiling support. 
-# Note that electric fence and accurate profiling are quite uncompatible.
-CCFLAGS += -g
-#CCFLAGS += -pg
-#LIB += -ldmalloc
-#LIB += -lefence
+
+# Debugging support
+ifeq ($(DEBUG),1)
+CFLAGS += -g
+#CFLAGS += -pg
+endif
 
 #################################################################################
 # Objects and files
 #################################################################################
 
 #
-# Objects
+# Objects
 # 
 interface_obj =                interface/main.o \
                                                interface/interface.o \
@@ -105,7 +206,8 @@ interface_obj =             interface/main.o \
                                                interface/intf_cmd.o \
                                                interface/intf_ctrl.o \
                                                interface/control.o \
-                                               interface/xconsole.o 
+                                               interface/intf_console.o \
+                                               $(video:%=interface/intf_%.o)
 
 input_obj =                    input/input_vlan.o \
                                                input/input_file.o \
@@ -117,38 +219,92 @@ input_obj =                       input/input_vlan.o \
                                                input/input.o
 
 audio_output_obj =             audio_output/audio_output.o \
-                                               audio_output/audio_dsp.o
+                                               $(audio:%=audio_output/aout_%.o)
 
 video_output_obj =             video_output/video_output.o \
-                                               video_output/video_x11.o \
-                                               video_output/video_graphics.o 
-
-audio_decoder_obj =            audio_decoder/audio_decoder.o
-
-generic_decoder_obj =          generic_decoder/generic_decoder.o
-
-video_decoder_obj =            video_decoder/video_decoder.o
+                                               video_output/video_text.o \
+                                               video_output/video_yuv.o \
+                                               $(video:%=video_output/vout_%.o)
+
+ac3_decoder_obj =              ac3_decoder/ac3_decoder.o \
+                                               ac3_decoder/ac3_parse.o \
+                                               ac3_decoder/ac3_exponent.o \
+                                               ac3_decoder/ac3_bit_allocate.o \
+                                               ac3_decoder/ac3_mantissa.o \
+                                               ac3_decoder/ac3_rematrix.o \
+                                               ac3_decoder/ac3_imdct.o \
+                                               ac3_decoder/ac3_downmix.o
+
+audio_decoder_obj =            audio_decoder/audio_decoder.o \
+                                               audio_decoder/audio_math.o
+
+spu_decoder_obj =              spu_decoder/spu_decoder.o
+
+#??generic_decoder_obj =               generic_decoder/generic_decoder.o
+# remeber to add it to OBJ 
+
+ifeq ($(DECODER),old)
+CFLAGS += -DOLD_DECODER
+video_decoder_obj =            video_decoder_ref/video_decoder.o \
+                                               video_decoder_ref/display.o \
+                                               video_decoder_ref/getblk.o \
+                                               video_decoder_ref/gethdr.o \
+                                               video_decoder_ref/getpic.o \
+                                               video_decoder_ref/getvlc.o \
+                                               video_decoder_ref/idct.o \
+                                               video_decoder_ref/motion.o \
+                                               video_decoder_ref/mpeg2dec.o \
+                                               video_decoder_ref/recon.o \
+                                               video_decoder_ref/spatscal.o
+else
+video_parser_obj =             video_parser/video_parser.o \
+                                               video_parser/vpar_headers.o \
+                                               video_parser/vpar_blocks.o \
+                                               video_parser/vpar_synchro.o \
+                                               video_parser/video_fifo.o
+
+video_decoder_obj =            video_decoder/video_decoder.o \
+                                               video_decoder/vdec_motion.o \
+                                               video_decoder/vdec_idct.o
+endif
 
 misc_obj =                     misc/mtime.o \
-                                               misc/xutils.o \
                                                misc/rsc_files.o \
-                                               misc/netutils.o
+                                               misc/netutils.o \
+                                               misc/decoder_fifo.o
 
-OBJ =  $(interface_obj) \
+C_OBJ = $(interface_obj) \
                $(input_obj) \
                $(audio_output_obj) \
                $(video_output_obj) \
+               $(ac3_decoder_obj) \
                $(audio_decoder_obj) \
+               $(spu_decoder_obj) \
                $(generic_decoder_obj) \
+               $(video_parser_obj) \
                $(video_decoder_obj) \
                $(vlan_obj) \
                $(misc_obj)
 
+#
+# Assembler Objects
+# 
+ifeq ($(ARCH),X86)
+ifeq ($(MMX), YES)
+ifeq ($(DECODER),new)
+ASM_OBJ =                      video_decoder/vdec_idctmmx.o \
+                                               video_output/video_yuv_mmx.o
+else
+ASM_OBJ =                      video_decoder_ref/vdec_idctmmx.o \
+                                               video_output/video_yuv_mmx.o
+endif
+endif
+endif
 
 #
 # Other lists of files
 #
-sources := $(OBJ:%.o=%.c)
+sources := $(C_OBJ:%.o=%.c)
 dependancies := $(sources:%.c=dep/%.d)
 
 # All symbols must be exported
@@ -164,33 +320,44 @@ export
 all: vlc
 
 clean:
-       rm -f $(OBJ)
+       rm -f $(C_OBJ) $(ASM_OBJ)
 
 distclean: clean
        rm -f **/*.o **/*~ *.log
-       rm -f vlc gmon.out core Documentation/cflow
+       rm -f vlc gmon.out core
        rm -rf dep
 
+show:
+       @echo "Command line for C objects:"
+       @echo $(CC) $(CCFLAGS) $(CFLAGS) -c -o "<dest.o>" "<src.c>"
+       @echo
+       @echo "Command line for assembler objects:"
+       @echo $(CC) $(CFLAGS) -c -o "<dest.o>" "<src.S>"
+
 FORCE:
 
 #
 # Real targets
 #
-vlc: $(OBJ)
-       $(CC) $(LCFLAGS) $(CFLAGS) -o $@ $(OBJ)
-
-Documentation/cflow: $(sources)
-       cflow $(FCFLAGS) $(CFLAGS) $(sources) | $(FFILTER) > $@
+vlc: $(C_OBJ) $(ASM_OBJ)
+       $(CC) $(LCFLAGS) $(CFLAGS) -o $@ $(C_OBJ) $(ASM_OBJ)    
 
 #
 # Generic rules (see below)
 #
 $(dependancies): %.d: FORCE
-       @make -s --no-print-directory -f Makefile.dep $@
+       @$(MAKE) -s --no-print-directory -f Makefile.dep $@
+
+$(C_OBJ): %.o: Makefile.dep
+$(C_OBJ): %.o: dep/%.d
+$(C_OBJ): %.o: %.c
+       @echo "compiling $*.c"
+       @$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
 
-$(OBJ): %.o: dep/%.d
-$(OBJ): %.o: %.c
-       $(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
+$(ASM_OBJ): %.o: Makefile.dep
+$(ASM_OBJ): %.o: %.S
+       @echo "assembling $*.S"
+       @$(CC) $(CFLAGS) -c -o $@ $<
 
 ################################################################################
 # Note on generic rules and dependancies
@@ -211,5 +378,5 @@ $(OBJ): %.o: %.c
 # Two makefiles are used: the main one (this one) has regular generic rules,
 # except for .o files, for which it calls the object Makefile. Dependancies
 # are not included in this file.
-# The object Makefile known how to make a .o from a .c, and includes dependancies
-# for the target, but only those required.
+# The object Makefile known how to make a .o from a .c, and includes
+# dependancies for the target, but only those required.