[Scummvm-cvs-logs] CVS: residual/tools Makefile,1.6,1.7 delua.cc,1.3,1.4

Pawel Kolodziejski aquadran at users.sourceforge.net
Thu Jan 13 15:32:16 CET 2005


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

Modified Files:
	Makefile delua.cc 
Log Message:
tools are again compilable

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/tools/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	13 Jan 2005 23:10:46 -0000	1.6
+++ Makefile	13 Jan 2005 23:31:10 -0000	1.7
@@ -1,23 +1,28 @@
 CXX = g++
-CXXFLAGS = $(CPPFLAGS) -g -O2 -Wall -I../lua -I.. -DLUA_NUM_TYPE=float
-CFLAGS = $(CPPFLAGS) -g -O2 -Wall
-#LDFLAGS =
+CXXFLAGS = -g -O2 -Wall -I../lua -I..
+CFLAGS = -g -O2 -Wall
+LDFLAGS =
 LIBS =
 
 all: bmtoppm delua imc2wav int2flt mat2ppm set2fig unlab vima
 
 bmtoppm: bmtoppm.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ bmtoppm.c -lppm -lpbm
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ bmtoppm.c -lppm
 
 mat2ppm: mat2ppm.c
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mat2ppm.c -lppm
 
 delua: delua.o ../localize.o ../registry.o ../debug.o
-	$(CXX) $(LDFLAGS) -o $@ delua.o ../localize.o ../registry.o $(LIBS)
-
-unlab: unlab.o util.o
-	$(CC) $(LDFLAGS) -o $@ $+
-
+	$(CXX) $(LDFLAGS) -o $@ delua.o ../localize.o ../registry.o \
+	../lua/lapi.o ../lua/lauxlib.o ../lua/lbuffer.o ../lua/lbuiltin.o \
+	../lua/ldo.o ../lua/lfunc.o ../lua/lgc.o ../lua/liolib.o \
+	../lua/llex.o ../lua/lmathlib.o ../lua/lmem.o ../lua/lobject.o \
+	../lua/lparser.o ../lua/lrestore.o ../lua/lsave.o ../lua/lstate.o \
+	../lua/lstring.o ../lua/lstrlib.o ../lua/ltable.o ../lua/ltask.o \
+	../lua/ltm.o ../lua/lundump.o ../lua/lvm.o ../lua/lzio.o $(LIBS)
 
 .c.o:
-	$(CC) $(CXXFLAGS) -c $<
+	$(CXX) $(CXXFLAGS) -c $<
+
+clean:
+	-rm -f *.o bmtoppm delua imc2wav int2flt mat2ppm set2fig unlab vima

Index: delua.cc
===================================================================
RCS file: /cvsroot/scummvm/residual/tools/delua.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- delua.cc	1 Jan 2005 10:23:17 -0000	1.3
+++ delua.cc	13 Jan 2005 23:31:10 -0000	1.4
@@ -15,12 +15,10 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
-extern "C" {
 #include "lua.h"
 #include "lundump.h"
 #include "lopcodes.h"
 #include "lzio.h"
-}
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -138,7 +136,7 @@
     os << "\"";
     std::string str(text->str, text->u.s.len);
     if (translateStrings)
-      str = Localizer::instance()->localize(str.c_str());
+      str = g_localizer->localize(str.c_str());
     for (std::string::iterator i = str.begin(); i != str.end(); i++) {
       unsigned char c = *i;
       if (strchr(specials, c)) {





More information about the Scummvm-git-logs mailing list