Commit Graph

218 Commits (478424e0b696cb217bda09d53b25b5077059dd55)

Author SHA1 Message Date
Christian Ohm 714d2d1b69 Use the system's version of GLee, if available.
Require at least 5.4, since that's what we have included. If not detected, we
use the integrated copy as before.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10028 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-04 19:07:34 +01:00
Giel van Schijndel a6a1ffbaa0 Explicitly link with -lX11 when running on an X11 system because we directly use X11 in lib/widget/scrap.c
This fixes #1098 also reported as DebianBug:556919.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9980 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-22 14:51:00 +01:00
Giel van Schijndel f5f030a763 configure: Check for -fstack-protector and use it if available
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9936 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 16:50:44 +01:00
Cyp 275e260a89 Fix building with PD-ksh on BSD. Reports and some patches from brad0. (svn -r9444)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9445 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:39 +01:00
Christian Ohm e9396eb168 Use a somewhat more modern tar format for make dist.
Allows filenames over 99 characters!

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9220 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:02 +01:00
Christian Ohm b6fe392071 Add -Wdeclaration-after-statement to the default warnings.
Should help prevent breaking the build for people who have to use crappy
compilers. Exclude lib/exceptionhandler, that contains C99 non-Windows code in
places.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9035 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:10 +01:00
Giel van Schijndel d8d04545c4 configure.ac: libbfd depends on libiberty, so link with libiberty ''after'' libbfd
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8830 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:57 +01:00
Giel van Schijndel 128f779778 Win32 cross build scripts: add support for building Ogg, Vorbis and Theora
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8829 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:56 +01:00
Giel van Schijndel 122d68b3be Popt requires iberty as well when cross compiling for Windows, so check for it ''before'' checking Popt
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8822 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:55 +01:00
Buginator bbc04559d4 Change DATADIR to WZ_DATADIR to prevent conflicts with windows system header files.
(r8424)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8526 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:14 +01:00
Christian Ohm a7ae06572d Integrate miniupnpc.
This should bring it up to about the state of the patches and comments in
ticket #1073, without the threaded device detection. Timeout is 500ms, that
should be enough to detect a LAN device, and doesn't delay startup too much.

