[Scummvm-cvs-logs] scummvm master -> a4610df4825a89ceda39bf1156d1b97a37cceac8
fingolfin
max at quendi.de
Wed Jun 1 15:26:00 CEST 2011
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:
a4610df482 Merge branch 'branch-1-3-0' into master
Commit: a4610df4825a89ceda39bf1156d1b97a37cceac8
https://github.com/scummvm/scummvm/commit/a4610df4825a89ceda39bf1156d1b97a37cceac8
Author: Max Horn (max at quendi.de)
Date: 2011-06-01T06:15:31-07:00
Commit Message:
Merge branch 'branch-1-3-0' into master
I manually resolved all conflicts, and inspected every single change.
Many were due to the version string mismatch and thus easily resolved.
The MSVC project files add in the 1-3-0 branch were not merged,
neither where the changes to gui/themes/translations.dat.
Conflicts:
NEWS
backends/base-backend.cpp
backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
backends/module.mk
backends/platform/ds/arm9/makefile
backends/platform/psp/README.PSP
backends/platform/samsungtv/main.cpp
backends/platform/samsungtv/samsungtv.cpp
backends/saves/posix/posix-saves.cpp
base/commandLine.cpp
base/internal_version.h
base/main.cpp
common/array.h
configure
devtools/create_project/create_project.cpp
dists/android/AndroidManifest.xml
dists/android/plugin-manifest.xml
dists/iphone/Info.plist
dists/irix/scummvm.spec
dists/macosx/Info.plist
dists/redhat/scummvm-tools.spec
dists/redhat/scummvm.spec
dists/scummvm.rc
dists/slackware/scummvm.SlackBuild
dists/wii/meta.xml
engines/sci/parser/vocabulary.cpp
engines/tinsel/handle.cpp
gui/themes/translations.dat
Changed paths:
audio/softsynth/opl/mame.cpp
backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
backends/platform/android/jni.cpp
backends/platform/dc/Makefile
backends/platform/ds/arm9/makefile
backends/platform/ds/arm9/source/dsmain.cpp
backends/platform/ps2/Makefile.gdb
backends/platform/ps2/Makefile.ps2
backends/platform/samsungtv/main.cpp
backends/platform/samsungtv/samsungtv.cpp
base/commandLine.cpp
configure
engines/saga/font.cpp
engines/saga/font.h
gui/gui-manager.cpp
gui/launcher.cpp
gui/massadd.cpp
gui/options.cpp
gui/saveload.cpp
diff --cc backends/platform/dc/Makefile
index 0133ffd,9586572..00d408f
--- a/backends/platform/dc/Makefile
+++ b/backends/platform/dc/Makefile
@@@ -10,10 -12,10 +10,14 @@@ CC = sh-elf-gcc -ml -m4-single-onl
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 -DNOSERIAL
+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
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-noserial -lz -lm
+LIBS = -L$(ronindir)/lib -lmad -lronin -lz -lm
++# For release builds:
++#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
diff --cc backends/platform/ds/arm9/makefile
index 65fb98e,62473bc..1b21b41
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@@ -245,7 -245,7 +245,9 @@@ ifdef USE_MA
DEFINES += -DUSE_MAD
endif
-DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE -DDISABLE_MASS_ADD -DDISABLE_NES_APU -DNDEBUG
+DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE_FOR_DEBUGGER -DDISABLE_MASS_ADD -DDISABLE_NES_APU
++# for release builds:
++#DEFINES += -DNDEBUG
LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections
diff --cc backends/platform/ps2/Makefile.gdb
index 48dcebc,456fc5b..1009f0f
--- a/backends/platform/ps2/Makefile.gdb
+++ b/backends/platform/ps2/Makefile.gdb
@@@ -48,35 -61,34 +61,35 @@@ VPATH = $(srcdir
INCDIR = ../../../
# DEPDIR = .deps
- DEFINES = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar
-
-DEFINES = -DRELEASE_BUILD -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 = -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
-INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
+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
+ CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
+
TARGET = elf/scummvm.elf
- OBJS := backends/platform/ps2/DmaPipe.o \
- backends/platform/ps2/Gs2dScreen.o \
- backends/platform/ps2/irxboot.o \
- backends/platform/ps2/ps2input.o \
- backends/platform/ps2/ps2pad.o \
- backends/platform/ps2/savefilemgr.o \
- backends/platform/ps2/fileio.o \
- backends/platform/ps2/asyncfio.o \
- backends/platform/ps2/icon.o \
- backends/platform/ps2/cd.o \
- backends/platform/ps2/eecodyvdfs.o \
- backends/platform/ps2/rpckbd.o \
- backends/platform/ps2/systemps2.o \
- backends/platform/ps2/ps2mutex.o \
- backends/platform/ps2/ps2time.o \
- backends/platform/ps2/ps2debug.o
+ OBJS := $(srcdir)/backends/platform/ps2/DmaPipe.o \
+ $(srcdir)/backends/platform/ps2/Gs2dScreen.o \
+ $(srcdir)/backends/platform/ps2/irxboot.o \
+ $(srcdir)/backends/platform/ps2/ps2input.o \
+ $(srcdir)/backends/platform/ps2/ps2pad.o \
+ $(srcdir)/backends/platform/ps2/savefilemgr.o \
+ $(srcdir)/backends/platform/ps2/fileio.o \
+ $(srcdir)/backends/platform/ps2/asyncfio.o \
+ $(srcdir)/backends/platform/ps2/icon.o \
+ $(srcdir)/backends/platform/ps2/cd.o \
+ $(srcdir)/backends/platform/ps2/eecodyvdfs.o \
+ $(srcdir)/backends/platform/ps2/rpckbd.o \
+ $(srcdir)/backends/platform/ps2/systemps2.o \
+ $(srcdir)/backends/platform/ps2/ps2mutex.o \
+ $(srcdir)/backends/platform/ps2/ps2time.o \
+ $(srcdir)/backends/platform/ps2/ps2debug.o
-
+
MODULE_DIRS += .
- BACKEND := ps2
-
include $(srcdir)/Makefile.common
LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile
diff --cc backends/platform/ps2/Makefile.ps2
index 472ba5e,3b80791..ea966ec
--- a/backends/platform/ps2/Makefile.ps2
+++ b/backends/platform/ps2/Makefile.ps2
@@@ -48,31 -61,32 +61,33 @@@ VPATH = $(srcdir
INCDIR = ../../../
# DEPDIR = .deps
- DEFINES = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar
-
-DEFINES = -DRELEASE_BUILD -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 = -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
-INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
+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
+ CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
+
TARGET = elf/scummvm.elf
- OBJS := backends/platform/ps2/DmaPipe.o \
- backends/platform/ps2/Gs2dScreen.o \
- backends/platform/ps2/irxboot.o \
- backends/platform/ps2/ps2input.o \
- backends/platform/ps2/ps2pad.o \
- backends/platform/ps2/savefilemgr.o \
- backends/platform/ps2/fileio.o \
- backends/platform/ps2/asyncfio.o \
- backends/platform/ps2/icon.o \
- backends/platform/ps2/cd.o \
- backends/platform/ps2/eecodyvdfs.o \
- backends/platform/ps2/rpckbd.o \
- backends/platform/ps2/systemps2.o \
- backends/platform/ps2/ps2mutex.o \
- backends/platform/ps2/ps2time.o \
- backends/platform/ps2/ps2debug.o
+ OBJS := $(srcdir)/backends/platform/ps2/DmaPipe.o \
+ $(srcdir)/backends/platform/ps2/Gs2dScreen.o \
+ $(srcdir)/backends/platform/ps2/irxboot.o \
+ $(srcdir)/backends/platform/ps2/ps2input.o \
+ $(srcdir)/backends/platform/ps2/ps2pad.o \
+ $(srcdir)/backends/platform/ps2/savefilemgr.o \
+ $(srcdir)/backends/platform/ps2/fileio.o \
+ $(srcdir)/backends/platform/ps2/asyncfio.o \
+ $(srcdir)/backends/platform/ps2/icon.o \
+ $(srcdir)/backends/platform/ps2/cd.o \
+ $(srcdir)/backends/platform/ps2/eecodyvdfs.o \
+ $(srcdir)/backends/platform/ps2/rpckbd.o \
+ $(srcdir)/backends/platform/ps2/systemps2.o \
+ $(srcdir)/backends/platform/ps2/ps2mutex.o \
+ $(srcdir)/backends/platform/ps2/ps2time.o \
+ $(srcdir)/backends/platform/ps2/ps2debug.o
-
+
MODULE_DIRS += .
BACKEND := ps2
diff --cc configure
index fe5784c,624d49f..3194f70
--- a/configure
+++ b/configure
@@@ -1931,14 -1786,9 +1931,16 @@@ if test -n "$_host"; the
_port_mk="backends/platform/dingux/dingux.mk"
;;
dreamcast)
- 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
+ DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
+ DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE"
+ DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
++ # for release builds:
++ #DEFINES="$DEFINES -DNOSERIAL"
+ CXXFLAGS="$CXXFLAGS -O3"
+ CXXFLAGS="$CXXFLAGS -funroll-loops"
+ CXXFLAGS="$CXXFLAGS -fschedule-insns2"
+ CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
+ CXXFLAGS="$CXXFLAGS -fdelete-null-pointer-checks"
_backend="dc"
_build_scalers=no
_mad=yes
diff --cc engines/saga/font.cpp
index a536390,60e7c98..8c3f4d7
--- a/engines/saga/font.cpp
+++ b/engines/saga/font.cpp
@@@ -48,6 -57,18 +52,18 @@@ Font::Font(SagaEngine *vm) : _vm(vm)
Font::~Font() {
debug(8, "Font::~Font(): Freeing fonts.");
+
+ #ifdef __DS__
+ for (int i = 0; i < _vm->getFontsCount(); i++) {
+ if (_fonts[i].outline.font) {
+ free(_fonts[i].outline.font);
+ }
-
++
+ if (_fonts[i].normal.font) {
+ free(_fonts[i].normal.font);
+ }
- }
++ }
+ #endif
}
@@@ -104,9 -125,17 +120,17 @@@ void Font::loadFont(FontData *font, uin
error("Invalid font resource size");
}
+ #ifndef __DS__
font->normal.font.resize(fontResourceData.size() - FONT_DESCSIZE);
memcpy(font->normal.font.getBuffer(), fontResourceData.getBuffer() + FONT_DESCSIZE, fontResourceData.size() - FONT_DESCSIZE);
+ #else
+ if (font->normal.font) {
+ free(font->normal.font);
+ }
-
+
+ font->normal.font = (byte *) malloc(fontResourceData.size() - FONT_DESCSIZE);
+ memcpy(font->normal.font, fontResourceData.getBuffer() + FONT_DESCSIZE, fontResourceData.size() - FONT_DESCSIZE);
+ #endif
// Create outline font style
createOutline(font);
diff --cc gui/gui-manager.cpp
index f56a909,edab31d..af1852d
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@@ -74,6 -77,14 +74,14 @@@ GuiManager::GuiManager() : _redrawStatu
ConfMan.registerDefault("gui_renderer", ThemeEngine::findModeConfigName(ThemeEngine::_defaultRendererMode));
ThemeEngine::GraphicsMode gfxMode = (ThemeEngine::GraphicsMode)ThemeEngine::findMode(ConfMan.get("gui_renderer"));
+ #ifdef __DS__
+ // Searching for the theme file takes ~10 seconds on the DS.
+ // Disable this search here because external themes are not supported.
+ if (!loadNewTheme("builtin", gfxMode)) {
+ // Loading the built-in theme failed as well. Bail out
+ error("Failed to load any GUI theme, aborting");
+ }
-#else
++#else
// Try to load the theme
if (!loadNewTheme(themefile, gfxMode)) {
// Loading the theme failed, try to load the built-in theme
diff --cc gui/launcher.cpp
index 792b5bb,c80852c..86ca316
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@@ -718,6 -721,8 +718,8 @@@ void LauncherDialog::updateListing()
void LauncherDialog::addGame() {
int modifiers = g_system->getEventManager()->getModifierState();
-
++
+ #ifndef DISABLE_MASS_ADD
const bool massAdd = (modifiers & Common::KBD_SHIFT) != 0;
if (massAdd) {
@@@ -918,7 -924,7 +921,7 @@@ void LauncherDialog::loadGame(int item
gameId = _domains[item];
const EnginePlugin *plugin = 0;
--
++
EngineMan.findGame(gameId, &plugin);
String target = _domains[item];
diff --cc gui/massadd.cpp
index 7b641d7,ba84115..861be97
--- a/gui/massadd.cpp
+++ b/gui/massadd.cpp
@@@ -264,3 -264,6 +264,4 @@@ void MassAddDialog::handleTickle()
} // End of namespace GUI
+ #endif // DISABLE_MASS_ADD
-
-
diff --cc gui/options.cpp
index 5cb70bc,d2369b9..0c9d03a
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@@ -138,8 -141,8 +138,8 @@@ void OptionsDialog::init()
_subSpeedDesc = 0;
_subSpeedSlider = 0;
_subSpeedLabel = 0;
- _oldTheme = ConfMan.get("gui_theme");
- _oldTheme = g_gui.theme()->getThemeId();
-
++ _oldTheme = g_gui.theme()->getThemeId();
+
// Retrieve game GUI options
_guioptions = 0;
if (ConfMan.hasKey("guioptions", _domain)) {
diff --cc gui/saveload.cpp
index 7c7394a,9e3c923..460246e
--- a/gui/saveload.cpp
+++ b/gui/saveload.cpp
@@@ -359,8 -362,19 +359,19 @@@ void SaveLoadChooser::updateSaveList()
}
// Fill the rest of the save slots with empty saves
-
++
+ int maximumSaveSlots = (*_plugin)->getMaximumSaveSlot();
-
++
+ #ifdef __DS__
+ // Low memory on the DS means too many save slots are impractical, so limit
+ // the maximum here.
+ if (maximumSaveSlots > 99) {
+ maximumSaveSlots = 99;
+ }
+ #endif
-
++
Common::String emptyDesc;
- for (int i = curSlot; i <= (*_plugin)->getMaximumSaveSlot(); i++) {
+ for (int i = curSlot; i <= maximumSaveSlots; i++) {
saveNames.push_back(emptyDesc);
SaveStateDescriptor dummySave(i, "");
_saveList.push_back(dummySave);
More information about the Scummvm-git-logs
mailing list