highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge SDL_CFLAGS handling for files that need it.

Browse Source 
Originally committed as revision 12412 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2008-03-10 20:01:50 +00:00
parent 5acef35f57
commit 3c889b5cf7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -117,7 +117,7 @@ output_example$(EXESUF): output_example.o .libs
tools/%$(EXESUF): tools/%.c tools/%$(EXESUF): tools/%.c
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS)
ffplay.o: CFLAGS += $(SDL_CFLAGS) ffplay.o .depend: CFLAGS += $(SDL_CFLAGS)
ffmpeg.o ffplay.o ffserver.o: version.h ffmpeg.o ffplay.o ffserver.o: version.h
@@ -227,7 +227,7 @@ depend dep: .depend .vhookdep
$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend
.depend: $(SRCS) version.h .depend: $(SRCS) version.h
$(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend $(CC) -MM $(CFLAGS) $(filter-out %.h,$^) 1>.depend
# gcc stupidly only outputs the basename of targets with -MM # gcc stupidly only outputs the basename of targets with -MM
.vhookdep: $(ALLHOOKS_SRCS) version.h .vhookdep: $(ALLHOOKS_SRCS) version.h