summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2009-10-05 16:54:34 -0700
committerPixel <pixel@nobis-crew.org>2009-10-05 16:54:34 -0700
commita41c6c12ba0a3db297ae945b0700d48e2d1905f8 (patch)
treee8eeb8012a6496b0fc7c0c84edb0c102e9136e89 /Makefile
parent4a19ee400c7fe4fddaf1b99e63494f18a49fee2d (diff)
Adding the newthread() call for a fully pthreaded lua environment.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
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