Commit Graph

26 Commits (732c0b70a18cf9b6c21d1e197d5b2610a102f2a1)

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