From c5f7b4e29afdd70a0f05d8785619585a45916b27 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Mon, 7 Jun 2010 20:43:01 +0000
Subject: *** empty log message ***

---
 src/cdlua5.mak                 | 10 ++++++++--
 src/cdluacontextplus5.mak      | 10 ++++++++--
 src/cdluaim5.mak               | 10 ++++++++--
 src/cdluapdf5.mak              | 10 ++++++++--
 src/lua5/cdlua5.c              |  5 -----
 src/lua5/cdlua5.def            |  1 -
 src/lua5/cdluacontextplus5.c   |  5 -----
 src/lua5/cdluacontextplus5.def |  1 -
 src/lua5/cdluaim5.c            |  5 -----
 src/lua5/cdluaim5.def          |  1 -
 src/lua5/cdluapdf5.c           |  4 ----
 src/lua5/cdluapdf5.def         |  1 -
 12 files changed, 32 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/cdlua5.mak b/src/cdlua5.mak
index 9f862f8..79cc3f5 100644
--- a/src/cdlua5.mak
+++ b/src/cdlua5.mak
@@ -1,5 +1,5 @@
 PROJNAME = cd
-LIBNAME = cdlua51
+LIBNAME = cdlua
 
 OPT = YES
 
@@ -8,7 +8,13 @@ SRCDIR = lua5
 SRC = cdlua5.c cdvoid5.c cdlua5ctx.c cdlua5_active.c cdlua5_canvas.c
 DEF_FILE = cdlua5.def
 
-USE_LUA51 = Yes
+ifdef USE_LUA52
+  LIBNAME := $(LIBNAME)52
+else
+  USE_LUA51 = Yes
+  LIBNAME := $(LIBNAME)51
+endif
+
 NO_LUALINK = Yes
 USE_CD = YES
 CD = ..
diff --git a/src/cdluacontextplus5.mak b/src/cdluacontextplus5.mak
index c00fe0d..29dc446 100644
--- a/src/cdluacontextplus5.mak
+++ b/src/cdluacontextplus5.mak
@@ -1,5 +1,5 @@
 PROJNAME = cd
-LIBNAME = cdluacontextplus51
+LIBNAME = cdluacontextplus
 
 OPT = YES
 
@@ -10,7 +10,13 @@ DEF_FILE = cdluacontextplus5.def
 
 LIBS = cdcontextplus
 
-USE_LUA51 = Yes
+ifdef USE_LUA52
+  LIBNAME := $(LIBNAME)52
+else
+  USE_LUA51 = Yes
+  LIBNAME := $(LIBNAME)51
+endif
+
 NO_LUALINK = Yes
 USE_CD = YES
 USE_CDLUA = YES
diff --git a/src/cdluaim5.mak b/src/cdluaim5.mak
index a9f50e0..a169240 100644
--- a/src/cdluaim5.mak
+++ b/src/cdluaim5.mak
@@ -1,5 +1,5 @@
 PROJNAME = cd
-LIBNAME = cdluaim51
+LIBNAME = cdluaim
 
 OPT = YES
 
@@ -7,10 +7,16 @@ DEF_FILE = cdluaim5.def
 SRCDIR = lua5
 SRC = cdluaim5.c
 
+ifdef USE_LUA52
+  LIBNAME := $(LIBNAME)52
+else
+  USE_LUA51 = Yes
+  LIBNAME := $(LIBNAME)51
+endif
+
 USE_CD = YES
 USE_CDLUA = YES
 USE_IM = YES
 USE_IMLUA = YES
-USE_LUA51 = YES
 NO_LUALINK = Yes
 CD = ..
diff --git a/src/cdluapdf5.mak b/src/cdluapdf5.mak
index 8b869c6..913aeee 100644
--- a/src/cdluapdf5.mak
+++ b/src/cdluapdf5.mak
@@ -1,5 +1,5 @@
 PROJNAME = cd
-LIBNAME = cdluapdf51
+LIBNAME = cdluapdf
 
 OPT = YES
 
@@ -10,7 +10,13 @@ DEF_FILE = cdluapdf5.def
 
 LIBS = cdpdf
 
