dak180
|
8c73647378
|
Replace BSON with QJson for the mac builds.
|
2011-07-11 12:15:49 -04:00 |
|
dak180
|
b6a2c1cb63
|
Adjust to the bson code moving.
|
2011-07-04 18:24:46 -04:00 |
Rene Jochum
|
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 |
|
dak180
|
75dbf4052b
|
Use @rpath for the mac builds since 10.5 is the minimum supported version.
|
2011-05-22 14:55:19 -04:00 |
|
dak180
|
980921eaf6
|
Clean up the xcconfig files.
|
2011-05-18 16:59:07 -04:00 |
|
dak180
|
a934315912
|
Pick up the last of the mismerged files from the great qt merge.
|
2011-05-16 16:18:42 -04:00 |
|
dak180
|
2ace96fd0b
|
Add the bson stuff to the xcode project.
|
2011-05-01 05:11:41 +02:00 |
|
dak180
|
1b684c1d15
|
Fix stuff that got lost in the merge.
|
2011-04-25 18:23:44 -04:00 |
|
dak180
|
df6e6dd669
|
Switch the xcode project from GLee to Glew.
Refs #2378.
|
2011-04-02 10:25:17 -04:00 |
|
dak180
|
34e6efd6d7
|
Slight cleanup of the xcode project.
|
2011-03-30 19:52:49 -04:00 |
|
dak180
|
817a598daa
|
Get all the changes that were not brought over from master.
|
2011-03-20 21:46:01 -04:00 |
|
dak180
|
01e55ddf07
|
Normalise the warnings for the mac builds.
|
2010-12-21 15:37:52 -05:00 |
|
dak180
|
c37f93680a
|
Bring qt-trunk in line with trunk.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11142 4a71c877-e1ca-e34f-864e-861f7616d084
|
2010-07-11 08:10:25 +02:00 |
|
dak180
|
048f1a8e3c
|
Update the xcode project into a working state.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10837 4a71c877-e1ca-e34f-864e-861f7616d084
|
2010-07-10 21:10:48 +02:00 |
|
dak180
|
ae26739a9a
|
Some more formatting fixes for the debug dialog and make sure that .strings files get their encoding set properly.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10473 4a71c877-e1ca-e34f-864e-861f7616d084
|
2010-04-12 11:59:30 +02:00 |
|
dak180
|
23a369df4c
|
Clean up the .xcconfig files.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10288 4a71c877-e1ca-e34f-864e-861f7616d084
|
2010-03-14 22:41:51 +01:00 |
|
dak180
|
bdc5d0fef1
|
Crash reports should have line numbers, now the mac ones will.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10201 4a71c877-e1ca-e34f-864e-861f7616d084
|
2010-03-08 09:45:02 +01:00 |
|
dak180
|
058044b2b5
|
Minor housekeeping and set a few lib headers to public.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10185 4a71c877-e1ca-e34f-864e-861f7616d084
|
2010-03-07 08:34:18 +01:00 |
|
dak180
|
00f5e91fb8
|
Use a more reliable download address for libpng.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10152 4a71c877-e1ca-e34f-864e-861f7616d084
|
2010-03-05 08:55:42 +01:00 |
|
dak180
|
5fc308b749
|
More encoding fixes and fix some names.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9816 4a71c877-e1ca-e34f-864e-861f7616d084
|
2010-02-15 20:51:08 +01:00 |
|
dak180
|
1eabbb6f5a
|
Externalize the xcode build settings for better readability and fix .strings mime-type.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9761 4a71c877-e1ca-e34f-864e-861f7616d084
|
2010-02-11 20:14:33 +01:00 |