lib/Makefile.m32: allow customizing dll suffixes#1942
Closed
vszakats wants to merge 1 commit into
Closed
Conversation
- New `CURL_DLL_SUFFIX` envvar will add a suffix to the generated libcurl dll name. Useful to add `-x64` to 64-bit builds so that it can live in the same directory as the 32-bit one. By default this is empty. - New `CURL_DLL_A_SUFFIX` envvar to customize the suffix of the generated import library (implib) for libcurl .dll. It defaults to `dll`, and it's useful to modify that to `.dll` to have the standard naming scheme for mingw-built .dlls, i.e. `libcurl.dll.a`.
Member
Author
|
Or, it may be even better to just make the diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 22efbdee0..bda2fa05f 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -313,8 +313,12 @@ DLL_LIBS += -lws2_32
# Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc
+ifeq ($(ARCH),w64)
+libcurl_dll_LIBRARY = libcurl-x64.dll
+else
libcurl_dll_LIBRARY = libcurl.dll
-libcurl_dll_a_LIBRARY = libcurldll.a
+endif
+libcurl_dll_a_LIBRARY = libcurl.dll.a
libcurl_a_LIBRARY = libcurl.a
libcurl_a_OBJECTS := $(patsubst %.c,%.o,$(strip $(CSOURCES))) |
bagder
approved these changes
Oct 4, 2017
Member
bagder
left a comment
bagder
left a comment
There was a problem hiding this comment.
Sounds like a plan, and really you know this file best so I'm good with your judgement on how this is best done!
Member
Author
|
Thanks! Let's go with the generic/customizable solution first, and change the defaults in a separate update later. In the meantime I'm testing the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
New
CURL_DLL_SUFFIXenvvar will add a suffix to the generatedlibcurl dll name. Useful to add
-x64to 64-bit builds so thatit can live in the same directory as the 32-bit one. By default
this is empty.
New
CURL_DLL_A_SUFFIXenvvar to customize the suffix of thegenerated import library (implib) for libcurl .dll. It defaults
to
dll, and it's useful to modify that to.dllto have thestandard naming scheme for mingw-built .dlls, i.e.
libcurl.dll.a.