[FFmpeg-devel] [PATCH] tests/api: Fix API test build on windows with --enable-shared
Hendrik Leppkes
h.leppkes at gmail.com
Wed Dec 2 09:09:23 CET 2015
On Wed, Dec 2, 2015 at 2:29 AM, Michael Niedermayer <michaelni at gmx.at> wrote:
> On Tue, Dec 01, 2015 at 08:04:22PM +0100, Hendrik Leppkes wrote:
>> On Mon, Nov 30, 2015 at 10:50 PM, Hendrik Leppkes <h.leppkes at gmail.com> wrote:
>> > ---
>> > I'm not quite sure if this fix is 100% correct, but it works here.
>> >
>> > The problem is that FF_DEP_LIBS points to the .dll files, but you can't link to the .dll files,
>> > you need to point to the import libraries. Unfortunately there is no variable which simply
>> > holds all import libraries - but they do appear to be part of FF_EXTRALIBS, so thats used instead.
>> >
>> > tests/api/Makefile | 2 +-
>> > 1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/tests/api/Makefile b/tests/api/Makefile
>> > index c48c34a..a6d8e42 100644
>> > --- a/tests/api/Makefile
>> > +++ b/tests/api/Makefile
>> > @@ -14,7 +14,7 @@ $(APITESTOBJS) $(APITESTOBJS:.o=.i): CPPFLAGS += -DTEST
>> > $(APITESTOBJS) $(APITESTOBJS:.o=.i): CFLAGS += -Umain
>> >
>> > $(APITESTPROGS): %$(EXESUF): %.o $(EXEOBJS) $(FF_DEP_LIBS)
>> > - $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(filter %.o,$^) $(FF_DEP_LIBS) $(FFEXTRALIBS) $(ELIBS)
>> > + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(filter %.o,$^) $(FF_EXTRALIBS) $(ELIBS)
>> >
>> > testclean::
>> > $(RM) $(addprefix $(APITESTSDIR)/,$(CLEANSUFFIXES) *-test$(EXESUF))
>> > --
>> > 2.6.2.windows.1
>> >
>>
>> Anyone that knows the build system a bit more? Or maybe anyone that
>
>> just feels like testing on some other systems than mine? :)
>
> seems to work on everything i tried but that probably is a small
> subset of what is out there
>
Considering this is only in the FATE Makefile, I'll push this later
and address any fallout on FATE, if any, unless someone objects in the
next couple hours.
- Hendrik
More information about the ffmpeg-devel
mailing list