ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
6575 Commits
Author SHA1 Message Date
Max Horn 8d77d8cf1c DS: Remove dead code 2011-06-06 16:55:18 +02:00
Max Horn c5532153c3 PS2: Remove dead code 2011-06-06 16:50:26 +02:00
Max Horn 4f159dba90 PS2: Simplify OSystem_PS2::logMessage 2011-06-06 16:47:20 +02:00
Max Horn c81e94b252 BACKENDS: Unify EventManager setup 2011-06-06 16:13:57 +02:00
Max Horn 848079b66d NULL: Fix null backend (untested) 2011-06-06 15:48:40 +02:00
Max Horn b0b5a1d802 DS: Add custom logMessage() implementation 2011-06-06 15:36:28 +02:00
Max Horn 4878b2b27b PS2: Add logMessage() implementation 2011-06-06 15:35:50 +02:00
Max Horn c847522422 BACKENDS: Add OSystem::getDefaultConfigFileName 
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).
 2011-06-06 15:30:21 +02:00
Max Horn afb06b51cc BACKENDS: Unify AudioCD manager instantiation 2011-06-06 15:02:33 +02:00
Max Horn 338a859591 NULL: cleanup 2011-06-06 14:13:18 +02:00
Alyssa Milburn 6842227ac2 COMMON: Add kInfo LogMessageType. 2011-06-06 12:26:01 +02:00
Max Horn 7a52d414e9 VKEYBD: Adjust to recent XML parser changes 2011-06-06 11:52:21 +02:00
Oystein Eftevaag 1d3be279fc IPHONE: Fixed a COMI crash and some minor gfx glitches 2011-06-05 00:03:15 -04:00
Littleboy b15a5c8e13 BACKENDS: Fix compilation on mingw64 (take 2) 2011-06-04 15:23:21 -04:00
Littleboy 5317837e69 BACKENDS: Cast ShellExecute return value to long instead of int 
This should fix compilation on mingw64
 2011-06-04 14:45:17 -04:00
Littleboy 3a90d7bf3e BACKENDS: Fix compilation with mingw 2011-06-04 14:38:31 -04:00
Littleboy 1dec501ac7 BACKENDS: Implement Win32 version of OSystem::displayLogFile interface 2011-06-04 14:27:20 -04:00
Willem Jan Palenstijn 7586b90e26 N64: Fix build error (typo) 2011-06-04 17:49:01 +02:00
Joost Peters 265e03c975 IRIX: Fix compilation 2011-06-04 16:55:58 +02:00
Willem Jan Palenstijn 2d87394be9 POSIX: Add TODO/FIXME to displayLogFile 2011-06-04 16:39:39 +02:00
Willem Jan Palenstijn 656c252636 POSIX: Implement displayLogFile in the posix backend 
Tested only on Linux, but hopefully this is sufficiently
portable to support the other POSIX platforms.

Using fork/exec instead of the simpler 'system' to avoid quoting issues
and depending on specific shell features to handle a missing xdg-open
gracefully.
 2011-06-04 15:12:07 +02:00
Max Horn ce32745d9c BACKENDS: Replace OSystem::disableCursorPalette by setFeatureState calls 2011-06-04 11:55:56 +02:00
Max Horn 91b889e2d3 COMMON: Rename kFeatureCursorHasPalette -> kFeatureCursorPalette 2011-06-04 11:55:56 +02:00
Max Horn 6287426db0 MACOSX: Include ApplicationServices header 
This should pacify buildbot. Somehow on my system, it does not need it, though.
 2011-06-03 18:31:29 +02:00
Max Horn 59646053a3 MACOSX: Fix indention 2011-06-03 18:25:57 +02:00
Max Horn 279a5b4f32 BACKENDS: Add OSystem::displayLogFile interface + OSX implementation 2011-06-03 13:36:04 +02:00
Max Horn 9db33ea544 ALL: Removed last traces of the MPEG2 code 2011-06-01 23:17:43 +02:00
Max Horn 4bfd23783a DC: Clarify comment 2011-06-01 18:17:35 +02:00
Max Horn 29ed72115e ANDROID: Revert stable-only changes from commit cf41ac0f which I accidentally merged 2011-06-01 16:45:18 +02:00
Max Horn 90f2cde9fa PS2: Do not add RELEASE_BUILD 
First merge screw up: I meant to comment these lines out (as they area
now -- in fact, these lines did not exist pre-merge at all, I moved the
-DRELEASE_BUILD additions manually to their own lines, so I could
comment them out, and then promptly forgot. *sigh*)

On the pro side, it was very easy to spot and correct this mistake!
 2011-06-01 15:48:44 +02:00
Max Horn a4610df482 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
 2011-06-01 15:15:31 +02:00
Max Horn 2d6be5d077 COMMON: Move more stuff from scummsys.h to portdefs.h 2011-05-31 13:56:28 +02:00
Max Horn 9c3e2e43bd COMMON: Move some code from scummsys.h to relevant portdefs.h files 2011-05-31 13:48:03 +02:00
D G Turner 1edcbe0b00 BUILD: Fix Linking. 
These defines are adding to, not replacing the MODULES list.
 2011-05-31 01:18:31 +01:00
Max Horn 9c3a8cd3b5 BUILD: Compile more files only when necessary 2011-05-31 00:35:27 +02:00
Max Horn 127a6f920a BUILD: Add SDL_BACKEND=1 to config.mk for all SDL based backends 2011-05-31 00:25:40 +02:00
CeRiAl 625f6d3b0e WINCE: Update of port-related README 2011-05-27 22:21:56 +02:00
CeRiAl 67c73a25f0 WINCE: Update of port-related README 2011-05-27 22:14:04 +02:00
Pawel Kolodziejski a87d33845a SAMSUNGTV: revert code of result some previous commit 2011-05-25 19:40:55 +02:00
Pawel Kolodziejski 5cd5d2663d SAMSUNGTV: change default path 2011-05-25 19:22:17 +02:00
Matthew Hoops 9539017ee3 ALL: initialise -> initialize 2011-05-25 11:17:11 -04:00
Matthew Hoops 6b36753170 ALL: favour/favourite -> favor/favorite 2011-05-25 10:50:46 -04:00
Matthew Hoops eea482fa43 ALL: behaviour -> behavior 2011-05-25 10:50:46 -04:00
Max Horn 4b7f6dfa3c BUILD: Rename USE_TEXT_CONSOLE -> USE_TEXT_CONSOLE_FOR_DEBUGGER 
This reduces the similarity in name to the otherwise mostly
unrelated DISABLE_TEXT_CONSOLE #define.
 2011-05-25 13:24:37 +02:00
Max Horn 39076ef972 BUILD: Rename UNIX #define to POSIX 2011-05-25 13:23:03 +02:00
Max Horn ecb8618cb7 BUILD: Unify build & configure rules for SDL based backends 2011-05-25 13:21:01 +02:00
CeRiAl 2395889372 WINCE: Update port specific readme 2011-05-25 00:56:05 +02:00
CeRiAl 91e304e35f WINCE: Update port specific readme 2011-05-25 06:52:52 +08:00
Pawel Kolodziejski 709f0de5c5 SAMSUNGTV: Fix build 2011-05-24 21:32:24 +02:00
Willem Jan Palenstijn 725db142bc SAMSUNGTV: Fix build on non-SDL platforms 2011-05-24 20:58:36 +02:00