summaryrefslogtreecommitdiff
path: root/library.mak
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2013-12-05 17:50:14 -0300
committerMichael Niedermayer <michaelni@gmx.at>2013-12-05 23:42:07 +0100
commit56572787ae2d7e113e36d5347b3d7263b35bdf98 (patch)
treeeee3f01bd03c23fe939e2e7f39d3723043222a1e /library.mak
parentaf7562a03556d72ac6e022067b879d0124b052ba (diff)
downloadffmpeg-56572787ae2d7e113e36d5347b3d7263b35bdf98.tar.gz
Add Windows resource file support for shared libraries
Originally written by James Almer <jamrial@gmail.com> With the following contributions by Timothy Gu <timothygu99@gmail.com> * Use descriptions of libraries from the pkg-config file generation function * Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser) * Use "FFmpeg" for ProductName as MSDN says "name of the product with which the file is distributed" [1]. * Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1]. * Only build the .rc files when --enable-small is not enabled. [1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
-rw-r--r--library.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/library.mak b/library.mak
index 737f5bb6cd..45096a741f 100644
--- a/library.mak
+++ b/library.mak
@@ -51,7 +51,7 @@ $(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
-$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
+$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver
$(SLIB_CREATE_DEF_CMD)
$$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
$(SLIB_EXTRA_CMD)