#1186 winbuild chain should include .res to link arguments

closed-fixed
1
2014-08-16
2013-02-04
No

winbuild does not include version info for .dll .exe

following diff will fix this

[-----]
Index: winbuild/MakefileBuild.vc
===================================================================
--- winbuild/MakefileBuild.vc (revision)
+++ winbuild/MakefileBuild.vc (working copy)
@@ -374,9 +374,15 @@
!include CURL_OBJS.inc
!include LIBCURL_OBJS.inc

+!IF "$(AS_DLL)" == "true"
+LIB_OBJS = $(LIBCURL_OBJS) $(RESOURCE)
+!ELSE
LIB_OBJS = $(LIBCURL_OBJS)
-EXE_OBJS = $(CURL_OBJS)
+!ENDIF

+EXE_OBJS = $(CURL_OBJS) $(CURL_DIROBJ)\curl.res
+
+
all : $(TARGET) $(PROGRAM_NAME)

package: $(TARGET)
[-----]

Discussion

  • SaroEngels

    SaroEngels - 2013-02-04

    Seems to work fine for 7.28.1, please commit upstreams. I'll try and see if cmake behaves differently.

     
  • SaroEngels

    SaroEngels - 2013-02-04

    cmake already does this fine.

     
  • Daniel Stenberg

    Daniel Stenberg - 2013-02-04

    Any chance you can add the real diff -u output as an attachment here? I can't apply that text part since the web form mangled the text... :-/

     
  • SaroEngels

    SaroEngels - 2013-02-04

    Yes, see the following attachment

     
  • SaroEngels

    SaroEngels - 2013-02-04

    Sorry, broken patch, next attempt here.

     
  • Daniel Stenberg

    Daniel Stenberg - 2013-02-04
    • status: open --> closed-fixed
    • assigned_to: Daniel Stenberg
    • milestone: -->
     
  • Daniel Stenberg

    Daniel Stenberg - 2013-02-04

    Thanks, fixed and pushed!

     

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks