[Scummvm-cvs-logs] scummvm master -> 4bfd23783af5ec60a20872e0b34aab55efe74ea6
fingolfin
max at quendi.de
Wed Jun 1 18:19:03 CEST 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b0a460e849 DC: Use 'noserial' for release builds
4bfd23783a DC: Clarify comment
Commit: b0a460e849fbad76e973fce57efd3d15a419e0f5
https://github.com/scummvm/scummvm/commit/b0a460e849fbad76e973fce57efd3d15a419e0f5
Author: Max Horn (max at quendi.de)
Date: 2011-06-01T09:17:01-07:00
Commit Message:
DC: Use 'noserial' for release builds
Changed paths:
configure
diff --git a/configure b/configure
index 5d371c0..9bb1e11 100755
--- a/configure
+++ b/configure
@@ -1945,8 +1945,9 @@ if test -n "$_host"; then
DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE"
DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
- # for release builds:
- #DEFINES="$DEFINES -DNOSERIAL"
+ if test "$_release_build" = yes; then
+ DEFINES="$DEFINES -DNOSERIAL"
+ fi
CXXFLAGS="$CXXFLAGS -O3"
CXXFLAGS="$CXXFLAGS -funroll-loops"
CXXFLAGS="$CXXFLAGS -fschedule-insns2"
@@ -2233,7 +2234,11 @@ case $_backend in
LDFLAGS="$LDFLAGS -nostartfiles"
LDFLAGS="$LDFLAGS "'$(ronindir)/lib/crt0.o'
LDFLAGS="$LDFLAGS "'-L$(ronindir)/lib'
- LIBS="$LIBS -lronin -lm"
+ if test "$_release_build" = yes; then
+ LIBS="$LIBS -lronin-noserial -lm"
+ else
+ LIBS="$LIBS -lronin -lm"
+ fi
;;
dingux)
DEFINES="$DEFINES -DDINGUX"
Commit: 4bfd23783af5ec60a20872e0b34aab55efe74ea6
https://github.com/scummvm/scummvm/commit/4bfd23783af5ec60a20872e0b34aab55efe74ea6
Author: Max Horn (max at quendi.de)
Date: 2011-06-01T09:17:35-07:00
Commit Message:
DC: Clarify comment
Changed paths:
backends/platform/dc/Makefile
diff --git a/backends/platform/dc/Makefile b/backends/platform/dc/Makefile
index 00d408f..6da32a9 100644
--- a/backends/platform/dc/Makefile
+++ b/backends/platform/dc/Makefile
@@ -12,7 +12,7 @@ LD = $(CXX)
CXXFLAGS= -O3 -Wno-multichar -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks -fno-exceptions
DEFINES = -D__DC__ -DNONSTANDARD_PORT -DUSE_MAD -DUSE_ZLIB -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_RGB_COLOR
# For release builds:
-#DEFINES := -DNOSERIAL
+#DEFINES += -DNOSERIAL
LDFLAGS = -Wl,-Ttext,0x8c010000 -nostartfiles $(ronindir)/lib/crt0.o
INCLUDES= -I./ -I$(srcdir) -I$(ronindir)/include/ -I$(srcdir)/engines
LIBS = -L$(ronindir)/lib -lmad -lronin -lz -lm
More information about the Scummvm-git-logs
mailing list