Merge pull request #7 from chipitsine/master

travis-ci integration

2 files changed, 27 insertions, 4 deletions

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..c0e6363
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,23 @@
+sudo: required
+dist: trusty
+
+os: linux
+
+language: c
+
+compiler:
+  - gcc
+  - clang
+
+env:
+  matrix:
+    - LUA=lua5.1-dev LUA_DEV=liblua5.1-dev LUA_INCLUDE_DIR=/usr/include/lua5.1 LUA_CMODULE_DIR=/lib LUALIB=-llua5.1
+    - LUA=libluajit-5.1-dev LUA_DEV=libluajit-5.1-dev LUA_INCLUDE_DIR=/usr/include/luajit-2.0 LUA_CMODULE_DIR=/lib LUALIB=-lluajit-5.1
+
+install:
+    - sudo apt-get update 
+    - sudo apt-get install -y $LUA luarocks
+
+script:
+  - make
+  - sh runtests.sh
diff --git a/Makefile b/Makefile
index 538db9a..2361028 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,10 @@ PREFIX =            /usr/local
 CFLAGS =            -O3 -Wall -pedantic -DNDEBUG
 CJSON_CFLAGS =      -fpic
 CJSON_LDFLAGS =     -shared
-LUA_INCLUDE_DIR =   $(PREFIX)/include
-LUA_CMODULE_DIR =   $(PREFIX)/lib/lua/$(LUA_VERSION)
-LUA_MODULE_DIR =    $(PREFIX)/share/lua/$(LUA_VERSION)
-LUA_BIN_DIR =       $(PREFIX)/bin
+LUA_INCLUDE_DIR ?=   $(PREFIX)/include
+LUA_CMODULE_DIR ?=   $(PREFIX)/lib/lua/$(LUA_VERSION)
+LUA_MODULE_DIR ?=    $(PREFIX)/share/lua/$(LUA_VERSION)
+LUA_BIN_DIR ?=       $(PREFIX)/bin
 
 ##### Platform overrides #####
 ##