Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.Sign up
GitHub is where the world builds software
Millions of developers and companies build, ship, and maintain their software on GitHub — the largest and most advanced development platform in the world.
lib/Makefile.m32: allow customizing dll suffixes #1942
- 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`.
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)))