summaryrefslogtreecommitdiff
path: root/core/src/luajit
diff options
context:
space:
mode:
authorruki <[email protected]>2017-03-30 17:47:13 +0800
committerruki <[email protected]>2017-03-30 17:47:13 +0800
commit69dedaf1e157fc449f0c3f6b354d5c19169a1f5d (patch)
treef425ce89fb6df24ed5775188fd3c18f153d8fe38 /core/src/luajit
parente5683cb340572a6ba45143d94569be683974bf32 (diff)
check jit for old makefile
Diffstat (limited to 'core/src/luajit')
-rw-r--r--core/src/luajit/makefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/core/src/luajit/makefile b/core/src/luajit/makefile
index b6770666c..48e7034de 100644
--- a/core/src/luajit/makefile
+++ b/core/src/luajit/makefile
@@ -75,17 +75,22 @@ luajit_C_FILES += \
src/lj_vmmath
# asm files
-ifeq ($PLAT,windows)
+ifeq ($(PLAT),windows)
luajit_OBJ_FILES += \
- src/autogen/$(PLAT)/$(ARCH)/lj_vm
+ src/autogen/$(PLAT)/$(luajit_JIT)/$(ARCH)/lj_vm
else
luajit_ASM_FILES += \
- src/autogen/$(PLAT)/$(ARCH)/lj_vm
+ src/autogen/$(PLAT)/$(luajit_JIT)/$(ARCH)/lj_vm
endif
# includes
luajit_INC_DIRS += \
- src/autogen/$(PLAT)/$(ARCH)
+ src/autogen/$(PLAT)/$(luajit_JIT)/$(ARCH)
+
+# disable jit compiler
+ifeq ($(luajit_JIT),nojit)
+luajit_CXFLAGS += -DLUAJIT_DISABLE_JIT
+endif
# suffix