[Scummvm-cvs-logs] CVS: residual Makefile.common,1.5,1.6 textobject.cpp,1.8,1.9

Pawel Kolodziejski aquadran at users.sourceforge.net
Wed Oct 6 12:35:10 CEST 2004


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20797/residual

Modified Files:
	Makefile.common textobject.cpp 
Log Message:
fixed makefile

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.common,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.common	6 Oct 2004 19:13:52 -0000	1.5
+++ Makefile.common	6 Oct 2004 19:32:18 -0000	1.6
@@ -21,7 +21,7 @@
 	lua/ltm.o \
 	lua/lundump.o \
 	lua/lvm.o \
-	lua/lzio.o
+	lua/lzio.o \
 	mixer/mixer.o \
 	mixer/rate.o \
 	mixer/audiostream.o \
@@ -53,7 +53,7 @@
 	textsplit.o \
 	timer.o \
 	vima.o \
-	walkplane.o \
+	walkplane.o
 
 DEPS = $(OBJS:.o=.d)
 

Index: textobject.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/textobject.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- textobject.cpp	4 Jun 2004 14:08:41 -0000	1.8
+++ textobject.cpp	6 Oct 2004 19:32:18 -0000	1.9
@@ -19,7 +19,12 @@
 #include "textobject.h"
 #include "engine.h"
 #include "localize.h"
+
+#ifdef DIRECT3D_DRIVER
+#include "driver_d3d.h"
+#else
 #include "driver_gl.h"
+#endif
 
 TextObject::TextObject(const char *text, const int x, const int y, const Color& fgColor) :
 		fgColor_(fgColor), x_(x), y_(y) {





More information about the Scummvm-git-logs mailing list