Commit Graph

77 Commits

Author SHA1 Message Date
Max Horn
9db33ea544 ALL: Removed last traces of the MPEG2 code 2011-06-01 23:17:43 +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
Max Horn
39076ef972 BUILD: Rename UNIX #define to POSIX 2011-05-25 13:23:03 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Littleboy
217089adfa CONFIGURE: Fix creation of the NSIS installer when building out of tree 2011-05-11 17:54:34 -04: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
Johannes Schickel
cf43b51f67 Merge pull request #31 from lordhoto/win-res
Embed engine/theme dists files into Win Executable.
Check the following link for further discussion:
https://github.com/scummvm/scummvm/pull/31
2011-05-06 10:57:11 -07:00
Johannes Schickel
09b9e3ab9d BUILD: Silence windres command line when a non-verbose build is done. 2011-05-05 20:24:57 +02:00
Johannes Schickel
297834017a WIN32: Embed engine data files and theme files into executable.
This embeds all the engine data files from dists/engine-data into the
executable in case the engines using them are included statically.

Furthermore it includes the theme dist files in the executable.
2011-05-05 20:22:37 +02:00
Littleboy
0e45aa8655 Merge remote-tracking branch 'upstream/master' into nsis
Conflicts:
	devtools/create_project/scripts/postbuild.cmd
	devtools/create_project/visualstudio.cpp
	ports.mk
2011-05-02 17:21:10 -04:00
Littleboy
7d22d7452f PORTS: Tweak win32setup target
- Rename README-SDL to be used by installer script
 - Use relative build path for WIN32PATH
 - Add default build folder to ignore file
2011-04-27 15:12:12 -04:00
Littleboy
66a319e158 PORTS: Add target to build a win32 setup installer 2011-04-27 11:08:43 -04:00
unknown
ae9e9a89bd Add Inno Setup installer script for Windows builds 2011-04-27 14:44:25 +10:00
dhewg
8f1a26ea3e BUILD: Move ARM_ASM flags to configure
So they're used again if a port overwrites _port_mk
2011-04-22 19:05:31 +02:00
Matthew Hoops
6d153f311c Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
	video/qt_decoder.cpp
2011-04-13 16:04:29 -04:00
Max Horn
6cf1de87ac DEVTOOLS: Renamed 'tools' directory to 'devtools' 2011-04-09 23:47:35 +02:00
Matthew Hoops
13a6f40dbb ALL: Add optional dependency on libfaad 2011-04-09 15:27:23 -04:00
Matthew Hoops
a44df1e693 MACOSX: Fix make bundle when compiling with libtheoradec
svn-id: r55326
2011-01-19 15:00:53 +00:00
Matthew Hoops
dad3f32278 MACOSX: Fix make bundle when compiling with libpng
svn-id: r53463
2010-10-15 03:33:54 +00:00
Jordi Vilalta Prat
62513679c0 BUILD: Patch #3086472 "AMIGAOS4: Adding COPYING.BSD and new Icon"
Use the DIST_FILES_DOCS variable so no new document files are forgotten.

svn-id: r53424
2010-10-13 14:21:27 +00:00
Jordi Vilalta Prat
8388e0dfea JANITORAL: Clean trailing whitespaces.
svn-id: r53160
2010-10-12 02:18:11 +00:00
Oystein Eftevaag
916a0f9cbf Added iPad icon
svn-id: r50752
2010-07-09 01:08:15 +00:00
Thierry Crozat
690203de74 Fix possible link error for scummvm-static (for MacOS X bundle) when USE_TRANSLATION is set but USE_TERMCONV is not.
svn-id: r49941
2010-06-17 18:54:37 +00:00
Thierry Crozat
3f4ec4a8a4 Fix link of scummvm-static (for MacOS X bundle) when translation is enabled.
svn-id: r49894
2010-06-15 21:31:46 +00:00
Eugene Sandulenko
d502bdf982 Add safeguards when no engines with engine-data are included. Inspired by patch #2986300
svn-id: r49240
2010-05-26 13:27:11 +00:00
Oystein Eftevaag
829bded59f Added stripping and permissions of the iPhone executable in ports.mk
svn-id: r49002
2010-05-11 01:17:17 +00:00
Max Horn
ea964491a0 Revise how prefix, datadir etc. are handled.
With these changes, we are a bit closer to how autoconf works, the
de-facto standard for configure scripts. The changes make it easier
for packagers to modify where ScummVM install things (e.g. the
Maemo port might benefit from this). It is now also trivial to
override certain paths when invoking make, e.g. you can now do
  make install prefix=/opt
