Merge branch 'master' of https://github.com/lxsang/antd-lua-plugin

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Xuan Sang LE
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile.am

@@ -24,6 +24,6 @@ SUBDIRS = . lib
 EXTRA_DIST = README.md APIs
 
 install-data-local:
-	mkdir -p $(prefix)/lib/lua
-	cp -v APIs/* $(prefix)/lib/lua
-	cp -v lib/core/lua-5.3.4/core.so $(prefix)/lib/lua
+	-mkdir -p $(prefix)/lib/lua
+	-cp -v APIs/* $(prefix)/lib/lua
+	-cp -v lib/core/lua-5.3.4/core.so $(prefix)/lib/lua

lib/ann/fann/Makefile.am

@@ -1,4 +1,4 @@
-all:
+all: clean-local
 	-mkdir build
 	cd build && cmake .. && make
 

lib/core/lua-5.3.4/Makefile

@@ -6,13 +6,14 @@
 # Your platform. See PLATS for possible values.
 PLAT= none
 
-CC= gcc -std=gnu99
+CC?= gcc -std=gnu99
 CFLAGS= -O2 -g -Wall -Wextra -DLUA_COMPAT_5_2 -fPIC $(SYSCFLAGS) $(MYCFLAGS)
 LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
 LIBS= -lm $(SYSLIBS) $(MYLIBS)
 
-AR= ar rcu
-RANLIB= ranlib
+AR?= ar
+LAR= $(AR) rcu
+RANLIB?= ranlib
 RM= rm -f
 
 SYSCFLAGS=
@@ -56,11 +57,11 @@ o:	$(ALL_O)
 a:	$(ALL_A)
 
 $(LUA_A): $(BASE_O)
-	$(AR) $@ $(BASE_O)
+	$(LAR) $@ $(BASE_O)
 	$(RANLIB) $@
 
 $(LUA_SO): $(BASE_O)
-	gcc -shared $(BASE_O) -o $@ -ldl -lm
+	$(CC) -shared $(BASE_O) -o $@ -ldl -lm
 
 $(LUA_T): $(LUA_O) $(LUA_A)
 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
@@ -84,7 +85,7 @@ echo:
 	@echo "CFLAGS= $(CFLAGS)"
 	@echo "LDFLAGS= $(SYSLDFLAGS)"
 	@echo "LIBS= $(LIBS)"
-	@echo "AR= $(AR)"
+	@echo "AR= $(LAR)"
 	@echo "RANLIB= $(RANLIB)"
 	@echo "RM= $(RM)"