Changeset 24

Timestamp:

2010-01-24 03:04:19 (2 years ago)

Author:

kpoole

Message:

Episode 3: Dead Water

Location:

trunk

Files:

• Classes/AssocVector.h (modified) (2 diffs)
• Classes/UnitTextureAtlas.cpp (modified) (1 diff)
• Classes/attack_prediction.cpp (modified) (4 diffs)
• Classes/game.cpp (modified) (5 diffs)
• Classes/game_preferences.hpp (modified) (1 diff)
• Classes/game_preferences.mm (modified) (2 diffs)
• Classes/gui/widgets/canvas.cpp (modified) (7 diffs)
• Classes/memory_wrapper.mm (modified) (4 diffs)
• Classes/playmp_controller.cpp (modified) (1 diff)
• Classes/playsingle_controller.cpp (modified) (1 diff)
• Classes/replay.cpp (modified) (25 diffs)
• Classes/replay.hpp (modified) (1 diff)
• Classes/shared_string.cpp (modified) (3 diffs)
• Classes/shared_string.hpp (modified) (1 diff)
• Classes/skiplist_map.hpp (modified) (1 diff)
• Classes/video.cpp (modified) (1 diff)
• Icon512_free.jpg (modified) (previous)
• Icon_free.png (modified) (previous)
• include/unitmaps/map.utbs.elves.horseman.h (modified) (1 diff)
• res/data/core/images/units/human-loyalists/horseman-moving.png (added)
• wesnoth.xcodeproj/project.pbxproj (modified) (23 diffs)

trunk/Classes/AssocVector.h

@@ -22 +22 @@
 #include <utility>
 
+// KP: default allocator changed to tcmalloc!
+#include "base/stl_allocator.h"
+
+
 //namespace Loki
 //{
@@ -78 +82 @@
         class V,
         class C = std::less<K>,
-        class A = std::allocator< std::pair<K, V> >
+        //class A = std::allocator< std::pair<K, V> >
+        class A = STL_Allocator< std::pair<K, V>, tcmallocAllocator>
     >
     class AssocVector 

trunk/Classes/UnitTextureAtlas.cpp

@@ -2133 +2133 @@
         if (pos != std::string::npos)
         {
-            searchStr[pos] = 0;
+            //searchStr[pos] = 0;
+            searchStr = searchStr.substr(0, pos);
         }
     }

trunk/Classes/attack_prediction.cpp

@@ -30 +30 @@
 // -DCHECK for testing correctness
 // (run tools/wesnoth-attack-sim.c --check on output)
-#if defined(BENCHMARK) || defined(CHECK)
+#if defined(BENCHMARK) || defined(WESCHECK)
 #include <time.h>
 #include <sys/time.h>
@@ -220 +220 @@
 }
 
-#ifdef CHECK
+#ifdef WESCHECK
 void prob_matrix::dump() const
 {
@@ -878 +878 @@
 }
 
-#if defined(BENCHMARK) || defined(CHECK)
+#if defined(BENCHMARK) || defined(WESCHECK)
 // We create a significant number of nasty-to-calculate units,
 // and test each one against the others.
@@ -894 +894 @@
   } while (0)
 
-#ifdef CHECK
+#ifdef WESCHECK
 void combatant::print(const char label[], unsigned int battle) const
 {

trunk/Classes/game.cpp

@@ -1019 +1019 @@
         return false;
     }
+    
+    if(state_.campaign_type == "multiplayer")
+        preferences::set_multiplayer(true);
+    else
+        preferences::set_multiplayer(false);
+    
+    
     recorder = replay(state_.replay_data);
     recorder.start_replay();
@@ -1808 +1815 @@
         SDL_Quit();
 #endif
+    
+    destroy_all_strings();
     exit(res);
 }
@@ -2245 +2254 @@
         else if(res == gui::NEW_CAMPAIGN) {
             draw_wait_cursor();
+            preferences::set_multiplayer(false);
             if(game.new_campaign() == false) {
                 continue;
@@ -2250 +2260 @@
 #ifndef FREE_VERSION            
         } else if (res == gui::SKIRMISH) {
+            preferences::set_multiplayer(true);
             if(game.play_multiplayer(3) == false) {
                 continue;
             }           
         } else if(res == gui::MULTIPLAYER) {
+            preferences::set_multiplayer(true);
             if(game.play_multiplayer(0) == false) {
                 continue;
@@ -2443 +2455 @@
             << "\n\nGame will be aborted.\n";
     }
+    
+    destroy_all_strings();
 
     return 0;

trunk/Classes/game_preferences.hpp

@@ -245 +245 @@
     void add_kill();
     void reset_turn_kills();
+    void set_multiplayer(bool isMultiplayer);
+    bool is_multiplayer();
 }
 

trunk/Classes/game_preferences.mm

@@ -51 +51 @@
 
 bool authenticated = false;
+    
+bool isMultiplayer = false;
 } // anon namespace
 
@@ -988 +990 @@
 int get_player_side()
 {
+    if (isMultiplayer)
+        return -1;
     return player_side;
 }
 
+void set_multiplayer(bool isMult)
+{
+    isMultiplayer = isMult;
+}
+
+bool is_multiplayer(void)
+{
+    return isMultiplayer;
+}
     
 } // preferences namespace

trunk/Classes/gui/widgets/canvas.cpp

@@ -30 +30 @@
 #include "wml_exception.hpp"
 
+#include <stdio.h>
+
 extern void blit_surface_scaled(int x, int y, int w, int h, surface surf, textureRenderFlags flags=DRAW);
 extern void blit_surface(int x, int y, surface surf, SDL_Rect* srcrect=NULL, SDL_Rect* clip_rect=NULL, textureRenderFlags flags=DRAW);
