Commit Graph

78 Commits (29d7c7abfde33f77e206ff74cf81bef8d606d4bc)

Author SHA1 Message Date
Freddie Witherden 89f631a6b2 Add timer.[ch] to the Xcode project. This allows Warzone to build on OS X again.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6128 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-11 10:22:28 +00:00
Ari Johnson 9ba4510a7c Automatically copy Theora framework into .app bundle
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6100 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-01 02:37:02 +00:00
Freddie Witherden 4a16da1eba Fix Theora.framework linker errors under OS X.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6097 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-29 18:41:37 +00:00
Freddie Witherden a36f4d4570 Make sure we copy Theora.framework into the Warzone.app bundle.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6096 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-29 17:51:57 +00:00
Freddie Witherden 7be01a4456 Make sure to export the Theora headers in the Xcode project.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6095 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-28 19:04:35 +00:00
Freddie Witherden f71e63860f Make sure the Theora-Info.plist file for the Xcode project uses relative as opposed to absolute paths.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6076 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-26 12:41:27 +00:00
Freddie Witherden 25def7520f Clean up the Xcode project somewhat. This may or may not fix the issues reported on the forums regarding Theora.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6075 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-26 10:14:57 +00:00
Freddie Witherden f920eb7348 Add Theora support to the Xcode project. (Compiles but *untested* with the FMV patch.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6073 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-25 20:06:15 +00:00
Freddie Witherden 7af67f65e0 Update the Xcode project so that trunk builds. (Broken as a result of the PhysFS VFS files being moved.) Textures are still corrupt.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6036 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-17 19:09:27 +00:00
Tim Baumgartner 8fe5abb6c1 -Reverted trunk Xcode project file to pre-r5912 as changes to 2.1 branch were ac
cidentally committed to trunk


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5913 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-31 22:33:52 +00:00
Tim Baumgartner c661f58660 -Removed references to non-existant files in the 2.1 branch Xcode project file
-Ported macosx/external/bison.sh from trunk to 2.1 branch for use with the updated Xcode project file


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5912 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-31 22:20:27 +00:00
Giel van Schijndel f0f68e7386 Rename utf8.[ch] to utf.[ch] because it deals with different UTFs (Unicode Transformation Format) but not just specifically with UTF-8
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5910 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-31 20:06:40 +00:00
Giel van Schijndel d45e64bf55 Reintroduce utf8.{c,h} for encoding and decoding UTF-8 strings
This is meant to be used with betawidget

This is a revert of r2477 (which removed the UTF-8 module)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5895 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-30 12:34:46 +00:00
Tim Baumgartner 56c578e28f -During the OS X build process, if a local build of Bison is built, it is now installed properly within the Bison source directory so that Bison's supporting files should always be found
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5887 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-29 04:42:18 +00:00
Tim Baumgartner 32b43be24f -Changed OS X downloaded version of QuesoGLC from tags/v0_7_1/quesoglc/ (r762) to branches/release-0.7/quesoglc/ (r835) to utilize QuesoGLC bug fixes (specifically the inline function linking error fix)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5886 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-29 02:38:57 +00:00
Tim Baumgartner 5cbce8754a Changes to the OS X build system
-Xcode project now only downloads and build Bison if the system version is not a compatible version of Bison (and if the Bison binary in macosx/external/bison/ does not exist)
-Added a Bison wrapper that calls the version of Bison in macosx/external/bison/ if it exists, otherwise the system Bison executable is used



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5885 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-29 02:10:29 +00:00
Tim Baumgartner c6ddf919c1 This commit fixes OS X build errors.
-Fixed Xcode project Release configuration framework and library search paths to point to their respective Release directories (rather than to the Debug directories)
-Added baseobject.h and baseobject.c to the Xcode project file
-Added preprocessor conditional to multiint.c so that the proper GLC header is included on OS X systems


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5878 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-27 07:25:48 +00:00
Ari Johnson 680cbae43c Committed patch from mailing list message <4894F4FB.3050205@gmail.com>
due to Tim Baumgartner.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5877 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-26 15:27:40 +00:00
Giel van Schijndel 22e9053a8c Update the Xcode project for r5695
Patch by Tim Baumgartner

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5704 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-29 10:34:23 +00:00
Giel van Schijndel 45539212bf Change the download location of the Popt sources to http://rpm5.org/files/popt/popt-1.10.4.tar.gz
Patch by Tim Baumgartner <baum> (file #4615 attached to bug #11940)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5673 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-26 18:30:55 +00:00
Giel van Schijndel bef2d4cd6a Update Xcode project for the addition of src/positiondef.h in r5531 and the removal of lib/framework/treapint.h in r5544
Patch by Tim Baumgartner

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5556 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-14 23:43:55 +00:00
Freddie Witherden 5fe6816fdd Fix building on OS X (some bozo forgot to update the Xcode project when adding new .c files). Update the font on OS X to Lucida Grande. Correct Framework install path to allow for moving executables.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5221 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-06 17:42:21 +00:00
Dennis Schridde 85ab4e02e9 Move base files from data/ into data/base/ (and stuff from warzone.wz to base.wz respecitively).
Should not create any problems, buildsystems were changed (MacOSX, please test).
Reason: Organisation, later: simplification.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5156 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 21:42:44 +00:00
Dennis Schridde 0803dc1ca9 Download quesoglc/tags/v0.7.1 for Mac, instead of a nonexistant path.
Reported an fixed by Verminus on the forums: http://forums.wz2100.net/?topic=1747.msg16528#msg16528


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5133 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-17 18:24:42 +00:00
Giel van Schijndel bfb035d41a Merge r4804 from the 2.1 branch into trunk (except for the removal of the SQLite stuff from the XCode projectfile)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4849 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 21:41:12 +00:00
Ari Johnson c7257cab47 Updated Xcode project file
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4524 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-06 03:09:17 +00:00
Ari Johnson b91006e4f1 Updated Xcode project
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4419 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 20:01:50 +00:00
Ari Johnson a67a6660f1 Updated Xcode project to include SQLite
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3899 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-02 23:23:33 +00:00
Ari Johnson adfeb3ab98 Updated Mac OS X port to use QuesoGLC 0.7.0 with a work-around for a
text display bug


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3732 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 21:55:02 +00:00
Ari Johnson 846fb926dd Update to Xcode project
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3616 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-01 02:38:02 +00:00
Ari Johnson 715286a3b4 Xcode project update for deleted source file
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3526 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-20 23:49:28 +00:00
Ari Johnson 0cb44b75ca Update Xcode project to pack up tagdefinitions/ instead of testdata/
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3351 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 00:22:58 +00:00
Ari Johnson d84aaa6701 Updates to Xcode project
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3330 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 00:02:10 +00:00
Ari Johnson f0b7dbde34 Updates to Xcode project to build warzone.wz and mp.wz for non-Debug builds
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3255 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-30 20:26:11 +00:00
Ari Johnson f87652c5e6 Updated Xcode project to build PhysFS framework with ZIP, etc. support
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3254 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-30 19:57:08 +00:00
Ari Johnson b7230cb273 Updated trunk Xcode project to use libvorbis-1.2.0
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3208 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 00:08:44 +00:00
Ari Johnson 47816967a7 Updated Xcode project and some endian fixes; also changed endian_*() calls
to expand to ((void) (x)) on little-endian systems, so that the compiler
will catch little-endian developers who forget to update the endian_*()
calls when they change the names of structure fields.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3205 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 23:55:34 +00:00
Ari Johnson f703418e6c Linking fix to allow Warzone to run (installation directory for Popt framework
was not set).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3080 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 18:13:49 +00:00
Ari Johnson ab26b78691 Warzone trunk now builds under Xcode again. This includes an Autorevision
target and changing pos.x, pos.y, and pos.z entries in the endianizing
routines to just x, y, and z to match the updated OBJECT_SAVE_V19 format.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3079 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 17:58:34 +00:00
Freddie Witherden d24cf2c233 Update the OS X project
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3072 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-16 12:05:13 +00:00
Ari Johnson 6cc628f38b Tiny change to Xcode project
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3069 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 23:42:29 +00:00
Ari Johnson 0a9bcf08a3 Xcode project can almost build trunk again. This commit allows the project
to download and build the external libraries that Warzone has added since
the last time that trunk would build under Xcode.  The actual game currently
will not build due to other issues, but this is phase 1.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3068 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-15 23:34:51 +00:00
Giel van Schijndel 470ea85417 * Remove lib/framework/utf8.c[ch] as we don't need it just right now (we can always revert this commit later on if necessary)
* This commit removes utf8.[ch] from all build systems (manual text-editing for the most of them)
 * For the removal from the XCode project I just reverted r2288

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2477 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 19:46:10 +00:00
Ari Johnson 44dd9e4dc9 Added lib/framework/utf8.[ch] to Xcode project
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2288 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-30 16:44:03 +00:00
Ari Johnson 993ae8e46f Added nettypes.[ch] to Xcode project file
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2252 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 14:40:17 +00:00
Ari Johnson d39a3ee15f Updated Xcode project file to reflect recent file renamings
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2065 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-12 20:06:58 +00:00
Ari Johnson 39b863d72d Updated Xcode project file to reflect removal of bullet.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2062 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-12 19:52:35 +00:00
Ari Johnson dad009776a Update to Xcode project file to include dec130.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2046 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-09 05:38:44 +00:00
Ari Johnson ddd8464d0d Updated Xcode project file to reflect removed netcrypt.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1959 4a71c877-e1ca-e34f-864e-861f7616d084
2007-06-24 19:46:28 +00:00
Ari Johnson ca8c8910c2 Updated libpng download location
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1944 4a71c877-e1ca-e34f-864e-861f7616d084
2007-06-23 18:51:53 +00:00