configure: Add the -D parameter to the dlltool command

Message ID 1300740098-43333-1-git-send-email-martin@martin.st
State Committed
Commit 52f9b632b57a64ff058018c9b886ce6e918bbda9
Headers show

Commit Message

Martin Storsjö March 21, 2011, 8:41 p.m.
This is required for the generated .lib file to actually
be usable by MSVC.
---
Didn't you say that you'd enqueue and push the version I sent,
where the .lib files actually had been tested? The version that
actually ended up in the repo was the old version.

 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Mans Rullgard March 21, 2011, 8:46 p.m. | #1
Martin Storsjö <martin@martin.st> writes:

> This is required for the generated .lib file to actually
> be usable by MSVC.
> ---
> Didn't you say that you'd enqueue and push the version I sent,
> where the .lib files actually had been tested? The version that
> actually ended up in the repo was the old version.
>
>  configure |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/configure b/configure
> index a2ad321..e38f20b 100755
> --- a/configure
> +++ b/configure
> @@ -2415,7 +2415,7 @@ case $target_os in
>          SLIBSUF=".dll"
>          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
>          SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
> -        SLIB_EXTRA_CMD=-'$(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)'
> +        SLIB_EXTRA_CMD=-'$(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) -D $(SLIBNAME_WITH_MAJOR)'
>          SLIB_INSTALL_EXTRA_CMD='-install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"; \
>              install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"; \
>              install -d "$(LIBDIR)"; \
> -- 
> 1.7.3.1

This looks good from my point of view.  I'll leave it to you and Luca to
sort out what works.
Luca Barbato March 21, 2011, 9:02 p.m. | #2
On 03/21/2011 09:41 PM, Martin Storsjö wrote:
> This is required for the generated .lib file to actually
> be usable by MSVC.
> ---
> Didn't you say that you'd enqueue and push the version I sent,
> where the .lib files actually had been tested? The version that
> actually ended up in the repo was the old version.

I was sure of it but apparently I messed up, pushing the change now.

lu

Patch

diff --git a/configure b/configure
index a2ad321..e38f20b 100755
--- a/configure
+++ b/configure
@@ -2415,7 +2415,7 @@  case $target_os in
         SLIBSUF=".dll"
         SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
         SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
-        SLIB_EXTRA_CMD=-'$(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)'
+        SLIB_EXTRA_CMD=-'$(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) -D $(SLIBNAME_WITH_MAJOR)'
         SLIB_INSTALL_EXTRA_CMD='-install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"; \
             install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"; \
             install -d "$(LIBDIR)"; \