diff options
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/demo/makefile | 11 | ||||
| -rw-r--r-- | core/src/lua-cjson/makefile | 8 |
2 files changed, 6 insertions, 13 deletions
diff --git a/core/src/demo/makefile b/core/src/demo/makefile index 63c6abcef..37b06ad98 100644 --- a/core/src/demo/makefile +++ b/core/src/demo/makefile @@ -40,14 +40,9 @@ demo_INC_DIRS += $(SV_INC_DIRS) demo_LIB_DIRS += $(SV_LIB_DIRS) # lua-cjson -ifndef LUA_CJSON_LIBS -LUA_CJSON_LIBS := lua-cjson$(DTYPE) -endif -ifndef LUA_CJSON_LIB_DIRS -LUA_CJSON_LIB_DIRS := ../lua-cjson -endif -demo_LIBS += $(LUA_CJSON_LIBS) -demo_LIB_DIRS += $(LUA_CJSON_LIB_DIRS) +lua-cjson_LIBS := $(if $(findstring cjson,$(base_LIBNAMES)),,lua-cjson$(DTYPE)) +demo_LIBS += $(lua-cjson_LIBS) +demo_LIB_DIRS += ../lua-cjson demo_LIBS += $(BASE_LIBS) diff --git a/core/src/lua-cjson/makefile b/core/src/lua-cjson/makefile index 8a95507ba..9e96851ae 100644 --- a/core/src/lua-cjson/makefile +++ b/core/src/lua-cjson/makefile @@ -25,11 +25,9 @@ lua-cjson_CFLAGS += -DNDEBUG -DUSE_INTERNAL_FPCONV lua-cjson_INC_DIRS += \ ../luajit/luajit/src -# use given lua-cjson library? -ifdef LUA_CJSON_LIBS -lua-cjson_C_FILES := -lua-cjson_INC_DIRS := -endif +# use given system library? +lua-cjson_C_FILES := $(if $(findstring cjson,$(base_LIBNAMES)),,$(lua-cjson_C_FILES)) +lua-cjson_INC_FILES := $(if $(findstring cjson,$(base_LIBNAMES)),,$(lua-cjson_INC_FILES)) # suffix include $(PRO_DIR)/suffix.mak |