@@ -37 +39 @@
 extern void fill_rect(Uint32 color, SDL_Rect *rect);
 
+// KP: added timage caching
+SDL_TextureID last_timage = 0;
+
+std::string timage_cache_files[] = {
+"buttons/downarrow-button.png",
+"buttons/downarrow-button-disabled.png",
+"buttons/downarrow-button-pressed.png",
+"buttons/downarrow-button-active.png",
+"buttons/uparrow-button.png",
+"buttons/uparrow-button-disabled.png",
+"buttons/uparrow-button-pressed.png",
+"buttons/uparrow-button-active.png",
+"buttons/left_arrow-button.png",
+"buttons/left_arrow-button-disabled.png",
+"buttons/left_arrow-button-pressed.png",
+"buttons/left_arrow-button-active.png",
+"buttons/right_arrow-button.png",
+"buttons/right_arrow-button-disabled.png",
+"buttons/right_arrow-button-pressed.png",
+"buttons/right_arrow-button-active.png",
+"buttons/button.png",
+"buttons/button-disabled.png",
+"buttons/button-pressed.png",
+"buttons/button-active.png",
+"buttons/scrollgroove-left.png",
+"buttons/scrollgroove-horizontal.png",
+"buttons/scrollgroove-right.png",
+"buttons/scrollleft.png",
+"buttons/scrollhorizontal.png",
+"buttons/scrollright.png",
+"buttons/scrollleft-disabled.png",
+"buttons/scrollhorizontal-disabled.png",
+"buttons/scrollright-disabled.png",
+"buttons/scrollleft-pressed.png",
+"buttons/scrollhorizontal-pressed.png",
+"buttons/scrollright-pressed.png",
+"buttons/scrollleft-active.png",
+"buttons/scrollhorizontal-active.png",
+"buttons/scrollright-active.png",
+"dialogs/translucent65-border-top.png",
+"dialogs/translucent65-border-bottom.png",
+"dialogs/translucent65-background.png",
+"buttons/slider.png",
+"buttons/slider-disabled.png",
+"buttons/slider-selected.png",
+"buttons/slider-active.png",
+"buttons/checkbox.png",
+"buttons/checkbox.png",
+"buttons/checkbox-active.png",
+"buttons/checkbox-pressed.png",
+"buttons/checkbox-pressed.png",
+"buttons/checkbox-active-pressed.png",
+"misc/selection2-border-topleft.png",
+"misc/selection2-border-topright.png",
+"misc/selection2-border-botleft.png",
+"misc/selection2-border-botright.png",
+"misc/selection2-border-top.png",
+"misc/selection2-border-bottom.png",
+"misc/selection2-border-left.png",
+"misc/selection2-border-right.png",
+"misc/selection2-background.png",
+"misc/selection-border-topleft.png",
+"misc/selection-border-topright.png",
+"misc/selection-border-botleft.png",
+"misc/selection-border-botright.png",
+"misc/selection-border-top.png",
+"misc/selection-border-bottom.png",
+"misc/selection-border-left.png",
+"misc/selection-border-right.png",
+"misc/selection-background.png",
+"buttons/scrollgroove-top.png",
+"buttons/scrollgroove-mid.png",
+"buttons/scrollgroove-bottom.png",
+"buttons/scrolltop.png",
+"buttons/scrollmid.png",
+"buttons/scrollbottom.png",
+"buttons/scrolltop-disabled.png",
+"buttons/scrollmid-disabled.png",
+"buttons/scrollbottom-disabled.png",
+"buttons/scrolltop-pressed.png",
+"buttons/scrollmid-pressed.png",
+"buttons/scrollbottom-pressed.png",
+"buttons/scrolltop-active.png",
+"buttons/scrollmid-active.png",
+"buttons/scrollbottom-active.png",
+"dialogs/opaque-border-topleft.png",
+"dialogs/opaque-border-top.png",
+"dialogs/opaque-border-topright.png",
+"dialogs/opaque-border-right.png",
+"dialogs/opaque-border-botright.png",
+"dialogs/opaque-border-bottom.png",
+"dialogs/opaque-border-botleft.png",
+"dialogs/opaque-border-left.png",
+"dialogs/opaque-background.png",
+"dialogs/translucent65-border-topleft.png",
+"dialogs/translucent65-border-top.png",
+"dialogs/translucent65-border-topright.png",
+"dialogs/translucent65-border-right.png",
+"dialogs/translucent65-border-botright.png",
+"dialogs/translucent65-border-bottom.png",
+"dialogs/translucent65-border-botleft.png",
+"dialogs/translucent65-border-left.png",
+"dialogs/translucent65-background.png",
+"dialogs/translucent54-border-topleft.png",
+"dialogs/translucent54-border-top.png",
+"dialogs/translucent54-border-topright.png",
+"dialogs/translucent54-border-right.png",
+"dialogs/translucent54-border-botright.png",
+"dialogs/translucent54-border-bottom.png",
+"dialogs/translucent54-border-botleft.png",
+"dialogs/translucent54-border-left.png",
+"dialogs/translucent54-background.png",
+""
+};
+
+std::map<std::string, SDL_TextureID> timage_cache;
 
 namespace gui2 {
@@ -540 +658 @@
     
     // KP: need to do this to free the texture
-    ~timage()
+    /*
+    virtual ~timage()
     {
+        printf("~timage()\n");
         if (image_texture_ != 0)
         {
@@ -547 +667 @@
         }
     }
+     */
+    // could never get the destructor to actually be called.... memory leaks somewhere??
 
 private:
@@ -644 +766 @@
  */
     if(!image_name_.has_formula()) {
+        
+        if(timage_cache.size() == 0)
+        {
+            // build the cache for the first time
+            int i=0;
+            while (timage_cache_files[i] != "")
+            {
+                // KP: do not cache this
+                surface tmp(image::get_image(image::locator(timage_cache_files[i]), image::UNSCALED, false));               
+                
+                surface image_;
+                image_.assign(make_neutral_surface(tmp));
+                assert(image_);
+                std::cerr << "Caching texture for timage " << timage_cache_files[i] << "\n";
+                SDL_TextureID tid = SDL_CreateTextureFromSurface(SDL_PIXELFORMAT_ABGR8888, image_);
+                timage_cache.insert(std::pair<std::string, SDL_TextureID>(timage_cache_files[i], tid));
+                i++;
+            }
+        }
+        
+                
         std::string str = image_name_();
-        // KP: do not cache this
-        surface tmp(image::get_image(image::locator(str), image::UNSCALED, false));
-
-        if(!tmp) {
-            ERR_G_D << "Image: '" << str
-                << "'not found and won't be drawn.\n";
-            return;
-        }
-
-        surface image_;
-        image_.assign(make_neutral_surface(tmp));
-        assert(image_);
-        std::cerr << "Creating texture for timage " << str << "\n";
-        image_texture_ = SDL_CreateTextureFromSurface(SDL_PIXELFORMAT_ABGR8888, image_);
-        src_clip_ = ::create_rect(0, 0, image_->w, image_->h);
+        
+        std::map<std::string, SDL_TextureID>::iterator it;
+        it = timage_cache.find(str);
+        if (it != timage_cache.end())
+        {
+            image_texture_ = (*it).second;
+            std::cerr << "Loaded from cache for timage " << str << "\n";
+        }
+        else
+        {
+            // KP: avoid texture leaks
+            if (last_timage != 0)
+            {
+                SDL_DestroyTexture(last_timage);
+                last_timage = 0;
+            }
+            
+            
+            // KP: do not cache this
+            surface tmp(image::get_image(image::locator(str), image::UNSCALED, false));
+
+            if(!tmp) {
+                ERR_G_D << "Image: '" << str
+                    << "'not found and won't be drawn.\n";
+                return;
+            }
+
+            surface image_;
+            image_.assign(make_neutral_surface(tmp));
+            assert(image_);
+            std::cerr << "Creating texture for timage " << str << "\n";
+            image_texture_ = SDL_CreateTextureFromSurface(SDL_PIXELFORMAT_ABGR8888, image_);
+            src_clip_ = ::create_rect(0, 0, image_->w, image_->h);
+            last_timage = image_texture_;
+        }
     }
 
@@ -697 +860 @@
         }
 
