Cyp
d7db005f71
Merge remote branch 'origin/master' into newnet
...
Conflicts:
.gitignore
configure.ac
data/base/images/intfac.img
data/base/images/intfac5.png
lib/netplay/makefile.win32
lib/netplay/netlog.c
lib/netplay/netplay.c
lib/netplay/netplay.h
lib/netplay/netplay.vcproj
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-All.xcconfig
po/POTFILES.in
src/hci.c
src/intfac.h
src/keybind.c
src/multibot.c
src/multiint.c
src/multijoin.c
src/multiplay.c
src/multistruct.c
src/multisync.c
src/scriptai.c
2010-06-15 08:35:52 +02:00
Christian Ohm
a993c51db9
Improve GLee detection.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10734 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:19 +02:00
Christian Ohm
ccd4264005
Enhanced GLee detection.
...
Since the pkg-config script Debian ships is a custom addition, test for GLee
manually as well.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10731 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:19 +02:00
Christian Ohm
e7183c700f
Use a different macro for the gettext version check.
...
Also remove an accidentally committed line from POTFILES.in.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10712 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-25 21:24:57 +02:00
Per Inge Mathisen
4c67b3d6ef
Correctly escape brackets in configure help
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10638 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-19 12:52:42 +02:00
Christian Ohm
f99a338ea6
Fix compilation with gcc 4.5.
...
gcc 4.5 enables some warnings with -Wall that didn't even exist in previous
versions (so we can't just disable them generally). This adds a new autoconf
macro to check for compiler flags, and adds -Wno-switch and -Wno-enum-compare
to the compiler flags if they exist.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10597 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-16 19:56:25 +02:00
Christian Ohm
fa9451b25a
Check for (un)zip in configure.ac.
...
Fixes #1434 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10585 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-15 21:38:52 +02:00
Christian Ohm
642efd7480
Fix last GLee fix.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10560 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-13 09:34:37 +02:00
Christian Ohm
f5d5c46fa8
Fix Glee detection.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10555 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 22:27:34 +02:00
Buginator
1c4c1cc5bd
Fix exception handler to obey UAC on windows machines.
...
It will write the crash report file to CSIDL_PERSONAL (c:\Users\user name\Documents\logs\warzone2100.rpt)
*All* platforms will now always have --debug-file enable as a default. This will write the logs to <configdir>/logs/WZlog*.txt
When a user overrides the configdir, then we will try to use that directory instead of the default as well.
refs ticket:1759
2.3: r10532
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10538 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:41 +02:00
Cyp
f6ca9df680
newnet: Add floating point consistency flags to icc build.
2010-03-14 22:13:12 +01:00
Cyp
a0bcd2a865
Merge remote branch 'origin/master' into newnet
...
Conflicts:
src/keybind.c
2010-03-14 18:46:40 +01:00
Christian Ohm
ae5fdb635c
Always use the integrated GLee when cross-compiling.
...
For some reason it seems to use the system's pkg-config info as well, if
someone finds out how to prevent that, feel free to revert this.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10277 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 18:38:25 +01:00
Cyp
674f2636c7
newnet: Add a couple more floating point sanity checks. Add -mno-fused-madd compile flag.
...
The tests were the same with and without -mno-fused-madd, but adding since multiply-add instructions have different rounding behaviour.
2010-03-09 19:40:43 +01:00
Cyp
48533d7037
Merge remote branch 'origin/master' into newnet
2010-03-07 11:00:10 +01:00
Per Inge Mathisen
240bb91891
Remove our dependency on popt by writing a custom popt-like parser. Patch by me and i-NoD. Closes ticket:1659
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10186 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-07 10:53:21 +01:00
Cyp
153712cb5e
newnet: Clean up warnings, warning free build with -O2. Enable the same warnings for C and C++, where applicable.
2010-03-05 20:01:51 +01:00
Cyp
79f5ef2f7a
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/netplay/netplay.c
lib/netplay/netplay.h
lib/netplay/nettypes.c
lib/netplay/nettypes.h
src/multibot.c
src/multistruct.c
src/multisync.c
src/order.c
src/orderdef.h
src/wavecast.cpp
2010-03-05 16:09:21 +01:00
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
Cyp
7d129cf4b5
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/netplay/netplay.c
src/multiopt.c
2010-02-24 10:21:00 +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
Cyp
8f2e94bb48
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/netplay/netplay.c
src/multiint.c
src/multiopt.c
2010-02-22 10:43:24 +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
f978943eb6
newnet: Fix the host mixing up broadcast messages with messsages to the host, by making NetQueue even more message-oriented. Use -Wall -Werror on C++ files too, and fix the corresponding werrors. Don't use gameRand() from scripts, since the scripts are apparently only executed on the host. Add syncDebug() log function, which is only printed, if it would print different things on different clients.
2010-02-16 23:02:27 +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
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