Skip to content

Commit 1752454

Browse files
authored
Update build-android-lua.yml
1 parent 759987b commit 1752454

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/build-android-lua.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,12 @@ jobs:
107107
108108
- name: Build Lua for Android
109109
run: |
110+
CJSON_DIR=$PWD/lua-cjson
111+
LUA_SRC=$PWD/lua-${{ env.LUA_VERSION }}/src
112+
cp $CJSON_DIR/lua_cjson.c $LUA_SRC/
113+
cp $CJSON_DIR/strbuf.c $LUA_SRC/
114+
cp $CJSON_DIR/fpconv.c $LUA_SRC/
115+
110116
cd lua-${{ env.LUA_VERSION }}
111117
make clean
112118
@@ -121,9 +127,6 @@ jobs:
121127
MYLIBS=-ldl -lm
122128
PLAT= generic
123129
124-
CJSON_DIR=../../lua-cjson
125-
CJSON_SRC=lua_cjson.c strbuf.c fpconv.c
126-
CJSON_O=$(CJSON_SRC:.c=.o)
127130
128131
# 编译规则,目标在当前目录
129132
%.o: $(CJSON_DIR)/%.c
@@ -134,7 +137,7 @@ jobs:
134137
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
135138
ltm.o lundump.o lvm.o lzio.o
136139
LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o lstrlib.o \
137-
lutf8lib.o loadlib.o lcorolib.o linit.o
140+
lutf8lib.o loadlib.o lcorolib.o linit.o lua_cjson.o strbuf.o fpconv.o
138141
139142
LUA_T= liblua.so
140143
LUA_O= lua.o
@@ -151,7 +154,7 @@ jobs:
151154
o: $(ALL_O)
152155
153156
$(LUA_T): $(CORE_O) $(LIB_O) $(CJSON_O)
154-
$(CC) -o $@ $(MYLDFLAGS) $(CORE_O) $(LIB_O) $(MYLIBS)
157+
$(CC) -o $@ $(MYLDFLAGS) $(CORE_O) $(LIB_O) $(CJSON_O) $(MYLIBS)
155158
$(STRIP) --strip-unneeded $@
156159
157160
$(LUAC_T): $(LUAC_O) $(LIB_O)

0 commit comments

Comments
 (0)