aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2020-04-21 18:41:55 -0300
committerHisham Muhammad <hisham@gobolinux.org>2020-04-21 18:41:55 -0300
commit4f7e1b5a49575c77657b77bea383f79cddd768e3 (patch)
treee8f669be9eed7fd1bca2a6eb6f04d17646bbb47a
parenta5336d294d27f98c38394b6ea441e68bab96bdc8 (diff)
downloadluafilesystem-4f7e1b5a49575c77657b77bea383f79cddd768e3.tar.gz
luafilesystem-4f7e1b5a49575c77657b77bea383f79cddd768e3.tar.bz2
luafilesystem-4f7e1b5a49575c77657b77bea383f79cddd768e3.zip
Makefile: make it easier to switch Lua versions
-rw-r--r--config8
-rw-r--r--config.win10
2 files changed, 9 insertions, 9 deletions
diff --git a/config b/config
index 4486599..33fe514 100644
--- a/config
+++ b/config
@@ -3,12 +3,14 @@
3# Default installation prefix 3# Default installation prefix
4PREFIX=/usr/local 4PREFIX=/usr/local
5 5
6LUA_VERSION = 5.1
7
6# System's libraries directory (where binary libraries are installed) 8# System's libraries directory (where binary libraries are installed)
7LUA_LIBDIR= $(PREFIX)/lib/lua/5.1 9LUA_LIBDIR= $(PREFIX)/lib/lua/$(LUA_VERSION)
8 10
9# Lua includes directory 11# Lua includes directory
10LUA_INC += -I$(PREFIX)/include 12LUA_INC += -I$(PREFIX)/include
11LUA_INC += -I/usr/include/lua5.1 13LUA_INC += -I/usr/include/lua$(LUA_VERSION) -I/usr/include/lua/$(LUA_VERSION)
12 14
13# OS dependent 15# OS dependent
14LIB_OPTION= -shared #for Linux 16LIB_OPTION= -shared #for Linux
@@ -17,8 +19,6 @@ LIB_OPTION= -shared #for Linux
17# Minimum runtime OS version on macOS 19# Minimum runtime OS version on macOS
18MACOSX_DEPLOYMENT_TARGET= 10.5 20MACOSX_DEPLOYMENT_TARGET= 10.5
19 21
20LIBNAME= $T.so.$V
21
22# Compilation directives 22# Compilation directives
23WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic 23WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
24INCS= $(LUA_INC) 24INCS= $(LUA_INC)
diff --git a/config.win b/config.win
index 50e81f6..6aeaa60 100644
--- a/config.win
+++ b/config.win
@@ -1,14 +1,14 @@
1LUA_VERSION= 5.1
2
1# Installation directories 3# Installation directories
2# System's libraries directory (where binary libraries are installed) 4# System's libraries directory (where binary libraries are installed)
3LUA_LIBDIR= "c:\lua5.1" 5LUA_LIBDIR= "c:\lua$(LUA_VERSION)"
4 6
5# Lua includes directory 7# Lua includes directory
6LUA_INC= "c:\lua5.1\include" 8LUA_INC= "c:\lua$(LUA_VERSION)\include"
7 9
8# Lua library 10# Lua library
9LUA_LIB= "c:\lua5.1\lua5.1.lib" 11LUA_LIB= "c:\lua$(LUA_VERSION)\lua$(LUA_VERSION).lib"
10
11LIBNAME= $T.dll
12 12
13# Compilation directives 13# Compilation directives
14WARN= /O2 14WARN= /O2