X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=7b6b985c04e3596f8f4c70f1c1f86abce520d85e;hb=7a0afd69fd2574bf075be9ed566f547dd93efd37;hp=4337898d4a59313840499ed4611cef7a43621e0f;hpb=c139cb708226c44e05819667004aa0493369853f;p=vlc

diff --git a/Makefile b/Makefile
index 4337898d4a..7b6b985c04 100644
--- a/Makefile
+++ b/Makefile
@@ -10,39 +10,53 @@
 ################################################################################
 
 # Environment
-#CC=gcc
-#SHELL=/bin/sh
+CC=egcc
+SHELL=/bin/sh
 
-# Video output settings
-VIDEO=X11
-#VIDEO=DUMMY
-#VIDEO=FB
-#VIDEO=GGI
-
-# Highly experimental
-#VIDEO=3DFX
+# Audio output settings
+AUDIO = dsp
+#AUDIO += esd
+# Not yet supported
+#AUDIO += alsa
+# 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
+#VIDEO += beos
+#VIDEO += dga
+# Fallback method that should always work
+VIDEO += dummy
 
-# Target architecture and optimization
-#ARCH=
-ARCH=MMX
+# Target architecture
+ARCH=X86
 #ARCH=PPC
 #ARCH=SPARC
 
 # Target operating system
 SYS=LINUX
+#SYS=GNU
 #SYS=BSD
 #SYS=BEOS
 
+# For x86 architecture, choose MMX support
+MMX=YES
+#MMX=NO
+# For x86 architecture, optimize for Pentium Pro
+# (choose NO if you get `Invalid instruction' errors)
+PPRO=YES
+#PPRO=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
+DEBUG=0
 
 #----------------- do not change anything below this line ----------------------
 
@@ -51,10 +65,18 @@ DEBUG=1
 ################################################################################
 
 # Program version - may only be changed by the project leader
-PROGRAM_VERSION = 1.0-dev
+PROGRAM_VERSION = 0.1.99
+
+# audio options
+audio := $(shell echo $(AUDIO) | tr 'A-Z' 'a-z')
+AUDIO := $(shell echo $(AUDIO) | tr 'a-z' 'A-Z')
+
+# video options
+video := $(shell echo $(VIDEO) | tr 'A-Z' 'a-z')
+VIDEO := $(shell echo $(VIDEO) | tr 'a-z' 'A-Z')
 
 # PROGRAM_OPTIONS is an identification string of the compilation options
-PROGRAM_OPTIONS = $(VIDEO) $(ARCH) $(SYS)
+PROGRAM_OPTIONS = $(ARCH) $(SYS)
 ifeq ($(DEBUG),1)
 PROGRAM_OPTIONS += DEBUG
 endif
@@ -63,10 +85,11 @@ endif
 PROGRAM_BUILD = `date -R` $(USER)@`hostname`
 
 # DEFINE will contain some of the constants definitions decided in Makefile, 
-# including VIDEO_xx and ARCH_xx. It will be passed to C compiler.
-DEFINE += -DVIDEO_$(VIDEO) 
+# 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)\""
@@ -74,11 +97,8 @@ ifeq ($(DEBUG),1)
 DEFINE += -DDEBUG
 endif
 
-# video is a lowercase version of VIDEO used for filenames
-video = $(shell echo $(VIDEO) | tr 'A-Z' 'a-z')
-
 ################################################################################
-# Tunning and other variables - do not change anything except if you know
+# Tuning and other variables - do not change anything except if you know
 # exactly what you are doing
 ################################################################################
 
@@ -87,31 +107,12 @@ video = $(shell echo $(VIDEO) | tr 'A-Z' 'a-z')
 #
 INCLUDE += -Iinclude
 
-ifeq ($(VIDEO),X11)
-INCLUDE += -I/usr/X11R6/include
-endif
-
-ifeq ($(VIDEO),3DFX)
-INCLUDE += -I/usr/include/glide
-endif
-
 #
 # Libraries
 #
 LIB += -lpthread
