Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,426 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

195 Commits (792a98e824c88a90473b8c011dd4a6bea1891f51)

Author SHA1 Message Date
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
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
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
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