67e9635f9f
Merge the ivis_common and ivis_opengl directories, only five years and two months after I originally split them apart.
2010-12-31 22:37:14 +01:00
0646b37603
Rename *.c to *.cpp.
2010-12-16 23:28:56 +01:00
a2cd7b0592
Make everything compile successfully with g++, without -fpermissive.
2010-12-16 23:24:40 +01:00
dd4391990d
Get rid of a few unnecessary Makefile.ams.
2010-12-11 16:41:57 +01:00
74c3872aa0
Fix broken FIXME_CAST_ASSIGN pointer-int cast magic being broken on 64-bit big-endian platforms.
...
Don't know whether anyone was actually building this on 64-bit big-endian, but better to fix it.
Was undefined behaviour anyway, due to pointer-aliasing rules.
Fixed the remaining pointer-aliasing errors and removed -Wno-strict-aliasing and -Wno-pointer-to-int-cast.
2010-12-05 20:59:04 +01:00
5bbe90df6b
Update files from TRUNK->master
2010-10-30 20:47:36 -04:00
69028fb461
Remove gcc warnings the cross compiler doesn't know.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11611 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-05 00:21:01 +02:00
a977d77208
Readd -lz to the win32 libraries.
...
Got lost in the newnet merge.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11610 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-05 00:21:01 +02:00
e1a812fd2e
Check if zip understands --filesync, else use -u.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11554 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-30 14:31:04 +02:00
0b2c7b2973
Disable warnings that shouldn't be caught by -Werror, unless enabled with ./configure --enable-warnings=yes.
2010-08-15 14:26:36 +02:00
59e98903b8
Remove -Wc++-compat, since there are too many malloc cast warnings.
2010-08-15 13:37:09 +02:00
438a4d5aff
Enable warnings, make warnings consistent, fix some warnings, use -Wno-error=squeak to allow squeaky warnings to compile without squelching them.
2010-08-15 12:30:46 +02:00
0c2015425c
Merge remote branch 'origin/newnet'
...
Conflicts:
lib/gamelib/gtime.c
lib/gamelib/gtime.h
lib/netplay/netplay.c
Closes ticket:1573. Closes ticket:805. Probably fixes 100 more issues.
2010-08-14 22:34:30 +02:00
b3054d87d0
Add --enable-debug=optimised for Cyp, debug build with optimizations turned on.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11460 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-14 14:38:16 +02:00
7d5f1271a9
Merge remote branch 'origin/master' into newnet
...
Conflicts:
.gitignore
lib/iniparser/Makefile.am
macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings
2010-08-14 11:26:09 +02:00
94320034ae
Assume that SDL headers are directly in the #include path, instead of assuming the SDL directory is in the #include path.
...
Closes #1941 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11385 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-05 20:05:02 +02:00
1cb0cf5cf9
newnet: Add -lz to configure. (Patch by Per.)
2010-07-21 18:28:41 +02:00
23cbd537f7
Merge remote branch 'origin/master' into newnet
...
Conflicts:
configure.ac
2010-07-16 18:01:22 +02:00
0c95725a23
Backport warnings from newnet branch, fix a warning that was stopping mac build.
2010-07-13 21:04:32 +02:00
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
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
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
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
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
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
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
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
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
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
f6ca9df680
newnet: Add floating point consistency flags to icc build.
2010-03-14 22:13:12 +01:00
a0bcd2a865
Merge remote branch 'origin/master' into newnet
...
Conflicts:
src/keybind.c
2010-03-14 18:46:40 +01:00
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
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
48533d7037
Merge remote branch 'origin/master' into newnet
2010-03-07 11:00:10 +01:00
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
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
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
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
7d129cf4b5
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/netplay/netplay.c
src/multiopt.c
2010-02-24 10:21:00 +01:00
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
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
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
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
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
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
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
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
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
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
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
Per Inge Mathisen
Cyp
cybersphinx
buginator
Giel van Schijndel