Commit Graph

210 Commits (f146148be9b42b6925bb7ae5cd3e7205899683c0)

Author SHA1 Message Date
Cyp 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
Buginator 48bad7a5a1 Update project file multibot.c -> multibot.cpp
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11466 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-15 00:10:51 +02:00
Cyp b59b089ca5 Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/netplay/nettypes.c
	src/multibot.c
2010-07-30 22:51:33 +02:00
Cyp 6957b04072 astar.c → astar.cpp in .vcproj file. 2010-07-24 13:32:09 +02:00
Christian Ohm 9d553bccab Add missing file for r11247.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11251 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-22 09:34:23 +02:00
Christian Ohm e27ccca05c Windows cross-build: Make quesoglc compile on Ubuntu.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11247 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-22 09:34:22 +02:00
Cyp 695a2b35ae Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/netplay/netplay.c
2010-07-13 20:50:37 +02:00
Buginator 096c257052 Commit these project settings defines to disable extra checking which causes a huge performance hit. (VS2k8 was already committed in r9639, this was forgotten.)
_HAS_ITERATOR_DEBUGGING=0
http://msdn.microsoft.com/en-us/library/aa985939(VS.80).aspx
_SECURE_SCL=0
http://msdn.microsoft.com/en-us/library/aa985896(VS.80).aspx
For more info on checked iterators see:
http://msdn.microsoft.com/en-us/library/aa985965(v=VS.80).aspx
and
http://msdn.microsoft.com/en-us/library/aa985982(v=VS.80).aspx


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11184 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-13 11:30:56 +02:00
Cyp f0beca71cc Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/netplay/netlog.c
	lib/netplay/netlog.h
	lib/netplay/netplay.c
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	macosx/configs/Warzone-Debug.xcconfig
	src/multijoin.c
2010-07-10 17:02:39 +02:00
Buginator 76834a7040 Update MSVC project file for the astar.cpp change.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11107 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 10:38:38 +02:00
Christian Ohm 58a3238bec Update libpng to 1.2.44 for Windows cross-builds.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11072 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-29 07:37:57 +02:00
Cyp 0b0e986ec6 Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/gamelib/gtime.c
	lib/netplay/netplay.c
	macosx/Warzone.xcodeproj/project.pbxproj
	src/multiint.c
	src/multisync.c
2010-06-26 22:42:44 +02:00
Christian Ohm 36c9e166b8 Include library patches for the Windows cross-build in the tarball.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10998 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-22 13:43:30 +02:00
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 da525967c0 Remove some popt residue that broke make distcheck.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10923 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-05 17:31:15 +02:00
Christian Ohm 47b2ef65fa Update libraries for the Windows cross-build.
Dejavu Fonts: 2.31
freetype: 2.3.12
gettext: 0.18.1
libogg: 1.2.0
libpng: 1.2.42
libvorbis: 1.3.1
zlib: 1.2.5

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10922 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-05 17:31:15 +02:00
Buginator 799b79358f die popt, die!
(remove from the build system)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10671 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-22 09:04:47 +02:00
Buginator 66edd6bdb3 Update MSVC project files to compile newnet
Added /arch:sse2


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@10283 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 21:11:15 +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 1d4c94f89c Change devpkg md5sum to actually match the updated package.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10273 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 18:38:25 +01:00
Buginator 763a6177cb Add a simple batch file for MSVC people to delete all the generated parser files, since 'clean solution' doesn't clean everything that was made by bison/flex.
(You can either run it manually, or add it to the Pre-build Event to force it to regenerate those files all the time)

