From 805d302b116d4698ac7602a8c65c02cf9cc772ae Mon Sep 17 00:00:00 2001
From: pixel <pixel>
Date: Tue, 5 Aug 2008 15:03:54 +0000
Subject: Cleaning up a bit the -dbg version, and adding the luaosmesa module
 to it.

---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ee733b6..2889511 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_FCNTL -DHAVE_MYSQL -DHAVE_UNISTD_H
 
 CPPFLAGS += $(INCLUDES) -g -DSTDC_HEADERS -DREADLINE_STATIC -DHOOK_STDS -fexceptions -DWORDS_LITTLEENDIAN -fexceptions -march=i686 $(HAVES) -DUSE_MPQLIB
 
-LDFLAGS += -u gluNewTess -rdynamic -g -fexception -lpthread -ljpeg -lSegFault ../Mesa-7.0.2/lib/libGLU.a ../Mesa-7.0.2/lib/libOSMesa.a /usr/lib/libreadline.a /usr/lib/libncurses.a -lz -ldl -L/usr/lib/oracle/11.1.0.1/client/lib
+LDFLAGS += -u gluNewTess -rdynamic -g -fexception -lpthread -lSegFault /usr/lib/libreadline.a /usr/lib/libncurses.a -lz -ldl -L/usr/lib/oracle/11.1.0.1/client/lib -Wl,--whole-archive ../Mesa-7.0.2/lib/libGLU.a ../Mesa-7.0.2/lib/libOSMesa.a -Wl,--no-whole-archive
 
 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
@@ -142,7 +142,6 @@ checkargs.c \
 datecalc.c \
 
 DEBUG_MODULES = \
-luaidbg.c \
 tinystr.cpp \
 tinyxml.cpp \
 tinyxmlerror.cpp \
@@ -174,6 +173,8 @@ ajaxlib.lua \
 htmllib.lua \
 xmllib.lua \
 httplib.lua \
+plugin-luaosmesa.cc \
+dds.c
 
 WHOLE_SOURCES = $(BALTISOT_SOURCES) $(LUA_SOURCES) $(LUAINTERFACE_SOURCES)
 DEBUG_SOURCES = $(DEBUG_MODULES)
@@ -196,7 +197,7 @@ lua-interface: $(ALL_OBJECTS)
 	$(LD) -o lua-interface $(ALL_OBJECTS) $(LDFLAGS)
 
 lua-interface-dbg: $(ALL_OBJECTS) $(DEBUG_OBJECTS)
-	$(LD) -o lua-interface-dbg $(ALL_OBJECTS) $(DEBUG_OBJECTS) $(LDFLAGS) -lfreetype -lftgl ../Mesa-7.0.2/lib/libGLU.a ../Mesa-7.0.2/lib/libOSMesa.a /usr/lib/libmysqlclient.a -locci -lclntsh
+	$(LD) -o lua-interface-dbg $(ALL_OBJECTS) $(DEBUG_OBJECTS) $(LDFLAGS) -lfreetype -lftgl ../Mesa-7.0.2/lib/libGLU.a ../Mesa-7.0.2/lib/libOSMesa.a /usr/lib/libmysqlclient.a -locci -lclntsh `Magick++-config --libs`
 
 clean:
 	rm -f lua-interface luac *.o *.dep
-- 
cgit v1.2.3