f2f727d0db
Make MiniUPnPc an external framework.
2011-04-23 19:27:54 -04:00
c716957cf6
No more tagfile.cpp.
2011-04-23 19:27:16 -04:00
02b8c3e412
Add the missing MiniUPnPc files and make MiniUPnPc an external framework.
2011-04-23 15:46:56 -04:00
435f352672
Build the index.
2011-04-21 22:23:25 -04:00
6ded3d1064
Explicitly define the architectures.
2011-04-21 22:04:08 -04:00
81f96c22b5
Generate pnglibconf.h properly.
2011-04-21 22:01:52 -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
ca9eb871a2
Update png to 1.4.7.
2011-04-11 17:39:42 -04:00
80785deae5
Update png to 1.4.6.
2011-04-09 20:30:23 -04:00
db46f36920
Update the strings files in the xcode project.
2011-04-03 23:41:48 -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
8fd1247bf6
Add the strings files for ca_ES and a template for hu.
...
Refs #2616
2011-04-03 16:14:24 -04:00
aa20f30827
Add a warning for the Xcode 4 workspace.
2011-04-02 15:53:58 -04:00
df6e6dd669
Switch the xcode project from GLee to Glew.
...
Refs #2378 .
2011-04-02 10:25:17 -04:00
dfd57a499a
Xcode 4 files.
2011-04-01 22:48:01 -05:00
bb40e5ea33
Remove the iniparser stuff from the xcode project.
2011-04-01 18:10:33 -04:00
92078012c5
Get rid of the remaining traces of Autorevision in the xcode project.
2011-04-01 18:07:56 -04:00
69df2f05f1
Get rid of the remaining traces of Autorevision in the xcode project.
2011-04-01 11:55:45 -04:00
34e6efd6d7
Slight cleanup of the xcode project.
2011-03-30 19:52:49 -04:00
24ca10f2f1
Add the new files to the xcode project.
2011-03-30 19:35:23 -04:00
a31eab0ea0
Link QtScript.framework in the mac builds.
2011-03-30 19:21:52 -04:00
0f467ceacd
Update the QT bundle.
2011-03-30 19:03:24 -04:00
693ef7c4b6
Ensure that the buildbot script exits with the proper status.
2011-03-24 19:34:34 -04:00
4a0211ce0e
Update the uurl setting for the buildbot scripts.
2011-03-23 01:47:07 -04:00
c758ff6030
Add some error and status messages to the buildbot scripts.
2011-03-23 00:44:48 -04:00
500f19b64b
Update the dmg script.
2011-03-20 23:52:06 -04:00
cc55135ae5
Update the dmg scrpit.
2011-03-20 23:33:57 -04:00
817a598daa
Get all the changes that were not brought over from master.
2011-03-20 21:46:01 -04:00
889d9e0c05
Use PhysFS 2.0.2 for the mac builds.
...
Refs #1066 .
2011-03-20 18:46:09 -04:00
9e2c4933eb
Use the autorevision script instead of the program.
...
Refs #2401 .
2011-03-20 18:29:57 -04:00
ca42b5bd74
Add wzfs.h and wz2100icon.h to the xcode project.
2011-03-20 18:24:46 -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
48e30ae04f
Use StaticAnalyzer builds for the buildbots.
2011-02-12 12:01:00 -05:00
8989f42afe
Add a category to the mac's app bundle.
2011-02-08 00:40:14 -05:00
70baa03ffb
A better way to copy the data directory.
2011-01-23 20:09:52 -05:00
8ecf322cc7
A better way to copy the data directory.
2011-01-23 17:12:31 -05:00
d39112244b
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/framework/frame.h
src/main.cpp
2011-01-22 23:05:36 +01:00
46aadf5a70
Switch the bot builds to use git.
2011-01-22 02:18:34 -05:00
3249152dff
Make the xcode project work with the changes made in fca489ce42, 1c0af54edf, 67e9635f9f & 178569f364.
2011-01-14 15:36:25 -05:00
a0dc6a08b7
Make the xcode project work with the changes made in fca489ce42, 1c0af54edf, 67e9635f9f & 178569f364.
2011-01-02 16:28:46 -05:00
01e55ddf07
Normalise the warnings for the mac builds.
2010-12-21 15:37:52 -05:00
760d19f776
Change Glee back to c; eliminates warnings in the mac build.
2010-12-21 15:18:18 -05:00
0c898fb097
Normalise the warnings for the mac builds.
2010-12-21 15:03:06 -05:00
22285a7528
Change Glee back to c; eliminates warnings in the mac build.
2010-12-21 12:30:41 -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
78bbd0c643
Upgrade png to 1.4.5.
2010-12-19 20:57:28 -05:00
c00f8f942f
Update the xcode project for all the .c --> .cpp changes.
2010-12-19 20:55:54 -05:00
c9abae073e
Upgrade png to 1.4.5.
2010-12-19 19:39:52 -05:00
0364933736
Make the xcode project work again.
2010-12-16 21:06:33 -05:00
ab1e0c269e
Add actiondef.h to the xcode project.
2010-12-16 16:32:50 -05:00
f945dfc029
Be sure to use the right python.
2010-12-14 01:10:43 -05:00
3ccc629eab
Replace legacy Carbon dialogs with Cocoa NSAlerts.
...
Also don't link the main binary with Carbon at all anymore.
2010-12-10 23:39:22 -06:00
8dc031917f
Update the libpng download url.
2010-12-10 18:29:36 -06:00
846ad2f6f3
Update Ogg to 1.2.2.
2010-12-10 18:52:56 -05:00
2ee40a6f91
Update Ogg to 1.2.2.
2010-12-10 15:08:30 -05:00
32954a11a3
Fetch the current QT package.
2010-12-04 23:23:53 -05:00
e2bf54462c
png changed their download path.
2010-12-04 23:23:52 -05:00
55d67e7886
png changed their download path.
2010-12-04 23:04:20 -05:00
ec0d8eadbf
Fix the mac builds broken by Cyp in rfccb548124.
2010-11-27 18:16:41 -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
57b82cc458
Add new (for the mac) translations to the xcode project.
2010-11-14 20:10:43 -05:00
a84749cd97
Update the autorevision script so we can get something out of tarballs; also some minor fixes to data copying.
2010-11-07 16:09:35 -05:00
475398b0d2
Update the autorevision script so we can get something out of tarballs; also some minor fixes to data copying.
2010-11-07 16:09:35 -05:00
eb0ae8282a
Update vorbis to 1.3.2.
2010-11-03 18:36:55 -04:00
fb697187f4
Update vorbis to 1.3.2.
2010-11-03 18:30:14 -04:00
8143663a38
Filter tag names properly.
2010-11-01 11:16:55 -04:00
af8ebf5afa
Filter tag names properly.
2010-11-01 11:16:55 -04:00
e540ca7ab1
Try to pickup the current revision from git first.
2010-10-30 23:12:14 -04:00
91a9a84c72
Increase the size of the dmg to hold everything.
...
(transplanted from a3008d5ddb112eaf0a88f2b09649c2a6442f94f4)
--HG--
extra : transplant_source : %A3%00%8D%5D%DB%11.%AF%0A%88%F2%B0%96I%C2%A6D/%94%F4
2010-10-30 21:06:49 -04:00
2f8af29d1b
Bring our own fonts.
2010-10-30 18:39:52 -04:00
173c4c0c6a
Get rid of QuesoGLC and other updates to bring the xcode project up to date.
2010-10-30 13:24:21 -04:00
9f40868dbf
Upgrade Qt to 4.7.
2010-10-30 13:10:04 -04: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
f13be24000
Hook the mac versioning system up to the new git stuff.
2010-10-27 14:26:57 -04:00
dca90809f9
Sync wzlocal with the po directory.
2010-10-26 15:53:04 -04:00
e006723545
Add the Turkish info.plist.
...
Refs #2261
2010-10-26 15:24:15 -04:00
57e5ef77da
Add the Romanian info.plist.
...
Refs #2246
2010-10-24 10:14:25 -04:00
5b45925a1c
Remove formation.c from the xcode project.
2010-10-17 15:14:08 -04:00
a31521f75e
Clean out extraneous linkage.
2010-10-13 20:52:12 -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
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
60c61a89b4
Make sure that git is in the path when Autorevision is run.
2010-10-07 15:19:46 -04:00
269af78e68
Update the copy data script to work without svn.
2010-10-06 18:54:42 -04:00
f146148be9
Make sure the licence is in the bundle.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11743 4a71c877-e1ca-e34f-864e-861f7616d084
2010-10-03 00:46:51 +02: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
83e21c6cf2
Bump the upload limit up for the buildbot.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11735 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-29 22:52:58 +02:00
42f15a57ed
Update the lt .strings file.
...
Refs #2199 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11728 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-29 22:52:58 +02:00
dak180
Per Inge Mathisen
Zarel
Cyp
NanoTech