From a41c6c12ba0a3db297ae945b0700d48e2d1905f8 Mon Sep 17 00:00:00 2001 From: Pixel Date: Mon, 5 Oct 2009 16:54:34 -0700 Subject: Adding the newthread() call for a fully pthreaded lua environment. --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5f2258d..8862ab0 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ INCLUDES = \ -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 +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 -DHAVE_VASPRINTF LIBS += -lz -ldl -lpthread @@ -218,6 +218,8 @@ cdutils.cpp \ dvdabstract.cpp \ isobuilder.cpp \ yazedc.cpp \ +LuaOCCI.cpp \ +plugin-luaocci.cc \ WHOLE_SOURCES = $(BALTISOT_SOURCES) $(LUA_SOURCES) $(LUAINTERFACE_SOURCES) $(GL_GLUE) DEBUG_SOURCES = $(DEBUG_MODULES) @@ -255,7 +257,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) + $(LD) -o lua-interface-dbg $(ALL_OBJECTS) $(DEBUG_OBJECTS) $(LDFLAGS) $(LDFLAGS_MESA) -locci -lclntsh clean: rm -f lua-interface-mesa lua-interface-gl luac *.o *.dep *.so *.dylib -- cgit v1.2.3