Commit cefd4199 authored by Jean-Marc Dressler's avatar Jean-Marc Dressler

Gr�ce � Jimmy, plus besoin de compiler les fichiers assembleurs � part,
le make se d�brouille tout seul comme un grand en utilisant gcc pour
compiler les .S
parent 681b4e18
...@@ -53,8 +53,8 @@ CCFLAGS += -march=pentiumpro ...@@ -53,8 +53,8 @@ CCFLAGS += -march=pentiumpro
# MMX support : # MMX support :
CFLAGS += -DHAVE_MMX CFLAGS += -DHAVE_MMX
assembly_obj = video_decoder_ref/idctmmx.o \ ASM_OBJ = video_decoder_ref/idctmmx.o \
video_decoder_ref/yuv12-rgb16.o video_decoder_ref/yuv12-rgb16.o
#Optimizations for PowerPC : #Optimizations for PowerPC :
#CCFLAGS += -mcpu=604e -mmultiple -mhard-float -mstring #CCFLAGS += -mcpu=604e -mmultiple -mhard-float -mstring
...@@ -161,7 +161,7 @@ misc_obj = misc/mtime.o \ ...@@ -161,7 +161,7 @@ misc_obj = misc/mtime.o \
misc/rsc_files.o \ misc/rsc_files.o \
misc/netutils.o misc/netutils.o
OBJ = $(interface_obj) \ C_OBJ = $(interface_obj) \
$(input_obj) \ $(input_obj) \
$(audio_output_obj) \ $(audio_output_obj) \
$(video_output_obj) \ $(video_output_obj) \
...@@ -169,13 +169,12 @@ OBJ = $(interface_obj) \ ...@@ -169,13 +169,12 @@ OBJ = $(interface_obj) \
$(generic_decoder_obj) \ $(generic_decoder_obj) \
$(video_decoder_obj) \ $(video_decoder_obj) \
$(vlan_obj) \ $(vlan_obj) \
$(misc_obj) $(misc_obj) \
# #
# Other lists of files # Other lists of files
# #
sources := $(OBJ:%.o=%.c) sources := $(C_OBJ:%.o=%.c)
dependancies := $(sources:%.c=dep/%.d) dependancies := $(sources:%.c=dep/%.d)
# All symbols must be exported # All symbols must be exported
...@@ -191,7 +190,7 @@ export ...@@ -191,7 +190,7 @@ export
all: vlc all: vlc
clean: clean:
rm -f $(OBJ) rm -f $(C_OBJ) $(ASM_OBJ)
distclean: clean distclean: clean
rm -f **/*.o **/*~ *.log rm -f **/*.o **/*~ *.log
...@@ -203,8 +202,8 @@ FORCE: ...@@ -203,8 +202,8 @@ FORCE:
# #
# Real targets # Real targets
# #
vlc: $(OBJ) vlc: $(C_OBJ) $(ASM_OBJ)
$(CC) $(LCFLAGS) $(CFLAGS) -o $@ $(OBJ) $(assembly_obj) $(CC) $(LCFLAGS) $(CFLAGS) -o $@ $(C_OBJ) $(ASM_OBJ)
Documentation/cflow: $(sources) Documentation/cflow: $(sources)
cflow $(FCFLAGS) $(CFLAGS) $(sources) | $(FFILTER) > $@ cflow $(FCFLAGS) $(CFLAGS) $(sources) | $(FFILTER) > $@
...@@ -215,9 +214,12 @@ Documentation/cflow: $(sources) ...@@ -215,9 +214,12 @@ Documentation/cflow: $(sources)
$(dependancies): %.d: FORCE $(dependancies): %.d: FORCE
@make -s --no-print-directory -f Makefile.dep $@ @make -s --no-print-directory -f Makefile.dep $@
$(OBJ): %.o: dep/%.d $(C_OBJ): %.o: dep/%.d
$(OBJ): %.o: %.c
$(C_OBJ): %.o: %.c
$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $< $(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
$(ASM_OBJ): %.o: %.S
$(CC) -c -o $@ $<
################################################################################ ################################################################################
# Note on generic rules and dependancies # Note on generic rules and dependancies
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment