Adding the luaosmesa plugin.

1 files changed, 26 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index d704574..5b6417c 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,9 @@ CPPFLAGS += $(INCLUDES) -O4 -fexceptions -DSTDC_HEADERS -DREADLINE_STATIC -DHOOK
 
 LDFLAGS += -O4 -fexceptions -shared -fPIC -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
-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
-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
+vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../mogltk/lib:../tinyxml
+vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../mogltk/lib:../tinyxml
+vpath %.cpp ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../mogltk/lib:../tinyxml
 vpath %.lua ../Baltisot/lib:../Baltisot/src
 
 CONFIGFILES_SOURCES = \
@@ -92,7 +92,7 @@ GL_SOURCES = \
 plugin-luagl.cc \
 LuaGL.cc \
 
-GL_LIBS = ../Mesa-7.0.2/lib/libGLU.a ../Mesa-7.0.2/lib/libOSMesa.a
+GL_LIBS =
 
 FTGL_SOURCES = \
 plugin-luaftgl.cc \
@@ -100,6 +100,12 @@ LuaFTGL.cc \
 
 FTGL_LIBS = -lfreetype -lftgl
 
+OSMESA_SOURCES = \
+plugin-luaosmesa.cc \
+dds.c
+
+OSMESA_LIBS = `Magick++-config --libs`
+
 WHOLE_SOURCES = \
 $(CONFIGFILES_SOURCES) \
 $(XML_SOURCES) \
@@ -112,6 +118,7 @@ $(SQL_SOURCES) \
 $(LUALIBS_SOURCES) \
 $(GL_SOURCES) \
 $(FTGL_SOURCES) \
+$(OSMESA_SOURCES) \
 
 MODULES_LIST = \
 luaconfigfiles.so \
@@ -125,6 +132,7 @@ luasql.so \
 luagl.so \
 luaftgl.so \
 lualibs.so \
+luaosmesa.so \
 
 ALL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(WHOLE_SOURCES) $(LUA_LIB))))
 ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES))))
@@ -136,37 +144,40 @@ modules: $(MODULES_LIST)
 dep: $(ALL_DEPS)
 
 luaconfigfiles.so: $(addsuffix .o, $(notdir $(basename $(CONFIGFILES_SOURCES))))
-	$(LD) $(LDFLAGS) -o $@ $+ $(CONFIGFILES_LIBS) 
+	$(LD) $(LDFLAGS) -o $@ $+ $(CONFIGFILES_LIBS)
 
 luaxml.so: $(addsuffix .o, $(notdir $(basename $(XML_SOURCES))))
-	$(LD) $(LDFLAGS) -o $@ $+ $(XML_LIBS) 
+	$(LD) $(LDFLAGS) -o $@ $+ $(XML_LIBS)
 
 luaocci.so: $(addsuffix .o, $(notdir $(basename $(OCCI_SOURCES))))
-	$(LD) $(LDFLAGS) -o $@ $+ $(OCCI_LIBS) 
+	$(LD) $(LDFLAGS) -o $@ $+ $(OCCI_LIBS)
 
 luahandle.so: $(addsuffix .o, $(notdir $(basename $(HANDLE_SOURCES))))
-	$(LD) $(LDFLAGS) -o $@ $+ $(HANDLE_LIBS) 
+	$(LD) $(LDFLAGS) -o $@ $+ $(HANDLE_LIBS)
 
 luahttp.so: $(addsuffix .o, $(notdir $(basename $(HTTP_SOURCES))))
-	$(LD) $(LDFLAGS) -o $@ $+ $(HTTP_LIBS) 
+	$(LD) $(LDFLAGS) -o $@ $+ $(HTTP_LIBS)
 
 luaregex.so: $(addsuffix .o, $(notdir $(basename $(REGEX_SOURCES))))
-	$(LD) $(LDFLAGS) -o $@ $+ $(REGEX_LIBS) 
+	$(LD) $(LDFLAGS) -o $@ $+ $(REGEX_LIBS)
 
 luatask.so: $(addsuffix .o, $(notdir $(basename $(TASK_SOURCES))))
-	$(LD) $(LDFLAGS) -o $@ $+ $(TASK_LIBS) 
+	$(LD) $(LDFLAGS) -o $@ $+ $(TASK_LIBS)
 
 luasql.so: $(addsuffix .o, $(notdir $(basename $(SQL_SOURCES))))
-	$(LD) $(LDFLAGS) -o $@ $+ $(SQL_LIBS) 
+	$(LD) $(LDFLAGS) -o $@ $+ $(SQL_LIBS)
 
 luagl.so: $(addsuffix .o, $(notdir $(basename $(GL_SOURCES))))
-	$(LD) $(LDFLAGS) -o $@ $+ $(GL_LIBS) 
+	$(LD) $(LDFLAGS) -o $@ $+ $(GL_LIBS)
 
 luaftgl.so: $(addsuffix .o, $(notdir $(basename $(FTGL_SOURCES))))
-	$(LD) $(LDFLAGS) -o $@ $+ $(FTGL_LIBS) 
+	$(LD) $(LDFLAGS) -o $@ $+ $(FTGL_LIBS)
 
 lualibs.so: $(addsuffix .o, $(notdir $(basename $(LUALIBS_SOURCES) $(LUA_LIB))))
-	$(LD) $(LDFLAGS) -o $@ $+ $(LUALIBS_LIBS) 
+	$(LD) $(LDFLAGS) -o $@ $+ $(LUALIBS_LIBS)
+
+luaosmesa.so: $(addsuffix .o, $(notdir $(basename $(OSMESA_SOURCES))))
+	$(LD) $(LDFLAGS) -o $@ $+ $(OSMESA_LIBS)
 
 clean:
 	rm -f *.o *.dep *.so