Commit Graph

396 Commits (554bf6b380bd7668eb6014167ab6a94fa15bd7e9)

Author SHA1 Message Date
dak180 06872ce2c9 Update Png to 1.5.5. 2011-09-22 12:08:07 -04:00
dak180 790a205f5b Add the backup url to the prebuilt script. 2011-09-22 11:35:27 -04:00
dak180 af83dc1098 Merge branch 'dak180/topic/TypeConfig'
Mac builds no longer require X11 to be installed to run.

* topic/TypeConfig:
  Try to ensure linking to the correct versions of FontConfig and Freetype.
  Use AT&T's binaries of fontconfig and freetype for QuesoGLC.
2011-09-18 14:59:26 -04:00
dak180 381250690b Try to ensure linking to the correct versions of FontConfig and Freetype.
The linker on the mac prefers dynamic libs over static, so if any are in the path it will use them instead.
2011-09-18 14:49:48 -04:00
dak180 9b4b81c797 Knock out 20 warnings cased by system frameworks in the mac build. 2011-09-15 12:27:43 -04:00
NanoTech a9925074c7 Move cocoaAppendAvailableScreenResolutions to lib/qtgame. 2011-09-14 17:09:48 -06:00
dak180 d890e63f46 Use AT&T's binaries of fontconfig and freetype for QuesoGLC.
This eliminates the dependency on X11 for the mac builds.
2011-09-12 01:42:15 -04:00
dak180 347e1da397 Update GLEW to 1.7.0. 2011-08-27 02:40:51 -04:00
dak180 53a23b0464 Switch vorbis to the default compiler. 2011-08-17 09:48:47 -04:00
dak180 2361edcb93 Patch vorbis to work with LLVM. 2011-08-17 09:37:38 -04:00
dak180 2d16f7848b Update Ogg to 1.3.0. 2011-08-06 12:16:12 -04:00
dak180 a899f46775 Add the map tools to the xcode project. 2011-07-30 00:39:56 -04:00
dak180 9357171481 Bring back QuesoGLC for the mac builds.
X11 (Apple's official version for 10.6) is not required to be installed to run the game.

Refs #2824.
2011-07-17 14:10:27 -04:00
dak180 ca66dafa35 Fix the mac builds. 2011-07-14 23:09:31 -04:00
safety0ff c394a15fda Add swap interval control to QtGame. There's no longer any need to restart to change vsync settings.
Refs #2815.
2011-07-13 21:00:31 +00:00
dak180 6dd85baedf Merge branch 'refs/heads/topic/QJson' 2011-07-11 21:49:31 -04:00
dak180 70526ea8a9 Fix the QJson url. 2011-07-11 15:41:49 -04:00
dak180 3ddd7a279f Remove the frame rate limiter from the mac builds. 2011-07-11 15:08:59 -04:00
dak180 8c73647378 Replace BSON with QJson for the mac builds. 2011-07-11 12:15:49 -04:00
dak180 16ac69b065 Make Bson a framework to separate out different licences. 2011-07-09 00:50:53 -04:00
dak180 12676f77a8 Rename the .moc files so they do not clobber other things. 2011-07-08 21:00:15 -04:00
dak180 e0f8fc3685 Update Png to 1.5.4. 2011-07-08 12:30:07 -04:00
dak180 7b26683f1a Use the newer OpenAL framework. 2011-07-04 18:29:49 -04:00
dak180 b6a2c1cb63 Adjust to the bson code moving. 2011-07-04 18:24:46 -04:00
dak180 9273fc5f49 Merge branch 'master' into topic/bson
Now with a proper merge of the xcode project.

Conflicts:
	configure.ac
	lib/netplay/Makefile.am
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Makefile.am
2011-07-03 00:31:01 -04:00
dak180 1ef935e646 Get the qtgame project working in the mac build. 2011-07-01 19:50:49 -04:00
dak180 f8a91a28f5 Add geometry.(cpp|h) to the xcode project. 2011-06-13 18:28:38 -04:00
dak180 84a64f1418 Externalize the dmg script. 2011-06-06 01:30:19 -04:00
dak180 0983b47ecf Add a path for fink qt. 2011-06-05 19:03:56 -04:00
dak180 f7e2cbe5bd Use Clang for the frameworks. 2011-06-03 14:08:54 -04:00
dak180 07519d308d Refine the autorevision.h update process. 2011-05-25 17:03:07 -04:00
dak180 896dd48a64 Do not update autorevision.h unless we have to. 2011-05-25 15:55:56 -04: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 888720d38e Move miniupnpc into 3rdparty and set up the xcode project. 2011-05-21 19:44:55 -04:00
dak180 98502b64c3 Make sure the build bot truthfully reports warnings. 2011-05-18 17:03:18 -04:00
dak180 980921eaf6 Clean up the xcconfig files. 2011-05-18 16:59:07 -04:00
dak180 9615263799 Update glew to 1.6.0. 2011-05-17 13:09:03 -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 6f947941fe Make sure we grab the right configuration to make the dmgs. 2011-05-15 13:22:34 -04:00
dak180 d9c53fbfd2 Fix StaticAnalyzer builds. 2011-05-15 12:17:29 -04:00
dak180 6f52118902 Move source downloading to take advantage of change detection. 2011-05-08 18:00:40 -04:00
dak180 fb4cf44424 A better way to tell if we have the right lib version. 2011-05-08 17:53:01 -04:00
dak180 4e4ac2e3d8 Use QtNetwork in the mac builds. 2011-05-01 00:43:22 -04:00
dak180 2ace96fd0b Add the bson stuff to the xcode project. 2011-05-01 05:11:41 +02:00
dak180 b459e91a57 Update the excluded translations. 2011-04-28 18:52:00 -04:00
dak180 1b684c1d15 Fix stuff that got lost in the merge. 2011-04-25 18:23:44 -04:00
dak180 b4ad9f00b5 Add the missing MiniUPnPc files. 2011-04-25 11:03:30 -04:00
Per Inge Mathisen 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
dak180 4e0523e939 Change the link order so the right png is used. 2011-04-23 21:10:22 -04:00
dak180 3a6b4c5e16 Remove QuesoGLC from the xcode project. 2011-04-23 19:34:21 -04:00