[Scummvm-cvs-logs] CVS: scummvm Makefile,1.21,1.22 Makefile.mingw,1.7,1.8

[Travis Howell]

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv7069

Modified Files:
	Makefile Makefile.mingw 
Log Message:

Include simon debug options by default


Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile	10 Nov 2002 22:07:06 -0000	1.21
+++ Makefile	20 Nov 2002 14:44:58 -0000	1.22
@@ -47,9 +47,6 @@
 # DEFINES += -DUSE_ALSA
 # LIBS    += -lasound
 
-# Uncomment this to activate extended debugging support in Simon
-DEFINES += -DSIMONDEBUG
-
 # Uncomment this for stricter compile time code verification
 # CFLAGS  += -Wshadow -Werror
 

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.mingw,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.mingw	27 Oct 2002 11:41:07 -0000	1.7
+++ Makefile.mingw	20 Nov 2002 14:44:59 -0000	1.8
@@ -19,6 +19,10 @@
 ZIP = zip -q
 CP  = cp
 
+#######################################################################
+# Default compilation parameters. Normally don't edit these           #
+#######################################################################
+
 CFLAGS   = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
 DEFINES  =
 LDFLAGS :=
@@ -27,6 +31,10 @@
 OBJS	 = scummvmico.o backends/sdl/sdl-common.o backends/sdl/sdl.o 
 EXEEXT	:=.exe
 
+#######################################################################
+# Compile options - you can modify these to tweak ScummVM compilation #
+#######################################################################
+
 # Enable this if you want ScummVM to dump all scripts it runs.
 # This is mainly interesting for developers.
 # DEFINES += -DDUMP_SCRIPTS
@@ -39,8 +47,12 @@
 DEFINES += -DUSE_VORBIS
 LIBS    += -lvorbisfile -lvorbis -logg
 
-# Uncomment this to activate extended debugging support in Simon
-DEFINES += -DSIMONDEBUG
+# Uncomment this for stricter compile time code verification
+# CFLAGS  += -Wshadow -Werror
+
+#######################################################################
+# Misc stuff - you should normally never have to edit this            #
+#######################################################################
 
 # Concat DEFINES and INCLUDES to for the CPPFLAGS
 CPPFLAGS= $(DEFINES) $(INCLUDES)