On Sat, Oct 13, 2012 at 09:50:59PM +0300, Martin Storsjö wrote: > On Sat, 13 Oct 2012, Måns Rullgård wrote: > >Martin Storsjö <[email protected]> writes: > >>--- a/configure > >>+++ b/configure > >>@@ -2794,6 +2794,29 @@ case $target_os in > >> add_cppflags -U__STRICT_ANSI__ > >> ;; > >> msvc) > >>+ if enabled shared; then > >>+ # Link to the import library instead of the > >>+ # normal static library. > >>+ LD_LIB='%.lib' > >>+ enabled static && > >>+ die "Cannot build shared and static libraries at the same > >>time with MSVC." > >>+ fi > > > >The static+shared error feels misplaced here. > > Yeah, it's a bit weird here. What section would be a better match?
Maybe around line 2931 with the check that at least one library type is built. > >>--- /dev/null > >>+++ b/libavcodec/symbols.h > > > >As nondescriptive filenames go, this one ranks pretty darn high. > > Indeed. Since this doesn't need to be installed, perhaps we could > just put it into internal.h instead? Sounds like a good place to me, we have other attributes in there. > >>+#if CONFIG_SHARED && defined(_MSC_VER) && !defined(COMPILING_avcodec) > > > >This condition seems a bit too specific. There are other compilers. > > That might be good for consistency, even if mingw can do without it. > So something like this then: > > #if CONFIG_SHARED && defined(_WIN32) && !defined(COMPILING_avcodec) Careful, we might soon get support for ICL, which might or might not need this. _WIN32 seems too greedy to me. > >>--- a/library.mak > >>+++ b/library.mak > >>@@ -19,6 +19,7 @@ $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm > >> $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d) > >> $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $< > >> > >>+$(OBJS): CPPFLAGS := -DCOMPILING_$(NAME)=1 $(CPPFLAGS) > > > >This should use += > > Ok, will change. That line is mine and I think I initially used +=, but at that point in time it did not work for some reason. There have been changes to that area since, so it might well work now, but doublecheck to be sure. Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