-LIN += -lm
-
-ifeq ($(VIDEO),X11)
-LIB += -L/usr/X11R6/lib
-LIB += -lX11
-LIB += -lXext 
-endif
-ifeq ($(VIDEO),GGI)
-LIB += -lggi
-endif
-ifeq ($(VIDEO),3DFX)
-LIB += -lglide2x
-endif
+LIB += -lm
+LIB += -ldl
 
 #
 # C compiler flags: compilation
@@ -126,18 +127,18 @@ CCFLAGS += -O6
 CCFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
 CCFLAGS += -fomit-frame-pointer
 
-# Optimizations for x86 familiy, without MMX
-ifeq ($(ARCH),)
+# Optimizations for x86 familiy
+ifeq ($(ARCH),X86)
 CCFLAGS += -malign-double
-CCFLAGS += -march=pentiumpro
 #CCFLAGS += -march=pentium
-endif
-
-# Optimization for x86 with MMX support
-ifeq ($(ARCH),MMX)
-CCFLAGS += -malign-double
+ifeq ($(PPRO), YES)
 CCFLAGS += -march=pentiumpro
 endif
+# Eventual MMX optimizations for x86
+ifeq ($(MMX), YES)
+CFLAGS += -DHAVE_MMX
+endif
+endif
 
 # Optimizations for PowerPC
 ifeq ($(ARCH),PPC)
@@ -162,15 +163,6 @@ LCFLAGS += $(LIB)
 LCFLAGS += -Wall
 #LCFLAGS += -s
 
-#
-# C compiler flags: common flags
-#
-
-# Optimizations for x86 with MMX support
-ifeq ($(ARCH),MMX)
-CFLAGS += -DHAVE_MMX
-endif
-
 #
 # Additionnal debugging flags
 #
@@ -193,9 +185,7 @@ interface_obj =  		interface/main.o \
 						interface/intf_msg.o \
 						interface/intf_cmd.o \
 						interface/intf_ctrl.o \
-						interface/control.o \
-						interface/intf_console.o \
-						interface/intf_$(video).o
+						interface/intf_console.o
 
 input_obj =         		input/input_vlan.o \
 						input/input_file.o \
@@ -206,15 +196,14 @@ input_obj =         		input/input_vlan.o \
 						input/input_psi.o \
 						input/input.o
 
-audio_output_obj = 		audio_output/audio_output.o \
-						audio_output/audio_dsp.o
+audio_output_obj = 		audio_output/audio_output.o
 
 video_output_obj = 		video_output/video_output.o \
-						video_output/video_$(video).o \
 						video_output/video_text.o \
 						video_output/video_yuv.o
 
-ac3_decoder_obj =		ac3_decoder/ac3_decoder.o \
+ac3_decoder_obj =		ac3_decoder/ac3_decoder_thread.o \
+						ac3_decoder/ac3_decoder.o \
 						ac3_decoder/ac3_parse.o \
 						ac3_decoder/ac3_exponent.o \
 						ac3_decoder/ac3_bit_allocate.o \
@@ -253,12 +242,14 @@ video_parser_obj = 		video_parser/video_parser.o \
 
 video_decoder_obj =		video_decoder/video_decoder.o \
 						video_decoder/vdec_motion.o \
+						video_decoder/vdec_motion_inner.o \
 			                        video_decoder/vdec_idct.o
 endif
 
 misc_obj =			misc/mtime.o \
 						misc/rsc_files.o \
-						misc/netutils.o
+						misc/netutils.o \
+						misc/decoder_fifo.o
 
 C_OBJ = $(interface_obj) \
 		$(input_obj) \
@@ -276,20 +267,31 @@ C_OBJ = $(interface_obj) \
 #
 # Assembler Objects
 # 
-ifeq ($(ARCH),MMX)
-ifeq ($(DECODER),old)
-ASM_OBJ = 			video_decoder_ref/idctmmx.o \
+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/idctmmx.o \
+ASM_OBJ = 			video_decoder_ref/vdec_idctmmx.o \
 						video_output/video_yuv_mmx.o
 endif
 endif
