Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,257 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

128 Commits (0de4f38295d2db0e1df9db11c6ccb598f5e84d2f)

Author SHA1 Message Date
dak180 f5a5412a3b Externalize the custom build rule scripts. 2012-03-12 21:46:26 -04:00
dak180 e0aadce3a9 Update the mac doc bundle. 2012-03-12 19:16:29 -04:00
dak180 8027777e9c Update the docs for xcode builds. 
Also get rid of some odd warnings
 2012-02-19 19:52:17 -05:00
dak180 79772c82b5 Update Png to 1.5.9. 2012-02-18 16:58:01 -05:00
dak180 a369971dbf Update Vorbis to 1.3.3. 2012-02-12 08:50:06 -05:00
dak180 c7f3d99d54 Update the docs for xcode builds. 
Also restructure the script so it will require less changes in the future.
 2012-02-04 15:25:40 -05:00
dak180 fb7c7ccdf1 Fix the help bundle. 
The info.plist file is now once again included in the bundle.
 2012-02-01 23:57:39 -05:00
dak180 3c9b149a7b Misc Xcode Fixes 
Xcode (4, at least) parses out the 'error:'s in the log and halts the build. This is probably not what was intended.

* nanotech/topic/xcode4-fixes:
  OS X: Fetching new build dependency versions is not an error.
  Don't assume Xcode's build products are in the source tree.
 2012-02-01 23:03:27 -05:00
dak180 c5d4acf773 Get all of the scripts that are likely to change with any regularity out of the xcode project. 2012-02-01 22:24:24 -05:00
NanoTech f273c9ddf0 OS X: Fetching new build dependency versions is not an error. 2012-02-01 20:51:37 -06:00
NanoTech 1ea990ebd4 Don't assume Xcode's build products are in the source tree. 
Fixes builds in Xcode 4 with the default external
derived data directory.
 2012-02-01 17:04:56 -06:00
dak180 4b79c19156 Update Qt to 4.7.4 and SDL to 1.2.15. 
Also do some house cleaning.

Changelog: This drops support for PPC and adds support for 64 bit intel on 10.6+.
 2012-01-21 12:10:42 -05:00
dak180 0a4e841b1a Only require moc if we are going to use it for anything. 
Currently moc is only used if the Qt backend is in use.
 2012-01-10 10:34:30 -05:00
dak180 6855e2a51d Use the included QuesoGLC. 
Adds Fribidi as an independent framework.
Also clean up some file references in the xcode project.

Refs #2828.
 2012-01-08 20:34:11 -05:00
vexed ac550acd58 Revert the new bsonlobby. 
Closes #3040.

Revert "Remove bson from project files."

This reverts commit 5c24f7b716.

Conflicts:

	lib/netplay/netlobby.h
	lib/netplay/netplay.vcxproj.filters
	src/Warzone2100.vcxproj

Revert "Merge branch 'refs/heads/topic/QJson'"

This reverts commit 6dd85baedf, reversing
changes made to 7d349eb214.

Conflicts:

	Makefile.am
	lib/netplay/netlobby.cpp
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Makefile.am
Revert "Fix various build issues for both 'qtgame' and the bson /new lobby stuff"

This reverts commit f76e960f7d.

Conflicts:

	lib/framework/framework.vcxproj
	lib/gamelib/gamelib.vcxproj
	lib/gamelib/gtime.cpp
	lib/netplay/netplay.vcxproj
	lib/netplay/netplay.vcxproj.filters
	src/Warzone2100.vcxproj
	win32/Warzone2100.sln

Revert "Fix SSL errors on the Macs."

This reverts commit 4c387a199b.

Revert "Merge branch 'bsonlobby' into master"

This reverts commit 793c30a862, reversing
changes made to 5fa33b7209.

Conflicts:

	data/makefile.win32
	lib/netplay/netlobby.cpp
	lib/netplay/netlobby.h
	lib/netplay/netplay.cpp
	lib/widget/label.cpp
	macosx/Warzone.xcodeproj/project.pbxproj
	po/POTFILES.in
	src/configuration.cpp
	src/frontend.h
	src/multiint.cpp
 2012-01-08 23:10:26 +01:00
dak180 8fcdd1babe Activate SDL for the xcode builds. 2011-12-30 17:52:25 -05:00
Per Inge Mathisen 700bb7a56e Merge branch 'master' into qt-sdl 
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
 2011-12-17 16:02:26 +01:00
dak180 6c8e465bc5 Move the map tools builds out of the main xcode project. 2011-12-16 15:35:02 -05:00
dak180 1e03b2760f Exclude .svg files from the final build since they are currently unused. 
Also fix up some build rules.

Refs #2986.
 2011-12-16 15:32:08 -05:00
dak180 8e1c6578a1 Simplify SDL includes (especially for the mac build). 2011-12-15 13:17:43 -05:00
dak180 7965939cc7 More updates to bring the xcode project inline with previous changes. 
Also some #if and #include clarity.
 2011-12-13 18:24:40 -05:00
dak180 f6d963963c Adjust the xcode build to moves and additional files. 
Some additional changes to set up support SDL for mac builds.
 2011-12-12 09:40:49 -05:00
dak180 758821c35d Use the md5 for the standard vids. 2011-10-24 07:32:51 -04:00
dak180 78a4482764 Fix a few errors in the dmg script. 2011-10-23 19:39:02 -04:00
dak180 7426d0c2bf Adapt to the new video urls. 
Also do some general cleanup of the script.
 2011-10-23 00:46:14 -04:00
dak180 070b09d412 Activated Romanian translations for mac builds now that they are being updated. 2011-10-02 15:31:20 -03:00
dak180 790a205f5b Add the backup url to the prebuilt script. 2011-09-22 11:35:27 -04: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 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 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 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 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 84a64f1418 Externalize the dmg script. 2011-06-06 01:30:19 -04:00
dak180 f7e2cbe5bd Use Clang for the frameworks. 2011-06-03 14:08:54 -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 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 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 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 f2f727d0db Make MiniUPnPc an external framework. 2011-04-23 19:27:54 -04:00