and also datadir, mandir etc. will reflect the change.

svn-id: r48989
2010-05-09 20:42:18 +00:00
Andre Heider
78a99ce6a6 Remove the now broken "deb" target.
svn-id: r48966
2010-05-08 08:15:28 +00:00
Max Horn
5a17a7be5f Patch #2984292: "AmigaOS4: Remove _SVN from unstable builds"
svn-id: r48652
2010-04-13 09:54:21 +00:00
Jordi Vilalta Prat
22e5a557b7 Added the svn:keywords property to some files missing it.
svn-id: r48148
2010-02-27 17:02:58 +00:00
Jordi Vilalta Prat
448ef35fe1 Install the plugins from the current directory (the build one), not from the source directory
svn-id: r47812
2010-02-02 13:02:08 +00:00
Oystein Eftevaag
a89fbc0fa5 Added a codesigning step to the iphonebundle make target
svn-id: r46089
2009-11-22 15:58:34 +00:00
Max Horn
161f49ac48 Fix bug #2703992: OSX: make bundle fails
svn-id: r45336
2009-10-22 12:04:56 +00:00
Max Horn
67564cb532 Move wii specific stuff from ports.mk to backends/platform/wii/wii.mk
svn-id: r44343
2009-09-25 11:22:29 +00:00
Max Horn
1a4257f46f Move linuxmoto specific stuff from ports.mk to a new file backends/platform/linuxmoto/linuxmoto.mk
svn-id: r44342
2009-09-25 11:22:14 +00:00
Max Horn
399c511f90 Part of patch #2850021: disable hq-scaler&mt32emu for motoezx&motomagx-platform
svn-id: r44341
2009-09-25 11:21:56 +00:00
Andre Heider
9f7c0a24e2 Added support for WINDRESFLAGS, required for e.g. multilib enabled MinGW toolchains
svn-id: r44035
2009-09-11 18:13:27 +00:00
Andre Heider
f73072169c Forgot to remove a $(STRIP) line in r43855
svn-id: r43860
2009-08-31 20:41:48 +00:00
Andre Heider
66f47501ee Skip unnecessary I/O when stripping moto* binaries
svn-id: r43855
2009-08-31 17:15:51 +00:00
Eugene Sandulenko
212965f978 Patch #2845084: "Linuxmoto-backend small update"
svn-id: r43809
2009-08-29 20:43:00 +00:00
Eugene Sandulenko
70b7ebb339 Patch #2826508: "Motorola A1200/E6/A1600 (motoezx) patch"
svn-id: r43636
2009-08-22 12:35:49 +00:00
Andre Heider
57e45de95b Merge creation of Info.plist into update-version.pl.
This fixes the static version info after branching (#2820503).

svn-id: r43101
2009-08-07 18:16:58 +00:00
Kostas Nakos
73572158a8 commit slightly modified patch #2828646: WINCE: Integrate Windows CE with the master build system
svn-id: r43041
2009-08-04 13:17:33 +00:00
Andre Heider
874ad3c0c8 oups, wrong spot.
svn-id: r41708
2009-06-20 11:53:31 +00:00
Andre Heider
774a8eecd2 added vkeybd_default.zip to the Wii dist target.
svn-id: r41707
2009-06-20 11:50:15 +00:00
Andre Heider
1772f7d564 added pred.dic to DIST_FILES_ENGINEDATA
svn-id: r41644
2009-06-18 19:39:12 +00:00
Andre Heider
0324f20e39 added DIST_FILES_DOCS to Makefile.common, used by some dist targets now, incl. OSX bundles.
svn-id: r41639
2009-06-18 18:40:38 +00:00
Andre Heider
b07a35e5af Moved the wiidist target to ports.mk, cleaned it up and automated meta.xml generation.
svn-id: r41619
2009-06-17 23:36:00 +00:00
Oystein Eftevaag
6d56924bb1 iPhone fixes for compiling with the unofficial sdk
svn-id: r40440
2009-05-10 22:15:33 +00:00
Oystein Eftevaag
bab6dedcc7 Updated xcode project, and fixed dependency for the iphonebundle makefile target
svn-id: r40366
2009-05-06 20:23:04 +00:00