8c73647378
Replace BSON with QJson for the mac builds.
2011-07-11 12:15:49 -04:00
16ac69b065
Make Bson a framework to separate out different licences.
2011-07-09 00:50:53 -04:00
b6a2c1cb63
Adjust to the bson code moving.
2011-07-04 18:24:46 -04:00
f4017eda50
Merge remote-tracking branch 'upstream/master' into bsonlobby
...
Conflicts:
configure.ac
lib/netplay/Makefile.am
macosx/Warzone.xcodeproj/project.pbxproj
src/Makefile.am
2011-07-03 01:04:50 +02:00
84a64f1418
Externalize the dmg script.
2011-06-06 01:30:19 -04:00
f7e2cbe5bd
Use Clang for the frameworks.
2011-06-03 14:08:54 -04:00
75dbf4052b
Use @rpath for the mac builds since 10.5 is the minimum supported version.
2011-05-22 14:55:19 -04:00
888720d38e
Move miniupnpc into 3rdparty and set up the xcode project.
2011-05-21 19:44:55 -04:00
980921eaf6
Clean up the xcconfig files.
2011-05-18 16:59:07 -04:00
a934315912
Pick up the last of the mismerged files from the great qt merge.
2011-05-16 16:18:42 -04:00
6f52118902
Move source downloading to take advantage of change detection.
2011-05-08 18:00:40 -04:00
fb4cf44424
A better way to tell if we have the right lib version.
2011-05-08 17:53:01 -04:00
2ace96fd0b
Add the bson stuff to the xcode project.
2011-05-01 05:11:41 +02:00
b459e91a57
Update the excluded translations.
2011-04-28 18:52:00 -04:00
1b684c1d15
Fix stuff that got lost in the merge.
2011-04-25 18:23:44 -04:00
b4ad9f00b5
Add the missing MiniUPnPc files.
2011-04-25 11:03:30 -04:00
3f8cecb841
Merge branch 'master' into qt
...
Conflicts:
configure.ac
lib/ivis_opengl/Makefile.am
lib/ivis_opengl/glew/glew.vcxproj
lib/ivis_opengl/glew/glew.vcxproj.filters
lib/ivis_opengl/piedraw.cpp
lib/ivis_opengl/piemode.cpp
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/tex.cpp
lib/sequence/Makefile.am
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Glew-All.xcconfig
macosx/configs/QuesoGLC-All.xcconfig
macosx/configs/Warzone-All.xcconfig
src/Makefile.am
src/texture.cpp
win32/libs/Makefile
win32/libs/glew/Makefile
win32/libs/glew/patches/glew_pkgconfig.diff
2011-04-25 00:51:13 +02:00
f2f727d0db
Make MiniUPnPc an external framework.
2011-04-23 19:27:54 -04:00
02b8c3e412
Add the missing MiniUPnPc files and make MiniUPnPc an external framework.
2011-04-23 15:46:56 -04:00
6ded3d1064
Explicitly define the architectures.
2011-04-21 22:04:08 -04:00
1d7bb2fd96
Fix the incredible brokenness in the mac build resulting from a botched rebasing.
...
This is why rebasing should generally be considered evil especially when it involves files that do not merge; in short, do not do this.
This goes double when the changes you are rebasing do not actually work yet.
2011-04-20 16:32:27 -04:00
1fad90d5e6
Make sure that preprocessor definitions get properly propagated.
2011-04-20 16:28:41 +02:00
6b6cdc0b5e
Use only one glew for QuesoGLC and Warzone.
2011-04-20 16:28:41 +02:00
19c0a75eaf
Switch the xcode project from GLee to Glew.
...
Refs #2378 .
2011-04-20 16:28:41 +02:00
dda501bf13
Merge remote branch 'origin/master' into qt
...
Conflicts:
data/base/script/text/cam1a.slo
lib/exceptionhandler/exceptionhandler.vcxproj
lib/exceptionhandler/exchndl.h
lib/framework/framework.vcxproj
lib/gamelib/gamelib.vcxproj
lib/iniparser/iniparser.vcxproj
lib/ivis_opengl/ivis_common.vcproj
lib/ivis_opengl/ivis_opengl.vcxproj
lib/netplay/netplay.vcxproj
lib/script/script.vcxproj
lib/sequence/sequence.vcxproj
lib/sound/sound.vcxproj
lib/widget/widget.vcxproj
macosx/README.BUILD.txt
macosx/Warzone.xcodeproj/project.pbxproj
src/Warzone2100.vcxproj
src/main.cpp
2011-04-17 23:17:24 +02:00
de63d0b4ac
Update png to 1.5.2.
2011-04-11 18:13:37 -04:00
01f5b99027
Xcode 3.2.x (10.6) is now officially required to build Warzone.
...
The 10.5 sdk supplied with Xcode 3.1.x generates build errors when used, which is the main reason for this change.
Xcode 4 is not yet officially supported as it does not supply a 10.5 sdk.
2011-04-03 21:29:10 -04:00
df6e6dd669
Switch the xcode project from GLee to Glew.
...
Refs #2378 .
2011-04-02 10:25:17 -04:00
34e6efd6d7
Slight cleanup of the xcode project.
2011-03-30 19:52:49 -04:00
817a598daa
Get all the changes that were not brought over from master.
2011-03-20 21:46:01 -04:00
e689ad51d5
Merge remote branch 'origin/master' into qt
...
Conflicts:
configure.ac
lib/exceptionhandler/exceptionhandler.h
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.cpp
lib/framework/input.h
lib/ivis_opengl/pieclip.h
lib/ivis_opengl/screen.cpp
macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
src/console.cpp
src/console.h
src/frontend.cpp
win32/libs/Makefile
and src/Makefile.am (resolved by Safety0ff)
2011-03-13 22:31:19 +01:00
add956d337
Use the autorevision script instead of the program.
...
Refs #2401 .
2011-03-06 20:24:04 -05:00
c9f97fe8d8
Provide a backup download location.
2011-03-03 14:40:14 -05:00
e6fd3c3c90
Remove -Wc++-compat, to keep pace with Cyp.
2011-03-03 12:53:11 -05:00
6afff6e0c0
Use PhysFS 2.0.2 for the mac builds.
...
Refs #1066 .
2011-03-01 21:08:17 -05:00
dc4cf90ce5
Merge branch 'master' into qt
...
Conflicts:
lib/framework/input.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/screen.h
lib/widget/scrap.cpp
lib/widget/scrap.h
macosx/Warzone.xcodeproj/project.pbxproj
src/multiint.cpp
2011-02-25 18:59:41 +01:00
7a44272305
Set up some analyser options for potential later use.
2011-02-13 18:31:17 -05:00
01e55ddf07
Normalise the warnings for the mac builds.
2010-12-21 15:37:52 -05:00
0c898fb097
Normalise the warnings for the mac builds.
2010-12-21 15:03:06 -05:00
b1d681736d
Contrary to the information I had fstack-protector seems to need 10.6 min to build.
2010-12-20 11:35:05 -05:00
60d7cb6127
Merge remote branch 'origin/master' into qt
...
Conflicts:
.hgignore (manual merge)
lib/framework/wzapp_c.h (used qt)
macosx/Warzone.xcodeproj/project.pbxproj (used qt)
po/*.po (used master)
2010-11-21 21:46:08 +01:00
654819950b
Update the dmg script to allow for code signing.
2010-11-14 20:13:59 -05:00
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
57e5ef77da
Add the Romanian info.plist.
...
Refs #2246
2010-10-24 10:14:25 -04:00
e5c398b141
Some 64bit prep.
...
--HG--
extra : rebase_source : b84622c5ee3ddfda891d561327bd4c99a8642362
2010-10-13 17:10:48 -04:00
20924b59a4
Clean up things that are no longer used.
...
--HG--
extra : rebase_source : 544022e1eeeac8e22d03d0a59cd98ddb9c220a51
2010-10-13 17:09:51 -04:00
c3e55dde07
Update libpng to 1.4.4 and use better cleaning for updated libs.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11737 4a71c877-e1ca-e34f-864e-861f7616d084
2010-10-01 19:24:23 +02:00
69c518ebf9
Get rid of -Wno-type-limits because LLVM-GCC 4.2 does not like it.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11716 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-20 18:34:42 +02:00
b3b4f3a082
Switch to LLVM-GCC 4.2 because 10.5 does not have Clang.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11715 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-20 18:34:42 +02:00
98f2eeda5c
Fix capitalisation errors.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11494 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-19 21:25:58 +02:00
dak180
Rene Jochum
Per Inge Mathisen
Cyp