+        // KP: avoid texture leaks
+        if (last_timage != 0)
+        {
+            SDL_DestroyTexture(last_timage);
+            last_timage = 0;
+        }
+        
         surface image_;
         image_.assign(make_neutral_surface(tmp));
@@ -703 +873 @@
         image_texture_ = SDL_CreateTextureFromSurface(SDL_PIXELFORMAT_ABGR8888, image_);
         src_clip_ = ::create_rect(0, 0, image_->w, image_->h);
+        last_timage = image_texture_;
+        
     } else if(!image_texture_){
         // The warning about no image should already have taken place

trunk/Classes/memory_wrapper.mm

@@ -27 +27 @@
 // this way, we can just set the #if statement below to 1 or 0 to enable/disable the allocators
 
-#if !(TARGET_IPHONE_SIMULATOR)
+//#if !(TARGET_IPHONE_SIMULATOR)
+#if 0
 
 
@@ -220 +221 @@
 
 #else
-
+#include "google/tcmalloc.h"
 
 
@@ -233 +234 @@
     // get general overall iPhone memory stats
     printf("%s\n", reason);
-
+    tc_malloc_stats();
     iPhoneMemory();
 }
@@ -273 +274 @@
 }
 
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <mach/task.h>
+#include <mach/mach_init.h>
+
+void getres(task_t task, unsigned int *rss, unsigned int *vs)
+{
+    struct task_basic_info t_info;
+    mach_msg_type_number_t t_info_count = TASK_BASIC_INFO_COUNT;
+    
+    task_info(task, TASK_BASIC_INFO, (task_info_t)&t_info, &t_info_count);
+    *rss = t_info.resident_size;
+    *vs = t_info.virtual_size;
+}
+
+
 size_t iPhoneMemory(void)
 {
+    // report process memory
+    unsigned int rss, vs, psize;
+    task_t task = MACH_PORT_NULL;
+    if (task_for_pid(current_task(), getpid(), &task) == KERN_SUCCESS)
+    {
+        getres(task, &rss, &vs);
+        psize = getpagesize();
+        printf("iPhone process memory used: %u KiB, VS: %u KiB.\n", rss, vs);
+    }   
+    
+    // now report overall system memory
     mach_port_t host_port;
     mach_msg_type_number_t host_size;

trunk/Classes/playmp_controller.cpp

@@ -148 +148 @@
     LOG_NG << "playmp::before_human_turn...\n";
     playsingle_controller::before_human_turn(save);
+    // KP: disable achievement stuff
+    preferences::set_player_side(player_number_);
+
 
     turn_data_ = new turn_info(gamestate_,status_,

trunk/Classes/playsingle_controller.cpp

@@ -850 +850 @@
     
     preferences::reset_turn_kills();
+    
+    free_all_caches();
 }
 

trunk/Classes/replay.cpp

@@ -145 +145 @@
     saveInfo_(),
     skip_(false),
-    message_locations(),
-    ignore_replays(true)
-{}
+    message_locations()
+{
+}
 
 replay::replay(const config& cfg) :
@@ -155 +155 @@
     saveInfo_(),
     skip_(false),
-    message_locations(),
-    ignore_replays(true)
-{}
+    message_locations()
+{
+}
 
 void replay::throw_error(const std::string& msg)
@@ -247 +247 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -257 +257 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -276 +276 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
 
@@ -295 +295 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -313 +313 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -329 +329 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -347 +347 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -364 +364 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -381 +381 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -398 +398 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -407 +407 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -421 +421 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -433 +433 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -451 +451 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -465 +465 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -479 +479 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -489 +489 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -505 +505 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -518 +518 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -537 +537 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -551 +551 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     
@@ -587 +587 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return "";
     
@@ -640 +640 @@
 {
     // KP: added flag to ignore replay data
-    if (ignore_replays)
+    if(preferences::is_multiplayer() == false)
         return;
     

trunk/Classes/replay.hpp

@@ -151 +151 @@
     bool skip_;
 
-    std::vector<int> message_locations;
-    
-    // KP: flag to turn off all replay saving
-public:
-    bool ignore_replays;
+    std::vector<int> message_locations; 
 };
 

trunk/Classes/shared_string.cpp

@@ -16 +16 @@
 
 #include <map>
-//#include "skiplist_map.hpp"
+#include "skiplist_map.hpp"
 //#include <boost/unordered_map.hpp>
 //#include "AssocVector.h"
+
+// KP: default allocator changed to tcmalloc!
+#include "base/stl_allocator.h"
+
 
 class string_compare
@@ -58 +62 @@
 //typedef boost::unordered_map<const std::string*, string_node*, string_hasher> MAP;
 //typedef AssocVector<const std::string*, string_node*, string_compare> MAP;
+typedef std::pair<const std::string*, string_node*> PAIR;
 typedef MAP::iterator ITERATOR;
-typedef std::pair<const std::string*, string_node*> PAIR;
 
 string_node* gNullData;
@@ -277 +281 @@
 }
 
