Commit Graph

724 Commits

Author SHA1 Message Date
Johannes Schickel
092142d880 BUILD: Enable Lands of Lore by default. 2011-06-02 03:03:50 +02:00
Max Horn
9db33ea544 ALL: Removed last traces of the MPEG2 code 2011-06-01 23:17:43 +02:00
Max Horn
b0a460e849 DC: Use 'noserial' for release builds 2011-06-01 18:17:01 +02:00
clone2727
49a8f7675f Merge pull request #20 from scott-t/t7g-ios
T7G iOS support
2011-06-01 07:04:05 -07: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
Matthew Hoops
aa49b38c5a Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
	engines/groovie/script.cpp
2011-05-31 14:16:29 -04:00
Fabio Battaglia
42fa23ff16 CONFIGURE: move some libs required by n64 port
Some system libs weren't found during link stage, this should fix it
2011-05-31 15:16:25 +02:00
Max Horn
c30904b48a BUILD: Fix typo which broke WebOS builds 2011-05-31 12:22:26 +02: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
Max Horn
f7e94e90b6 WINCE: Remove unnecessary -I flags 2011-05-30 23:58:45 +02:00
Max Horn
22e02b0aa2 BUILD: Only add one option per line to INCLUDES/CXXFLAGS/LDFLAGS
This improves (IMHO) readability, and makes it easier to diff for
changes in compiler options.
2011-05-30 23:55:11 +02:00
Max Horn
09ba2ad438 DC: Don't set a lib search path for plugins
Plugins may not rely on external libs, so there is no point in
specifying a custom library search path for them.
2011-05-26 13:31:17 +02:00
Max Horn
a654115f1a BUILD: Make endianess check stricter 2011-05-26 11:06:33 +02:00
Max Horn
de8a44abfc BUILD: Reorder configure some more 2011-05-26 11:06:33 +02:00
Max Horn
7b51caedba ANDROID: Trying to fix the recent linker failures 2011-05-26 08:25:28 +02:00
Max Horn
bf490b4084 BUILD: Reorder plugin stuff in configure some more 2011-05-26 07:26:01 +02:00
Max Horn
7fcaac9408 BUILD: Unify plugin prefix/suffix handling, unify setting DYNAMIC_MODULES 2011-05-25 14:58:54 +02:00
Max Horn
4f34347485 BUILD: Minor configure cleanup 2011-05-25 14:40:04 +02:00
Max Horn
6e157fd2d4 BUILD: Do not define LUA_USE_POSIX
It doesn't really do anything useful anymore anyway (except
make linux builds use _setjmp instead of setjmp, but both
are equally bad for us and need to replaced anyway).
2011-05-25 13:40:45 +02:00
Max Horn
652bf358c2 BUILD: Update comments 2011-05-25 13:40:07 +02:00
Max Horn
c439e08590 BUILD: Declare RELEASE_BUILD in DEFINES, not CXXFLAGS 2011-05-25 13:24:38 +02:00
Max Horn
d2e778bf0b BUILD: Replace _need_memalign runtime test by hardcoded list
According to a discussion on -devel, this test cannot work reliably in
general: It cannot determine when unaligned access really works reliably
in all situations, nor on all implementations of the target CPU arch;
nor does it determine whether unaligned access is supported effectively
(as opposed to say supported via super-slow fault handler mechanism).
2011-05-25 13:24:38 +02: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
717a7accf5 BUILD: Always enable indeo3 codec 2011-05-25 13:24:37 +02:00
Max Horn
8387b68c57 BUILD: Add only one -D to DEFINES per line; add FIXMEs to -D in CXXFLAGS 2011-05-25 13:24:37 +02:00
Max Horn
38ff07589c BUILD: Unify how _posix is computed
However, the current approach of determining _posix based on _host_os is
flawed and should be replaced by feature detection; added a TODO about
this.
2011-05-25 13:23:04 +02:00
Max Horn
39076ef972 BUILD: Rename UNIX #define to POSIX 2011-05-25 13:23:03 +02:00
Max Horn
6639eacb3a BUILD: Move some Android 'hack' back to near end of configure 2011-05-25 13:21:53 +02:00
Max Horn
d935c53cdf BUILD: Rearrange some PSP stuff
Cursory testing shows no regressions caused by this, but proper
testing of this change is recommended.
2011-05-25 13:21:53 +02:00
Max Horn
9b14c50b77 BUILD: Unify how debug/release mode defaults are determined 2011-05-25 13:21:53 +02:00
Max Horn
63a69b4f1e BUILD: Overhaul how we determine the need for aligned mem access
Also add some comments explaining what is going on and why.
2011-05-25 13:21:52 +02:00
Max Horn
e013a51604 BUILD: Enable ARM asm only based on _host_cpu
Also moved x86 and ARM recognition code in configure to be
next to each other; and print whether ARM specific code is
going to be used or not.
2011-05-25 13:21:02 +02:00
Max Horn
ecb8618cb7 BUILD: Unify build & configure rules for SDL based backends 2011-05-25 13:21:01 +02:00
Max Horn
7585303c06 BUILD: Do not manually set endianess
If for some reason the endianess is not detected right, then this should
be reported as a bug; and any (hopefully temporary) specification of
the endianess should be accompanied by an explanatory comment.
2011-05-25 13:21:01 +02:00
Max Horn
1b248cd936 BUILD: Reorder parts of configure 2011-05-25 13:21:00 +02:00
CeRiAl
e27dd8ac4e WINCE: Change plugin extensions from .dll to .plugin - fixes erroneous loading of runtime-dlls 2011-05-20 06:31:23 +08:00
Willem Jan Palenstijn
a47d2aaa6f BUILD: Reset executable flag of configure 2011-05-18 00:07:46 +02:00
CeRiAl
6db6d69eed WINCE: Enable building of plugins with normal configure/make
Enables building of plugin .dlls without a custom Makefile.
Also removes generation of scummvm.exe.map from configure script.
2011-05-18 06:04:23 +08:00
David-John Willis
ea1ef4386a CONFIGURE: Add missing SDL_BACKEND define for the OpenPandora backend.
* Not really sure when/how it got lost but as it's lack  spectacularly
  breaks the backend it is a really good idea to put it back ;)

Thanks to Max for the heads up.
(cherry picked from commit bd60a289c7)
2011-05-14 11:53:13 +02:00
md5
e3a487702a CONFIGURE: Don't enable the sword25 engine if Zlib is not enabled 2011-05-13 20:35:39 +03:00
md5
7543c3ba5f CONFIGURE: Don't disable the sword25 engine when libpng is not found 2011-05-13 18:52:51 +03:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Matthew Hoops
a1d41da096 Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h
2011-05-11 00:30:28 -04:00
Klaus Reimer
a6dc171255 WEBOS: Added comment for Palm Pixi specific compiler options. 2011-05-08 17:39:26 +02:00
Klaus Reimer
8d7baf9ffa WEBOS: Removed unused libpdl linking. 2011-05-08 17:39:26 +02:00
Klaus Reimer
77817a8be8 WEBOS: Moved webos plugin build configuration into its own block so it can be configured separately from the generic linux configuration. 2011-05-08 17:39:26 +02:00
Klaus Reimer
c7b4818025 WEBOS: Added comments to explain some WebOS compile settings. 2011-05-08 17:39:25 +02:00
Klaus Reimer
31d86f9045 WEBOS: Added comment for Palm Pixi specific compiler options. 2011-05-08 17:37:31 +02:00
Klaus Reimer
6631cf60db WEBOS: Removed unused libpdl linking. 2011-05-08 17:37:31 +02:00