Re: [FFmpeg-devel] [PATCH] tests/api: Fix API test build on windows with --enable-shared
On Wed, Dec 2, 2015 at 9:09 AM, Hendrik Leppkes wrote: > On Wed, Dec 2, 2015 at 2:29 AM, Michael Niedermayer 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 >>> 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. > Applied. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] tests/api: Fix API test build on windows with --enable-shared
On Wed, Dec 2, 2015 at 2:29 AM, Michael Niedermayer 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 >> 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 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] tests/api: Fix API test build on windows with --enable-shared
On Tue, Dec 1, 2015 at 8:29 PM, Michael Niedermayer 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 >> 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 that is still a far larger set than what anyone else actively working on FFmpeg has AFAIK, and definitely supersedes what I have :). In other words, it is a best effort wrt development, and we can't hope for much more. > > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > it is not once nor twice but times without number that the same ideas make > their appearance in the world. -- Aristotle > > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] tests/api: Fix API test build on windows with --enable-shared
On Tue, Dec 01, 2015 at 08:04:22PM +0100, Hendrik Leppkes wrote: > On Mon, Nov 30, 2015 at 10:50 PM, Hendrik Leppkes 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 [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB it is not once nor twice but times without number that the same ideas make their appearance in the world. -- Aristotle signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] tests/api: Fix API test build on windows with --enable-shared
On Mon, Nov 30, 2015 at 10:50 PM, Hendrik Leppkes 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? :) - Hendrik ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
