From 9d9c8fad6a0e5ff433fd6a97b4921af10e074f96 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Mon, 28 Mar 2016 12:09:19 -0500 Subject: Extend system library support (nw) Extend USE_SYSTEM_LIB_* to support providing the library name and include directory. To link against system specific lib names and header path: (ref #711) USE_SYSTEM_LIB_LUA=lua5.3:/usr/include/lua5.3 --- makefile | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index 29eb6c018cc..f9f6c2f4032 100644 --- a/makefile +++ b/makefile @@ -376,36 +376,36 @@ endif # which 3rdparty library to build; # link against system (common) library otherwise #------------------------------------------------- -ifndef USE_SYSTEM_LIB_EXPAT -PARAMS += --with-bundled-expat +ifdef USE_SYSTEM_LIB_EXPAT +PARAMS += --with-system-expat='$(USE_SYSTEM_LIB_EXPAT)' endif -ifndef USE_SYSTEM_LIB_ZLIB -PARAMS += --with-bundled-zlib +ifdef USE_SYSTEM_LIB_ZLIB +PARAMS += --with-system-zlib='$(USE_SYSTEM_LIB_ZLIB)' endif -ifndef USE_SYSTEM_LIB_JPEG -PARAMS += --with-bundled-jpeg +ifdef USE_SYSTEM_LIB_JPEG +PARAMS += --with-system-jpeg='$(USE_SYSTEM_LIB_JPEG)' endif -ifndef USE_SYSTEM_LIB_FLAC -PARAMS += --with-bundled-flac +ifdef USE_SYSTEM_LIB_FLAC +PARAMS += --with-system-flac='$(USE_SYSTEM_LIB_FLAC)' endif -ifndef USE_SYSTEM_LIB_LUA -PARAMS += --with-bundled-lua +ifdef USE_SYSTEM_LIB_LUA +PARAMS += --with-system-lua='$(USE_SYSTEM_LIB_LUA)' endif -ifndef USE_SYSTEM_LIB_SQLITE3 -PARAMS += --with-bundled-sqlite3 +ifdef USE_SYSTEM_LIB_SQLITE3 +PARAMS += --with-system-sqlite3='$(USE_SYSTEM_LIB_SQLITE3)' endif -ifndef USE_SYSTEM_LIB_PORTMIDI -PARAMS += --with-bundled-portmidi +ifdef USE_SYSTEM_LIB_PORTMIDI +PARAMS += --with-system-portmidi='$(USE_SYSTEM_LIB_PORTMIDI)' endif -ifndef USE_SYSTEM_LIB_PORTAUDIO -PARAMS += --with-bundled-portaudio +ifdef USE_SYSTEM_LIB_PORTAUDIO +PARAMS += --with-system-portaudio='$(USE_SYSTEM_LIB_PORTAUDIO)' endif # reverse logic for this one @@ -414,8 +414,8 @@ ifdef USE_BUNDLED_LIB_SDL2 PARAMS += --with-bundled-sdl2 endif -ifndef USE_SYSTEM_LIB_UV -PARAMS += --with-bundled-libuv +ifdef USE_SYSTEM_LIB_UV +PARAMS += --with-system-uv='$(USE_SYSTEM_LIB_UV)' endif #------------------------------------------------- -- cgit v1.2.3