summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorruki <[email protected]>2022-11-30 23:52:54 +0800
committerruki <[email protected]>2022-11-30 23:52:54 +0800
commita758f2d6a14af3e4d2acab53f12e91be64ab906a (patch)
treed46cc2642af17215c9d8a914bc144982c2b8e556 /core/src
parent45e9be5a1eaa6588633fee019cb0b14c3e9d6775 (diff)
improve makefile
Diffstat (limited to 'core/src')
-rw-r--r--core/src/luajit/makefile7
-rw-r--r--core/src/luajit/xmake.lua2
2 files changed, 1 insertions, 8 deletions
diff --git a/core/src/luajit/makefile b/core/src/luajit/makefile
index 425e15f0a..9747413c3 100644
--- a/core/src/luajit/makefile
+++ b/core/src/luajit/makefile
@@ -137,13 +137,6 @@ luajit_CXFLAGS += -fPIE
endif
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
diff --git a/core/src/luajit/xmake.lua b/core/src/luajit/xmake.lua
index a3c7120df..427c319a1 100644
--- a/core/src/luajit/xmake.lua
+++ b/core/src/luajit/xmake.lua
@@ -19,7 +19,7 @@ end
if os.isfile("/etc/redhat-release") then
jit = false
end
-local autogendir = path.join("autogen", plat, jit and "jit" or "nojit", arch)
+local autogendir = path.join("luajit", "autogen", plat, jit and "jit" or "nojit", arch)
-- add target
target("luajit")