+// there is a BIG memory leak at program exit, but it would be slow to free everything...
+// actually... I think iPhone OS automatically cleans up when the app exits...
+void destroy_all_strings(void)
+{
+/*  
+    if (gMap == NULL)
+        return;
+    
+    ITERATOR it;
+    for(it = gStringPool().begin(); it != gStringPool().end(); )
+    {
+        //if (it->second != gNullData)
+        {
+            string_node *dataPtr = it->second;
+            gStringPool().erase(it++);
+            delete dataPtr;
+        }
+    }   
+    delete gMap;
+    gMap = NULL;
+    gNullData = NULL;
+*/ 
+}

trunk/Classes/shared_string.hpp

@@ -239 +239 @@
 size_t shared_count(const std::string &str);
 void shared_cleanup(void);
+void destroy_all_strings(void);
 
 #endif

trunk/Classes/skiplist_map.hpp

@@ -17 +17 @@
 #include "skiplist.hpp"
 
-template <typename Key, typename Value, typename Compare = std::less<Key>, typename Alloc = std::allocator<Value> >
+// KP: default allocator changed to tcmalloc!
+
+#include "base/stl_allocator.h"
+
+//template <typename Key, typename Value, typename Compare = std::less<Key>, typename Alloc = std::allocator<Value> >
+template <typename Key, typename Value, typename Compare = std::less<Key>, typename Alloc = STL_Allocator<Value, tcmallocAllocator> >
 class skiplist_map : private skiplist<std::pair<const Key, Value>, Key, key_extractor<std::pair<const Key, Value> >, Compare, Alloc> {
 private:

trunk/Classes/video.cpp

@@ -1233 +1233 @@
     SDL_RenderPresent();
 }
+
+

trunk/include/unitmaps/map.utbs.elves.horseman.h

@@ -2 +2 @@
 addMapEntry("units/elves-desert/horseman-defend.png", 0, 0, 0, 44, 58, 10, 2, 72, 72, UNITMAP_UTBS_ELVES_HORSEMAN);
 addMapEntry("units/elves-desert/horseman-melee.png", 44, 0, 0, 48, 52, 13, 12, 72, 72, UNITMAP_UTBS_ELVES_HORSEMAN);
-//addMapEntry("units/elves-desert/horseman-moving.png", 44, 52, 0, 46, 52, 13, 12, 72, 72, UNITMAP_UTBS_ELVES_HORSEMAN);
+addMapEntry("units/elves-desert/horseman-moving.png", 44, 52, 0, 46, 52, 13, 12, 72, 72, UNITMAP_UTBS_ELVES_HORSEMAN);
 addMapEntry("units/elves-desert/horseman-ranged-1.png", 171, 0, 0, 40, 51, 16, 12, 72, 72, UNITMAP_UTBS_ELVES_HORSEMAN);
 addMapEntry("units/elves-desert/horseman-ranged-2.png", 0, 58, 0, 43, 53, 13, 11, 72, 72, UNITMAP_UTBS_ELVES_HORSEMAN);

trunk/wesnoth.xcodeproj/project.pbxproj

@@ -209 +209 @@
         2717423C10A5A69E007A78E1 /* common.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1911D10844C3C00AB3EA5 /* common.cc */; };
         2717423E10A5A6A1007A78E1 /* dynamic_annotations.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1910210844C3C00AB3EA5 /* dynamic_annotations.cc */; };
-        2717423F10A5A6A3007A78E1 /* heap-checker-bcad.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1912E10844C3C00AB3EA5 /* heap-checker-bcad.cc */; };
-        2717424010A5A6A3007A78E1 /* heap-checker.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1912F10844C3C00AB3EA5 /* heap-checker.cc */; };
-        2717424110A5A6A6007A78E1 /* heap-profile-table.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1913010844C3C00AB3EA5 /* heap-profile-table.cc */; };
-        2717424210A5A6A7007A78E1 /* heap-profiler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1913210844C3C00AB3EA5 /* heap-profiler.cc */; };
         2717424310A5A6A8007A78E1 /* internal_logging.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1913310844C3C00AB3EA5 /* internal_logging.cc */; };
         2717424410A5A6AA007A78E1 /* linuxthreads.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1910710844C3C00AB3EA5 /* linuxthreads.cc */; };
