[Scummvm-cvs-logs] scummvm master -> 90f2cde9fa27b06fe7753d68d4166bc10c833942

[fingolfin]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
90f2cde9fa PS2: Do not add RELEASE_BUILD


Commit: 90f2cde9fa27b06fe7753d68d4166bc10c833942
    https://github.com/scummvm/scummvm/commit/90f2cde9fa27b06fe7753d68d4166bc10c833942
Author: Max Horn (max at quendi.de)
Date: 2011-06-01T06:48:44-07:00

Commit Message:
PS2: Do not add RELEASE_BUILD

First merge screw up: I meant to comment these lines out (as they area
now -- in fact, these lines did not exist pre-merge at all, I moved the
-DRELEASE_BUILD additions manually to their own lines, so I could
comment them out, and then promptly forgot. *sigh*)

On the pro side, it was very easy to spot and correct this mistake!

Changed paths:
    backends/platform/ps2/Makefile.gdb
    backends/platform/ps2/Makefile.ps2



diff --git a/backends/platform/ps2/Makefile.gdb b/backends/platform/ps2/Makefile.gdb
index 1009f0f..1e2510d 100644
--- a/backends/platform/ps2/Makefile.gdb
+++ b/backends/platform/ps2/Makefile.gdb
@@ -62,7 +62,8 @@ INCDIR = ../../../
 # DEPDIR = .deps
 
 DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar -fno-rtti -fno-exceptions # -DNO_ADAPTOR
-DEFINES += -DRELEASE_BUILD
+# for release builds:
+#DEFINES += -DRELEASE_BUILD
 
 INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
 INCLUDES += -I $(PS2GDB)/ee -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
diff --git a/backends/platform/ps2/Makefile.ps2 b/backends/platform/ps2/Makefile.ps2
index ea966ec..77cc735 100644
--- a/backends/platform/ps2/Makefile.ps2
+++ b/backends/platform/ps2/Makefile.ps2
@@ -62,7 +62,8 @@ INCDIR = ../../../
 # DEPDIR = .deps
 
 DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -G2 -O2 -Wall -Wno-multichar -fno-rtti -fno-exceptions # -DNO_ADAPTOR
-DEFINES += -DRELEASE_BUILD
+# for release builds:
+#DEFINES += -DRELEASE_BUILD
 
 INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
 INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines