From 4b4a084d456baf4fadd57558970cd21ba88f4394 Mon Sep 17 00:00:00 2001 From: scuri Date: Mon, 7 Jun 2010 21:05:38 +0000 Subject: *** empty log message *** --- src/imlua5.mak | 11 +++++++++-- src/imlua_fftw5.mak | 11 +++++++++-- src/imlua_process5.mak | 11 +++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/imlua5.mak b/src/imlua5.mak index 554b701..031595d 100644 --- a/src/imlua5.mak +++ b/src/imlua5.mak @@ -1,8 +1,9 @@ PROJNAME = im -LIBNAME = imlua51 +LIBNAME = imlua OPT = YES +USE_LOH_SUBDIR = Yes LOHDIR = lua5/loh SRC = lua5/imlua.c lua5/imlua_aux.c lua5/imlua_convert.c lua5/imlua_file.c lua5/imlua_image.c lua5/imlua_palette.c lua5/imlua_util.c DEF_FILE = lua5/imlua.def @@ -12,7 +13,13 @@ SRCLUADIR = lua5 INCLUDES = lua5 +ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +else + USE_LUA51 = Yes + LIBNAME := $(LIBNAME)51 +endif + USE_IM = YES -USE_LUA51 = YES NO_LUALINK = Yes IM = .. diff --git a/src/imlua_fftw5.mak b/src/imlua_fftw5.mak index ca7b49b..91d5f40 100644 --- a/src/imlua_fftw5.mak +++ b/src/imlua_fftw5.mak @@ -1,9 +1,10 @@ PROJNAME = im -LIBNAME = imlua_fftw51 +LIBNAME = imlua_fftw DEF_FILE = imlua_fftw.def OPT = YES +USE_LOH_SUBDIR = Yes LOHDIR = lua5/loh SRC = lua5/imlua_fftw.c DEF_FILE = lua5/imlua_fftw.def @@ -14,7 +15,13 @@ SRCLUADIR = lua5 LIBS = im_fftw INCLUDES = lua5 +ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +else + USE_LUA51 = Yes + LIBNAME := $(LIBNAME)51 +endif + USE_IMLUA = YES -USE_LUA51 = YES NO_LUALINK = Yes IM = .. diff --git a/src/imlua_process5.mak b/src/imlua_process5.mak index 85415c4..bed58fa 100644 --- a/src/imlua_process5.mak +++ b/src/imlua_process5.mak @@ -1,8 +1,9 @@ PROJNAME = im -LIBNAME = imlua_process51 +LIBNAME = imlua_process OPT = YES +USE_LOH_SUBDIR = Yes LOHDIR = lua5/loh SRC = lua5/imlua_process.c lua5/imlua_kernel.c DEF_FILE = lua5/imlua_process.def @@ -13,7 +14,13 @@ SRCLUADIR = lua5 LIBS = im_process INCLUDES = lua5 +ifdef USE_LUA52 + LIBNAME := $(LIBNAME)52 +else + USE_LUA51 = Yes + LIBNAME := $(LIBNAME)51 +endif + USE_IMLUA = YES -USE_LUA51 = YES NO_LUALINK = Yes IM = .. -- cgit v1.2.3