@@ -222 +218 @@
         2717424A10A5A6AF007A78E1 /* memory_region_map.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1913C10844C3C00AB3EA5 /* memory_region_map.cc */; };
         2717424B10A5A6B1007A78E1 /* page_heap.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1913F10844C3C00AB3EA5 /* page_heap.cc */; };
-        2717424C10A5A6B2007A78E1 /* profile-handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1914310844C3C00AB3EA5 /* profile-handler.cc */; };
-        2717424D10A5A6B4007A78E1 /* profiledata.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1914510844C3C00AB3EA5 /* profiledata.cc */; };
-        2717424E10A5A6B5007A78E1 /* profiler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1914710844C3C00AB3EA5 /* profiler.cc */; };
         2717424F10A5A6B5007A78E1 /* raw_printer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1914810844C3C00AB3EA5 /* raw_printer.cc */; };
         2717425010A5A6B6007A78E1 /* sampler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1914A10844C3C00AB3EA5 /* sampler.cc */; };
@@ -230 +223 @@
         2717425210A5A6B9007A78E1 /* spinlock.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1910E10844C3C00AB3EA5 /* spinlock.cc */; };
         2717425310A5A6BB007A78E1 /* stack_trace_table.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1914E10844C3C00AB3EA5 /* stack_trace_table.cc */; };
-        2717425410A5A6BC007A78E1 /* stacktrace.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1915010844C3C00AB3EA5 /* stacktrace.cc */; };
-        2717425510A5A6BF007A78E1 /* stacktrace_with_context.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1915610844C3C00AB3EA5 /* stacktrace_with_context.cc */; };
         2717425610A5A6C0007A78E1 /* static_vars.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1915910844C3C00AB3EA5 /* static_vars.cc */; };
         2717425710A5A6C2007A78E1 /* symbolize.cc in Sources */ = {isa = PBXBuildFile; fileRef = 27F1915B10844C3C00AB3EA5 /* symbolize.cc */; };
@@ -1020 +1011 @@
         27B2A26E1092044800E69353 /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 27B2A26D1092044800E69353 /* Entitlements.plist */; };
         27DBCB33100DAB75001A3E32 /* IMG_jpg.c in Sources */ = {isa = PBXBuildFile; fileRef = 27DBCB32100DAB75001A3E32 /* IMG_jpg.c */; };
+        27E0245E11061DB300D724A6 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 27E007DE11061DAC00D724A6 /* fonts */; };
+        27E0245F11061DB300D724A6 /* data in Resources */ = {isa = PBXBuildFile; fileRef = 27E007E311061DAC00D724A6 /* data */; };
+        27E0246011061DB300D724A6 /* sounds in Resources */ = {isa = PBXBuildFile; fileRef = 27E0219A11061DB200D724A6 /* sounds */; };
+        27E0246111061DB300D724A6 /* precache in Resources */ = {isa = PBXBuildFile; fileRef = 27E021AF11061DB200D724A6 /* precache */; };
+        27E0246211061DB300D724A6 /* images in Resources */ = {isa = PBXBuildFile; fileRef = 27E0226611061DB300D724A6 /* images */; };
         27E4CD7F1009FA8100B71BBA /* SDL_ttf.c in Sources */ = {isa = PBXBuildFile; fileRef = 27E4CD7E1009FA8100B71BBA /* SDL_ttf.c */; };
         27E4CE8D100A3B9F00B71BBA /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = 27E4CE7B100A3B9F00B71BBA /* png.c */; };
