[Scummvm-cvs-logs] SF.net SVN: scummvm:[48346] scummvm/branches/branch-1-1-0

[marcus_c at users.sourceforge.net]

Revision: 48346
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48346&view=rev
Author:   marcus_c
Date:     2010-03-21 00:47:05 +0000 (Sun, 21 Mar 2010)

Log Message:
-----------
Disabled serial for release.

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/backends/platform/dc/Makefile
    scummvm/branches/branch-1-1-0/configure

Modified: scummvm/branches/branch-1-1-0/backends/platform/dc/Makefile
===================================================================
--- scummvm/branches/branch-1-1-0/backends/platform/dc/Makefile	2010-03-21 00:40:10 UTC (rev 48345)
+++ scummvm/branches/branch-1-1-0/backends/platform/dc/Makefile	2010-03-21 00:47:05 UTC (rev 48346)
@@ -12,10 +12,10 @@
 CXX     = sh-elf-g++ -ml -m4-single-only
 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
+DEFINES = -D__DC__ -DNONSTANDARD_PORT -DUSE_MAD -DUSE_ZLIB -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_RGB_COLOR -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
+LIBS	= -L$(ronindir)/lib -lmad -lronin-noserial -lz -lm
 EXECUTABLE = scummvm.elf
 DEPDIR = .deps
 CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP

Modified: scummvm/branches/branch-1-1-0/configure
===================================================================
--- scummvm/branches/branch-1-1-0/configure	2010-03-21 00:40:10 UTC (rev 48345)
+++ scummvm/branches/branch-1-1-0/configure	2010-03-21 00:47:05 UTC (rev 48346)
@@ -1368,7 +1368,7 @@
 			_strip=$_host-strip
 			;;
 		dreamcast)
-			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
+			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DNOSERIAL"
 			CXXFLAGS="$CXXFLAGS -O3 -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks"
 			_need_memalign=yes
 			_backend="dc"
@@ -2256,7 +2256,7 @@
 	dc)
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include'
 		LDFLAGS="$LDFLAGS -Wl,-Ttext,0x8c010000 -nostartfiles "'$(ronindir)/lib/crt0.o -L$(ronindir)/lib'
-		LIBS="$LIBS -lronin -lm"
+		LIBS="$LIBS -lronin-noserial -lm"
 		;;
 	gp2x)
 		find_sdlconfig


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.