Commit Graph

180 Commits (ef994389f5c7399f09e24a0c67efcc08585854cd)

Author SHA1 Message Date
Giel van Schijndel d871a85964 Add video playback support:
* Add support for decoding and displaying of OggTheora/Vorbis videos
 * Change all references to *.rpl files to *.ogg files (and lower case them)
 * Add a new menu (and config) option for selecting the size at which to display videos (1x (native), 2x, full screen)

This closes ticket:64 and ticket:46

Code changes are ticket:64 (patch by Gerard Krol, Giel van Schijndel and Buginator)

FMVs can be found at http://download.gna.org/warzone/videos/sequences_ogg.zip (for now at least)
Videos encoded by Angus Lees


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6119 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-08 18:24:19 +00:00
Giel van Schijndel 73f4744912 Move the version checks for pkg-config, xgettext and msgfmt out of autogen.sh and into configure.ac
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6093 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-28 17:35:56 +00:00
Giel van Schijndel 6109556e05 * Add a new autoconf macro: AC_PROG_VERSION_CHECK
- This macro can be used to check the version of the given program
 * Move the version checks for Flex and Bison aut of autogen.sh and into configure.ac

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6088 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-28 13:23:01 +00:00
Freddie Witherden 3e69cb5235 Fix a typo in configure.ac regarding the minimum system SQLite version.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6082 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-26 18:46:51 +00:00
Giel van Schijndel becaf21060 Revert r6058: I stupidly used "git svn dcommit" instead of "git stash pop" (yes I know they don't even look the same...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6059 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 15:54:41 +00:00
Giel van Schijndel 53d6990a55 Initial FMV support
patch: http://developer.wz2100.net/attachment/ticket/64/FMV5c.patch

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6058 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-20 15:52:01 +00:00
Dennis Schridde 85ac0d8ae0 Minor buildsystem cleanups
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6040 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-18 16:08:37 +00:00
Giel van Schijndel 10ac89541a Update our SQLite copy from 3.5.9 to 3.6.2
* 3.6.0 introduced an interface change to the VFS layer
 * Updated physfs_vfs.c for the interface change in 3.6.0, breaking compatibility with SQLite < 3.6.0
 * Change the configure script to require sqlite3 >= 3.6

This closes ticket:66

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6034 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-16 20:02:16 +00:00
Giel van Schijndel 2c616f323e Trunk is currently broken when playing music and switching between the "base" and "mp" mods, see ticket:57.
This revision fixes ticket:57. We (Buginator, EvilGuru and Giel) decided to use the fix suggested in ticket:57 for now and to use [wiki:Proposal:ModMounting] on a later date. I.e. fix the problem now (however dirty the solution may be), and implement a properly designed one later on, instead of letting trunk remain broken until said proposal is worked out in enough detail.

This revision fixes bug #11847, bug #11875, bug #11898, bug #11976, bug #11989, bug #12017, bug #12250 and bug #12280.

Patch by Buginator and myself


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6028 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 20:36:50 +00:00
Giel van Schijndel ff507b13f0 * Don't use "if USE_SYSTEM_SQLITE" sections in all Makefiles
* Use the pkg-config variables SQLITE_CFLAGS and SQLITE_LIBS to compile and link with instead


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6021 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 14:41:44 +00:00
Giel van Schijndel 140f553d06 * Change the autotools build system such that if the system provides an SQLite version that meets our requirements we use that instead of the one in our own repository
* Require sqlite3 versions >= 3.5.4 and < 3.6 (due to r5984 these versions are possible)
 * Move physfs_vfs.[ch] from lib/sqlite3/ to lib/framework/
 * Update the autotools, raw win32 Makefile, Code::Blocks and MSVC build systems
  - NOTE: Xcode still requires an update

This closes ticket:59


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6018 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 13:40:28 +00:00
Giel van Schijndel c2f0855e00 NTW is a multiplay mod, not a global mod. So move it to data/mods/multiplay.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5989 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-11 09:12:38 +00:00
Per Inge Mathisen 85b9e9b164 Remove irrelevant -Wextra from profiling debug build modes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5948 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 10:08:52 +00:00
Giel van Schijndel 1d57b4792f Add the cross compilation options to configure's --help output
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5935 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 13:24:29 +00:00
Dennis Schridde aa30a0fe6d Amend r5726: Forgot to update configure
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5746 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 19:47:58 +00:00
Giel van Schijndel 0da42eeaff Link ''with'' all symbols exported to the dynamic symbol table
* This option is needed to allow retrieving of decent back traces using backtrace_symbols_fd (GNU raw back trace extension) has some symbols to work  with

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5675 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-26 18:50:29 +00:00
Giel van Schijndel 3fd663fd85 Add --disable-sound to the configure script, to disable sound at compile time
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5290 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-21 18:34:51 +00:00
Dennis Schridde c29df7dae5 Variable to store default for distributor should not be the applicationdir variable...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5210 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-04 15:20:03 +00:00
Giel van Schijndel 6254f73329 Remove now useless testcase directory "tests" as its only testcase (t1000: tested level_parser.y) has no code left to test (due to r5163)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5165 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-24 12:48:26 +00:00
Giel van Schijndel 13c84db269 Disable optimisations (-O0) for --enable-debug=relaxed as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5129 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-17 10:48:26 +00:00
Giel van Schijndel 45c2a0676c Don't check for strlcpy and strlcat in the configure script as simply #defining _XOPEN_SOURCE (what config.h does) is enough to prevent declarations of these functions from being included (thus the #inclusion of "frame.h" in strlfuncs.h should be enough (this should fix bug #11609)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4915 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-04 13:56:27 +00:00
Giel van Schijndel 35d84d2fbf Add the beginnings of an external unit test framework (i.e. it doesn't run in Warzone itself, it just links to pieces of Warzone's code to test it):
* Add a new directory with unit tests (/tests/)
  * Run `make test` in this directory to execute all these unit tests and get reports from them if they fail
 * Add a single unit test to the directory which tests level_parser.y and the input it should & shouldn't accept


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4883 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-02 18:44:01 +00:00
Giel van Schijndel b9857f9bf9 Detect whether the OS already supplies strlcpy and strlcat and don't define our own if it does:
* Add m4 macros AC_STRLCPY_CHECK and AC_STRLCAT_CHECK for use in the autoconf script
 * Don't define our implementation when HAVE_STRLCPY or HAVE_STRLCAT is defined

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4876 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-02 12:04:20 +00:00
Dennis Schridde ab8b41239d Remove stack-protector, as it breaks my MinGW build.
Please add it manually on the commandline whenever you need it.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4716 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 23:56:51 +00:00
Dennis Schridde faff55ad5e Move -lstdc++ from Makefile to configure.ac
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4715 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 23:56:45 +00:00
Dennis Schridde afc1ed6605 Cleanup configure.ac
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4714 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 23:56:40 +00:00
Giel van Schijndel 44b3b5c1e0 Compile with -Wwrite-strings to warn about passing string constants into char* variables as opposed to const char*
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4698 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-20 16:17:39 +00:00
Giel van Schijndel 40cc8f09ac Give the configure and crossbuild scripts the possibility to specify the compression method on the command line (--with-nsis-compression)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4663 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 14:32:48 +00:00
Giel van Schijndel 42f7e913b3 Also check for Libiberty and BFD when crosscompiling for Windows
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4595 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 01:09:51 +00:00
Giel van Schijndel b7c92bd0a1 GLC depends on FontConfig and FreeType, so link against that as well when crosscompiling for Windows
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4592 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 00:09:32 +00:00
Giel van Schijndel 0de6dfd9b3 * When checking for libraries Popt and PhysicsFS make sure to link against ${WIN32_LIBS} as well
* Expand ${WIN32_LIBS} to include -lz which PhysicsFS depends on and -lintl and -liconv which Popt depends on


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4591 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 00:02:36 +00:00
Giel van Schijndel 7ed537a019 Pass the ${PREFIX} variable from the crossbuild script to pkg-config
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4590 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 23:53:30 +00:00
Giel van Schijndel 2e758ba89d add an --enable-static parameter to the configure script which tells pkg-config to pass libraries required for static linking
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4589 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 23:42:04 +00:00
Giel van Schijndel 6f0a6c4988 Also use a CPPFLAGS_FOR_BUILD (alongside CC and CXX) and pass it to the configure script as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4588 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 23:00:40 +00:00
Per Inge Mathisen 3c749e2ee3 Fix bug #11467: Assert when loading a savegame in campaign. Reported by Dale Gill.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4554 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-09 19:54:14 +00:00
Per Inge Mathisen 274ae7c9a4 Enforce strict function prototypes for autoconf builds, and fix function prototype problems.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4487 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 15:34:55 +00:00
Giel van Schijndel 665e57dc12 Move the exceptionhandler to a directory of its own
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4484 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 15:11:43 +00:00
Per Inge Mathisen be566a7d6d Add -Wcast-align and -Wmissing-declarations to autoconf debug builds, and fix warnings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4403 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 23:28:44 +00:00
Per Inge Mathisen 38cfafe7b8 Rename --disable-debug to correct --enable-debug in configure --help
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4333 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-25 19:42:21 +00:00
Dennis Schridde 02fb26efff Adapt autotools build to r4062
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4065 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-15 17:03:58 +00:00
Dennis Schridde d58ef8fa12 Workaround stupid autoconf CFLAGS default
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4008 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 11:25:20 +00:00
Dennis Schridde 50ecf5e339 YY_NO_INPUT is now set just where needed. Apparently I forgot to commit this before.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3990 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 11:09:41 +00:00
Dennis Schridde d8409c9819 - Don't define CFLAGS anymore, export WZ_CFLAGS instead, which can be overridden by make commandlines
- Set -DYY_NO_INPUT only in those places where needed
- Add some previously forgotten CFLAGS where needed
- Remove extranous -lintl from WIN32_LIBS
- Remove apparently unnecessary directory from Mac include (png_util doesn't need it either)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3986 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 02:01:46 +00:00
Dennis Schridde 9f44219b1c Move addition of CFLAGS from configure.ac to the places they are actually needed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3983 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 20:08:42 +00:00
Per Inge Mathisen 51ca960ed5 Add -Wmissing-field-initializers, fix missing field initializers, and make source
compile even if GCC is not C99 compatible.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3944 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 18:27:43 +00:00
Giel van Schijndel 8425a89dbc * Add SQLite 3.5.4 to the source tree (3.5.6 gives some warnings @ compile time which I don't trust)
* Patch it up so that the compiler doesn't generate 'cast to pointer from integer of different size' warnings (as these are harmless, but annoying if -Werror triggers compiler failure)
 * Add this patch as lib/sqlite3/sqlite3.diff (to be able to keep track of it)
 * Add it to the autotools, raw makefiles and Code::Blocks build systems, XCode and MSVC (and any others I'm forgetting here) still need updating


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3897 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-02 22:37:25 +00:00
Dennis Schridde bdc4c57fa7 Port r3843 from branches/2.1: Autogenerate playerX.slo files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3844 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-20 11:54:29 +00:00
Dennis Schridde da7212b287 Merge r3827 + r3828 from branches/2.1. This fixes bug #11087.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3830 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-18 15:39:42 +00:00
Giel van Schijndel f558eb0d61 Revert unintentional part of r3612
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3613 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 23:39:31 +00:00
Giel van Schijndel 4f93b03142 Make function-pointer array pLoadFunction a local (but still static) array instead of global
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3612 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 23:38:05 +00:00