@@ -2877 +2873 @@
         27B2A26D1092044800E69353 /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; };
         27DBCB32100DAB75001A3E32 /* IMG_jpg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = IMG_jpg.c; sourceTree = "<group>"; };
+        27E007DE11061DAC00D724A6 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = res/fonts; sourceTree = "<group>"; };
+        27E007E311061DAC00D724A6 /* data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = data; path = res/data; sourceTree = "<group>"; };
+        27E0219A11061DB200D724A6 /* sounds */ = {isa = PBXFileReference; lastKnownFileType = folder; name = sounds; path = res/sounds; sourceTree = "<group>"; };
+        27E021AF11061DB200D724A6 /* precache */ = {isa = PBXFileReference; lastKnownFileType = folder; name = precache; path = res/precache; sourceTree = "<group>"; };
+        27E0226611061DB300D724A6 /* images */ = {isa = PBXFileReference; lastKnownFileType = folder; name = images; path = res/images; sourceTree = "<group>"; };
         27E4CD7E1009FA8100B71BBA /* SDL_ttf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_ttf.c; path = Classes/SDL/SDL_ttf.c; sourceTree = SOURCE_ROOT; };
         27E4CE79100A3AD600B71BBA /* pngconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pngconf.h; path = include/pngconf.h; sourceTree = "<group>"; };
@@ -3101 +3102 @@
         27EAB5891086B8A700544661 /* ftcmanag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftcmanag.c; sourceTree = "<group>"; };
         27EAB5A01086B8E300544661 /* ftgzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ftgzip.c; path = gzip/ftgzip.c; sourceTree = "<group>"; };
-        27EAFCF2108743D000544661 /* debugallocation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugallocation.cc; sourceTree = "<group>"; };
         27EEF8471005F7D00053FBAA /* pango.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pango.h; path = include/pango/pango.h; sourceTree = "<group>"; };
         27EEF88D100605A40053FBAA /* IMG.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = IMG.c; sourceTree = "<group>"; };
@@ -3162 +3162 @@
         27F1912B10844C3C00AB3EA5 /* stacktrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stacktrace.h; sourceTree = "<group>"; };
         27F1912C10844C3C00AB3EA5 /* tcmalloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tcmalloc.h; sourceTree = "<group>"; };
-        27F1912E10844C3C00AB3EA5 /* heap-checker-bcad.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "heap-checker-bcad.cc"; sourceTree = "<group>"; };
-        27F1912F10844C3C00AB3EA5 /* heap-checker.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "heap-checker.cc"; sourceTree = "<group>"; };
-        27F1913010844C3C00AB3EA5 /* heap-profile-table.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "heap-profile-table.cc"; sourceTree = "<group>"; };
-        27F1913110844C3C00AB3EA5 /* heap-profile-table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "heap-profile-table.h"; sourceTree = "<group>"; };
-        27F1913210844C3C00AB3EA5 /* heap-profiler.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "heap-profiler.cc"; sourceTree = "<group>"; };
         27F1913310844C3C00AB3EA5 /* internal_logging.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = internal_logging.cc; sourceTree = "<group>"; };
         27F1913410844C3C00AB3EA5 /* internal_logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = internal_logging.h; sourceTree = "<group>"; };
@@ -3182 +3177 @@
         27F1914110844C3C00AB3EA5 /* page_heap_allocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = page_heap_allocator.h; sourceTree = "<group>"; };
         27F1914210844C3C00AB3EA5 /* pagemap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pagemap.h; sourceTree = "<group>"; };
-        27F1914310844C3C00AB3EA5 /* profile-handler.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "profile-handler.cc"; sourceTree = "<group>"; };
-        27F1914410844C3C00AB3EA5 /* profile-handler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "profile-handler.h"; sourceTree = "<group>"; };
-        27F1914510844C3C00AB3EA5 /* profiledata.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = profiledata.cc; sourceTree = "<group>"; };
-        27F1914610844C3C00AB3EA5 /* profiledata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = profiledata.h; sourceTree = "<group>"; };
-        27F1914710844C3C00AB3EA5 /* profiler.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = profiler.cc; sourceTree = "<group>"; };
         27F1914810844C3C00AB3EA5 /* raw_printer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = raw_printer.cc; sourceTree = "<group>"; };
         27F1914910844C3C00AB3EA5 /* raw_printer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = raw_printer.h; sourceTree = "<group>"; };
@@ -3194 +3184 @@
         27F1914D10844C3C00AB3EA5 /* span.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = span.h; sourceTree = "<group>"; };
         27F1914E10844C3C00AB3EA5 /* stack_trace_table.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stack_trace_table.cc; sourceTree = "<group>"; };
-        27F1914F10844C3C00AB3EA5 /* stack_trace_table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stack_trace_table.h; sourceTree = "<group>"; };
-        27F1915010844C3C00AB3EA5 /* stacktrace.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stacktrace.cc; sourceTree = "<group>"; };
-        27F1915110844C3C00AB3EA5 /* stacktrace_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stacktrace_config.h; sourceTree = "<group>"; };
-        27F1915210844C3C00AB3EA5 /* stacktrace_generic-inl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "stacktrace_generic-inl.h"; sourceTree = "<group>"; };
-        27F1915310844C3C00AB3EA5 /* stacktrace_libunwind-inl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "stacktrace_libunwind-inl.h"; sourceTree = "<group>"; };
-        27F1915410844C3C00AB3EA5 /* stacktrace_powerpc-inl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "stacktrace_powerpc-inl.h"; sourceTree = "<group>"; };
-        27F1915510844C3C00AB3EA5 /* stacktrace_win32-inl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "stacktrace_win32-inl.h"; sourceTree = "<group>"; };
-        27F1915610844C3C00AB3EA5 /* stacktrace_with_context.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stacktrace_with_context.cc; sourceTree = "<group>"; };
-        27F1915710844C3C00AB3EA5 /* stacktrace_x86-inl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "stacktrace_x86-inl.h"; sourceTree = "<group>"; };
-        27F1915810844C3C00AB3EA5 /* stacktrace_x86_64-inl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "stacktrace_x86_64-inl.h"; sourceTree = "<group>"; };
         27F1915910844C3C00AB3EA5 /* static_vars.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = static_vars.cc; sourceTree = "<group>"; };
         27F1915A10844C3C00AB3EA5 /* static_vars.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = static_vars.h; sourceTree = "<group>"; };
@@ -7106 +7086 @@
             isa = PBXGroup;
             children = (
-                27EAFCF2108743D000544661 /* debugallocation.cc */,
+                27F1911E10844C3C00AB3EA5 /* common.h */,
+                27F1913410844C3C00AB3EA5 /* internal_logging.h */,
+                27F1915E10844C3C00AB3EA5 /* system-alloc.h */,
+                27F1913E10844C3C00AB3EA5 /* packed-cache-inl.h */,
+                27F1916110844C3C00AB3EA5 /* tcmalloc_guard.h */,
                 27F190F710844C3C00AB3EA5 /* addressmap-inl.h */,
+                27F1911D10844C3C00AB3EA5 /* common.cc */,
+                27F1913310844C3C00AB3EA5 /* internal_logging.cc */,
+                27F1911B10844C3C00AB3EA5 /* central_freelist.cc */,
+                27F1913F10844C3C00AB3EA5 /* page_heap.cc */,
+                27F1914C10844C3C00AB3EA5 /* span.cc */,
+                27F1914E10844C3C00AB3EA5 /* stack_trace_table.cc */,
+                27F1915910844C3C00AB3EA5 /* static_vars.cc */,
+                27F1915B10844C3C00AB3EA5 /* symbolize.cc */,
+                27F1916210844C3C00AB3EA5 /* thread_cache.cc */,
+                27F1913810844C3C00AB3EA5 /* malloc_hook.cc */,
+                27F1913610844C3C00AB3EA5 /* malloc_extension.cc */,
+                27F1913910844C3C00AB3EA5 /* maybe_threads.cc */,
                 27F190F810844C3C00AB3EA5 /* base */,
