[Scummvm-cvs-logs] CVS: scummvm Makefile,1.6,1.7 Makefile.common,1.16,1.17

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv12143

Modified Files:
	Makefile Makefile.common 
Log Message:
rewrote config class; cleanup; code restructuring

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	24 Aug 2002 13:52:16 -0000	1.6
+++ Makefile	8 Sep 2002 01:08:10 -0000	1.7
@@ -16,7 +16,7 @@
 CFLAGS   = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
 DEFINES  =
 LDFLAGS :=
-INCLUDES:= -I. -Icommon -Iscumm
+INCLUDES:= -I. -Icommon
 LIBS	 =
 OBJS	 =
 

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.common	31 Aug 2002 07:43:34 -0000	1.16
+++ Makefile.common	8 Sep 2002 01:08:11 -0000	1.17
@@ -9,8 +9,9 @@
 
 INCS	= scumm/scumm.h common/scummsys.h common/stdafx.h
 
-COMMON_OBJS = common/config-file.o common/engine.o common/gameDetector.o \
-	common/main.o common/timer.o common/util.o common/scaler.o common/file.o
+COMMON_OBJS = common/config-file.o common/engine.o common/file.o \
+	common/gameDetector.o common/main.o common/scaler.o common/str.o \
+	common/timer.o common/util.o
 
 GUI_OBJS = gui/gui.o gui/newgui.o gui/widget.o gui/dialog.o gui/ListWidget.o \
 	gui/ScrollBarWidget.o