2.3: r10252 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10256 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 09:21:15 +01:00
Buginator d82fb0f23b GLee search path fix
2.3: r10174

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10253 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 09:21:14 +01:00
Cyp 6fc229b3c2 newnet: Remove popt from cross-compile scripts. 2010-03-11 17:25:53 +01:00
Per Inge Mathisen c472531b60 Rename patch to be nice to scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10074 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-04 19:07:37 +01:00
i-nod f875b678ac Fix MSVC 2008 for the GLee changes in r10028.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10053 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-04 19:07:36 +01:00
Giel van Schijndel fafeb245d9 Win32 cross build scripts: Add http://www.il.fontys.nl/~giel/warzone/devpkg/ as mirror for package archives
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9975 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-22 01:50:21 +01:00
Giel van Schijndel fa787fcc80 Win32 cross build scripts: Apply revision 5375 from the SDL repository as a patch to SDL-1.2.14.
This fixes #1340, also reported as SDLBug:849.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9948 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 20:50:19 +01:00
Giel van Schijndel 39afcf0604 Win32 cross build script: Optionally downgrade to SDL 1.2.13
Use SDL 1.2.13 instead of 1.2.14 when asked for, SDL 1.2.14 has some
problems on Windows, see #1340. Unfortunately SDL 1.2.13 has other
problems on Windows 7.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9919 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 01:50:21 +01:00
Giel van Schijndel 02b24836bf Win32 cross build script:
* Use `set -e` instead of `#!/bin/sh -e` as the former is portable, unlike the latter
 * Use "$()" for a nested shell instead of backticks as the former allows proper nesting

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9898 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-20 19:50:46 +01:00
Giel van Schijndel 384e87976d Win32 crossbuild script: Make sure that win32/builds/libs exists
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9868 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-19 17:50:37 +01:00
i-nod a7c4631fbc Update MSVC2008 project file (random.cpp).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9717 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:28:14 +01:00
Buginator 1ebb9ea9bc Update MSVC project file to add random.cpp
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9709 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:28:12 +01:00
Buginator d859cd7bd3 Change HOST_TRIPLET to be i586-mingw32msvc instead of mingw32 as the default HOST_TRIPLET
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9708 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:28:12 +01:00
i-nod 43e3379f9f Some tweaks for MSVC 2008 project:
- STL debug was disarmed (very high performance impact), can be re-enabled when truly needed
- removed erroneously duplicated header
- removed 'src' sub-group folder, they are in 'source files' anyway

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9639 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:28:04 +01:00
Per Inge Mathisen 6f95d916dc Exorcise target.c and target.h from all build systems.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9631 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:28:03 +01:00
Buginator dc8cb98ad9 Update MSVC project file for release build and fix iniparser DebugInformationFormat.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9588 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:57 +01:00
Cyp e095e8d80e visibility: Cast terrain visibility as sectors instead of rays.
Previous algorithm had a surprisingly high asymptotic runtime. (Insertion into unsorted sets.)
The new implementation does not generate pretty moiré patterns.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9539 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:52 +01:00
Christian Ohm b0c4e40934 Include files needed for win32 cross-building.
Building from tarball still doesn't work, since nsis wants the gmo files in the
build dir while they are in the source dir.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9146 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:34 +01:00
Giel van Schijndel e89964b87b Win32 crossbuild scripts
* build the *.gmo files when required
 * only run autogen.sh when required.
 * Use 'set -x' to achieve make-like command printing behaviour
  - I.e. instead of using a custom 'execute' function

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8909 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:08 +01:00
Christian Ohm 9d2e338b64 Win32 build scripts: Use --force for QuesoGLC svn export to deal with failed earlier runs.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8907 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:08 +01:00
Giel van Schijndel 2863ece766 Dash workaround: source __BUILD_CONFIG.USER from the current directory (using ./)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8905 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:08 +01:00
Giel van Schijndel 4bd1606843 Win32 crossbuild scripts: use 'bash' as shell when building gettext
* Apparently that monster has some code that's sensitive to which shell is used as the default for /bin/sh

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8902 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:07 +01:00
Giel van Schijndel 4801f4b4ca Win32 crossbuild scripts: dependency fixes (these ''should'' be the last)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8842 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:01 +01:00
Giel van Schijndel 733113472b Win32 crossbuild script: use stabs as default debug symbol format
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8841 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:58 +01:00
Giel van Schijndel c526dfc78a Win32 cross build scripts:
* automatically fetch the DejaVu fonts
 * Place the fontconfig configure files where they're expected by the NSIS script
  - source:trunk/pkg/nsis/fonts.conf.wd_enable and source:trunk/pkg/nsis/fonts.conf.wd_disable
 * Fix some dependency ordering for `fontconfig` and `ogg`

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8840 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:58 +01:00
Giel van Schijndel 4d006adb4f Add proper dependency resolving for `zlib` and `png` and bump the default INSTALLER_VERSION to 2.2.0.999 (must be numeric and 4 numbers)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8839 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:58 +01:00
Giel van Schijndel 53efd0f5db Add proper dependency resolving for `iconv` and fix a syntax error in __BUILD_SCRIPT
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8838 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:58 +01:00
Giel van Schijndel a08ed80b76 Win32 cross build scripts: automatically fetch and extract the devpkg (precompiled libraries)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8837 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:58 +01:00
Giel van Schijndel 19754d0203 Win32 cross build scripts: better dependency tracking
* track the files we use, not the files that are the source of what we use

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8836 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:58 +01:00
Giel van Schijndel 18d344d8aa Win32 cross build scripts: don't depend on libiberty when building Popt
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8835 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:57 +01:00