mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 03:59:43 +00:00
Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23'
* commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23': build: Allow specifying extra object files when linking HOSTPROGS Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3e78ceadf9
@ -116,7 +116,7 @@ $(HOSTOBJS): %.o: %.c
|
||||
$(call COMPILE,HOSTCC)
|
||||
|
||||
$(HOSTPROGS): %$(HOSTEXESUF): %.o
|
||||
$(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $< $(HOSTLIBS)
|
||||
$(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTLIBS)
|
||||
|
||||
$(OBJS): | $(sort $(dir $(OBJS)))
|
||||
$(HOBJS): | $(sort $(dir $(HOBJS)))
|
||||
|
Loading…
Reference in New Issue
Block a user