6c90f4a38e
Remove deleted files from the mac build.
2013-12-01 09:43:36 -05:00
b4b019aa5a
Merge branch 'bugfixes'
...
Conflicts:
src/init.cpp
src/multiint.cpp
src/power.cpp
2013-11-19 22:18:46 -05:00
a3468b1a00
Make sure tar does not make `._` files.
2013-11-17 15:09:29 -05:00
2b0dc1bce3
Make sure to remove the leading `v`.
2013-11-17 14:34:45 -05:00
5d5a6eb8b7
Quote all possible spaces the mkdmgs script.
2013-11-17 11:22:36 -05:00
1c5e5739e0
Merge branch 'bugfixes'
2013-10-28 00:00:26 -04:00
992113d98c
Fix the mac build for 8f4adda2.
...
Refs. ticket:4095.
2013-10-27 23:19:24 -04:00
7db9ad7f96
Whitespace fixes.
2013-09-10 15:51:59 -04:00
47e9ca607b
Clean up some of the mac scripts.
2013-09-10 15:46:56 -04:00
8b38d3abd1
Remove imd.cpp from the mac build.
2013-09-10 15:30:02 -04:00
121d4cadb7
Merge branch 'bugfixes'
...
* bugfixes:
Update autorevision to 1.6.
Check Moc after downloading Qt.
Use Gist as the primary location for the vorbis patch.
2013-08-29 15:18:24 -04:00
2e5d5515aa
Check Moc after downloading Qt.
2013-08-23 13:44:13 -04:00
7ec1c97385
Use Gist as the primary location for the vorbis patch.
2013-08-23 13:27:44 -04:00
236dccb24d
Merge branch 'bugfixes'
...
* bugfixes:
Update ogg to 1.3.1 for the mac build.
Eliminate a few warnings in 3rdparty code.
Update the xcode project file to the 3.2 format.
Fix ups.
Update png to 1.5.17.
Update to glew 1.10.0 for the mac builds.
2013-08-01 16:49:59 -04:00
898255a5e6
Update Qt to 4.8.4 for mac builds.
...
This commit ends support for 32 bit intel for mac builds.
2013-08-01 16:48:43 -04:00
6dc1eef3ff
Fix the SDKROOT setting in sub projects.
...
Update xcode 4+ project files.
2013-08-01 16:48:28 -04:00
1065210325
Update ogg to 1.3.1 for the mac build.
2013-07-25 15:05:30 -04:00
65a0201ef4
Eliminate a few warnings in 3rdparty code.
2013-07-25 15:05:04 -04:00
afdd27b877
Update the xcode project file to the 3.2 format.
2013-07-22 15:18:43 -04:00
c31cf2693e
Fix ups.
...
* Add underscore.sty into 3rdparty
* Use a quoted here doc in CS-ID
* Try not to blowup quite so spectacularly building the docs without a network connection.
2013-07-22 15:08:34 -04:00
874df70e1f
Update png to 1.5.17.
2013-07-22 14:18:55 -04:00
45cf49cfee
Update to glew 1.10.0 for the mac builds.
...
Note: other builds may want to test to ensure that they do not build against glew 1.9.0 since it can cause crashes.
2013-07-22 13:00:28 -04:00
1aa8ee20ce
Merge branch 'bugfixes'
2013-07-05 23:36:16 +00:00
a94d37a9eb
Automatically build the sequences only on tags.
...
Not betas or release candidates though.
2013-07-01 10:57:51 -04:00
b77446cca6
Update png for mac builds to 1.5.16.
2013-06-05 18:18:05 -04:00
fc37c4e7fa
identity: Add libcrypto to the mac builds.
2013-06-05 10:20:18 -04:00
6b909ba03b
Update png to 1.5.15 for the mac builds.
2013-05-13 16:32:23 -04:00
3c21376ac9
Update zlib to 1.2.8 for the mac builds.
2013-05-13 16:13:56 -04:00
cb18ebcaa7
Account for the death of function.(cpp|h) and functiondef.h.
...
Also fix includes.
2013-05-05 08:11:37 -04:00
753456eaa4
Eliminate bison/flex dependencies from the mac builds.
...
References work done in 372eff669#3887 , #3538 , #3950 .
2013-03-28 13:45:52 -04:00
f5c718d375
Update the mac build for Cyp's widget branch.
2013-03-18 21:18:02 -04:00
454f3d39de
Add GLM support for MacOSX, from dak180.
2013-02-18 20:29:15 +01:00
986a803681
Merge branch 'bugfixes'
2013-02-04 08:00:45 +01:00
daf0bd65c7
Add support to the mac build for the new debug GUI for qtscript.
...
Refs. #3924 .
2013-02-02 17:01:58 -05:00
4ec6413c81
Get rid of an unnecessary addition from f910611e.
2013-02-02 13:05:26 -05:00
20edd9680d
Merge branch 'bugfixes', remote-tracking branch 'origin'
...
Conflicts:
data/mp/multiplay/skirmish/semperfi.js
lib/widget/widget.cpp
src/qtscriptfuncs.cpp
2013-01-31 21:14:11 +01:00
f910611e54
Build a local, up to date, copy of the docs if possible.
2013-01-30 20:52:39 -05:00
eb5d5b59eb
More specific matching.
2013-01-30 11:47:10 -05:00
c7c6534c7c
Merge branch 'bugfixes'
...
Conflicts:
lib/widget/bar.cpp
lib/widget/button.cpp
lib/widget/button.h
lib/widget/editbox.cpp
lib/widget/form.cpp
lib/widget/form.h
lib/widget/label.cpp
lib/widget/slider.cpp
lib/widget/slider.h
lib/widget/widgbase.h
lib/widget/widget.cpp
src/hci.cpp
src/intdisplay.cpp
2013-01-29 16:22:16 +01:00
6a3ed31e88
Update the mac build's png to 1.5.14.
2013-01-24 09:00:25 -05:00
170f3a9931
Merge branch 'bugfixes'
2013-01-18 08:00:44 +01:00
21d8642186
Update the copyright year in the mac strings.
2013-01-16 22:06:05 -05:00
6c6fe7c38a
Merge branch 'bugfixes'
...
Conflicts:
src/e3demo.cpp
src/e3demo.h
2013-01-16 15:44:22 -05:00
931f4b6b5c
Make sure the right sequences.wz gets copied.
2013-01-14 23:29:18 -05:00
ccc2a07bd3
Merge branch 'bugfixes'
2013-01-14 08:00:56 +01:00
c855c90c81
Move the OV_EXCLUDE_STATIC_CALLBACKS define out of the code.
2013-01-13 10:31:49 -05:00
1193559f53
Merge branch 'bugfixes'
...
* bugfixes:
Make configure fail if it doesn't find flex.
Update the default layout for CS-ID.xcconfig.
Emit warnings on improperly / unsigned frameworks.
Do not rely on the default Designated Requirements.
stats: Prevent double-counting of wins/losses.
stats: Use actual number of games played when drawing medals.
stats: Actually save stats, so players aren't stuck with the pacifier forever.
Prevent updating autorevision.h's timestamp when its contents haven't changed
Prevent out-of-bounds array access
map2preview: handle unknown tilesets
Conflicts:
src/multiint.cpp
2013-01-07 15:27:58 +01:00
c6e66959c9
Update the default layout for CS-ID.xcconfig.
2013-01-05 21:14:27 -05:00
767c19e1b6
Emit warnings on improperly / unsigned frameworks.
2013-01-05 20:36:21 -05:00
33ec6eee1a
Do not rely on the default Designated Requirements.
...
Also, sign the frameworks earlier.
2013-01-05 18:29:51 -05:00
dak180
vexed
haonoq
per
automerge
Cyp
cybersphinx