From 98e54608796785be979158050d5d81540f480b05 Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Wed, 23 Sep 2009 15:17:59 -0700 Subject: Xcode project fixes backported from 'master' branch Signed-off-by: Steven Noonan --- crawl-ref/source/AppHdr.h | 4 + crawl-ref/source/Crawl.xcodeproj/project.pbxproj | 732 ++++++++++++++++++++--- 2 files changed, 652 insertions(+), 84 deletions(-) diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index 840480b808..bf4c551106 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -308,9 +308,11 @@ #ifdef USE_TILE +#ifdef __cplusplus #include "libgui.h" #include "tilesdl.h" #endif +#endif // ========================================================================= // Lua user scripts (NOTE: this may also be enabled in your makefile!) @@ -464,6 +466,7 @@ // #define NEED_SNPRINTF // Must include libutil.h here if one of the above is defined. +#ifdef __cplusplus #include "libutil.h" template < class T > @@ -474,5 +477,6 @@ inline void UNUSED(const volatile T &) // And now headers we want precompiled #include #include "version.h" +#endif #endif diff --git a/crawl-ref/source/Crawl.xcodeproj/project.pbxproj b/crawl-ref/source/Crawl.xcodeproj/project.pbxproj index 23049126a1..709c5298fe 100644 --- a/crawl-ref/source/Crawl.xcodeproj/project.pbxproj +++ b/crawl-ref/source/Crawl.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 44; objects = { /* Begin PBXBuildFile section */ @@ -97,8 +97,6 @@ 7B237E8C0A8EC9D000580F30 /* describe.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7B237E050A8EC9D000580F30 /* describe.h */; }; 7B237E8D0A8EC9D000580F30 /* spl-util.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7B237E060A8EC9D000580F30 /* spl-util.h */; }; 7B237E8E0A8EC9D000580F30 /* spl-util.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E070A8EC9D000580F30 /* spl-util.cc */; }; - 7B237E8F0A8EC9D000580F30 /* randart.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7B237E080A8EC9D000580F30 /* randart.h */; }; - 7B237E900A8EC9D000580F30 /* randart.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E090A8EC9D000580F30 /* randart.cc */; }; 7B237E910A8EC9D000580F30 /* player.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7B237E0A0A8EC9D000580F30 /* player.h */; }; 7B237E920A8EC9D000580F30 /* player.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E0B0A8EC9D000580F30 /* player.cc */; }; 7B237E930A8EC9D000580F30 /* effects.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7B237E0C0A8EC9D000580F30 /* effects.h */; }; @@ -240,11 +238,135 @@ 7BF855710C9C919100B7C520 /* luadgn.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7BF8556F0C9C919100B7C520 /* luadgn.h */; }; 93B134650F25595F007DB230 /* version.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93B134610F255926007DB230 /* version.cc */; }; 93B134C30F256113007DB230 /* arena.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93B134C20F256113007DB230 /* arena.cc */; }; + B0274AC4106AD979004F7B39 /* randart.cc in Sources */ = {isa = PBXBuildFile; fileRef = B0274AC2106AD957004F7B39 /* randart.cc */; }; + B0274AC5106AD979004F7B39 /* randart.h in Sources */ = {isa = PBXBuildFile; fileRef = B0274AC3106AD957004F7B39 /* randart.h */; }; + B0274AC8106AD989004F7B39 /* randart.cc in Sources */ = {isa = PBXBuildFile; fileRef = B0274AC2106AD957004F7B39 /* randart.cc */; }; + B0274AC9106AD989004F7B39 /* randart.h in Sources */ = {isa = PBXBuildFile; fileRef = B0274AC3106AD957004F7B39 /* randart.h */; }; + B02C574510670C63006AC96D /* libgui.cc in Sources */ = {isa = PBXBuildFile; fileRef = B02C574310670C63006AC96D /* libgui.cc */; }; + B02C576110670ED2006AC96D /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = B02C576010670ED2006AC96D /* SDLMain.m */; }; + B02C57911067129A006AC96D /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B02C57901067129A006AC96D /* AppKit.framework */; }; + B090C2F210671F8900AE855D /* dngn.png in Copy Dungeon Tiles */ = {isa = PBXBuildFile; fileRef = B090C2EE10671F8900AE855D /* dngn.png */; }; + B090C2F410671F8900AE855D /* main.png in Copy Dungeon Tiles */ = {isa = PBXBuildFile; fileRef = B090C2F010671F8900AE855D /* main.png */; }; + B090C2F510671F8900AE855D /* player.png in Copy Dungeon Tiles */ = {isa = PBXBuildFile; fileRef = B090C2F110671F8900AE855D /* player.png */; }; + B0B5DF211066ED0E0020B21F /* libpng.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF201066ED0E0020B21F /* libpng.framework */; }; + B0B5DF231066ED0E0020B21F /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF221066ED0E0020B21F /* SDL_image.framework */; }; + B0B5DF251066ED0E0020B21F /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF241066ED0E0020B21F /* SDL.framework */; }; + B0B5DF6A1066EE1A0020B21F /* libpng.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF201066ED0E0020B21F /* libpng.framework */; }; + B0B5DF6B1066EE1A0020B21F /* SDL_image.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF221066ED0E0020B21F /* SDL_image.framework */; }; + B0B5DF6C1066EE1A0020B21F /* SDL.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF241066ED0E0020B21F /* SDL.framework */; }; + B0B5DFCD1066F9B30020B21F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DFC91066F9A80020B21F /* OpenGL.framework */; }; + B0B5DFE21066FA2F0020B21F /* tiledef-dngn.cc in Sources */ = {isa = PBXBuildFile; fileRef = B0B5DFD31066FA240020B21F /* tiledef-dngn.cc */; }; + B0B5DFE41066FA2F0020B21F /* tiledef-main.cc in Sources */ = {isa = PBXBuildFile; fileRef = B0B5DFD71066FA240020B21F /* tiledef-main.cc */; }; + B0B5DFE51066FA2F0020B21F /* tiledef-player.cc in Sources */ = {isa = PBXBuildFile; fileRef = B0B5DFD91066FA240020B21F /* tiledef-player.cc */; }; + B0B5E17F106706EE0020B21F /* Freetype2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5E17B106706E40020B21F /* Freetype2.framework */; }; + B0B5E1DC106706FD0020B21F /* Freetype2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5E17B106706E40020B21F /* Freetype2.framework */; }; + D2660D460FF0864B00986331 /* levcomp.ypp in Sources */ = {isa = PBXBuildFile; fileRef = 7B352ED20B001B9E00CABB32 /* levcomp.ypp */; }; + D2660D470FF0864B00986331 /* levcomp.lpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B352ED10B001B9E00CABB32 /* levcomp.lpp */; }; + D2660D480FF0864B00986331 /* maps.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237DE60A8EC9D000580F30 /* maps.cc */; }; + D2660D490FF0864B00986331 /* arena.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93B134C20F256113007DB230 /* arena.cc */; }; + D2660D4A0FF0864B00986331 /* mon-pick.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237DE80A8EC9D000580F30 /* mon-pick.cc */; }; + D2660D4B0FF0864B00986331 /* overmap.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237DEE0A8EC9D000580F30 /* overmap.cc */; }; + D2660D4C0FF0864B00986331 /* initfile.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237DF10A8EC9D000580F30 /* initfile.cc */; }; + D2660D4D0FF0864B00986331 /* hiscores.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237DF30A8EC9D000580F30 /* hiscores.cc */; }; + D2660D4E0FF0864B00986331 /* travel.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237DF50A8EC9D000580F30 /* travel.cc */; }; + D2660D4F0FF0864B00986331 /* lev-pand.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237DF70A8EC9D000580F30 /* lev-pand.cc */; }; + D2660D500FF0864B00986331 /* newgame.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237DF90A8EC9D000580F30 /* newgame.cc */; }; + D2660D510FF0864B00986331 /* mutation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237DFB0A8EC9D000580F30 /* mutation.cc */; }; + D2660D520FF0864B00986331 /* misc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237DFC0A8EC9D000580F30 /* misc.cc */; }; + D2660D530FF0864B00986331 /* mon-util.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237DFF0A8EC9D000580F30 /* mon-util.cc */; }; + D2660D540FF0864B00986331 /* it_use3.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E010A8EC9D000580F30 /* it_use3.cc */; }; + D2660D550FF0864B00986331 /* itemname.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E030A8EC9D000580F30 /* itemname.cc */; }; + D2660D560FF0864B00986331 /* command.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E040A8EC9D000580F30 /* command.cc */; }; + D2660D570FF0864B00986331 /* spl-util.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E070A8EC9D000580F30 /* spl-util.cc */; }; + D2660D590FF0864B00986331 /* player.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E0B0A8EC9D000580F30 /* player.cc */; }; + D2660D5A0FF0864B00986331 /* abl-show.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E0D0A8EC9D000580F30 /* abl-show.cc */; }; + D2660D5B0FF0864B00986331 /* files.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E0E0A8EC9D000580F30 /* files.cc */; }; + D2660D5C0FF0864B00986331 /* directn.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E0F0A8EC9D000580F30 /* directn.cc */; }; + D2660D5D0FF0864B00986331 /* view.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E140A8EC9D000580F30 /* view.cc */; }; + D2660D5E0FF0864B00986331 /* spl-book.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E150A8EC9D000580F30 /* spl-book.cc */; }; + D2660D5F0FF0864B00986331 /* spells4.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E170A8EC9D000580F30 /* spells4.cc */; }; + D2660D600FF0864B00986331 /* stuff.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E1E0A8EC9D000580F30 /* stuff.cc */; }; + D2660D610FF0864B00986331 /* stash.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E200A8EC9D000580F30 /* stash.cc */; }; + D2660D620FF0864B00986331 /* transfor.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E220A8EC9D000580F30 /* transfor.cc */; }; + D2660D630FF0864B00986331 /* tags.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E240A8EC9D000580F30 /* tags.cc */; }; + D2660D640FF0864B00986331 /* item_use.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E260A8EC9D000580F30 /* item_use.cc */; }; + D2660D650FF0864B00986331 /* acr.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E270A8EC9D000580F30 /* acr.cc */; }; + D2660D660FF0864B00986331 /* abyss.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E280A8EC9D000580F30 /* abyss.cc */; }; + D2660D670FF0864B00986331 /* chardump.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E2A0A8EC9D000580F30 /* chardump.cc */; }; + D2660D680FF0864B00986331 /* beam.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E2C0A8EC9D000580F30 /* beam.cc */; }; + D2660D690FF0864B00986331 /* spl-cast.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E2F0A8EC9D000580F30 /* spl-cast.cc */; }; + D2660D6A0FF0864B00986331 /* output.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E310A8EC9D000580F30 /* output.cc */; }; + D2660D6B0FF0864B00986331 /* ouch.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E330A8EC9D000580F30 /* ouch.cc */; }; + D2660D6C0FF0864B00986331 /* message.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E350A8EC9D000580F30 /* message.cc */; }; + D2660D6D0FF0864B00986331 /* menu.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E370A8EC9D000580F30 /* menu.cc */; }; + D2660D6E0FF0864B00986331 /* macro.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E380A8EC9D000580F30 /* macro.cc */; }; + D2660D6F0FF0864B00986331 /* shopping.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E390A8EC9D000580F30 /* shopping.cc */; }; + D2660D700FF0864B00986331 /* religion.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E3B0A8EC9D000580F30 /* religion.cc */; }; + D2660D710FF0864B00986331 /* spells3.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E3C0A8EC9D000580F30 /* spells3.cc */; }; + D2660D720FF0864B00986331 /* spells2.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E3E0A8EC9D000580F30 /* spells2.cc */; }; + D2660D730FF0864B00986331 /* mstuff2.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E3F0A8EC9D000580F30 /* mstuff2.cc */; }; + D2660D740FF0864B00986331 /* monstuff.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E410A8EC9D000580F30 /* monstuff.cc */; }; + D2660D750FF0864B00986331 /* spells1.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E460A8EC9D000580F30 /* spells1.cc */; }; + D2660D760FF0864B00986331 /* skills2.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E480A8EC9D000580F30 /* skills2.cc */; }; + D2660D770FF0864B00986331 /* decks.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E490A8EC9D000580F30 /* decks.cc */; }; + D2660D780FF0864B00986331 /* describe.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E4A0A8EC9D000580F30 /* describe.cc */; }; + D2660D790FF0864B00986331 /* monspeak.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E4B0A8EC9D000580F30 /* monspeak.cc */; }; + D2660D7A0FF0864B00986331 /* monplace.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E4D0A8EC9D000580F30 /* monplace.cc */; }; + D2660D7B0FF0864B00986331 /* Kills.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E4F0A8EC9D000580F30 /* Kills.cc */; }; + D2660D7C0FF0864B00986331 /* effects.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E520A8EC9D000580F30 /* effects.cc */; }; + D2660D7D0FF0864B00986331 /* fight.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E530A8EC9D000580F30 /* fight.cc */; }; + D2660D7E0FF0864B00986331 /* food.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E540A8EC9D000580F30 /* food.cc */; }; + D2660D7F0FF0864B00986331 /* clua.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E570A8EC9D000580F30 /* clua.cc */; }; + D2660D800FF0864B00986331 /* cloud.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E590A8EC9D000580F30 /* cloud.cc */; }; + D2660D810FF0864B00986331 /* items.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E5A0A8EC9D000580F30 /* items.cc */; }; + D2660D820FF0864B00986331 /* skills.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E5D0A8EC9D000580F30 /* skills.cc */; }; + D2660D830FF0864B00986331 /* it_use2.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E5F0A8EC9D000580F30 /* it_use2.cc */; }; + D2660D840FF0864B00986331 /* invent.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E610A8EC9D000580F30 /* invent.cc */; }; + D2660D850FF0864B00986331 /* libutil.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E620A8EC9D000580F30 /* libutil.cc */; }; + D2660D870FF0864B00986331 /* delay.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E660A8EC9D000580F30 /* delay.cc */; }; + D2660D880FF0864B00986331 /* dungeon.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E670A8EC9D000580F30 /* dungeon.cc */; }; + D2660D890FF0864B00986331 /* debug.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E680A8EC9D000580F30 /* debug.cc */; }; + D2660D8A0FF0864B00986331 /* mt19937ar.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B237E6A0A8EC9D000580F30 /* mt19937ar.cc */; }; + D2660D8B0FF0864B00986331 /* itemprop.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BC222E50ABBB286003A7D9A /* itemprop.cc */; }; + D2660D8C0FF0864B00986331 /* notes.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BD75A330AC214A200B74F6E /* notes.cc */; }; + D2660D8D0FF0864B00986331 /* mapdef.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B352E9D0B00183400CABB32 /* mapdef.cc */; }; + D2660D8E0FF0864B00986331 /* branch.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BA3DBB90B3D90A700B5B3D7 /* branch.cc */; }; + D2660D8F0FF0864B00986331 /* mtransit.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BDEBB280BB4CB0B008DF39F /* mtransit.cc */; }; + D2660D900FF0864B00986331 /* ghost.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BDEBB2A0BB4CB1D008DF39F /* ghost.cc */; }; + D2660D910FF0864B00986331 /* tutorial.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BDEBB2F0BB4CB5C008DF39F /* tutorial.cc */; }; + D2660D920FF0864B00986331 /* format.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BDEBB340BB4CB93008DF39F /* format.cc */; }; + D2660D930FF0864B00986331 /* database.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B973FFB0BE3AA8400AAE35B /* database.cc */; }; + D2660D940FF0864B00986331 /* makeitem.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B9740050BE3AC8000AAE35B /* makeitem.cc */; }; + D2660D950FF0864B00986331 /* xom.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4CEF15890C128CA5002C7D7A /* xom.cc */; }; + D2660D960FF0864B00986331 /* cio.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BF855600C9C912B00B7C520 /* cio.cc */; }; + D2660D970FF0864B00986331 /* mapmark.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BF855650C9C914D00B7C520 /* mapmark.cc */; }; + D2660D980FF0864B00986331 /* dgnevent.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BF855690C9C916800B7C520 /* dgnevent.cc */; }; + D2660D990FF0864B00986331 /* luadgn.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BF8556E0C9C919100B7C520 /* luadgn.cc */; }; + D2660D9A0FF0864B00986331 /* place.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B6164250C9CA8E80054B3D9 /* place.cc */; }; + D2660D9B0FF0864B00986331 /* terrain.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B6164290C9CA8E80054B3D9 /* terrain.cc */; }; + D2660D9C0FF0864B00986331 /* traps.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B61642B0C9CA8E80054B3D9 /* traps.cc */; }; + D2660D9D0FF0864B00986331 /* state.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B54B51A0CA8217900612805 /* state.cc */; }; + D2660D9E0FF0864B00986331 /* store.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BD2221F0CC2D51300B475D8 /* store.cc */; }; + D2660D9F0FF0864B00986331 /* mgrow.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7B4896600CD3A5D2004A5F43 /* mgrow.cc */; }; + D2660DA00FF0864B00986331 /* quiver.cc in Sources */ = {isa = PBXBuildFile; fileRef = 6232EBE00DACA55C004F7E9C /* quiver.cc */; }; + D2660DA10FF0864B00986331 /* version.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93B134610F255926007DB230 /* version.cc */; }; + D2660DA20FF0864B00986331 /* crash-u.cc in Sources */ = {isa = PBXBuildFile; fileRef = D274AC530FE66EEC00C9C1AE /* crash-u.cc */; }; + D2660DA30FF0864B00986331 /* spl-mis.cc in Sources */ = {isa = PBXBuildFile; fileRef = D274AC580FE66EFC00C9C1AE /* spl-mis.cc */; }; + D2660DA50FF0864B00986331 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B0EFD420BD12E9200002671 /* liblua.a */; }; + D2660DA60FF0864B00986331 /* libreadline.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B3B07560BD13A8100F2980E /* libreadline.dylib */; }; + D2660DA70FF0864B00986331 /* libncurses.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B3B075F0BD13AF000F2980E /* libncurses.dylib */; }; + D2660E1E0FF0868B00986331 /* tile2.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2660E070FF0868B00986331 /* tile2.cc */; }; + D2660E1F0FF0868B00986331 /* tilebuf.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2660E080FF0868B00986331 /* tilebuf.cc */; }; + D2660E200FF0868B00986331 /* tilefont.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2660E0A0FF0868B00986331 /* tilefont.cc */; }; + D2660E210FF0868B00986331 /* tilemcache.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2660E0C0FF0868B00986331 /* tilemcache.cc */; }; + D2660E220FF0868B00986331 /* tilepick.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2660E0E0FF0868B00986331 /* tilepick.cc */; }; + D2660E230FF0868B00986331 /* tilereg.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2660E0F0FF0868B00986331 /* tilereg.cc */; }; + D2660E240FF0868B00986331 /* tilesdl.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2660E120FF0868B00986331 /* tilesdl.cc */; }; + D2660E250FF0868B00986331 /* tiletex.cc in Sources */ = {isa = PBXBuildFile; fileRef = D2660E140FF0868B00986331 /* tiletex.cc */; }; D274AC550FE66EEC00C9C1AE /* crash-u.cc in Sources */ = {isa = PBXBuildFile; fileRef = D274AC530FE66EEC00C9C1AE /* crash-u.cc */; }; D274AC5A0FE66EFC00C9C1AE /* spl-mis.cc in Sources */ = {isa = PBXBuildFile; fileRef = D274AC580FE66EFC00C9C1AE /* spl-mis.cc */; }; D2A696BD0DA29D4E00FDDE82 /* Crawl.icns in Resources */ = {isa = PBXBuildFile; fileRef = D2A696BC0DA29D4E00FDDE82 /* Crawl.icns */; }; - D2AE25EF0DA2624E00E15489 /* crawl in Resources */ = {isa = PBXBuildFile; fileRef = D2AE25EE0DA2624E00E15489 /* crawl */; }; - D2AE25F90DA262DD00E15489 /* crawl in CopyFiles */ = {isa = PBXBuildFile; fileRef = D2AE25EE0DA2624E00E15489 /* crawl */; }; + D2AE25F90DA262DD00E15489 /* crawl in Copy Wrapper Script */ = {isa = PBXBuildFile; fileRef = D2AE25EE0DA2624E00E15489 /* crawl */; }; D2F272350DA1C5AD00445FE9 /* dat in Resources */ = {isa = PBXBuildFile; fileRef = D2F271FE0DA1C5AD00445FE9 /* dat */; }; D2F2725B0DA1C61600445FE9 /* docs in Resources */ = {isa = PBXBuildFile; fileRef = D2F2723F0DA1C61600445FE9 /* docs */; }; /* End PBXBuildFile section */ @@ -257,19 +379,26 @@ remoteGlobalIDString = 7B0EFD410BD12E9200002671; remoteInfo = Lua; }; - D2F272360DA1C5BC00445FE9 /* PBXContainerItemProxy */ = { + B02C579D10671327006AC96D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D2660D420FF0864B00986331; + remoteInfo = "Crawl-tiles-cmd"; + }; + D2660D440FF0864B00986331 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; proxyType = 1; remoteGlobalIDString = 7B0EFD410BD12E9200002671; remoteInfo = Lua; }; - D2F272380DA1C5BC00445FE9 /* PBXContainerItemProxy */ = { + D2F272360DA1C5BC00445FE9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; proxyType = 1; - remoteGlobalIDString = 8DD76FA90486AB0100D96B5E; - remoteInfo = "Crawl-cmd"; + remoteGlobalIDString = 7B0EFD410BD12E9200002671; + remoteInfo = Lua; }; /* End PBXContainerItemProxy section */ @@ -298,7 +427,6 @@ 7B237E890A8EC9D000580F30 /* it_use2.h in CopyFiles */, 7B237E8C0A8EC9D000580F30 /* describe.h in CopyFiles */, 7B237E8D0A8EC9D000580F30 /* spl-util.h in CopyFiles */, - 7B237E8F0A8EC9D000580F30 /* randart.h in CopyFiles */, 7B237E910A8EC9D000580F30 /* player.h in CopyFiles */, 7B237E930A8EC9D000580F30 /* effects.h in CopyFiles */, 7B237E970A8EC9D000580F30 /* dungeon.h in CopyFiles */, @@ -368,14 +496,42 @@ ); runOnlyForDeploymentPostprocessing = 1; }; - D2AE25F30DA262B100E15489 /* CopyFiles */ = { + B090C2ED10671F5F00AE855D /* Copy Dungeon Tiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = dat/tiles; + dstSubfolderSpec = 7; + files = ( + B090C2F210671F8900AE855D /* dngn.png in Copy Dungeon Tiles */, + B090C2F410671F8900AE855D /* main.png in Copy Dungeon Tiles */, + B090C2F510671F8900AE855D /* player.png in Copy Dungeon Tiles */, + ); + name = "Copy Dungeon Tiles"; + runOnlyForDeploymentPostprocessing = 0; + }; + B0B5DF681066EDFF0020B21F /* Copy Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + B0B5DF6A1066EE1A0020B21F /* libpng.framework in Copy Frameworks */, + B0B5DF6B1066EE1A0020B21F /* SDL_image.framework in Copy Frameworks */, + B0B5DF6C1066EE1A0020B21F /* SDL.framework in Copy Frameworks */, + B0B5E1DC106706FD0020B21F /* Freetype2.framework in Copy Frameworks */, + ); + name = "Copy Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; + D2AE25F30DA262B100E15489 /* Copy Wrapper Script */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 12; dstPath = ""; dstSubfolderSpec = 6; files = ( - D2AE25F90DA262DD00E15489 /* crawl in CopyFiles */, + D2AE25F90DA262DD00E15489 /* crawl in Copy Wrapper Script */, ); + name = "Copy Wrapper Script"; runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ @@ -473,8 +629,6 @@ 7B237E050A8EC9D000580F30 /* describe.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = describe.h; sourceTree = ""; }; 7B237E060A8EC9D000580F30 /* spl-util.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "spl-util.h"; sourceTree = ""; }; 7B237E070A8EC9D000580F30 /* spl-util.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "spl-util.cc"; sourceTree = ""; }; - 7B237E080A8EC9D000580F30 /* randart.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = randart.h; sourceTree = ""; }; - 7B237E090A8EC9D000580F30 /* randart.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = randart.cc; sourceTree = ""; }; 7B237E0A0A8EC9D000580F30 /* player.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = player.h; sourceTree = ""; }; 7B237E0B0A8EC9D000580F30 /* player.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = player.cc; sourceTree = ""; }; 7B237E0C0A8EC9D000580F30 /* effects.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = effects.h; sourceTree = ""; }; @@ -620,6 +774,57 @@ 8DD76FB20486AB0100D96B5E /* crawl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = crawl; sourceTree = BUILT_PRODUCTS_DIR; }; 93B134610F255926007DB230 /* version.cc */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = version.cc; sourceTree = SOURCE_ROOT; }; 93B134C20F256113007DB230 /* arena.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = arena.cc; sourceTree = ""; }; + B0274AC2106AD957004F7B39 /* randart.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = randart.cc; sourceTree = ""; }; + B0274AC3106AD957004F7B39 /* randart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randart.h; sourceTree = ""; }; + B02C574310670C63006AC96D /* libgui.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = libgui.cc; sourceTree = ""; }; + B02C574410670C63006AC96D /* libgui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libgui.h; sourceTree = ""; }; + B02C575F10670ED2006AC96D /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = ""; }; + B02C576010670ED2006AC96D /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMain.m; sourceTree = ""; }; + B02C57901067129A006AC96D /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; + B090C2EE10671F8900AE855D /* dngn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dngn.png; path = rltiles/dngn.png; sourceTree = ""; }; + B090C2F010671F8900AE855D /* main.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = main.png; path = rltiles/main.png; sourceTree = ""; }; + B090C2F110671F8900AE855D /* player.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = player.png; path = rltiles/player.png; sourceTree = ""; }; + B0B5DF201066ED0E0020B21F /* libpng.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpng.framework; path = /Library/Frameworks/libpng.framework; sourceTree = ""; }; + B0B5DF221066ED0E0020B21F /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = /Library/Frameworks/SDL_image.framework; sourceTree = ""; }; + B0B5DF241066ED0E0020B21F /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = ""; }; + B0B5DFC91066F9A80020B21F /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; + B0B5DFD21066FA240020B21F /* tiledef_defines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tiledef_defines.h; path = rltiles/tiledef_defines.h; sourceTree = ""; }; + B0B5DFD31066FA240020B21F /* tiledef-dngn.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "tiledef-dngn.cc"; path = "rltiles/tiledef-dngn.cc"; sourceTree = ""; }; + B0B5DFD41066FA240020B21F /* tiledef-dngn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "tiledef-dngn.h"; path = "rltiles/tiledef-dngn.h"; sourceTree = ""; }; + B0B5DFD71066FA240020B21F /* tiledef-main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "tiledef-main.cc"; path = "rltiles/tiledef-main.cc"; sourceTree = ""; }; + B0B5DFD81066FA240020B21F /* tiledef-main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "tiledef-main.h"; path = "rltiles/tiledef-main.h"; sourceTree = ""; }; + B0B5DFD91066FA240020B21F /* tiledef-player.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "tiledef-player.cc"; path = "rltiles/tiledef-player.cc"; sourceTree = ""; }; + B0B5DFDA1066FA240020B21F /* tiledef-player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "tiledef-player.h"; path = "rltiles/tiledef-player.h"; sourceTree = ""; }; + B0B5E17B106706E40020B21F /* Freetype2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Freetype2.framework; path = /Library/Frameworks/Freetype2.framework; sourceTree = ""; }; + D25C91860FF0368E00D9E8AD /* main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cc; path = rltiles/tool/main.cc; sourceTree = ""; }; + D25C91870FF0368E00D9E8AD /* tile.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tile.cc; path = rltiles/tool/tile.cc; sourceTree = ""; }; + D25C91880FF0368E00D9E8AD /* tile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tile.h; path = rltiles/tool/tile.h; sourceTree = ""; }; + D25C91890FF0368E00D9E8AD /* tile_colour.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tile_colour.cc; path = rltiles/tool/tile_colour.cc; sourceTree = ""; }; + D25C918A0FF0368E00D9E8AD /* tile_colour.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tile_colour.h; path = rltiles/tool/tile_colour.h; sourceTree = ""; }; + D25C918B0FF0368E00D9E8AD /* tile_convert.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tile_convert.cc; path = rltiles/tool/tile_convert.cc; sourceTree = ""; }; + D25C918C0FF0368E00D9E8AD /* tile_list_processor.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tile_list_processor.cc; path = rltiles/tool/tile_list_processor.cc; sourceTree = ""; }; + D25C918D0FF0368E00D9E8AD /* tile_list_processor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tile_list_processor.h; path = rltiles/tool/tile_list_processor.h; sourceTree = ""; }; + D25C918E0FF0368E00D9E8AD /* tile_page.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tile_page.cc; path = rltiles/tool/tile_page.cc; sourceTree = ""; }; + D25C918F0FF0368E00D9E8AD /* tile_page.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tile_page.h; path = rltiles/tool/tile_page.h; sourceTree = ""; }; + D2660C000FF0749200986331 /* dc-dngn.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "dc-dngn.txt"; path = "rltiles/dc-dngn.txt"; sourceTree = ""; }; + D2660C010FF0749200986331 /* dc-main.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "dc-main.txt"; path = "rltiles/dc-main.txt"; sourceTree = ""; }; + D2660C020FF0749200986331 /* dc-player.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "dc-player.txt"; path = "rltiles/dc-player.txt"; sourceTree = ""; }; + D2660E030FF0864B00986331 /* crawl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = crawl; sourceTree = BUILT_PRODUCTS_DIR; }; + D2660E070FF0868B00986331 /* tile2.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tile2.cc; sourceTree = ""; }; + D2660E080FF0868B00986331 /* tilebuf.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tilebuf.cc; sourceTree = ""; }; + D2660E090FF0868B00986331 /* tilebuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tilebuf.h; sourceTree = ""; }; + D2660E0A0FF0868B00986331 /* tilefont.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tilefont.cc; sourceTree = ""; }; + D2660E0B0FF0868B00986331 /* tilefont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tilefont.h; sourceTree = ""; }; + D2660E0C0FF0868B00986331 /* tilemcache.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tilemcache.cc; sourceTree = ""; }; + D2660E0D0FF0868B00986331 /* tilemcache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tilemcache.h; sourceTree = ""; }; + D2660E0E0FF0868B00986331 /* tilepick.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tilepick.cc; sourceTree = ""; }; + D2660E0F0FF0868B00986331 /* tilereg.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tilereg.cc; sourceTree = ""; }; + D2660E100FF0868B00986331 /* tilereg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tilereg.h; sourceTree = ""; }; + D2660E110FF0868B00986331 /* tiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tiles.h; sourceTree = ""; }; + D2660E120FF0868B00986331 /* tilesdl.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tilesdl.cc; sourceTree = ""; }; + D2660E130FF0868B00986331 /* tilesdl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tilesdl.h; sourceTree = ""; }; + D2660E140FF0868B00986331 /* tiletex.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tiletex.cc; sourceTree = ""; }; + D2660E150FF0868B00986331 /* tiletex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tiletex.h; sourceTree = ""; }; D274AC530FE66EEC00C9C1AE /* crash-u.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "crash-u.cc"; sourceTree = ""; }; D274AC540FE66EEC00C9C1AE /* crash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crash.h; sourceTree = ""; }; D274AC580FE66EFC00C9C1AE /* spl-mis.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "spl-mis.cc"; sourceTree = ""; }; @@ -650,10 +855,19 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D2F271F40DA1C58C00445FE9 /* Frameworks */ = { + D2660DA40FF0864B00986331 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D2660DA50FF0864B00986331 /* liblua.a in Frameworks */, + D2660DA60FF0864B00986331 /* libreadline.dylib in Frameworks */, + D2660DA70FF0864B00986331 /* libncurses.dylib in Frameworks */, + B0B5DF211066ED0E0020B21F /* libpng.framework in Frameworks */, + B0B5DF231066ED0E0020B21F /* SDL_image.framework in Frameworks */, + B0B5DF251066ED0E0020B21F /* SDL.framework in Frameworks */, + B0B5DFCD1066F9B30020B21F /* OpenGL.framework in Frameworks */, + B0B5E17F106706EE0020B21F /* Freetype2.framework in Frameworks */, + B02C57911067129A006AC96D /* AppKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -663,6 +877,7 @@ 08FB7794FE84155DC02AAC07 /* Crawl */ = { isa = PBXGroup; children = ( + D25C91990FF037A000D9E8AD /* Frameworks */, 08FB7795FE84155DC02AAC07 /* Source */, 7B352F1B0B0022C900CABB32 /* Resources */, 7B3B07610BD13B1700F2980E /* Libraries */, @@ -681,6 +896,8 @@ 7B352E950B0017CF00CABB32 /* Levcomp */, 7B0EFD4B0BD12EEA00002671 /* Lua */, 7B352EF30B001FA700CABB32 /* Shared */, + D25C917A0FF035D100D9E8AD /* rltiles */, + D25C91790FF035AF00D9E8AD /* Tiles */, ); name = Source; sourceTree = ""; @@ -691,6 +908,7 @@ 8DD76FB20486AB0100D96B5E /* crawl */, 7B0EFD420BD12E9200002671 /* liblua.a */, D2F271F60DA1C58C00445FE9 /* Crawl.app */, + D2660E030FF0864B00986331 /* crawl */, ); name = Products; sourceTree = ""; @@ -898,8 +1116,8 @@ 7B237E0A0A8EC9D000580F30 /* player.h */, 6232EBE00DACA55C004F7E9C /* quiver.cc */, 6232EBE10DACA55C004F7E9C /* quiver.h */, - 7B237E090A8EC9D000580F30 /* randart.cc */, - 7B237E080A8EC9D000580F30 /* randart.h */, + B0274AC2106AD957004F7B39 /* randart.cc */, + B0274AC3106AD957004F7B39 /* randart.h */, 7B6164270C9CA8E80054B3D9 /* ray.h */, 7B237E3B0A8EC9D000580F30 /* religion.cc */, 7B237E3A0A8EC9D000580F30 /* religion.h */, @@ -966,6 +1184,9 @@ 7B352F1B0B0022C900CABB32 /* Resources */ = { isa = PBXGroup; children = ( + B090C2EE10671F8900AE855D /* dngn.png */, + B090C2F010671F8900AE855D /* main.png */, + B090C2F110671F8900AE855D /* player.png */, D2F2723F0DA1C61600445FE9 /* docs */, D2F271FE0DA1C5AD00445FE9 /* dat */, ); @@ -988,6 +1209,80 @@ name = Documentation; sourceTree = ""; }; + D25C91790FF035AF00D9E8AD /* Tiles */ = { + isa = PBXGroup; + children = ( + B02C575F10670ED2006AC96D /* SDLMain.h */, + B02C576010670ED2006AC96D /* SDLMain.m */, + B02C574310670C63006AC96D /* libgui.cc */, + B02C574410670C63006AC96D /* libgui.h */, + D2660E070FF0868B00986331 /* tile2.cc */, + D2660E080FF0868B00986331 /* tilebuf.cc */, + D2660E090FF0868B00986331 /* tilebuf.h */, + D2660E0A0FF0868B00986331 /* tilefont.cc */, + D2660E0B0FF0868B00986331 /* tilefont.h */, + D2660E0C0FF0868B00986331 /* tilemcache.cc */, + D2660E0D0FF0868B00986331 /* tilemcache.h */, + D2660E0E0FF0868B00986331 /* tilepick.cc */, + D2660E0F0FF0868B00986331 /* tilereg.cc */, + D2660E100FF0868B00986331 /* tilereg.h */, + D2660E110FF0868B00986331 /* tiles.h */, + D2660E120FF0868B00986331 /* tilesdl.cc */, + D2660E130FF0868B00986331 /* tilesdl.h */, + D2660E140FF0868B00986331 /* tiletex.cc */, + D2660E150FF0868B00986331 /* tiletex.h */, + ); + name = Tiles; + sourceTree = ""; + }; + D25C917A0FF035D100D9E8AD /* rltiles */ = { + isa = PBXGroup; + children = ( + B0B5DFD21066FA240020B21F /* tiledef_defines.h */, + B0B5DFD31066FA240020B21F /* tiledef-dngn.cc */, + B0B5DFD41066FA240020B21F /* tiledef-dngn.h */, + B0B5DFD71066FA240020B21F /* tiledef-main.cc */, + B0B5DFD81066FA240020B21F /* tiledef-main.h */, + B0B5DFD91066FA240020B21F /* tiledef-player.cc */, + B0B5DFDA1066FA240020B21F /* tiledef-player.h */, + D2660C000FF0749200986331 /* dc-dngn.txt */, + D2660C010FF0749200986331 /* dc-main.txt */, + D2660C020FF0749200986331 /* dc-player.txt */, + D25C91840FF0366F00D9E8AD /* tool */, + ); + name = rltiles; + sourceTree = ""; + }; + D25C91840FF0366F00D9E8AD /* tool */ = { + isa = PBXGroup; + children = ( + D25C91860FF0368E00D9E8AD /* main.cc */, + D25C91870FF0368E00D9E8AD /* tile.cc */, + D25C91880FF0368E00D9E8AD /* tile.h */, + D25C91890FF0368E00D9E8AD /* tile_colour.cc */, + D25C918A0FF0368E00D9E8AD /* tile_colour.h */, + D25C918B0FF0368E00D9E8AD /* tile_convert.cc */, + D25C918C0FF0368E00D9E8AD /* tile_list_processor.cc */, + D25C918D0FF0368E00D9E8AD /* tile_list_processor.h */, + D25C918E0FF0368E00D9E8AD /* tile_page.cc */, + D25C918F0FF0368E00D9E8AD /* tile_page.h */, + ); + name = tool; + sourceTree = ""; + }; + D25C91990FF037A000D9E8AD /* Frameworks */ = { + isa = PBXGroup; + children = ( + B0B5DF201066ED0E0020B21F /* libpng.framework */, + B0B5DF221066ED0E0020B21F /* SDL_image.framework */, + B0B5DF241066ED0E0020B21F /* SDL.framework */, + B0B5DFC91066F9A80020B21F /* OpenGL.framework */, + B0B5E17B106706E40020B21F /* Freetype2.framework */, + B02C57901067129A006AC96D /* AppKit.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; D2AE25EC0DA2621100E15489 /* Mac */ = { isa = PBXGroup; children = ( @@ -1069,21 +1364,40 @@ productReference = 8DD76FB20486AB0100D96B5E /* crawl */; productType = "com.apple.product-type.tool"; }; + D2660D420FF0864B00986331 /* Crawl-tiles-cmd */ = { + isa = PBXNativeTarget; + buildConfigurationList = D2660DFE0FF0864B00986331 /* Build configuration list for PBXNativeTarget "Crawl-tiles-cmd" */; + buildPhases = ( + B0B5DFAD1066F8500020B21F /* Generate Tiles */, + D2660D450FF0864B00986331 /* Sources */, + D2660DA40FF0864B00986331 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + D2660D430FF0864B00986331 /* PBXTargetDependency */, + ); + name = "Crawl-tiles-cmd"; + productInstallPath = "$(HOME)/bin"; + productName = Crawl; + productReference = D2660E030FF0864B00986331 /* crawl */; + productType = "com.apple.product-type.tool"; + }; D2F271F50DA1C58C00445FE9 /* Crawl */ = { isa = PBXNativeTarget; buildConfigurationList = D2F271FD0DA1C58C00445FE9 /* Build configuration list for PBXNativeTarget "Crawl" */; buildPhases = ( D2F271F20DA1C58C00445FE9 /* Resources */, - D2F271F30DA1C58C00445FE9 /* Sources */, - D2F271F40DA1C58C00445FE9 /* Frameworks */, - D2AE25F10DA2626100E15489 /* ShellScript */, - D2AE25F30DA262B100E15489 /* CopyFiles */, + B090C2DB10671E3200AE855D /* Copy Crawl Executable */, + B090C2ED10671F5F00AE855D /* Copy Dungeon Tiles */, + D2AE25F30DA262B100E15489 /* Copy Wrapper Script */, + B0B5DF681066EDFF0020B21F /* Copy Frameworks */, ); buildRules = ( ); dependencies = ( + B02C579E10671327006AC96D /* PBXTargetDependency */, D2F272370DA1C5BC00445FE9 /* PBXTargetDependency */, - D2F272390DA1C5BC00445FE9 /* PBXTargetDependency */, ); name = Crawl; productName = Crawl; @@ -1096,15 +1410,16 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "Crawl" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* Crawl */; projectDirPath = ""; projectRoot = ""; targets = ( + D2F271F50DA1C58C00445FE9 /* Crawl */, 7B0EFD410BD12E9200002671 /* Lua */, 8DD76FA90486AB0100D96B5E /* Crawl-cmd */, - D2F271F50DA1C58C00445FE9 /* Crawl */, + D2660D420FF0864B00986331 /* Crawl-tiles-cmd */, ); }; /* End PBXProject section */ @@ -1116,7 +1431,6 @@ files = ( D2F272350DA1C5AD00445FE9 /* dat in Resources */, D2F2725B0DA1C61600445FE9 /* docs in Resources */, - D2AE25EF0DA2624E00E15489 /* crawl in Resources */, D2A696BD0DA29D4E00FDDE82 /* Crawl.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1124,18 +1438,33 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - D2AE25F10DA2626100E15489 /* ShellScript */ = { + B090C2DB10671E3200AE855D /* Copy Crawl Executable */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Copy Crawl Executable"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cp \"$BUILT_PRODUCTS_DIR/crawl\" \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/\""; + }; + B0B5DFAD1066F8500020B21F /* Generate Tiles */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); + name = "Generate Tiles"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "echo \"Copying command-line app into application bundle.\"\n\ncp ${BUILT_PRODUCTS_DIR}/crawl ${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\n"; + shellScript = "cd \"$PROJECT_DIR/rltiles\"\nmake -f makefile.mac -j2\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1183,6 +1512,8 @@ files = ( 7BBC4A080B0F783C00F27D45 /* levcomp.ypp in Sources */, 7BBC4A070B0F783C00F27D45 /* levcomp.lpp in Sources */, + B0274AC8106AD989004F7B39 /* randart.cc in Sources */, + B0274AC9106AD989004F7B39 /* randart.h in Sources */, 7B237E6D0A8EC9D000580F30 /* maps.cc in Sources */, 93B134C30F256113007DB230 /* arena.cc in Sources */, 7B237E6F0A8EC9D000580F30 /* mon-pick.cc in Sources */, @@ -1199,7 +1530,6 @@ 7B237E8A0A8EC9D000580F30 /* itemname.cc in Sources */, 7B237E8B0A8EC9D000580F30 /* command.cc in Sources */, 7B237E8E0A8EC9D000580F30 /* spl-util.cc in Sources */, - 7B237E900A8EC9D000580F30 /* randart.cc in Sources */, 7B237E920A8EC9D000580F30 /* player.cc in Sources */, 7B237E940A8EC9D000580F30 /* abl-show.cc in Sources */, 7B237E950A8EC9D000580F30 /* files.cc in Sources */, @@ -1278,10 +1608,117 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D2F271F30DA1C58C00445FE9 /* Sources */ = { + D2660D450FF0864B00986331 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + D2660D460FF0864B00986331 /* levcomp.ypp in Sources */, + D2660D470FF0864B00986331 /* levcomp.lpp in Sources */, + B02C576110670ED2006AC96D /* SDLMain.m in Sources */, + B0274AC4106AD979004F7B39 /* randart.cc in Sources */, + B0274AC5106AD979004F7B39 /* randart.h in Sources */, + B0B5DFE21066FA2F0020B21F /* tiledef-dngn.cc in Sources */, + B0B5DFE41066FA2F0020B21F /* tiledef-main.cc in Sources */, + B0B5DFE51066FA2F0020B21F /* tiledef-player.cc in Sources */, + B02C574510670C63006AC96D /* libgui.cc in Sources */, + D2660E240FF0868B00986331 /* tilesdl.cc in Sources */, + D2660D480FF0864B00986331 /* maps.cc in Sources */, + D2660D490FF0864B00986331 /* arena.cc in Sources */, + D2660D4A0FF0864B00986331 /* mon-pick.cc in Sources */, + D2660D4B0FF0864B00986331 /* overmap.cc in Sources */, + D2660D4C0FF0864B00986331 /* initfile.cc in Sources */, + D2660D4D0FF0864B00986331 /* hiscores.cc in Sources */, + D2660D4E0FF0864B00986331 /* travel.cc in Sources */, + D2660D4F0FF0864B00986331 /* lev-pand.cc in Sources */, + D2660D500FF0864B00986331 /* newgame.cc in Sources */, + D2660D510FF0864B00986331 /* mutation.cc in Sources */, + D2660D520FF0864B00986331 /* misc.cc in Sources */, + D2660D530FF0864B00986331 /* mon-util.cc in Sources */, + D2660D540FF0864B00986331 /* it_use3.cc in Sources */, + D2660D550FF0864B00986331 /* itemname.cc in Sources */, + D2660D560FF0864B00986331 /* command.cc in Sources */, + D2660D570FF0864B00986331 /* spl-util.cc in Sources */, + D2660D590FF0864B00986331 /* player.cc in Sources */, + D2660D5A0FF0864B00986331 /* abl-show.cc in Sources */, + D2660D5B0FF0864B00986331 /* files.cc in Sources */, + D2660D5C0FF0864B00986331 /* directn.cc in Sources */, + D2660D5D0FF0864B00986331 /* view.cc in Sources */, + D2660D5E0FF0864B00986331 /* spl-book.cc in Sources */, + D2660D5F0FF0864B00986331 /* spells4.cc in Sources */, + D2660D600FF0864B00986331 /* stuff.cc in Sources */, + D2660D610FF0864B00986331 /* stash.cc in Sources */, + D2660D620FF0864B00986331 /* transfor.cc in Sources */, + D2660D630FF0864B00986331 /* tags.cc in Sources */, + D2660D640FF0864B00986331 /* item_use.cc in Sources */, + D2660D650FF0864B00986331 /* acr.cc in Sources */, + D2660D660FF0864B00986331 /* abyss.cc in Sources */, + D2660D670FF0864B00986331 /* chardump.cc in Sources */, + D2660D680FF0864B00986331 /* beam.cc in Sources */, + D2660D690FF0864B00986331 /* spl-cast.cc in Sources */, + D2660D6A0FF0864B00986331 /* output.cc in Sources */, + D2660D6B0FF0864B00986331 /* ouch.cc in Sources */, + D2660D6C0FF0864B00986331 /* message.cc in Sources */, + D2660D6D0FF0864B00986331 /* menu.cc in Sources */, + D2660D6E0FF0864B00986331 /* macro.cc in Sources */, + D2660D6F0FF0864B00986331 /* shopping.cc in Sources */, + D2660D700FF0864B00986331 /* religion.cc in Sources */, + D2660D710FF0864B00986331 /* spells3.cc in Sources */, + D2660D720FF0864B00986331 /* spells2.cc in Sources */, + D2660D730FF0864B00986331 /* mstuff2.cc in Sources */, + D2660D740FF0864B00986331 /* monstuff.cc in Sources */, + D2660D750FF0864B00986331 /* spells1.cc in Sources */, + D2660D760FF0864B00986331 /* skills2.cc in Sources */, + D2660D770FF0864B00986331 /* decks.cc in Sources */, + D2660D780FF0864B00986331 /* describe.cc in Sources */, + D2660D790FF0864B00986331 /* monspeak.cc in Sources */, + D2660D7A0FF0864B00986331 /* monplace.cc in Sources */, + D2660D7B0FF0864B00986331 /* Kills.cc in Sources */, + D2660D7C0FF0864B00986331 /* effects.cc in Sources */, + D2660D7D0FF0864B00986331 /* fight.cc in Sources */, + D2660D7E0FF0864B00986331 /* food.cc in Sources */, + D2660D7F0FF0864B00986331 /* clua.cc in Sources */, + D2660D800FF0864B00986331 /* cloud.cc in Sources */, + D2660D810FF0864B00986331 /* items.cc in Sources */, + D2660D820FF0864B00986331 /* skills.cc in Sources */, + D2660D830FF0864B00986331 /* it_use2.cc in Sources */, + D2660D840FF0864B00986331 /* invent.cc in Sources */, + D2660D850FF0864B00986331 /* libutil.cc in Sources */, + D2660D870FF0864B00986331 /* delay.cc in Sources */, + D2660D880FF0864B00986331 /* dungeon.cc in Sources */, + D2660D890FF0864B00986331 /* debug.cc in Sources */, + D2660D8A0FF0864B00986331 /* mt19937ar.cc in Sources */, + D2660D8B0FF0864B00986331 /* itemprop.cc in Sources */, + D2660D8C0FF0864B00986331 /* notes.cc in Sources */, + D2660D8D0FF0864B00986331 /* mapdef.cc in Sources */, + D2660D8E0FF0864B00986331 /* branch.cc in Sources */, + D2660D8F0FF0864B00986331 /* mtransit.cc in Sources */, + D2660D900FF0864B00986331 /* ghost.cc in Sources */, + D2660D910FF0864B00986331 /* tutorial.cc in Sources */, + D2660D920FF0864B00986331 /* format.cc in Sources */, + D2660D930FF0864B00986331 /* database.cc in Sources */, + D2660D940FF0864B00986331 /* makeitem.cc in Sources */, + D2660D950FF0864B00986331 /* xom.cc in Sources */, + D2660D960FF0864B00986331 /* cio.cc in Sources */, + D2660D970FF0864B00986331 /* mapmark.cc in Sources */, + D2660D980FF0864B00986331 /* dgnevent.cc in Sources */, + D2660D990FF0864B00986331 /* luadgn.cc in Sources */, + D2660D9A0FF0864B00986331 /* place.cc in Sources */, + D2660D9B0FF0864B00986331 /* terrain.cc in Sources */, + D2660D9C0FF0864B00986331 /* traps.cc in Sources */, + D2660D9D0FF0864B00986331 /* state.cc in Sources */, + D2660D9E0FF0864B00986331 /* store.cc in Sources */, + D2660D9F0FF0864B00986331 /* mgrow.cc in Sources */, + D2660DA00FF0864B00986331 /* quiver.cc in Sources */, + D2660DA10FF0864B00986331 /* version.cc in Sources */, + D2660DA20FF0864B00986331 /* crash-u.cc in Sources */, + D2660DA30FF0864B00986331 /* spl-mis.cc in Sources */, + D2660E1E0FF0868B00986331 /* tile2.cc in Sources */, + D2660E1F0FF0868B00986331 /* tilebuf.cc in Sources */, + D2660E200FF0868B00986331 /* tilefont.cc in Sources */, + D2660E210FF0868B00986331 /* tilemcache.cc in Sources */, + D2660E220FF0868B00986331 /* tilepick.cc in Sources */, + D2660E230FF0868B00986331 /* tilereg.cc in Sources */, + D2660E250FF0868B00986331 /* tiletex.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1293,15 +1730,20 @@ target = 7B0EFD410BD12E9200002671 /* Lua */; targetProxy = 7B0EFD440BD12E9E00002671 /* PBXContainerItemProxy */; }; - D2F272370DA1C5BC00445FE9 /* PBXTargetDependency */ = { + B02C579E10671327006AC96D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D2660D420FF0864B00986331 /* Crawl-tiles-cmd */; + targetProxy = B02C579D10671327006AC96D /* PBXContainerItemProxy */; + }; + D2660D430FF0864B00986331 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 7B0EFD410BD12E9200002671 /* Lua */; - targetProxy = D2F272360DA1C5BC00445FE9 /* PBXContainerItemProxy */; + targetProxy = D2660D440FF0864B00986331 /* PBXContainerItemProxy */; }; - D2F272390DA1C5BC00445FE9 /* PBXTargetDependency */ = { + D2F272370DA1C5BC00445FE9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 8DD76FA90486AB0100D96B5E /* Crawl-cmd */; - targetProxy = D2F272380DA1C5BC00445FE9 /* PBXContainerItemProxy */; + target = 7B0EFD410BD12E9200002671 /* Lua */; + targetProxy = D2F272360DA1C5BC00445FE9 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1314,26 +1756,28 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_OPTIMIZATION_LEVEL = 1; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(PROJECT_DIR)/AppHdr.h"; GCC_PREPROCESSOR_DEFINITIONS = ( OSX, CLUA_BINDINGS, DB_NDBM, ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = 4.0; GCC_WARN_SIGN_COMPARE = NO; GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_LABEL = NO; PRODUCT_NAME = crawl; YACC_GENERATED_FILE_STEM = InputFileStem; - ZERO_LINK = YES; }; name = Development; }; 1DEB928A08733DD80010E9CD /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = OSX; - GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1355,7 +1799,8 @@ MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; + WARNING_CFLAGS = ""; }; name = Development; }; @@ -1367,6 +1812,7 @@ LUA_USE_READLINE, ); GCC_TREAT_WARNINGS_AS_ERRORS = NO; + GCC_VERSION = 4.0; GCC_WARN_PEDANTIC = NO; PRODUCT_NAME = lua; }; @@ -1380,6 +1826,7 @@ LUA_USE_READLINE, ); GCC_TREAT_WARNINGS_AS_ERRORS = NO; + GCC_VERSION = 4.0; GCC_WARN_PEDANTIC = NO; PRODUCT_NAME = lua; }; @@ -1393,6 +1840,7 @@ LUA_USE_READLINE, ); GCC_TREAT_WARNINGS_AS_ERRORS = NO; + GCC_VERSION = 4.0; GCC_WARN_PEDANTIC = NO; PRODUCT_NAME = lua; }; @@ -1406,6 +1854,7 @@ LUA_USE_READLINE, ); GCC_TREAT_WARNINGS_AS_ERRORS = NO; + GCC_VERSION = 4.0; GCC_WARN_PEDANTIC = NO; PRODUCT_NAME = lua; }; @@ -1418,6 +1867,8 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(PROJECT_DIR)/AppHdr.h"; GCC_PREPROCESSOR_DEFINITIONS = ( OSX, CLUA_BINDINGS, @@ -1428,19 +1879,20 @@ FULLDEBUG, ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = 4.0; GCC_WARN_SIGN_COMPARE = NO; GCC_WARN_UNINITIALIZED_AUTOS = NO; GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_LABEL = NO; PRODUCT_NAME = crawl; YACC_GENERATED_FILE_STEM = InputFileStem; - ZERO_LINK = NO; }; name = Debug; }; 7B97C0200A8ECFD700CE8936 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = ( OSX, DEBUG, @@ -1448,7 +1900,6 @@ DEBUG_ITEM_SCAN, WIZARD, ); - GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1470,7 +1921,8 @@ MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; + WARNING_CFLAGS = ""; }; name = Debug; }; @@ -1480,6 +1932,8 @@ COPY_PHASE_STRIP = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_OPTIMIZATION_LEVEL = 1; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(PROJECT_DIR)/AppHdr.h"; GCC_PREPROCESSOR_DEFINITIONS = ( OSX, CLUA_BINDINGS, @@ -1488,25 +1942,25 @@ DEBUG, DEBUG_ITEM_SCAN, ); + GCC_VERSION = 4.0; GCC_WARN_SIGN_COMPARE = NO; GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_LABEL = NO; PRODUCT_NAME = crawl; YACC_GENERATED_FILE_STEM = InputFileStem; - ZERO_LINK = YES; }; name = Wizard; }; 7B97C0250A8ED2AB00CE8936 /* Wizard */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = ( OSX, WIZARD, DEBUG, DEBUG_ITEM_SCAN, ); - GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1528,43 +1982,40 @@ MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; + WARNING_CFLAGS = ""; }; name = Wizard; }; 7B97C0260A8ED34400CE8936 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = 1; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(PROJECT_DIR)/AppHdr.h"; GCC_PREPROCESSOR_DEFINITIONS = ( OSX, CLUA_BINDINGS, DB_NDBM, ); + GCC_VERSION = 4.0; GCC_WARN_SIGN_COMPARE = NO; GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_LABEL = NO; PRODUCT_NAME = crawl; YACC_GENERATED_FILE_STEM = InputFileStem; - ZERO_LINK = NO; }; name = Release; }; 7B97C0270A8ED34400CE8936 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = OSX; - GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1586,24 +2037,147 @@ MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; + WARNING_CFLAGS = ""; }; name = Release; }; - D2F271F90DA1C58C00445FE9 /* Development */ = { + D2660DFF0FF0864B00986331 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; + GCC_DEBUGGING_SYMBOLS = full; GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_OPTIMIZATION_LEVEL = 1; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(PROJECT_DIR)/AppHdr.h"; + GCC_PREPROCESSOR_DEFINITIONS = ( + OSX, + USE_TILE, + CLUA_BINDINGS, + DB_NDBM, + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = 4.0; + GCC_WARN_SIGN_COMPARE = NO; + GCC_WARN_UNUSED_FUNCTION = NO; + GCC_WARN_UNUSED_LABEL = NO; + HEADER_SEARCH_PATHS = ( + /Library/Frameworks/Freetype2.framework/Headers, + /Library/Frameworks/SDL.framework/Headers, + /Library/Frameworks/SDL_image.framework/Headers, + /Library/Frameworks/libpng.framework/Headers, + ); + PRODUCT_NAME = crawl; + YACC_GENERATED_FILE_STEM = InputFileStem; + }; + name = Development; + }; + D2660E000FF0864B00986331 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_OPTIMIZATION_LEVEL = 1; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(PROJECT_DIR)/AppHdr.h"; + GCC_PREPROCESSOR_DEFINITIONS = ( + OSX, + USE_TILE, + CLUA_BINDINGS, + DB_NDBM, + ); + GCC_VERSION = 4.0; + GCC_WARN_SIGN_COMPARE = NO; + GCC_WARN_UNUSED_FUNCTION = NO; + GCC_WARN_UNUSED_LABEL = NO; + HEADER_SEARCH_PATHS = ( + /Library/Frameworks/Freetype2.framework/Headers, + /Library/Frameworks/SDL.framework/Headers, + /Library/Frameworks/SDL_image.framework/Headers, + /Library/Frameworks/libpng.framework/Headers, + ); + PRODUCT_NAME = crawl; + YACC_GENERATED_FILE_STEM = InputFileStem; + }; + name = Release; + }; + D2660E010FF0864B00986331 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_PREFIX_HEADER = "$(PROJECT_DIR)/AppHdr.h"; + GCC_PREPROCESSOR_DEFINITIONS = ( + OSX, + USE_TILE, + CLUA_BINDINGS, + DB_NDBM, + WIZARD, + DEBUG, + DEBUG_ITEM_SCAN, + FULLDEBUG, + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = 4.0; + GCC_WARN_SIGN_COMPARE = NO; + GCC_WARN_UNINITIALIZED_AUTOS = NO; + GCC_WARN_UNUSED_FUNCTION = NO; + GCC_WARN_UNUSED_LABEL = NO; + HEADER_SEARCH_PATHS = ( + /Library/Frameworks/Freetype2.framework/Headers, + /Library/Frameworks/SDL.framework/Headers, + /Library/Frameworks/SDL_image.framework/Headers, + /Library/Frameworks/libpng.framework/Headers, + ); + PRODUCT_NAME = crawl; + YACC_GENERATED_FILE_STEM = InputFileStem; + }; + name = Debug; + }; + D2660E020FF0864B00986331 /* Wizard */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_OPTIMIZATION_LEVEL = 1; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(PROJECT_DIR)/AppHdr.h"; + GCC_PREPROCESSOR_DEFINITIONS = ( + OSX, + USE_TILE, + CLUA_BINDINGS, + DB_NDBM, + WIZARD, + DEBUG, + DEBUG_ITEM_SCAN, + ); + GCC_VERSION = 4.0; + GCC_WARN_SIGN_COMPARE = NO; + GCC_WARN_UNUSED_FUNCTION = NO; + GCC_WARN_UNUSED_LABEL = NO; + HEADER_SEARCH_PATHS = ( + /Library/Frameworks/Freetype2.framework/Headers, + /Library/Frameworks/SDL.framework/Headers, + /Library/Frameworks/SDL_image.framework/Headers, + /Library/Frameworks/libpng.framework/Headers, + ); + PRODUCT_NAME = crawl; + YACC_GENERATED_FILE_STEM = InputFileStem; + }; + name = Wizard; + }; + D2F271F90DA1C58C00445FE9 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_VERSION = 4.0; INFOPLIST_FILE = "Crawl-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; - OTHER_CFLAGS = "-O"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -1613,7 +2187,6 @@ PREBINDING = NO; PRODUCT_NAME = Crawl; WRAPPER_EXTENSION = app; - ZERO_LINK = YES; }; name = Development; }; @@ -1622,14 +2195,9 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_VERSION = 4.0; INFOPLIST_FILE = "Crawl-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; - OTHER_CFLAGS = "-O"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -1639,7 +2207,6 @@ PREBINDING = NO; PRODUCT_NAME = Crawl; WRAPPER_EXTENSION = app; - ZERO_LINK = NO; }; name = Release; }; @@ -1647,16 +2214,9 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_VERSION = 4.0; INFOPLIST_FILE = "Crawl-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; - OTHER_CFLAGS = "-O"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -1666,21 +2226,15 @@ PREBINDING = NO; PRODUCT_NAME = Crawl; WRAPPER_EXTENSION = app; - ZERO_LINK = YES; }; name = Debug; }; D2F271FC0DA1C58C00445FE9 /* Wizard */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_VERSION = 4.0; INFOPLIST_FILE = "Crawl-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; - OTHER_CFLAGS = "-O"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -1690,7 +2244,6 @@ PREBINDING = NO; PRODUCT_NAME = Crawl; WRAPPER_EXTENSION = app; - ZERO_LINK = YES; }; name = Wizard; }; @@ -1730,6 +2283,17 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Development; }; + D2660DFE0FF0864B00986331 /* Build configuration list for PBXNativeTarget "Crawl-tiles-cmd" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D2660DFF0FF0864B00986331 /* Development */, + D2660E000FF0864B00986331 /* Release */, + D2660E010FF0864B00986331 /* Debug */, + D2660E020FF0864B00986331 /* Wizard */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Development; + }; D2F271FD0DA1C58C00445FE9 /* Build configuration list for PBXNativeTarget "Crawl" */ = { isa = XCConfigurationList; buildConfigurations = ( -- cgit v1.2.3-54-g00ecf