-                27F1911B10844C3C00AB3EA5 /* central_freelist.cc */,
                 27F1911C10844C3C00AB3EA5 /* central_freelist.h */,
-                27F1911D10844C3C00AB3EA5 /* common.cc */,
-                27F1911E10844C3C00AB3EA5 /* common.h */,
                 27F1911F10844C3C00AB3EA5 /* tcconfig.h */,
                 27F1912210844C3C00AB3EA5 /* getpc.h */,
                 27F1912310844C3C00AB3EA5 /* google */,
-                27F1912E10844C3C00AB3EA5 /* heap-checker-bcad.cc */,
-                27F1912F10844C3C00AB3EA5 /* heap-checker.cc */,
-                27F1913010844C3C00AB3EA5 /* heap-profile-table.cc */,
-                27F1913110844C3C00AB3EA5 /* heap-profile-table.h */,
-                27F1913210844C3C00AB3EA5 /* heap-profiler.cc */,
-                27F1913310844C3C00AB3EA5 /* internal_logging.cc */,
-                27F1913410844C3C00AB3EA5 /* internal_logging.h */,
                 27F1913510844C3C00AB3EA5 /* linked_list.h */,
-                27F1913610844C3C00AB3EA5 /* malloc_extension.cc */,
                 27F1913710844C3C00AB3EA5 /* malloc_hook-inl.h */,
-                27F1913810844C3C00AB3EA5 /* malloc_hook.cc */,
-                27F1913910844C3C00AB3EA5 /* maybe_threads.cc */,
                 27F1913A10844C3C00AB3EA5 /* maybe_threads.h */,
                 27F1913C10844C3C00AB3EA5 /* memory_region_map.cc */,
                 27F1913D10844C3C00AB3EA5 /* memory_region_map.h */,
-                27F1913E10844C3C00AB3EA5 /* packed-cache-inl.h */,
-                27F1913F10844C3C00AB3EA5 /* page_heap.cc */,
                 27F1914010844C3C00AB3EA5 /* page_heap.h */,
                 27F1914110844C3C00AB3EA5 /* page_heap_allocator.h */,
                 27F1914210844C3C00AB3EA5 /* pagemap.h */,
-                27F1914310844C3C00AB3EA5 /* profile-handler.cc */,
-                27F1914410844C3C00AB3EA5 /* profile-handler.h */,
-                27F1914510844C3C00AB3EA5 /* profiledata.cc */,
-                27F1914610844C3C00AB3EA5 /* profiledata.h */,
-                27F1914710844C3C00AB3EA5 /* profiler.cc */,
                 27F1914810844C3C00AB3EA5 /* raw_printer.cc */,
                 27F1914910844C3C00AB3EA5 /* raw_printer.h */,
                 27F1914A10844C3C00AB3EA5 /* sampler.cc */,
                 27F1914B10844C3C00AB3EA5 /* sampler.h */,
-                27F1914C10844C3C00AB3EA5 /* span.cc */,
                 27F1914D10844C3C00AB3EA5 /* span.h */,
-                27F1914E10844C3C00AB3EA5 /* stack_trace_table.cc */,
-                27F1914F10844C3C00AB3EA5 /* stack_trace_table.h */,
-                27F1915010844C3C00AB3EA5 /* stacktrace.cc */,
-                27F1915110844C3C00AB3EA5 /* stacktrace_config.h */,
-                27F1915210844C3C00AB3EA5 /* stacktrace_generic-inl.h */,
-                27F1915310844C3C00AB3EA5 /* stacktrace_libunwind-inl.h */,
-                27F1915410844C3C00AB3EA5 /* stacktrace_powerpc-inl.h */,
-                27F1915510844C3C00AB3EA5 /* stacktrace_win32-inl.h */,
-                27F1915610844C3C00AB3EA5 /* stacktrace_with_context.cc */,
-                27F1915710844C3C00AB3EA5 /* stacktrace_x86-inl.h */,
-                27F1915810844C3C00AB3EA5 /* stacktrace_x86_64-inl.h */,
-                27F1915910844C3C00AB3EA5 /* static_vars.cc */,
                 27F1915A10844C3C00AB3EA5 /* static_vars.h */,
-                27F1915B10844C3C00AB3EA5 /* symbolize.cc */,
                 27F1915C10844C3C00AB3EA5 /* symbolize.h */,
                 27F1915D10844C3C00AB3EA5 /* system-alloc.cc */,
-                27F1915E10844C3C00AB3EA5 /* system-alloc.h */,
                 27F1915F10844C3C00AB3EA5 /* tcmalloc.cc */,
                 27F1916010844C3C00AB3EA5 /* tcmalloc.h */,
-                27F1916110844C3C00AB3EA5 /* tcmalloc_guard.h */,
-                27F1916210844C3C00AB3EA5 /* thread_cache.cc */,
                 27F1916310844C3C00AB3EA5 /* thread_cache.h */,
             );
