diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 02:45:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 02:45:45 +0200 |
| commit | dac096cf39d24735f1992b7d867519f17974865b (patch) | |
| tree | 94803d59c376db3bd998de821b517e21661a2993 /Makefile | |
| parent | 7f1543d46cd88e86bd662695d79c16c93892223e (diff) | |
| parent | bb0babd7054bed7edfd9f4d6b20cdba864de1830 (diff) | |
| download | android_external_ffmpeg-dac096cf39d24735f1992b7d867519f17974865b.tar.gz android_external_ffmpeg-dac096cf39d24735f1992b7d867519f17974865b.tar.bz2 android_external_ffmpeg-dac096cf39d24735f1992b7d867519f17974865b.zip | |
Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'
* commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830':
build: Support executable only ldflags
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -63,7 +63,7 @@ FF_DEP_LIBS := $(DEP_LIBS) all: $(AVPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS) - $(LD) $(LDFLAGS) $(LD_O) $^ $(ELIBS) + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) @@ -117,7 +117,7 @@ $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) $(STRIP) $@ %$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS) - $(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) OBJDIRS += tools |