diff options
| author | Viktor Szakats <vszakats@users.noreply.github.com> | 2017-10-04 15:57:19 +0000 |
|---|---|---|
| committer | Viktor Szakats <vszakats@users.noreply.github.com> | 2017-10-04 15:57:19 +0000 |
| commit | aaa16f80256abc1463fd9374815130a165222257 (patch) | |
| tree | 943839d1038314953c10ecc0c642760ddd1de5aa | |
| parent | 4f38db1d28a971f938400f558e968fdffb9233a0 (diff) | |
| download | curl-aaa16f80256abc1463fd9374815130a165222257.tar.gz | |
lib/Makefile.m32: allow customizing dll suffixes
- 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`.
Closes https://github.com/curl/curl/pull/1942
| -rw-r--r-- | lib/Makefile.m32 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 22efbdee0..577785e62 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 -libcurl_dll_LIBRARY = libcurl.dll -libcurl_dll_a_LIBRARY = libcurldll.a +ifeq ($(CURL_DLL_A_SUFFIX),) +CURL_DLL_A_SUFFIX := dll +endif + +libcurl_dll_LIBRARY = libcurl$(CURL_DLL_SUFFIX).dll +libcurl_dll_a_LIBRARY = libcurl$(CURL_DLL_A_SUFFIX).a libcurl_a_LIBRARY = libcurl.a libcurl_a_OBJECTS := $(patsubst %.c,%.o,$(strip $(CSOURCES))) |