On Sat, 13 Oct 2012, Måns Rullgård wrote:
Martin Storsjö <mar...@martin.st> writes:
@@ -2930,6 +2944,9 @@ build the shared libraries as well. To only build the
shared libraries specify
EOF
exit 1;
fi
+if enabled_all msvc static shared; then
+ die "Cannot build shared and static libraries at the same time with MSVC."
+fi
Another idea is to simply disable static if shared is enabled. That way
users can simply configure --enable-shared and save some pointless typing.
Sounds sane, changed locally into:
+if enabled_all msvc shared; then
+ # Cannot build shared and static libraries at the same time with MSVC.
+ disable static
+fi
+#if CONFIG_SHARED && defined(_WIN32) && !defined(COMPILING_avcodec)
+#define avcodec_exportdata __declspec(dllimport)
+#else
+#define avcodec_exportdata
+#endif
I want to think about this some more.
Ok
diff --git a/library.mak b/library.mak
index b365935..56a4586 100644
--- a/library.mak
+++ b/library.mak
@@ -33,6 +33,7 @@ install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static
install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
define RULES
+$(OBJS): CPPFLAGS += -DCOMPILING_$(NAME)=1
$(EXAMPLES) $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB))
$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
This could use a blank line.
Done locally.
// Martin
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
