diff options
author | 2018-02-08 22:06:25 +0100 | |
---|---|---|
committer | 2018-02-08 16:06:25 -0500 | |
commit | 8cc758355d51920adb7dc5b5899cf5fdca9fbd74 (patch) | |
tree | c806616593f525c9deba1a8cfd7b9bb1e708c035 /makefile | |
parent | 556bdf249f76f415cc7fc8f2d72762688ef97440 (diff) |
Enable use of system-wide asio, glm and rapidjson (#3172)
* Fixed building using system utf8proc
* Fixed building using system portaudio
* Allow using system-wide asio headers (1.11.0 or higher required).
* Allow using system-wide glm headers
* Allow using system-wide rapidjson headers
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -55,6 +55,7 @@ # OPT_FLAGS = # LDOPTS = +# USE_SYSTEM_LIB_ASIO = 1 # USE_SYSTEM_LIB_EXPAT = 1 # USE_SYSTEM_LIB_ZLIB = 1 # USE_SYSTEM_LIB_JPEG = 1 @@ -65,6 +66,8 @@ # USE_SYSTEM_LIB_PORTAUDIO = 1 # USE_BUNDLED_LIB_SDL2 = 1 # USE_SYSTEM_LIB_UTF8PROC = 1 +# USE_SYSTEM_LIB_GLM = 1 +# USE_SYSTEM_LIB_RAPIDJSON = 1 # MESA_INSTALL_ROOT = /opt/mesa # SDL_INSTALL_ROOT = /opt/sdl2 @@ -429,6 +432,10 @@ endif # which 3rdparty library to build; # link against system (common) library otherwise #------------------------------------------------- +ifdef USE_SYSTEM_LIB_ASIO +PARAMS += --with-system-asio='$(USE_SYSTEM_LIB_ASIO)' +endif + ifdef USE_SYSTEM_LIB_EXPAT PARAMS += --with-system-expat='$(USE_SYSTEM_LIB_EXPAT)' endif @@ -465,6 +472,14 @@ ifdef USE_SYSTEM_LIB_UTF8PROC PARAMS += --with-system-utf8proc='$(USE_SYSTEM_LIB_UTF8PROC)' endif +ifdef USE_SYSTEM_LIB_GLM +PARAMS += --with-system-glm='$(USE_SYSTEM_LIB_GLM)' +endif + +ifdef USE_SYSTEM_LIB_RAPIDJSON +PARAMS += --with-system-rapidjson='$(USE_SYSTEM_LIB_RAPIDJSON)' +endif + # reverse logic for this one ifdef USE_BUNDLED_LIB_SDL2 |