+endif
+
+#
+# Plugins
+#
+interface_plugin =	$(video:%=interface/intf_%.so)
+audio_plugin =		$(audio:%=audio_output/aout_%.so)
+video_plugin = 		$(video:%=video_output/vout_%.so)
+
+PLUGIN_OBJ = $(interface_plugin) $(audio_plugin) $(video_plugin)
 
 #
 # Other lists of files
 #
-sources := $(C_OBJ:%.o=%.c)
+sources := $(C_OBJ:%.o=%.c) $(PLUGIN_OBJ:%.so=%.c)
 dependancies := $(sources:%.c=dep/%.d)
 
 # All symbols must be exported
@@ -305,10 +307,10 @@ export
 all: vlc
 
 clean:
-	rm -f $(C_OBJ) $(ASM_OBJ)
+	rm -f $(C_OBJ) $(ASM_OBJ) $(PLUGIN_OBJ)
 
 distclean: clean
-	rm -f **/*.o **/*~ *.log
+	rm -f **/*.o **/*.so **/*~ *.log
 	rm -f vlc gmon.out core
 	rm -rf dep
 
@@ -324,8 +326,8 @@ FORCE:
 #
 # Real targets
 #
-vlc: $(C_OBJ) $(ASM_OBJ)
-	$(CC) $(LCFLAGS) $(CFLAGS) -o $@ $(C_OBJ) $(ASM_OBJ)	
+vlc: $(C_OBJ) $(ASM_OBJ) $(PLUGIN_OBJ)
+	$(CC) $(LCFLAGS) $(CFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(ASM_OBJ)	
 
 #
 # Generic rules (see below)
@@ -333,17 +335,48 @@ vlc: $(C_OBJ) $(ASM_OBJ)
 $(dependancies): %.d: FORCE
 	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
 
-$(C_OBJ): %.o: Makefile Makefile.dep
+$(C_OBJ): %.o: Makefile.dep
 $(C_OBJ): %.o: dep/%.d
 $(C_OBJ): %.o: %.c
-	@echo "compiling $*.c"
+	@echo "compiling $*.o from $*.c"
 	@$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
 
-$(ASM_OBJ): %.o: Makefile Makefile.dep
+$(ASM_OBJ): %.o: Makefile.dep
 $(ASM_OBJ): %.o: %.S
-	@echo "assembling $*.S"
+	@echo "assembling $*.o from $*.S"
 	@$(CC) $(CFLAGS) -c -o $@ $<
 
+$(PLUGIN_OBJ): %.so: Makefile.dep
+$(PLUGIN_OBJ): %.so: dep/%.d
+
+# audio plugins
+audio_output/aout_dummy.so audio_output/aout_dsp.so: %.so: %.c
+		@echo "compiling $*.so from $*.c"
+		@$(CC) $(CCFLAGS) $(CFLAGS) -shared -o $@ $<
+
+audio_output/aout_esd.so: %.so: %.c
+		@echo "compiling $*.so from $*.c"
+		@$(CC) $(CCFLAGS) $(CFLAGS) -laudiofile -lesd -shared -o $@ $<
+
+# video plugins
+interface/intf_dummy.so video_output/vout_dummy.so \
+	interface/intf_fb.so video_output/vout_fb.so: %.so: %.c
+		@echo "compiling $*.so from $*.c"
+		@$(CC) $(CCFLAGS) $(CFLAGS) -shared -o $@ $<
+
+interface/intf_x11.so video_output/vout_x11.so: %.so: %.c
+		@echo "compiling $*.so from $*.c"
+		@$(CC) $(CCFLAGS) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lX11 -lXext -shared -o $@ $<
+
+interface/intf_glide.so video_output/vout_glide.so: %.so: %.c
+		@echo "compiling $*.so from $*.c"
+		@$(CC) $(CCFLAGS) $(CFLAGS) -I/usr/include/glide -lglide2x -shared -o $@ $<
+
+interface/intf_ggi.so video_output/vout_ggi.so: %.so: %.c
+		@echo "compiling $*.so from $*.c"
+		@$(CC) $(CCFLAGS) $(CFLAGS) -lggi -shared -o $@ $<
+
+
 ################################################################################
 # Note on generic rules and dependancies
 ################################################################################