Commit Graph

86 Commits (4071ab708eb5956a1b59d1029fa123ff40089553)

Author SHA1 Message Date
dak180 d2994ad998 astar.c --> astar.cpp
Add jpeg_encoder.(c|h)

Remove -mfpmath=sse and -mno-fused-madd since floats are going to be ripped out and so clang can be used

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11119 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 18:04:28 +02:00
Cyp f0beca71cc Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/netplay/netlog.c
	lib/netplay/netlog.h
	lib/netplay/netplay.c
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	macosx/configs/Warzone-Debug.xcconfig
	src/multijoin.c
2010-07-10 17:02:39 +02:00
dak180 d4996a8b7d Switch to gcc4.2 so -mfpmath=sse and -mno-fused-madd actually do something.
Clean up a Build Rule for bison.

Make the autorevision script smarter.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11105 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-07 07:47:33 +02:00
dak180 9467cbd5a4 -msse3 is only used on intel in any case.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11104 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-07 07:47:33 +02:00
dak180 a658e90d16 Get rid of VORBIS_NEEDS_HACK on the theory that less hacks are better.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11102 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-06 07:17:42 +02:00
dak180 559a02e7f7 Minor adjustments to better match up with newnet.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11101 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-06 07:17:41 +02:00
dak180 88c1e07e00 Update the xcode project to bring it in line with trunk and multibot.c → cpp.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@11096 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-05 19:12:24 +02:00
dak180 b66bdb8955 Turn -Wsign-compare warnings off until someone has time to fix them.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11093 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-05 08:08:53 +02:00
dak180 36891ca806 Add a warning that we do not get now so we will not get it later.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11069 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-28 08:20:54 +02:00
dak180 0fbdda02f7 Add some warnings for Zarel.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11057 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-27 07:49:21 +02:00
Cyp 0b0e986ec6 Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/gamelib/gtime.c
	lib/netplay/netplay.c
	macosx/Warzone.xcodeproj/project.pbxproj
	src/multiint.c
	src/multisync.c
2010-06-26 22:42:44 +02:00
dak180 c77a8f43f9 Change compilers around to make Vorbis happy.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11029 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-24 20:00:16 +02:00
dak180 64b75224e7 Support for Mac OS X 10.4 is now dropped; the binaries may still work on 10.4 but this is no longer supported.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11026 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-23 23:42:28 +02:00
Cyp d7db005f71 Merge remote branch 'origin/master' into newnet
Conflicts:
	.gitignore
	configure.ac
	data/base/images/intfac.img
	data/base/images/intfac5.png
	lib/netplay/makefile.win32
	lib/netplay/netlog.c
	lib/netplay/netplay.c
	lib/netplay/netplay.h
	lib/netplay/netplay.vcproj
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	po/POTFILES.in
	src/hci.c
	src/intfac.h
	src/keybind.c
	src/multibot.c
	src/multiint.c
	src/multijoin.c
	src/multiplay.c
	src/multistruct.c
	src/multisync.c
	src/scriptai.c
2010-06-15 08:35:52 +02:00
dak180 47ae3d8974 Make sure the SDL headers are in the path.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10889 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-31 21:27:35 +02:00
dak180 30288e3cae Eliminate some errors when SDL has not yet been downloaded.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10884 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-31 08:22:31 +02:00
dak180 c61a6b8632 Update libpng to 1.4.2 and upgrade warnings to force rebuilds.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10866 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-24 08:51:22 +02:00
dak180 e3c1703206 Improve the fetch scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10757 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:51 +02:00
dak180 2806c9ddf0 Update zlib to 1.2.5.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10750 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:43 +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 0e81296ddb Add better error reporting to build rules.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10411 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-23 12:26:18 +01:00
dak180 231e973305 Better error reporting in build scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10410 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-23 12:26:18 +01:00
Cyp 8573291c68 Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/netplay/Makefile.am
	lib/netplay/netplay.c
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	src/multistat.h
	src/multisync.c
2010-03-17 14:26:32 +01:00
dak180 a0bae4f519 Translations now are fully working on the mac! ☺
Credit to stwf for finding this fix.

fixes ticket: 927

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10315 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:56 +01: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 b05f229416 Add -mno-fused-madd to the mac builds.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@10208 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-09 21:16:04 +01:00
Cyp fabd5716f1 Merge branch 'master' into newnet
Conflicts:
	src/structure.c
2010-03-09 19:51:10 +01:00
dak180 76827a7e78 Add -mfpmath=sse -msse3 to intel 32bit builds
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@10200 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-08 09:45:37 +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 e06967f936 Activating -Werror since it will no longer cause insanity in Zarels
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10129 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-04 19:07:44 +01:00
dak180 80b379fcbf Externalize fetch scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10056 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-04 19:07:36 +01:00
dak180 5bc553c3c0 Add a file listing all disabled translations for the mac (translations are not working yet but might be soon).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9821 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-15 21:00:18 +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