@@ -7177 +7136 @@
             isa = PBXGroup;
             children = (
+                27F1910F10844C3C00AB3EA5 /* spinlock.h */,
+                27F190FE10844C3C00AB3EA5 /* atomicops.h */,
                 27F190FA10844C3C00AB3EA5 /* atomicops-internals-macosx.h */,
-                27F190FE10844C3C00AB3EA5 /* atomicops.h */,
+                27F1910010844C3C00AB3EA5 /* commandlineflags.h */,
                 27F190FF10844C3C00AB3EA5 /* basictypes.h */,
-                27F1910010844C3C00AB3EA5 /* commandlineflags.h */,
+                27F1911610844C3C00AB3EA5 /* thread_annotations.h */,
                 27F1910110844C3C00AB3EA5 /* cycleclock.h */,
                 27F1910210844C3C00AB3EA5 /* dynamic_annotations.cc */,
@@ -7195 +7156 @@
                 27F1910D10844C3C00AB3EA5 /* simple_mutex.h */,
                 27F1910E10844C3C00AB3EA5 /* spinlock.cc */,
-                27F1910F10844C3C00AB3EA5 /* spinlock.h */,
                 27F1911010844C3C00AB3EA5 /* spinlock_linux-inl.h */,
                 27F1911110844C3C00AB3EA5 /* spinlock_posix-inl.h */,
@@ -7202 +7162 @@
                 27F1911410844C3C00AB3EA5 /* sysinfo.cc */,
                 27F1911510844C3C00AB3EA5 /* sysinfo.h */,
-                27F1911610844C3C00AB3EA5 /* thread_annotations.h */,
                 27F1911710844C3C00AB3EA5 /* thread_lister.c */,
                 27F1911810844C3C00AB3EA5 /* thread_lister.h */,
@@ -7554 +7513 @@
             isa = PBXGroup;
             children = (
+                27E007DE11061DAC00D724A6 /* fonts */,
+                27E007E311061DAC00D724A6 /* data */,
+                27E0219A11061DB200D724A6 /* sounds */,
+                27E021AF11061DB200D724A6 /* precache */,
+                27E0226611061DB300D724A6 /* images */,
                 FD77A07E0E26BDA900F39101 /* Default.png */,
                 FD77A07C0E26BD8C00F39101 /* Icon.png */,
@@ -7929 +7893 @@
                 2738F75C10E78EFC006BE9F2 /* OFDashboardTabNowPlayingLandscapeHit.png in Resources */,
                 2738F7F010E78F99006BE9F2 /* openfeint_offline_config.xml in Resources */,
+                27E0245E11061DB300D724A6 /* fonts in Resources */,
+                27E0245F11061DB300D724A6 /* data in Resources */,
+                27E0246011061DB300D724A6 /* sounds in Resources */,
+                27E0246111061DB300D724A6 /* precache in Resources */,
+                27E0246211061DB300D724A6 /* images in Resources */,
             );
             runOnlyForDeploymentPostprocessing = 0;
@@ -8425 +8394 @@
                 2717423C10A5A69E007A78E1 /* common.cc in Sources */,
                 2717423E10A5A6A1007A78E1 /* dynamic_annotations.cc in Sources */,
-                2717423F10A5A6A3007A78E1 /* heap-checker-bcad.cc in Sources */,
-                2717424010A5A6A3007A78E1 /* heap-checker.cc in Sources */,
-                2717424110A5A6A6007A78E1 /* heap-profile-table.cc in Sources */,
-                2717424210A5A6A7007A78E1 /* heap-profiler.cc in Sources */,
                 2717424310A5A6A8007A78E1 /* internal_logging.cc in Sources */,
                 2717424410A5A6AA007A78E1 /* linuxthreads.cc in Sources */,
@@ -8438 +8403 @@
                 2717424A10A5A6AF007A78E1 /* memory_region_map.cc in Sources */,
                 2717424B10A5A6B1007A78E1 /* page_heap.cc in Sources */,
-                2717424C10A5A6B2007A78E1 /* profile-handler.cc in Sources */,
-                2717424D10A5A6B4007A78E1 /* profiledata.cc in Sources */,
-                2717424E10A5A6B5007A78E1 /* profiler.cc in Sources */,
                 2717424F10A5A6B5007A78E1 /* raw_printer.cc in Sources */,
                 2717425010A5A6B6007A78E1 /* sampler.cc in Sources */,
@@ -8446 +8408 @@
                 2717425210A5A6B9007A78E1 /* spinlock.cc in Sources */,
                 2717425310A5A6BB007A78E1 /* stack_trace_table.cc in Sources */,
-                2717425410A5A6BC007A78E1 /* stacktrace.cc in Sources */,
-                2717425510A5A6BF007A78E1 /* stacktrace_with_context.cc in Sources */,
                 2717425610A5A6C0007A78E1 /* static_vars.cc in Sources */,
                 2717425710A5A6C2007A78E1 /* symbolize.cc in Sources */,
@@ -8889 +8849 @@
                 GCC_PREFIX_HEADER = "";
                 GCC_PREPROCESSOR_DEFINITIONS = (
+                    NO_HEAP_CHECK,
+                    NO_TCMALLOC_SAMPLES,
                     NDEBUG,
                     LANDSCAPE,
@@ -8954 +8916 @@
                 GCC_PREFIX_HEADER = "";
                 GCC_PREPROCESSOR_DEFINITIONS = (
+                    NO_HEAP_CHECK,
+                    NO_TCMALLOC_SAMPLES,
                     NDEBUG,
                     LANDSCAPE,
@@ -9021 +8985 @@
                 GCC_PREFIX_HEADER = "";
                 GCC_PREPROCESSOR_DEFINITIONS = (
+                    NO_HEAP_CHECK,
+                    NO_TCMALLOC_SAMPLES,
                     DEBUG,
                     DEBUG_ERROR,
@@ -9091 +9057 @@
                 GCC_PREFIX_HEADER = "";
                 GCC_PREPROCESSOR_DEFINITIONS = (
+                    NO_HEAP_CHECK,
+                    NO_TCMALLOC_SAMPLES,
                     DEBUG,
                     DEBUG_ERROR,
@@ -9140 +9108 @@
                 GCC_PREFIX_HEADER = "";
                 GCC_PREPROCESSOR_DEFINITIONS = (
+                    NO_HEAP_CHECK,
+                    NO_TCMALLOC_SAMPLES,
                     NDEBUG,
                     LANDSCAPE,