Port r8447 plus the fixes for it in r8449, r8453, r8455 and r8456 to trunk.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8460 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:20:02 +01:00
Christian Ohm f7c5520b68 Remove data/base/Makefile from configure.ac.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8357 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:19:55 +01:00
Buginator a86cbc2e3c As was discussed on the ML, removing SQL from trunk.
Please test!!
OS X & mingw builds may be broken!


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8312 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:19:50 +01:00
Per Inge Mathisen e709e7c9cf Fix profile versions of --enable-debug (needed ldflags set)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8199 4a71c877-e1ca-e34f-864e-861f7616d084
2009-10-04 23:34:00 +02:00
Christian Ohm 429fb34bfb Check for alloca.h in configure instead of hardcoding it.
Patch from #817.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8132 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-28 22:21:07 +02:00
Christian Ohm f003ee3613 Check for theora >= 1.0 in configure, since older versions don't work.
And let's hope that it is intelligent enough to recognize 1.0alpha as smaller
than 1.0. Fixes #726.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8112 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-28 22:21:02 +02:00
Christian Ohm 7bc59a2524 Add correct linker flags for openbsd to configure. Fixes #819.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7973 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:07:05 +02:00
Per Inge Mathisen f55c3ad471 Add INI file parser (iniParser -- version 3.0b (beta) by N.Devillard)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7902 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:06:53 +02:00
Christian Ohm 62fc9784d4 Clarify SQLite warning (refs #552).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7872 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:06:35 +02:00
Buginator ebbc650470 Move AIV from global to multiplay, since it is only a MP mod.
Update makefile(s) as well, and configure.ac


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7596 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:55 +02:00
Giel van Schijndel ecbe152f7c Don't #define _XOPEN_SOURCE on FreeBSD as on that platform it actually causes several functions to be ''hidden''.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7537 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:29 +02:00
Giel van Schijndel 6e4c85a1b3 Allow usage of 'Flex' from non-standard locations
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7536 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:28 +02:00
Giel van Schijndel 939f4902ad Replace SDL-net by using BSD sockets instead
NOTE: Still needs some checking and work for Windoze compatibility.

Addresses #435

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7286 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-06 22:29:35 +02:00
Giel van Schijndel c48e302bcb Lets use Winsock 2!
Even Windows 98 provides Winsock 2 (95 in an add on package). So we can
safely upgrade.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7284 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-06 22:29:35 +02:00
Giel van Schijndel 8f7322f717 Improve buildsystem for cross compiling
* Make sure to pass CXXFLAGS to ./configure as well
 * Allow for overriding of CFLAGS and CXXFLAGS when building for the building system
  - CFLAGS_FOR_BUILD
  - CXXFLAGS_FOR_BUILD

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7283 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-06 22:29:34 +02:00
Per Inge Mathisen eb8fc6ce26 Add new --enable-debug option "g++" which compiles Warzone code using g++ compiler.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6913 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:58 +02:00
Per Inge Mathisen 58546965b7 Delete commented out references to non-existent files from gamedesc.lev
Delete two unused and broken map files that either belongs to an expand mission or is unreferenced.
Add basic unit testing framework for testing all map files in data/base.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6728 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-26 19:41:25 +00:00
Dennis Schridde 9377726dec Make configure warning complain about correct sqlite3 version number
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6565 4a71c877-e1ca-e34f-864e-861f7616d084
2009-01-30 20:56:01 +00:00
Dennis Schridde f9ef8289a4 Bump SQLite3 to 3.6.10
An change was introduced on sqlite3_vfs which causes an incompatible
 pointer error when mixed with older sqlite versions. Thus bump the
 required version to 3.6.10 as well.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6564 4a71c877-e1ca-e34f-864e-861f7616d084
2009-01-30 18:28:21 +00:00
Giel van Schijndel cb22e77099 * Check whether the system itself already provides strlcpy and/or strlcat
- If it does, check whether it's behaviour is consistent with our implementation
   - If behaviour is consistent: use the system's implementation
   - If not, rename our implementation (to prevent symbol clashes) and use our own


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6556 4a71c877-e1ca-e34f-864e-861f7616d084
2009-01-24 18:15:19 +00:00
Giel van Schijndel c5392dda1d Fix the "Perl isn't installed message" to show the minimal version required
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6543 4a71c877-e1ca-e34f-864e-861f7616d084
2009-01-11 14:38:25 +00:00
Giel van Schijndel ae18d97e54 Don't depend on OpenAL and Vorbis when compiling with --disable-sound
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6542 4a71c877-e1ca-e34f-864e-861f7616d084
2009-01-11 14:34:38 +00:00
Per Inge Mathisen 3307b9cee5 Fix compile problem in recent versions of ubuntu by adding -Wno-format-security to debug build mode.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6460 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-12 18:38:50 +00:00
Giel van Schijndel 0d99e81fb9 Only accept Perl versions >= 5.10
* NOTE: Perl is only required when one of build_tools/code-generators/* or src/*.tpl* changes

This should fix #161


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6386 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-26 00:25:08 +00:00
Giel van Schijndel 266d51bbb5 configure script:
* Use `test -n "$STRING"` instead of `test ! -z "$STRING"` to test a string for non-zeroness
 * Use `text -z "$STRING"` instead of `test "x$STRING" = "x"` to test a string for zeroness
 * Add some influential environment variables to AC_ARG_VAR so that it gets documented in --help and automatically AC_SUBST'ed
 * Use the AS_IF macro for conditional code execution

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6349 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-19 10:03:07 +00:00
Giel van Schijndel 91cf8eeabd Bugfix: mark Perl as available only when it is, and vice versa
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6344 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-16 19:19:08 +00:00
Giel van Schijndel 5f05dd99e6 Check for Perl in the configure script, rather than just assuming it's installed
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6343 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-16 19:13:39 +00:00
Giel van Schijndel d57d5d5001 Generate the SQL table definition as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6313 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-15 22:02:30 +00:00
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