[Scummvm-cvs-logs] CVS: residual Makefile,1.19,1.20 Makefile.common,1.4,1.5 Makefile.cross,1.12,1.13 Makefile.mingw,1.20,1.21

[Pawel Kolodziejski]

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

Modified Files:
	Makefile Makefile.common Makefile.cross Makefile.mingw 
Log Message:
forgot whole branch

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile	2 May 2004 11:34:40 -0000	1.19
+++ Makefile	6 Oct 2004 19:13:52 -0000	1.20
@@ -1,14 +1,12 @@
 CXX = g++
 CC = gcc
 AR = ar rcu
-CXXFLAGS = -g -W -Wall -Ilua/include `sdl-config --cflags` -DUNIX \
+CXXFLAGS = -g -W -Wall -Ilua `sdl-config --cflags` -DUNIX \
 	   -Wno-multichar # -O2
 LDFLAGS = -g -W -Wall # -O2
-LIBS =  -Llua/lib -llua -llualib `sdl-config --libs` -lz 
+LIBS = `sdl-config --libs` -lz 
 
 # Comment this out for Mac OS X ...
 LIBS += -lGL -lGLU
 
 include Makefile.common
-
-.PHONY: lua-build lua-clean

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.common,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.common	11 Sep 2004 14:09:42 -0000	1.4
+++ Makefile.common	6 Oct 2004 19:13:52 -0000	1.5
@@ -1,4 +1,30 @@
 OBJS =\
+	lua/lapi.o \
+	lua/lauxlib.o \
+	lua/lbuffer.o \
+	lua/lbuiltin.o \
+	lua/ldo.o \
+	lua/lfunc.o \
+	lua/lgc.o \
+	lua/lfunc.o \
+	lua/liolib.o \
+	lua/llex.o \
+	lua/lmathlib.o \
+	lua/lmem.o \
+	lua/lobject.o \
+	lua/lparser.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
+	mixer/mixer.o \
+	mixer/rate.o \
+	mixer/audiostream.o \
 	actor.o \
 	bitmap.o \
 	blocky16.o \
@@ -8,6 +34,7 @@
 	engine.o \
 	keyframe.o \
 	lab.o \
+	lipsynch.o \
 	localize.o \
 	lua.o \
 	main.o \
@@ -22,33 +49,21 @@
 	screen.o \
 	smush.o \
 	sound.o \
-	lipsynch.o \
 	textobject.o \
 	textsplit.o \
 	timer.o \
 	vima.o \
 	walkplane.o \
-	mixer/mixer.o \
-	mixer/rate.o \
-	mixer/audiostream.o
 
 DEPS = $(OBJS:.o=.d)
 
-residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a
+residual: $(OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 .cpp.o:
 	$(CXX) $(CXXFLAGS) -MMD -c $(<) -o $*.o
 
-lua/lib/liblua.a lua/lib/liblualib.a: lua-build
-
-lua-build:
-	$(MAKE) -C lua
-
-clean: lua-clean
-	-rm -f residual$(EXEEXT) *.o mixer\*.o *.d mixer\*.d *~
-
-lua-clean:
-	$(MAKE) -C lua clean
+clean: 
+	-rm -f residual$(EXEEXT) *.o *~ mixer\*.o *.d mixer\*.d mixer\*~ lua\*.o *.d lua\*.d lua\*~
 
 -include $(DEPS)

Index: Makefile.cross
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.cross,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.cross	5 Apr 2004 02:00:33 -0000	1.12
+++ Makefile.cross	6 Oct 2004 19:13:52 -0000	1.13
@@ -3,12 +3,10 @@
 SDL_LIBS=-L/usr/i586-mingw32msvc/lib -lSDL
 
 CXX = i586-mingw32msvc-g++
-CXXFLAGS = -W -Wall -Wno-multichar -Ilua/include $(SDL_CFLAGS) # -O2
+CXXFLAGS = -W -Wall -Wno-multichar -Ilua $(SDL_CFLAGS) # -O2
 LDFLAGS = -W -Wall # -O2
-LIBS = -Llua/lib -llua -llualib -lmingw32 -lopengl32 -lglu32 -lgdi32 \
+LIBS = -lmingw32 -lopengl32 -lglu32 -lgdi32 \
 	$(SDL_LIBS) -lz
 EXEEXT =.exe
 
 include Makefile.common
-
-.PHONY: lua-build lua-clean

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.mingw,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.mingw	5 Apr 2004 02:00:33 -0000	1.20
+++ Makefile.mingw	6 Oct 2004 19:13:52 -0000	1.21
@@ -6,16 +6,14 @@
 SDL_LIBS=`sdl-config --libs`
 
 CXX = g++
-CXXFLAGS = -g -W -Wall -Wno-multichar -Ilua/include $(SDL_CFLAGS) # -O2 
+CXXFLAGS = -g -W -Wall -Wno-multichar -Ilua $(SDL_CFLAGS) # -O2 
 LDFLAGS = -g -W -Wall # -O2
-LIBS = -Llua/lib -llua -llualib -lmingw32 -lopengl32 -lglu32 -lgdi32 \
+LIBS = -lmingw32 -lopengl32 -lglu32 -lgdi32 \
 	$(SDL_LIBS) -lz
 EXEEXT =.exe
 
 include Makefile.common
 
-.PHONY: lua-build lua-clean
-
 # Some additional targets
 install:   residual
 	mkdir -p $(RESIDUALPATH)