summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-09-20 21:07:59 +0800
committerruki <[email protected]>2021-09-20 21:07:59 +0800
commitd6cf1e9c4b73507fb2bcfa0d173ebb62a28faa64 (patch)
tree7a613832c29ba48e8157ed199eddbda3f6daeaa8
parent8a177cf0047b61c1fc5085138b7d268e500fe909 (diff)
rename BACKEND to RUNTIME
-rw-r--r--core/makefile6
-rw-r--r--core/src/demo/makefile4
-rw-r--r--core/src/lcurses/makefile4
-rw-r--r--core/src/lua-cjson/makefile4
-rw-r--r--core/src/makefile4
-rw-r--r--core/src/xmake/makefile4
-rw-r--r--makefile6
7 files changed, 16 insertions, 16 deletions
diff --git a/core/makefile b/core/makefile
index d7c529489..40811af32 100644
--- a/core/makefile
+++ b/core/makefile
@@ -368,7 +368,7 @@ config : .null
@$(ECHO) "directories:"
@$(ECHO) " install:\t\t"$(abspath $(INSTALL))
@$(ECHO) " package:\t\t"$(PACKAGE)
- @$(ECHO) " backend:\t\t"$(BACKEND)
+ @$(ECHO) " backend:\t\t"$(RUNTIME)
@$(ECHO) ""
@$(ECHO) "toolchains:"
@$(ECHO) " bin:\t\t"$(BIN)
@@ -461,8 +461,8 @@ config : .null
@$(ECHO) "export SPARC" >> .config.mak
@$(ECHO) "" >> .config.mak
@$(ECHO) "# backend" >> .config.mak
- @$(ECHO) "BACKEND ="$(BACKEND) >> .config.mak
- @$(ECHO) "export BACKEND" >> .config.mak
+ @$(ECHO) "RUNTIME ="$(RUNTIME) >> .config.mak
+ @$(ECHO) "export RUNTIME" >> .config.mak
@$(ECHO) "" >> .config.mak
@$(ECHO) "# demo" >> .config.mak
@$(ECHO) "DEMO ="$(DEMO) >> .config.mak
diff --git a/core/src/demo/makefile b/core/src/demo/makefile
index 93525ddaf..6c4aad363 100644
--- a/core/src/demo/makefile
+++ b/core/src/demo/makefile
@@ -20,7 +20,7 @@ demo_INC_DIRS += ../ ../tbox/tbox/src ../tbox/inc/$(PLAT)
demo_LIB_DIRS += ../tbox
# luajit
-ifeq ($(BACKEND),luajit)
+ifeq ($(RUNTIME),luajit)
luajit_LIBS := $(if $(findstring luajit,$(base_LIBNAMES)),,luajit$(DTYPE))
demo_LIBS += $(luajit_LIBS)
demo_INC_DIRS += ../luajit/luajit/src
@@ -28,7 +28,7 @@ demo_LIB_DIRS += ../luajit
endif
# lua
-ifeq ($(BACKEND),lua)
+ifeq ($(RUNTIME),lua)
lua_LIBS := $(if $(findstring lua,$(base_LIBNAMES)),,lua$(DTYPE))
demo_LIBS += $(lua_LIBS)
demo_INC_DIRS += ../lua/lua
diff --git a/core/src/lcurses/makefile b/core/src/lcurses/makefile
index a0d6a6400..e5d519499 100644
--- a/core/src/lcurses/makefile
+++ b/core/src/lcurses/makefile
@@ -17,11 +17,11 @@ lcurses_C_FILES += lcurses
lcurses_CXFLAGS += $(if $(findstring curses,$(base_LIBNAMES)),-DXM_CONFIG_API_HAVE_CURSES,)
# includes
-ifeq ($(BACKEND),luajit)
+ifeq ($(RUNTIME),luajit)
lcurses_INC_DIRS += ../luajit/luajit/src
lcurses_CXFLAGS += -DUSE_LUAJIT
endif
-ifeq ($(BACKEND),lua)
+ifeq ($(RUNTIME),lua)
lcurses_INC_DIRS += ../lua/lua
lcurses_CXFLAGS += -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2
endif
diff --git a/core/src/lua-cjson/makefile b/core/src/lua-cjson/makefile
index e1d53ecf9..021c3d015 100644
--- a/core/src/lua-cjson/makefile
+++ b/core/src/lua-cjson/makefile
@@ -22,11 +22,11 @@ lua-cjson_C_FILES += \
lua-cjson_CFLAGS += -DNDEBUG -DUSE_INTERNAL_FPCONV
# includes
-ifeq ($(BACKEND),luajit)
+ifeq ($(RUNTIME),luajit)
lua-cjson_INC_DIRS += ../luajit/luajit/src
lua-cjson_CXFLAGS += -DUSE_LUAJIT
endif
-ifeq ($(BACKEND),lua)
+ifeq ($(RUNTIME),lua)
lua-cjson_INC_DIRS += ../lua/lua
lua-cjson_CXFLAGS += -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2
endif
diff --git a/core/src/makefile b/core/src/makefile
index 47151258e..f16a1557d 100644
--- a/core/src/makefile
+++ b/core/src/makefile
@@ -3,10 +3,10 @@ include $(PRO_DIR)/prefix.mak
# projects
SUB_PROS += demo
-ifeq ($(BACKEND),luajit)
+ifeq ($(RUNTIME),luajit)
DEP_PROS += luajit
endif
-ifeq ($(BACKEND),lua)
+ifeq ($(RUNTIME),lua)
DEP_PROS += lua
endif
DEP_PROS += lcurses sv lua-cjson tbox xmake
diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile
index 3db867eb7..2c5eefa01 100644
--- a/core/src/xmake/makefile
+++ b/core/src/xmake/makefile
@@ -153,11 +153,11 @@ xmake_INC_DIRS += \
../tbox/tbox/src \
../tbox/inc/$(PLAT) \
../sv/sv/include
-ifeq ($(BACKEND),luajit)
+ifeq ($(RUNTIME),luajit)
xmake_INC_DIRS += ../luajit/luajit/src
xmake_CXFLAGS += -DUSE_LUAJIT
endif
-ifeq ($(BACKEND),lua)
+ifeq ($(RUNTIME),lua)
xmake_INC_DIRS += ../lua/lua
xmake_CXFLAGS += -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2
endif
diff --git a/makefile b/makefile
index c22bc30cb..bdb79d05b 100644
--- a/makefile
+++ b/makefile
@@ -16,8 +16,8 @@ endif
endif
# use luajit or lua backend
-ifeq ($(BACKEND),)
-BACKEND :=luajit
+ifeq ($(RUNTIME),)
+RUNTIME :=luajit
endif
# the temporary directory
@@ -99,7 +99,7 @@ xrepo_bin_install :=$(destdir)/bin/xrepo
build:
@echo compiling xmake-core ...
@if [ -f core/.config.mak ]; then rm core/.config.mak; fi
- +@$(MAKE) -C core --no-print-directory f DEBUG=$(debug) BACKEND=$(BACKEND)
+ +@$(MAKE) -C core --no-print-directory f DEBUG=$(debug) RUNTIME=$(RUNTIME)
+@$(MAKE) -C core --no-print-directory c
+@$(MAKE) -C core --no-print-directory