Adding the cd-tool interface to lua-interface's built-in compilation.

2 files changed, 21 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 7ffcc73..e184f79 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,8 @@ INCLUDES = \
 -I ../tinyxml \
 -I /usr/include/mysql \
 -I /usr/include/FTGL -I /usr/include/freetype2 \
--I /usr/include/oracle/11.1.0.1/client/
+-I /usr/include/oracle/11.1.0.1/client/ \
+-I ../PSX-Bundle/includes
 
 HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_FCNTL -DHAVE_MYSQL -DHAVE_UNISTD_H -DHAVE_FORK -DHAVE_PIPE -DHAVE_FSYNC -DHAVE_MALLOC_H -DHAVE_ASPRINTF -DHAVE_BYTESWAP_H
 
@@ -49,8 +50,8 @@ BASIC_LDFLAGS = $(ARCH_FLAGS) $(LIBS)
 LDFLAGS += $(BASIC_LDFLAGS) $(LDFLAGS_READLINE) -L/usr/lib/oracle/11.1.0.1/client/lib
 
 vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src
-vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src
-vpath %.cpp ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src
+vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../lua-modules-cd-tool/src
+vpath %.cpp ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../PSX-Bundle/lib
 vpath %.lua ../Baltisot/lib:../Baltisot/src
 
 LUAINTERFACE_SOURCES = \
@@ -169,6 +170,7 @@ checkargs.c \
 datecalc.c \
 
 DEBUG_MODULES = \
+lua-interface-main.c \
 tinystr.cpp \
 tinyxml.cpp \
 tinyxmlerror.cpp \
@@ -177,31 +179,29 @@ plugin-luaconfigfiles.cc \
 LuaConfigFile.cc \
 plugin-luaxml.cc \
 LuaXML.cc \
-plugin-luaocci.cc \
-LuaOCCI.cc \
 plugin-luahandle.cc \
 plugin-luahttp.cc \
 LuaHttp.cc \
 plugin-luaregex.cc \
 LuaRegex.cc \
 plugin-luatask.cc \
-plugin-luasql.cc \
-SQL.cc \
-LuaSQL.cc \
 plugin-lualibs.cc \
 loadlualibs.cc \
-plugin-luagl.cc \
-LuaGL.cc \
-plugin-luaftgl.cc \
-LuaFTGL.cc \
 supportlib.lua \
 tasklib.lua \
 ajaxlib.lua \
 htmllib.lua \
 xmllib.lua \
 httplib.lua \
-plugin-luaosmesa.cc \
-dds.c
+dblib.lua \
+plugin-luacd.cc \
+luacd.cpp \
+cdabstract.cpp \
+cdreader.cpp \
+cdutils.cpp \
+dvdabstract.cpp \
+isobuilder.cpp \
+yazedc.cpp \
 
 WHOLE_SOURCES = $(BALTISOT_SOURCES) $(LUA_SOURCES) $(LUAINTERFACE_SOURCES) gl-glue.s
 DEBUG_SOURCES = $(DEBUG_MODULES)
@@ -234,7 +234,7 @@ lua-interface: lua-interface-mesa.$(SHARED_EXT) lua-interface-main.o
 	$(LD) -o $@ ./lua-interface.$(SHARED_EXT) lua-interface-main.o
 
 lua-interface-dbg: $(ALL_OBJECTS) $(DEBUG_OBJECTS)
-	$(LD) -o lua-interface-dbg $(ALL_OBJECTS) $(DEBUG_OBJECTS) $(LDFLAGS) -lfreetype -lftgl ../Mesa-7.0.3/lib/libGLU.a ../Mesa-7.0.3/lib/libOSMesa.a /usr/lib/libmysqlclient.a -locci -lclntsh `Magick++-config --libs`
+	$(LD) -o lua-interface-dbg $(ALL_OBJECTS) $(DEBUG_OBJECTS) $(LDFLAGS)
 
 clean:
 	rm -f lua-interface-mesa lua-interface-gl luac *.o *.dep *.so *.dylib
diff --git a/src/lua-interface.cpp b/src/lua-interface.cpp
index 3387c00..4dc7129 100644
--- a/src/lua-interface.cpp
+++ b/src/lua-interface.cpp
@@ -71,6 +71,7 @@ extern void luasql_init(Lua * L) WEAK;
 extern void luatask_init(Lua * L) WEAK;
 extern void luaxml_init(Lua * L) WEAK;
 extern void luaosmesa_init(Lua * L) WEAK;
+extern void luacd_init(Lua * L) WEAK;
 
 }
 
@@ -311,7 +312,7 @@ int sLua_baselua_interface::baselua_interface_proceed_statics(Lua * L, int n, in
     case BASELUA_INTERFACE_LOADMODULE:
         filename = L->tostring();
         if (0) {
-#if not defined(__APPLE__) or defined(MODULES_BUILT_IN)
+#if !(defined(__APPLE__) || defined(MODULES_BUILT_IN))
 	} else if ((filename == "luaconfigfiles") && (luaconfigfiles_init != NULL)) {
             luaconfigfiles_init(L);
 #ifndef _MSVC
@@ -344,6 +345,8 @@ int sLua_baselua_interface::baselua_interface_proceed_statics(Lua * L, int n, in
         } else if ((filename == "luaosmesa") && (luaosmesa_init != NULL)) {
             luaosmesa_init(L);
 #endif
+        } else if ((filename == "luacd") && (luacd_init != NULL)) {
+            luacd_init(L);
 #endif
         } else {
     	    LuaLoadPlugin(filename, L);
@@ -715,6 +718,8 @@ void autoload_exports(Lua * L) {
     if (luaocci_init)
         luaocci_init(L);
 #endif
+    if (luacd_init)
+        luacd_init(L);
 #endif
 }