Age | Commit message (Collapse) | Author |
|
This was removed from OSystem in b51f2f3212ae8a5abbdce4d947ec2d1cad1a0b6f.
|
|
The header contains forbidden symbols on some platforms, and the
simplest solution seems to be to include it here. This also includes
it from all the portdefs.h files, except the Symbian one. Probably
the FIXME and the #if can be removed once it's known to work.
|
|
|
|
|
|
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
|
|
|
|
|
|
|
|
|
|
|
|
This is used to provide default implementations for createConfigWriteStream
and createConfigReadStream, which can be used by most backends.
Note that backends can still override createConfigRead/WriteStream;
this could be useful if settings on some port are not stored in a
regular file (think 'Windows registry', for a hypothetical example).
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
This reduces the similarity in name to the otherwise mostly
unrelated DISABLE_TEXT_CONSOLE #define.
|
|
|
|
- Enable libmad
- Remove forced include of scummsys.h, it caused problems in the forbidden symbols code.
|
|
|
|
In some places we used $DEVKITARM, but in others we hardcode the path
$DEVKITPRO/devkitARM. To ensure consistent behavior, I changed it to the
latter everywhere for now. Should it turn out that we really want to
have this flexible, we can reintroduce $DEVKITARM in a proper way. In
that case, we could augment configure to set DEVKITARM to
$DEVKITPRO/devkitARM, if it has not been set yet.
|
|
|
|
For further discussion check here:
https://github.com/scummvm/scummvm/pull/16
Conflicts:
graphics/png.cpp
|
|
|
|
|
|
Note that this change is not tested at all (not even compile wise!).
|
|
byte depth.
|
|
|
|
Only applies when using loadable modules.
This requires a second compile run or black voodoo linker tricks.
Not implemented at this time. Disable it, so we get DS build failure
reports from buildbot (which are useful with all the DISABLE_EVERYTHING
defines).
The resulting binary might be too big to be usable.
|
|
This change is not tested, but should hopefully work fine.
|
|
svn-id: r55850
|
|
svn-id: r55806
|
|
svn-id: r54385
|
|
This is the only we need right now, and it saves a few bytes per
instance. The template approach I used before has the drawback that it
increases the binary size, which negates the benefit. Thanks to LordHoto
for pointing this out.
svn-id: r54344
|
|
svn-id: r54335
|
|
svn-id: r54334
|
|
svn-id: r54332
|
|
svn-id: r54325
|
|
DS backend
svn-id: r54318
|
|
svn-id: r54317
|
|
svn-id: r54265
|
|
Also renamed the source/header files, now they are more closely
aligned to how we rename most other source files
svn-id: r54264
|
|
way of reducing dynamic size
svn-id: r54059
|
|
This merge was extremely difficult to carry out. It wasn't entirely SVN's fault -- there were several merges to the branch that were done by hand. Please check for any issues and regressions. Also note that the DS makefile was not copied over since the "one at a time" plugin mode currently has too much fragmentation ie. it doesn't work.
svn-id: r54051
|
|
svn-id: r53976
|
|
svn-id: r53160
|
|
- Unify ELF loader handling in configure
- Rename ELF_LOADER_TARGET to USE_ELF_LOADER
svn-id: r52728
|
|
svn-id: r52555
|