diff options
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/demo/makefile | 16 | ||||
| -rw-r--r-- | core/src/luajit/makefile | 13 |
2 files changed, 10 insertions, 19 deletions
diff --git a/core/src/demo/makefile b/core/src/demo/makefile index 4ee62ff81..63c6abcef 100644 --- a/core/src/demo/makefile +++ b/core/src/demo/makefile @@ -20,18 +20,10 @@ demo_INC_DIRS += ../ ../tbox/tbox/src ../tbox/inc/$(PLAT) demo_LIB_DIRS += ../tbox # luajit -ifndef LUAJIT_LIBS -LUAJIT_LIBS := luajit$(DTYPE) -endif -ifndef LUAJIT_INC_DIRS -LUAJIT_INC_DIRS := ../luajit/luajit/src -endif -ifndef LUAJIT_LIB_DIRS -LUAJIT_LIB_DIRS := ../luajit -endif -demo_LIBS += $(LUAJIT_LIBS) -demo_INC_DIRS += $(LUAJIT_INC_DIRS) -demo_LIB_DIRS += $(LUAJIT_LIB_DIRS) +luajit_LIBS := $(if $(findstring luajit,$(base_LIBNAMES)),,luajit$(DTYPE)) +demo_LIBS += $(luajit_LIBS) +demo_INC_DIRS += ../luajit/luajit/src +demo_LIB_DIRS += ../luajit # sv ifndef SV_LIBS diff --git a/core/src/luajit/makefile b/core/src/luajit/makefile index 2fbfe89b9..f2a2563bf 100644 --- a/core/src/luajit/makefile +++ b/core/src/luajit/makefile @@ -137,13 +137,12 @@ luajit_CXFLAGS += -fPIE endif endif -# use given luajit library? -ifdef LUAJIT_LIBS -luajit_C_FILES := -luajit_ASM_FILES := -luajit_INC_FILES := -luajit_OBJ_FILES := -endif +# use given system library? +luajit_C_FILES := $(if $(findstring luajit,$(base_LIBNAMES)),,$(luajit_C_FILES)) +luajit_ASM_FILES := $(if $(findstring luajit,$(base_LIBNAMES)),,$(luajit_ASM_FILES)) +luajit_INC_FILES := $(if $(findstring luajit,$(base_LIBNAMES)),,$(luajit_INC_FILES)) +luajit_OBJ_FILES := $(if $(findstring luajit,$(base_LIBNAMES)),,$(luajit_OBJ_FILES)) + # suffix include $(PRO_DIR)/suffix.mak |