cybersphinx
aa48d4c069
Fix last commit (libpng).
2010-11-02 16:28:37 +01:00
cybersphinx
17a9973597
Update the dependencies for the Windows cross build.
...
DejaVu fonts: 2.31 -> 2.32
freetype: 2.3.12 -> 2.4.3
gettext: 1.18.1 -> 1.18.1.1
libogg: 1.2.0 -> 1.2.1
libpng: 1.2.44 -> 1.4.4
libvorbis: 1.3.1 -> 1.3.2
2010-11-02 16:13:24 +01:00
buginator
5bbe90df6b
Update files from TRUNK->master
2010-10-30 20:47:36 -04:00
Cyp
95b4cff1b8
Merge remote branches 'origin/qt-trunk' and 'origin/master' into qt
...
Conflicts:
macosx/Warzone.xcodeproj/project.pbxproj
2010-10-31 22:27:42 +01:00
buginator
0b9861ed64
Fix MSVC build
2010-10-30 20:42:25 -04:00
Cyp
6e1771e319
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/ivis_common/piemode.h
lib/ivis_common/rendmode.h
lib/ivis_common/textdraw.h
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Project-All.xcconfig
2010-10-30 20:04:42 +02:00
buginator
a11d60774e
Fix MSVC builds
2010-10-17 18:46:06 -04:00
Cyp
0794c5a674
Merge remote branch 'origin/master' into qt-trunk
...
Conflicts:
.hgignore
configure.ac
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/endian_hack.h
lib/framework/frame.c
lib/framework/input.c
lib/framework/input.h
lib/framework/opengl.h
lib/framework/wzapp_c.h
lib/gamelib/gtime.c
lib/gamelib/gtime.h
lib/ivis_common/Makefile.am
lib/ivis_common/ivispatch.h
lib/ivis_common/png_util.h
lib/ivis_opengl/screen.c
lib/ivis_opengl/screen.h
lib/netplay/netlog.c
lib/netplay/netlog.h
lib/netplay/netplay.c
lib/netplay/netplay.vcproj
lib/netplay/netsocket.cpp
lib/netplay/nettypes.c
lib/sequence/sequence.c
lib/sound/oggvorbis.c
lib/widget/scrap.c
macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Bison-Debug.xcconfig
macosx/configs/Bison-Release.xcconfig
macosx/configs/FetchPrebuilt.sh
macosx/configs/FetchSource.sh
macosx/configs/Project-All.xcconfig
macosx/configs/SDLmain-All.xcconfig
macosx/configs/SDLmain-Debug.xcconfig
macosx/configs/SDLmain-Release.xcconfig
macosx/configs/Warzone-All.xcconfig
macosx/configs/Warzone-Debug.xcconfig
po/cs.po
po/da.po
po/de.po
po/en_GB.po
po/es.po
po/et_EE.po
po/fi.po
po/fr.po
po/fy.po
po/ga.po
po/hr.po
po/it.po
po/ko.po
po/la.po
po/lt.po
po/nb.po
po/nl.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/uk_UA.po
po/zh_CN.po
po/zh_TW.po
src/astar.c
src/data.c
src/fpath.c
src/frontend.c
src/hci.c
src/main.cpp
src/move.c
src/move.h
src/multibot.c
src/multiint.c
src/multijoin.c
src/multiplay.c
src/multisync.c
src/terrain.c
2010-10-09 14:44:15 +02:00
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
Buginator
8f2c5c24d6
add back QuesoGLC to the project file
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11137 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-11 08:10:23 +02:00
Christian Ohm
2f46811c0a
Update libpng to 1.2.44 for Windows cross-builds.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11073 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:54 +02:00
Christian Ohm
e4805ee8d7
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/branches/qt-trunk@10935 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:51 +02:00
Christian Ohm
ef25620a44
Remove some popt residue that broke make distcheck.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10934 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:51 +02:00
Buginator
0cf96267e6
MSVC fixes.
...
*NOTE* You *must* get the Qt: Framework, or Qt SDK, and set it up correctly!
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10824 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:46 +02:00
Buginator
e65f2688e7
Stage two merge.
...
Add new files for Qt.
Remove old files
Update build system (linux).
Remove SDL.
Remove QuesoGLC.
Remove Fontconfig & other all dependencies it had.
CC & mingw (windows) & MSVC build systems are *NOT* updated / working yet.
**NOTE** MSVC people check types.h, "bool" != "BOOL" ! "bool" is a byte, "BOOL" is a int.
r8503 - r10787 (from Qt branch)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10813 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:44 +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
Giel van Schijndel
04e6a296f3
Win32 cross build scripts: don't clean the download cache unless very-clean or very-preclean is used
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8833 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:57 +01:00
Giel van Schijndel
f36411f32e
Win32 cross build scripts:
...
* Fix order of dependency building
* Evaluate variables in the correct order when invoking ''our'' ./configure script
* Depend on the correct files when building libraries
* Link in all dependent libraries so that we won't abort when some library has to build its examples
* Run `autoconf` to reproduce Ogg's configure script (apparently the one delivered is bad)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8832 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:57 +01:00
Giel van Schijndel
4efad885e7
Win32 cross build scripts: prevent linker errors in QuesoGLC
...
* as a result of trying to use rpl_malloc and rpl_realloc instead of the plain versions
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8831 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
f03549b8b1
Win32 crossbuild scripts: some tweaks to make sure we cooperate nicely with pkg-config
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8828 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:56 +01:00
Giel van Schijndel
a98f8117ab
Win32 cross build scripts: enable cross building for Expat, FreeType2, Fontconfig and QuesoGLC
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8827 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:56 +01:00
Giel van Schijndel
5e6cf99d24
Forgot to ''enable'' crossbuilding of SDL in r8824
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8826 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:56 +01:00
Giel van Schijndel
6f04fa89c3
Windows cross build script: add a `clean` (and `preclean`) command
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8825 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:56 +01:00
Giel van Schijndel
5bb996c268
Win32 cross build scripts: enable cross building of SDL (1.2.14)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8824 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:56 +01:00
Giel van Schijndel
3b6aceb15d
Win32 cross build scripts: enable cross building of libiconv
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8823 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:55 +01:00
Giel van Schijndel
115d2bfd2c
Windows cross compilation scripts
...
* redo the cross compilation script in such a way that it'll also automatically fetch (wget) and build the dependencies
- Currently only building of popt, gettext, zlib and png is implemented
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8821 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:55 +01:00
i-nod
da88cb87ab
- Added vc2k8 solution which uses new Warzone2100.vs2k8.vcproj. Lib projects are common between the vc2k8 and vc2k5. vc2k8 (and up) people should you it instead of Warzone2100.sln. Also check for the new devpkg on msvc wiki.
...
- vc2k8 project is using modern style icon instead of obsolete one.
- Removed sqlite3 dependencies from vc2k5 solution.
- Set eol-style to native for iniparser.vcproj
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8326 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:19:52 +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
Buginator
eea4cbb7b8
Update the project file to link with libtheora_static.lib as that is the default name that is now built with using libtheora.
...
Update theora to Thusnelda. (MSVC people, get project file here, and build it yourself)
http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8212 4a71c877-e1ca-e34f-864e-861f7616d084
2009-10-06 22:09:59 +02:00
Per Inge Mathisen
dba1290112
This patch adds the beginnings of a "Challenge" single player game mode. It
...
adds fixed game setups with a running timer, which becomes a game score. The
faster you can finish the challenge, the better the score. However, if you
have been unable to finish the challenge, then the higher the score is better
(you survived it longer)! Challenges are setup in INI files in a challenges/
directory. This closes ticket:778
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7954 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:07:02 +02:00
Per Inge Mathisen
c8e73a71a6
iniparser project for MSVC, patch by i-NoD, closes ticket:779
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7935 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:06:58 +02:00
Buginator
619a23086d
Update .vcproj to use the vs2k5 version of the resource file, since the new icons break the resource compiler.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7766 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:06:21 +02:00
Guangcong Luo
4c640229ab
Temporary workaround for bad resource compiler not supporting modern icon formats.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7643 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:04 +02:00
Guangcong Luo
5a974ed226
Windows installer fixes:
...
* Make the cross-compile script Ubuntu-compatible
* Don't redownload the music mod if we already have it
* Download sequences (if we don't already have it)
* Remove EULA agreement (The GPL is not a EULA)
* Install OpenAL silently (Its license is not a EULA; see ML discussion)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7327 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-06 22:29:40 +02:00
Giel van Schijndel
9c340eb3f7
Use winsock 2 on all build systems (not just autohell like in r7284)
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7297 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-06 22:29:37 +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
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
Gerard Krol
5601741b95
Brace for impact, this is the new terrain renderer!
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6682 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-21 23:35:21 +00:00
Per Inge Mathisen
ac5170ab5d
Remove more dead gateway code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6665 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-19 21:14:24 +00:00
Buginator
55d3044f15
Updated MSVC project & solution file(s).
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6637 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-15 05:42:09 +00:00
Dennis Schridde
aac41748dc
Bump copyright
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6617 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-10 18:01:48 +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
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
Giel van Schijndel
043cc9d278
Fix a spelling error in the MSVC project files causing problems with the #include path
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6027 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 19:47:56 +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
360dc86ef4
* Make CHECK_OBJECT, CHECK_PROJECTILE and CHECK_STRUCTURE macros that redirect to a function
...
* Add two new files: src/baseobject.[ch]
* Have CHECK_OBJECT call any of CHECK_DROID, CHECK_PROJECTILE or CHECK_STRUCTURE depending on the object's type
* Change CHECK_DROID and checkDroid to use the AT_MACRO to get the current filename and line number
* Change checkDroid to use ASSERT_HELPER to provide the source of the assertion
NOTE: The autotools, Code::Blocks, win32 Makefiles and MSVC buildsystems are updated, Xcode will still require an update
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5866 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-24 15:56:00 +00:00
Giel van Schijndel
ced8a64ad1
Revert r5768 which got committed accidentily
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5772 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 23:09:33 +00:00
Giel van Schijndel
d54e360aa7
Add some code to hook into Mumble's Link plugin and provide Mumble with positional information about the player's current viewing position in Warzone
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5768 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 20:53:14 +00:00
Giel van Schijndel
763bc7bbd8
Add a new parser: message_parser which parses research message data in a significantly different format from the current CSV message format as "parsed" by loadViewData (this allows for easier gettext translation)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5695 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-28 21:01:05 +00:00
Giel van Schijndel
410c511363
Don't duplicate $CFLAGS in $__BOTHFLAGS
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5624 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 23:22:36 +00:00