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
* remove (S)RAM save code (it has not been in use for quite some time)
* remove the lz compressor (was only used by ram save code)
* OPT_SPEED was set incorrectly
* dsmain.cpp was misspelled as ds_main.cpp
* remove unsed arm9 libcartreset (the copy in the arm7 directory
still is around, though)
svn-id: r50741
Conversion of the old build system is incomplete. Binaries created
using this new build system support most likely will not run!
More work is needed, but the work done so far should be enough
to get basic NDS support on our buildbot working.
svn-id: r50672
1) It wouldn't build at all for me, because source/fat had been missed off the
INCLUDES line.
2) Stray whitespace removed (to stop emacs warning on saving)
3) DS_BUILD flag selection reworked slightly. Now do: make all SCUMM_BUILD=x
(where x is a,b,c,d,e,f,g) and it'll select that version and build it. If
no x is supplied or x is not a-g, then version a will be built.
4) New allbuilds target. In backends/platform/ds, do: make allbuilds
and versions A-G are built in turn (version G does not complete currently due
to lack of logo g). This uses a 'semiclean' target in each makefile to clean
just the files that change between versions.
svn-id: r32470
and DS builds). This causes the scumm engines graphics code to call ARM
routines to do drawStripToScreen and copy8col.
These routines were originally written for the DS port, and have now been made
available to any other ARM device out there that wants them.
I've tested this change on WinCE, but can't test it on the DS as I don't have
one. We know that the routines work there though.
svn-id: r28016
Max Horn
agent-q
Jordi Vilalta Prat
Andre Heider
Neil Millstone
Johannes Schickel
Robin Watts
Bertrand Augereau