-USE_LUA51 = Yes
+ifdef USE_LUA52
+  LIBNAME := $(LIBNAME)52
+else
+  USE_LUA51 = Yes
+  LIBNAME := $(LIBNAME)51
+endif
+
 NO_LUALINK = Yes
 USE_CD = YES
 USE_CDLUA = YES
diff --git a/src/lua5/cdlua5.c b/src/lua5/cdlua5.c
index bb40ecb..c5d9537 100644
--- a/src/lua5/cdlua5.c
+++ b/src/lua5/cdlua5.c
@@ -1855,8 +1855,3 @@ int luaopen_cdlua(lua_State* L)
 {
   return cdlua_open(L);
 }
-
-int luaopen_cdlua51(lua_State* L)
-{
-  return cdlua_open(L);
-}
diff --git a/src/lua5/cdlua5.def b/src/lua5/cdlua5.def
index b4811b2..2a14843 100644
--- a/src/lua5/cdlua5.def
+++ b/src/lua5/cdlua5.def
@@ -8,6 +8,5 @@ EXPORTS
   cdlua_checkcanvas
   cdlua_pushcanvas
   luaopen_cdlua
-  luaopen_cdlua51
   cdlua_pushbitmap
   cdlua_checkbitmap
\ No newline at end of file
diff --git a/src/lua5/cdluacontextplus5.c b/src/lua5/cdluacontextplus5.c
index de69167..aa19633 100644
--- a/src/lua5/cdluacontextplus5.c
+++ b/src/lua5/cdluacontextplus5.c
@@ -37,8 +37,3 @@ int luaopen_cdluacontextplus(lua_State* L)
 {
   return cdluacontextplus_open(L);
 }
-
-int luaopen_cdluacontextplus51(lua_State* L)
-{
-  return cdluacontextplus_open(L);
-}
diff --git a/src/lua5/cdluacontextplus5.def b/src/lua5/cdluacontextplus5.def
index 55e478b..69bdb2c 100644
--- a/src/lua5/cdluacontextplus5.def
+++ b/src/lua5/cdluacontextplus5.def
@@ -1,4 +1,3 @@
 EXPORTS
   luaopen_cdluacontextplus
-  luaopen_cdluacontextplus51
  
\ No newline at end of file
diff --git a/src/lua5/cdluaim5.c b/src/lua5/cdluaim5.c
index 815cd0f..579c2c9 100644
--- a/src/lua5/cdluaim5.c
+++ b/src/lua5/cdluaim5.c
@@ -285,8 +285,3 @@ int luaopen_cdluaim(lua_State *L)
 {
   return cdluaim_open(L);
 }
-
-int luaopen_cdluaim51(lua_State *L)
-{
-  return cdluaim_open(L);
-}
diff --git a/src/lua5/cdluaim5.def b/src/lua5/cdluaim5.def
index 0b26928..df8d982 100644
--- a/src/lua5/cdluaim5.def
+++ b/src/lua5/cdluaim5.def
@@ -1,4 +1,3 @@
 EXPORTS
   cdluaim_open
   luaopen_cdluaim
-  luaopen_cdluaim51
diff --git a/src/lua5/cdluapdf5.c b/src/lua5/cdluapdf5.c
index eb3f221..40877ad 100644
--- a/src/lua5/cdluapdf5.c
+++ b/src/lua5/cdluapdf5.c
@@ -47,7 +47,3 @@ int luaopen_cdluapdf(lua_State* L)
   return cdluapdf_open(L);
 }
 
-int luaopen_cdluapdf51(lua_State* L)
-{
-  return cdluapdf_open(L);
-}
diff --git a/src/lua5/cdluapdf5.def b/src/lua5/cdluapdf5.def
index bfbc889..8555b36 100644
--- a/src/lua5/cdluapdf5.def
+++ b/src/lua5/cdluapdf5.def
@@ -1,4 +1,3 @@
 EXPORTS
   cdluapdf_open
   luaopen_cdluapdf
-  luaopen_cdluapdf51
\ No newline at end of file
-- 
cgit v1.2.3