OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3cf8db9
)
Fix building of object files in tools/
author
Ramiro Polla
<ramiro.polla@gmail.com>
Tue, 7 Dec 2010 11:42:19 +0000
(11:42 +0000)
committer
Ramiro Polla
<ramiro.polla@gmail.com>
Tue, 7 Dec 2010 11:42:19 +0000
(11:42 +0000)
Fixes issue issue2408.
Originally committed as revision 25905 to svn://svn.ffmpeg.org/ffmpeg/trunk
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
e52d5c5
..
ef514e8
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-90,7
+90,7
@@
tools/%$(EXESUF): tools/%.o
$(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
tools/%.o: tools/%.c
- $(CC) $(CPPFLAGS) $(CFLAGS) $(CC_O) $<
+ $(CC) $(CPPFLAGS) $(CFLAGS)
-c
$(CC_O) $<
ffplay.o: CFLAGS += $(SDL_CFLAGS)