From 4f7e1b5a49575c77657b77bea383f79cddd768e3 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 21 Apr 2020 18:41:55 -0300 Subject: Makefile: make it easier to switch Lua versions --- config | 8 ++++---- config.win | 10 +++++----- 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 @@ # Default installation prefix PREFIX=/usr/local +LUA_VERSION = 5.1 + # System's libraries directory (where binary libraries are installed) -LUA_LIBDIR= $(PREFIX)/lib/lua/5.1 +LUA_LIBDIR= $(PREFIX)/lib/lua/$(LUA_VERSION) # Lua includes directory LUA_INC += -I$(PREFIX)/include -LUA_INC += -I/usr/include/lua5.1 +LUA_INC += -I/usr/include/lua$(LUA_VERSION) -I/usr/include/lua/$(LUA_VERSION) # OS dependent LIB_OPTION= -shared #for Linux @@ -17,8 +19,6 @@ LIB_OPTION= -shared #for Linux # Minimum runtime OS version on macOS MACOSX_DEPLOYMENT_TARGET= 10.5 -LIBNAME= $T.so.$V - # Compilation directives WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic INCS= $(LUA_INC) diff --git a/config.win b/config.win index 50e81f6..6aeaa60 100644 --- a/config.win +++ b/config.win @@ -1,14 +1,14 @@ +LUA_VERSION= 5.1 + # Installation directories # System's libraries directory (where binary libraries are installed) -LUA_LIBDIR= "c:\lua5.1" +LUA_LIBDIR= "c:\lua$(LUA_VERSION)" # Lua includes directory -LUA_INC= "c:\lua5.1\include" +LUA_INC= "c:\lua$(LUA_VERSION)\include" # Lua library -LUA_LIB= "c:\lua5.1\lua5.1.lib" - -LIBNAME= $T.dll +LUA_LIB= "c:\lua$(LUA_VERSION)\lua$(LUA_VERSION).lib" # Compilation directives WARN= /O2 -- cgit v1.2.3-55-g6feb