Merge pull request #1090 from igrechuhin/ig-cleanup

Project cleanup.

12 files changed, 59 insertions, 346 deletions

diff --git a/iphone/Maps/Classes/RenderBuffer.hpp b/iphone/Maps/Classes/RenderBuffer.hpp
deleted file mode 100644
index 8c43178752..0000000000
--- a/iphone/Maps/Classes/RenderBuffer.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include "RenderContext.hpp"
-#include "std/shared_ptr.hpp"
-#include "graphics/render_target.hpp"
-
-@class CAEAGLLayer;
-
-namespace iphone
-{
-
-class RenderBuffer : public graphics::RenderTarget
-{
-private:
-  unsigned int m_id;
-  shared_ptr<RenderContext> m_renderContext;
-  int m_width;
-  int m_height;
-
-public:
-  RenderBuffer(shared_ptr<RenderContext> renderContext, CAEAGLLayer * layer);
-  RenderBuffer(shared_ptr<RenderContext> renderContext, int width, int height);
-  ~RenderBuffer();
-
-  void makeCurrent();
-
-  unsigned int id() const;
-
-  void present();
-
-  unsigned width() const;
-  unsigned height() const;
-
-  void attachToFrameBuffer();
-  void detachFromFrameBuffer();
-  void coordMatrix(math::Matrix<float, 4, 4> & m);
-};
-
-}
diff --git a/iphone/Maps/Classes/RenderBuffer.mm b/iphone/Maps/Classes/RenderBuffer.mm
deleted file mode 100644
index 8b02d36849..0000000000
--- a/iphone/Maps/Classes/RenderBuffer.mm
+++ /dev/null
@@ -1,98 +0,0 @@
-#import <QuartzCore/CAEAGLLayer.h>
-
-#include "RenderBuffer.hpp"
-#include "graphics/opengl/opengl.hpp"
-#include "graphics/coordinates.hpp"
-
-namespace iphone
-{
-
-RenderBuffer::RenderBuffer(shared_ptr<RenderContext> renderContext, CAEAGLLayer * layer)
-  : m_renderContext(renderContext)
-{
-  OGLCHECK(glGenRenderbuffersOES(1, &m_id));
-  makeCurrent();
-
-  BOOL res = [m_renderContext->getEAGLContext() renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:layer];
-
-  if (res == NO)
-    LOG(LINFO, ("renderbufferStorage:fromDrawable has failed!"));
-
-  OGLCHECK(glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &m_width));
-  OGLCHECK(glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &m_height));
-}
-
-RenderBuffer::RenderBuffer(shared_ptr<RenderContext> renderContext, int width, int height)
-  : m_renderContext(renderContext)
-{
-  OGLCHECK(glGenRenderbuffersOES(1, &m_id));
-  makeCurrent();
-
-  m_width = width;
-  m_height = height;
-  OGLCHECK(glRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_RGBA8_OES, m_width, m_height));
-}
-
-void RenderBuffer::makeCurrent()
-{
-  OGLCHECK(glBindRenderbufferOES(GL_RENDERBUFFER_OES, m_id));
-}
-
-RenderBuffer::~RenderBuffer()
-{
-  OGLCHECK(glDeleteRenderbuffersOES(1, &m_id));
-}
-
-unsigned int RenderBuffer::id() const
-{
-  return m_id;
-}
-
-void RenderBuffer::present()
-{
-  makeCurrent();
-
-  const int maxTryCount = 100;
-  int tryCount = 0;
-    
-  while (!([m_renderContext->getEAGLContext() presentRenderbuffer:GL_RENDERBUFFER_OES])
-         && (tryCount++ < maxTryCount));
-
-  if (tryCount == maxTryCount + 1)
-    NSLog(@"failed to present renderbuffer");
-  else if (tryCount != 0)
-    NSLog(@"renderBuffer was presented from %d try", tryCount);
-}
-
-unsigned RenderBuffer::width() const
-{
-  return m_width;
-}
-
-unsigned RenderBuffer::height() const
-{
-  return m_height;
-}
-
-void RenderBuffer::attachToFrameBuffer()
-{
-  OGLCHECK(glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES,
-                                        GL_COLOR_ATTACHMENT0_OES,
-                                        GL_RENDERBUFFER_OES,
-                                        m_id));
-}
-
-void RenderBuffer::detachFromFrameBuffer()
-{
-  OGLCHECK(glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES,
-                                        GL_COLOR_ATTACHMENT0_OES,
-                                        GL_RENDERBUFFER_OES,
-                                        0));
-}
-  
-void RenderBuffer::coordMatrix(math::Matrix<float, 4, 4> & m)
-{
-  graphics::getOrthoMatrix(m, 0, width(), height(), 0, -graphics::maxDepth, graphics::maxDepth);
-}
-  
-}
diff --git a/iphone/Maps/Classes/RenderContext.hpp b/iphone/Maps/Classes/RenderContext.hpp
deleted file mode 100644
index 70125e7fac..0000000000
--- a/iphone/Maps/Classes/RenderContext.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <OpenGLES/EAGL.h>
-#include <OpenGLES/ES1/gl.h>
-#include <OpenGLES/ES1/glext.h>
-
-#include "graphics/opengl/gl_render_context.hpp"
-#include "std/shared_ptr.hpp"
-
-
-namespace iphone
-{
-  class RenderContext : public graphics::gl::RenderContext
-  {
-	private:
-		/// Pointer to render context.
-		EAGLContext * m_context;
-	public:
-		/// Create rendering context.
-		RenderContext();
-		/// Create shared render context.
-		RenderContext(RenderContext * renderContext);
-		/// Destroy render context
-		~RenderContext();
-		/// Make this rendering context current
-		void makeCurrent();
-		/// create a shared render context
-    graphics::RenderContext * createShared();
-
-  	EAGLContext * getEAGLContext();
-  };
-}
\ No newline at end of file
diff --git a/iphone/Maps/Classes/RenderContext.mm b/iphone/Maps/Classes/RenderContext.mm
deleted file mode 100644
index 11a5b91cda..0000000000
--- a/iphone/Maps/Classes/RenderContext.mm
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "RenderContext.hpp"
-
-namespace iphone
-{
-	RenderContext::RenderContext()
-	{
-    m_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
-	}
-
-	RenderContext::RenderContext(RenderContext * renderContext)
-	{
-		m_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup:renderContext->m_context.sharegroup];
-	}
-
-	RenderContext::~RenderContext()
-	{
-
-	}
-
-	void RenderContext::makeCurrent()
-	{
-    [EAGLContext setCurrentContext:m_context];
-	}
- 
-  graphics::RenderContext * RenderContext::createShared()
-	{
-    graphics::RenderContext * res = new RenderContext(this);
-    res->setResourceManager(resourceManager());
-    return res;
-	}
-
-	EAGLContext * RenderContext::getEAGLContext()
-	{
-		return m_context;
-	}
-}
-
-
-
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index bb1b367c23..1b4e1d23c3 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -111,6 +111,8 @@
 		34C659471BD12A77009DC20A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34C659451BD12A77009DC20A /* InfoPlist.strings */; };
 		34C659481BD12A77009DC20A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34C659451BD12A77009DC20A /* InfoPlist.strings */; };
 		34C6594C1BD12A89009DC20A /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 5605022E1B6211E100169CAD /* sound-strings */; };
+		34CA57181C292F17004D9C89 /* MyTrackerSDKCorp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F696CCBA1C2816FB00150DFD /* MyTrackerSDKCorp.framework */; };
+		34CA57191C292F50004D9C89 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864B186C5EAA00AF7E9E /* MediaPlayer.framework */; };
 		34CC4C091B81F3B500E44C1F /* MWMSearchTabbedViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34CC4C071B81F3B500E44C1F /* MWMSearchTabbedViewController.mm */; };
 		34CC4C0A1B81F3B500E44C1F /* MWMSearchTabbedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34CC4C081B81F3B500E44C1F /* MWMSearchTabbedViewController.xib */; };
 		34CC4C0E1B82069C00E44C1F /* MWMSearchTabbedCollectionViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34CC4C0C1B82069C00E44C1F /* MWMSearchTabbedCollectionViewCell.mm */; };
@@ -1130,8 +1132,6 @@
 		97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = "<group>"; };
 		97C98520186AE3CF00AF7E9E /* AppInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppInfo.mm; sourceTree = "<group>"; };
 		97C98521186AE3CF00AF7E9E /* AppInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppInfo.h; sourceTree = "<group>"; };
-		97C98647186C5E9900AF7E9E /* EventKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EventKit.framework; path = System/Library/Frameworks/EventKit.framework; sourceTree = SDKROOT; };
-		97C98648186C5E9900AF7E9E /* EventKitUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EventKitUI.framework; path = System/Library/Frameworks/EventKitUI.framework; sourceTree = SDKROOT; };
 		97C9864B186C5EAA00AF7E9E /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
 		97C9864D186C5ED300AF7E9E /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
 		97C9864F186C5EDE00AF7E9E /* PassKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PassKit.framework; path = System/Library/Frameworks/PassKit.framework; sourceTree = SDKROOT; };
@@ -1145,7 +1145,6 @@
 		97ECD87718362B3D00F77A46 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
 		97ECD87918362B5400F77A46 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		97ECD87E1836594400F77A46 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
-		97EDDCE418A299C000AEFB7A /* Twitter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Twitter.framework; path = System/Library/Frameworks/Twitter.framework; sourceTree = SDKROOT; };
 		97F0817C19AF72590098FB0B /* BadgeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BadgeView.h; path = Classes/BadgeView.h; sourceTree = "<group>"; };
 		97F0817D19AF72590098FB0B /* BadgeView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BadgeView.mm; path = Classes/BadgeView.mm; sourceTree = "<group>"; };
 		97F6178F183E742E009919E2 /* LinkCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LinkCell.h; path = Settings/LinkCell.h; sourceTree = "<group>"; };
@@ -1495,7 +1494,9 @@
 				6741AAC41BF356BA002C974C /* libfreetype.a in Frameworks */,
 				6741AAC51BF356BA002C974C /* libfribidi.a in Frameworks */,
 				6741AAC61BF356BA002C974C /* libgeometry.a in Frameworks */,
+				34CA57191C292F50004D9C89 /* MediaPlayer.framework in Frameworks */,
 				674A7E291C0DA576003D48E1 /* libsdf_image.a in Frameworks */,
+				34CA57181C292F17004D9C89 /* MyTrackerSDKCorp.framework in Frameworks */,
 				6741AAC91BF356BA002C974C /* libindexer.a in Frameworks */,
 				341876B51C280272005A0C9A /* CoreVideo.framework in Frameworks */,
 				6741AACA1BF356BA002C974C /* libjansson.a in Frameworks */,
@@ -1718,7 +1719,6 @@
 				F6BC1E4C1ACBE96100EF0360 /* FBSDKShareKit.framework */,
 				B00511051A1101FC00A61AA4 /* CoreMedia.framework */,
 				B00511031A1101F600A61AA4 /* CoreData.framework */,
-				97EDDCE418A299C000AEFB7A /* Twitter.framework */,
 				972CDCC51887F1B7006641CA /* CFNetwork.framework */,
 				97C98655186C734000AF7E9E /* AVFoundation.framework */,
 				97C98653186C5F0500AF7E9E /* AudioToolbox.framework */,
@@ -1726,8 +1726,6 @@
 				97C9864F186C5EDE00AF7E9E /* PassKit.framework */,
 				97C9864D186C5ED300AF7E9E /* Social.framework */,
 				97C9864B186C5EAA00AF7E9E /* MediaPlayer.framework */,
-				97C98647186C5E9900AF7E9E /* EventKit.framework */,
-				97C98648186C5E9900AF7E9E /* EventKitUI.framework */,
 				97719D471843B6F200BDD815 /* Security.framework */,
 				97719D441843B6DC00BDD815 /* MessageUI.framework */,
 				97ECD87E1836594400F77A46 /* StoreKit.framework */,
@@ -4206,6 +4204,7 @@
 					"$(PROJECT_DIR)/PushNotifications",
 					"$(PROJECT_DIR)/Statistics",
 					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/MyTracker",
 				);
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "$(SRCROOT)/MAPSME.plist";
@@ -4238,6 +4237,7 @@
 					"$(PROJECT_DIR)/PushNotifications",
 					"$(PROJECT_DIR)/Statistics",
 					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/MyTracker",
 				);
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "$(SRCROOT)/MAPSME.plist";
@@ -4271,6 +4271,7 @@
 					"$(PROJECT_DIR)/PushNotifications",
 					"$(PROJECT_DIR)/Statistics",
 					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/MyTracker",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(OMIM_ROOT)",
@@ -4307,6 +4308,7 @@
 					"$(PROJECT_DIR)/PushNotifications",
 					"$(PROJECT_DIR)/Statistics",
 					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/MyTracker",
 				);
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "$(SRCROOT)/MAPSME.plist";
@@ -4340,6 +4342,7 @@
 					"$(PROJECT_DIR)/PushNotifications",
 					"$(PROJECT_DIR)/Statistics",
 					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/MyTracker",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(OMIM_ROOT)",
@@ -4376,6 +4379,7 @@
 					"$(PROJECT_DIR)/PushNotifications",
 					"$(PROJECT_DIR)/Statistics",
 					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/MyTracker",
 				);
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "$(SRCROOT)/MAPSME.plist";
diff --git a/qt/widgets.hpp b/qt/widgets.hpp
deleted file mode 100644
index 4ca77d0562..0000000000
--- a/qt/widgets.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-
-//#include "../qt_tstfrm/widgets.hpp"
-/*#include "../map/qgl_render_context.hpp"
-#include "graphics/resource_manager.hpp"
-
-class Drawer;
-class VideoTimer;
-
-namespace graphics
-{
-  namespace gl
-  {
-    class RenderContext;
-  }
-}
-
-namespace qt
-{
-  /// Widget uses our graphics library for drawing.
-  class GLDrawWidget : public GLDrawWidgetT<Drawer>
-  {
-
-    typedef GLDrawWidgetT<Drawer> base_type;
-    shared_ptr<graphics::gl::RenderContext> m_renderContext;
-
-  protected:
-
-    shared_ptr<graphics::ResourceManager> m_resourceManager;
-
-  public:
-    typedef Drawer drawer_t;
-
-    GLDrawWidget(QWidget * pParent);
-    ~GLDrawWidget();
-
-    shared_ptr<graphics::gl::RenderContext> const & renderContext();
-    shared_ptr<graphics::ResourceManager> const & resourceManager();
-
-    shared_ptr<drawer_t> const & GetDrawer() const;
-
-  protected:
-    virtual void initializeGL();
-  };
-}*/
diff --git a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj
index 7f7f8a209e..a18fadab91 100644
--- a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj
+++ b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj
@@ -16,7 +16,6 @@
 		670D05991B0CBD5A0013A7AC /* draw_widget.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345711A404CB200A0A8C3 /* draw_widget.hpp */; };
 		670D059A1B0CBD5B0013A7AC /* mainwindow.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345761A404CB200A0A8C3 /* mainwindow.hpp */; };
 		670D059B1B0CBD5B0013A7AC /* proxystyle.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753457A1A404CB200A0A8C3 /* proxystyle.hpp */; };
-		670D059C1B0CBD5B0013A7AC /* widgets.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345851A404CB200A0A8C3 /* widgets.hpp */; };
 		6714E5E41BD13F67008AB603 /* drules_proto_clear.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */; };
 		6714E5E51BD13F67008AB603 /* drules_proto_clear.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5DF1BD13F67008AB603 /* drules_proto_clear.txt */; };
 		6714E5E61BD13F67008AB603 /* drules_proto_dark.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */; };
@@ -185,7 +184,7 @@
 		6714E6001BD14016008AB603 /* resources-mdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_clear"; sourceTree = "<group>"; };
 		6714E6011BD14016008AB603 /* resources-mdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_dark"; sourceTree = "<group>"; };
 		671F59011B8755FE0032311E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		671F592F1B8759460032311E /* libminizip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminizip.a; path = "/Volumes/AltHD/omim/xcode/minizip/../../../omim-xcode-build/Debug/libminizip.a"; sourceTree = "<absolute>"; };
+		671F592F1B8759460032311E /* libminizip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminizip.a; path = "../../../omim-xcode-build/Debug/libminizip.a"; sourceTree = "<group>"; };
 		6729A5B91A693013007D5872 /* categories.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = categories.txt; sourceTree = "<group>"; };
 		6729A5BA1A693013007D5872 /* classificator.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = classificator.txt; sourceTree = "<group>"; };
 		6729A5BB1A693013007D5872 /* countries.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = countries.txt; sourceTree = "<group>"; };
@@ -212,9 +211,7 @@
 		6729A66B1A695C70007D5872 /* eula.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = eula.html; sourceTree = "<group>"; };
 		6729A66C1A695C70007D5872 /* welcome.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = welcome.html; sourceTree = "<group>"; };
 		6729A6701A695CA8007D5872 /* languages.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = languages.txt; sourceTree = "<group>"; };
-		674A298E1B26EB5D001A525C /* librender.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librender.a; path = "/Volumes/AltHD/omim/xcode/render/../../../omim-xcode-build/Debug/librender.a"; sourceTree = "<absolute>"; };
 		674A29901B26F0AE001A525C /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-xcode-build/Debug/libalohalitics.a"; sourceTree = "<group>"; };
-		674A29911B26F0AE001A525C /* libanim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libanim.a; path = "../../../omim-xcode-build/Debug/libanim.a"; sourceTree = "<group>"; };
 		674A29921B26F0AE001A525C /* libapi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libapi.a; path = "../../../omim-xcode-build/Debug/libapi.a"; sourceTree = "<group>"; };
 		674A29931B26F0AE001A525C /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug/libbase.a"; sourceTree = "<group>"; };
 		674A29941B26F0AE001A525C /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = "<group>"; };
@@ -224,12 +221,10 @@
 		674A29991B26F0AE001A525C /* libgenerator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgenerator.a; path = "../../../omim-xcode-build/Debug/libgenerator.a"; sourceTree = "<group>"; };
 		674A299A1B26F0AE001A525C /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "../../../omim-xcode-build/Debug/libgeometry.a"; sourceTree = "<group>"; };
 		674A299B1B26F0AE001A525C /* libgflags.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgflags.a; path = "../../../omim-xcode-build/Debug/libgflags.a"; sourceTree = "<group>"; };
-		674A299C1B26F0AE001A525C /* libgraphics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgraphics.a; path = "../../../omim-xcode-build/Debug/libgraphics.a"; sourceTree = "<group>"; };
-		674A299D1B26F0AE001A525C /* libgui.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgui.a; path = "../../../omim-xcode-build/Debug/libgui.a"; sourceTree = "<group>"; };
 		674A299E1B26F0AE001A525C /* libindexer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libindexer.a; path = "../../../omim-xcode-build/Debug/libindexer.a"; sourceTree = "<group>"; };
 		674A299F1B26F0AE001A525C /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = "../../../omim-xcode-build/Debug/libjansson.a"; sourceTree = "<group>"; };
 		674A29A01B26F0AE001A525C /* libmap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmap.a; path = "../../../omim-xcode-build/Debug/libmap.a"; sourceTree = "<group>"; };
-		674A29A11B26F0AE001A525C /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "/Volumes/AltHD/omim/xcode/opening_hours/../../../omim-xcode-build/Debug/libopening_hours.a"; sourceTree = "<absolute>"; };
+		674A29A11B26F0AE001A525C /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../omim-xcode-build/Debug/libopening_hours.a"; sourceTree = "<group>"; };
 		674A29A21B26F0AE001A525C /* libosrm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosrm.a; path = "../../../omim-xcode-build/Debug/libosrm.a"; sourceTree = "<group>"; };
 		674A29A31B26F0AE001A525C /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "../../../omim-xcode-build/Debug/libplatform.a"; sourceTree = "<group>"; };
 		674A29A41B26F0AE001A525C /* libprotobuf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprotobuf.a; path = "../../../omim-xcode-build/Debug/libprotobuf.a"; sourceTree = "<group>"; };
@@ -268,7 +263,6 @@
 		675345821A404CB200A0A8C3 /* slider_ctrl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = slider_ctrl.hpp; sourceTree = "<group>"; };
 		675345831A404CB200A0A8C3 /* update_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = update_dialog.cpp; sourceTree = "<group>"; };
 		675345841A404CB200A0A8C3 /* update_dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = update_dialog.hpp; sourceTree = "<group>"; };
-		675345851A404CB200A0A8C3 /* widgets.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = widgets.hpp; sourceTree = "<group>"; };
 		675345A31A40534500A0A8C3 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		675345A51A40534F00A0A8C3 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		675345A71A40535E00A0A8C3 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -276,8 +270,8 @@
 		67534D261A40AA4300A0A8C3 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		677A2DE71C0DDD7C00635A00 /* resources-default */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-default"; sourceTree = "<group>"; };
 		67A461A61C2172C400B18739 /* 07_roboto_medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = 07_roboto_medium.ttf; sourceTree = "<group>"; };
-		67E8DC911BBC1D3F0053C5BA /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "/Volumes/AltHD/mapsme/omim/xcode/agg/../../../omim-xcode-build/Debug/libagg.a"; sourceTree = "<absolute>"; };
-		67E8DC921BBC1D3F0053C5BA /* liblodepng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblodepng.a; path = "/Volumes/AltHD/mapsme/omim/xcode/lodepng/../../../omim-xcode-build/Debug/liblodepng.a"; sourceTree = "<absolute>"; };
+		67E8DC911BBC1D3F0053C5BA /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "../../../omim-xcode-build/Debug/libagg.a"; sourceTree = "<group>"; };
+		67E8DC921BBC1D3F0053C5BA /* liblodepng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblodepng.a; path = "../../../omim-xcode-build/Debug/liblodepng.a"; sourceTree = "<group>"; };
 		9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "02_droidsans-fallback.ttf"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -347,7 +341,6 @@
 				671F592F1B8759460032311E /* libminizip.a */,
 				671F59011B8755FE0032311E /* libz.dylib */,
 				674A29901B26F0AE001A525C /* libalohalitics.a */,
-				674A29911B26F0AE001A525C /* libanim.a */,
 				674A29921B26F0AE001A525C /* libapi.a */,
 				674A29931B26F0AE001A525C /* libbase.a */,
 				674A29941B26F0AE001A525C /* libcoding.a */,
@@ -357,8 +350,6 @@
 				674A29991B26F0AE001A525C /* libgenerator.a */,
 				674A299A1B26F0AE001A525C /* libgeometry.a */,
 				674A299B1B26F0AE001A525C /* libgflags.a */,
-				674A299C1B26F0AE001A525C /* libgraphics.a */,
-				674A299D1B26F0AE001A525C /* libgui.a */,
 				674A299E1B26F0AE001A525C /* libindexer.a */,
 				674A299F1B26F0AE001A525C /* libjansson.a */,
 				674A29A01B26F0AE001A525C /* libmap.a */,
@@ -372,7 +363,6 @@
 				674A29A81B26F0AE001A525C /* libsuccinct.a */,
 				674A29A91B26F0AE001A525C /* libtomcrypt.a */,
 				674A29AA1B26F0AE001A525C /* libzlib.a */,
-				674A298E1B26EB5D001A525C /* librender.a */,
 				67534D261A40AA4300A0A8C3 /* CoreLocation.framework */,
 				67534C411A4097D000A0A8C3 /* OpenGL.framework */,
 				675345A71A40535E00A0A8C3 /* Cocoa.framework */,
@@ -472,7 +462,6 @@
 				675345821A404CB200A0A8C3 /* slider_ctrl.hpp */,
 				675345831A404CB200A0A8C3 /* update_dialog.cpp */,
 				675345841A404CB200A0A8C3 /* update_dialog.hpp */,
-				675345851A404CB200A0A8C3 /* widgets.hpp */,
 				6753454C1A404C6100A0A8C3 /* Supporting Files */,
 			);
 			name = MapsMe;
@@ -565,7 +554,6 @@
 				670D05991B0CBD5A0013A7AC /* draw_widget.hpp in Sources */,
 				670D059A1B0CBD5B0013A7AC /* mainwindow.hpp in Sources */,
 				670D059B1B0CBD5B0013A7AC /* proxystyle.hpp in Sources */,
-				670D059C1B0CBD5B0013A7AC /* widgets.hpp in Sources */,
 				670D05931B0CBD320013A7AC /* about.hpp in Sources */,
 				670D05941B0CBD320013A7AC /* info_dialog.hpp in Sources */,
 				670D05951B0CBD320013A7AC /* preferences_dialog.hpp in Sources */,
diff --git a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
index 60a362f4b0..dd4dbad5b3 100644
--- a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
+++ b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
@@ -160,7 +160,7 @@
 		674A28DD1B1C8027001A525C /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "../../../omim-xcode-build/Debug/libtomcrypt.a"; sourceTree = "<group>"; };
 		674A28EB1B1C80F4001A525C /* libstorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstorage.a; path = "../../../omim-xcode-build/Debug/libstorage.a"; sourceTree = "<group>"; };
 		674A28ED1B1C80FB001A525C /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = "../../../omim-xcode-build/Debug/libjansson.a"; sourceTree = "<group>"; };
-		674A28EF1B1C8104001A525C /* libsearch.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsearch.a; path = "/Volumes/AltHD/omim/xcode/search/../../../omim-xcode-build/Debug/libsearch.a"; sourceTree = "<absolute>"; };
+		674A28EF1B1C8104001A525C /* libsearch.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsearch.a; path = "../../../omim-xcode-build/Debug/libsearch.a"; sourceTree = "<group>"; };
 		674A28F11B1C8119001A525C /* libsuccinct.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsuccinct.a; path = "../../../omim-xcode-build/Debug/libsuccinct.a"; sourceTree = "<group>"; };
 		674A28F31B1C8125001A525C /* libosrm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosrm.a; path = "../../../omim-xcode-build/Debug/libosrm.a"; sourceTree = "<group>"; };
 		674A39D21B727589001DDB91 /* source_to_element_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = source_to_element_test.cpp; sourceTree = "<group>"; };
@@ -173,9 +173,9 @@
 		677792501C1B2E9300EC9499 /* metadata_parser_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = metadata_parser_test.cpp; sourceTree = "<group>"; };
 		67AB92B31B738DE800AB5194 /* source_data.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = source_data.cpp; sourceTree = "<group>"; };
 		67AB92B41B738DE800AB5194 /* source_data.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = source_data.hpp; sourceTree = "<group>"; };
-		67AB92C61B73D03500AB5194 /* libmap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmap.a; path = "/Volumes/AltHD/omim/xcode/map/../../../omim-xcode-build/Debug/libmap.a"; sourceTree = "<absolute>"; };
-		67AB92C81B73D10200AB5194 /* libosrm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosrm.a; path = "/Volumes/AltHD/omim/xcode/osrm/../../../omim-xcode-build/Debug/libosrm.a"; sourceTree = "<absolute>"; };
-		67AB92CA1B73D10B00AB5194 /* libsuccinct.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsuccinct.a; path = "/Volumes/AltHD/omim/xcode/succinct/../../../omim-xcode-build/Debug/libsuccinct.a"; sourceTree = "<absolute>"; };
+		67AB92C61B73D03500AB5194 /* libmap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmap.a; path = "../../../omim-xcode-build/Debug/libmap.a"; sourceTree = "<group>"; };
+		67AB92C81B73D10200AB5194 /* libosrm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosrm.a; path = "../../../omim-xcode-build/Debug/libosrm.a"; sourceTree = "<group>"; };
+		67AB92CA1B73D10B00AB5194 /* libsuccinct.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsuccinct.a; path = "../../../omim-xcode-build/Debug/libsuccinct.a"; sourceTree = "<group>"; };
 		67AB92CC1B73D15700AB5194 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj
index 34ef71d14f..e8fa2689d2 100644
--- a/xcode/indexer/indexer.xcodeproj/project.pbxproj
+++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj
@@ -167,21 +167,21 @@
 		670C610B1AB065B100C38A8C /* visibility_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = visibility_test.cpp; sourceTree = "<group>"; };
 		670C611F1AB065E100C38A8C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
 		670C61251AB0661100C38A8C /* indexer_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = indexer_tests; sourceTree = BUILT_PRODUCTS_DIR; };
-		670C61411AB0670700C38A8C /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = ../platform/build/Debug/libplatform.a; sourceTree = "<group>"; };
-		670C61431AB0673800C38A8C /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = ../base/build/Debug/libbase.a; sourceTree = "<group>"; };
-		670C61441AB0673800C38A8C /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = ../coding/build/Debug/libcoding.a; sourceTree = "<group>"; };
+		670C61411AB0670700C38A8C /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libplatform.a"; sourceTree = "<group>"; };
+		670C61431AB0673800C38A8C /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libbase.a"; sourceTree = "<group>"; };
+		670C61441AB0673800C38A8C /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libcoding.a"; sourceTree = "<group>"; };
 		670C61471AB0675700C38A8C /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		670C61491AB0677200C38A8C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		670C614B1AB067D200C38A8C /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		670C614D1AB0682300C38A8C /* QtCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QtCore.framework; path = /usr/local/Cellar/qt5/5.3.2/lib/QtCore.framework; sourceTree = "<absolute>"; };
-		670C614F1AB0684000C38A8C /* libprotobuf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprotobuf.a; path = /usr/local/Cellar/protobuf/2.5.0/lib/libprotobuf.a; sourceTree = "<absolute>"; };
-		670C61511AB0685E00C38A8C /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "../../../Library/Developer/Xcode/DerivedData/omim-baysrswfihipzadzzkpyheldfppg/Build/Products/Debug/libtomcrypt.a"; sourceTree = "<group>"; };
-		670C61531AB0688100C38A8C /* libstorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstorage.a; path = "../../../Library/Developer/Xcode/DerivedData/omim-baysrswfihipzadzzkpyheldfppg/Build/Products/Debug/libstorage.a"; sourceTree = "<group>"; };
-		670C61551AB0689F00C38A8C /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "../../../Library/Developer/Xcode/DerivedData/omim-baysrswfihipzadzzkpyheldfppg/Build/Products/Debug/libgeometry.a"; sourceTree = "<group>"; };
+		670C614F1AB0684000C38A8C /* libprotobuf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprotobuf.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libprotobuf.a"; sourceTree = "<group>"; };
+		670C61511AB0685E00C38A8C /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libtomcrypt.a"; sourceTree = "<group>"; };
+		670C61531AB0688100C38A8C /* libstorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstorage.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libstorage.a"; sourceTree = "<group>"; };
+		670C61551AB0689F00C38A8C /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libgeometry.a"; sourceTree = "<group>"; };
 		670C61581AB0691900C38A8C /* features_offsets_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_offsets_table.cpp; sourceTree = "<group>"; };
 		670C61591AB0691900C38A8C /* features_offsets_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_offsets_table.hpp; sourceTree = "<group>"; };
 		670C615A1AB0691900C38A8C /* string_file_values.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = string_file_values.hpp; sourceTree = "<group>"; };
-		670C620A1AC3550F00C38A8C /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = ../opening_hours/build/Debug/libopening_hours.a; sourceTree = "<group>"; };
+		670C620A1AC3550F00C38A8C /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libopening_hours.a"; sourceTree = "<group>"; };
 		670D04A81B0BA8580013A7AC /* feature_loader_101.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_loader_101.cpp; sourceTree = "<group>"; };
 		670D04A91B0BA8580013A7AC /* feature_loader_101.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = feature_loader_101.hpp; sourceTree = "<group>"; };
 		670D04AA1B0BA8580013A7AC /* interval_index_101.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interval_index_101.hpp; sourceTree = "<group>"; };
diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj
index b2b451fac5..575b112f59 100644
--- a/xcode/map/map.xcodeproj/project.pbxproj
+++ b/xcode/map/map.xcodeproj/project.pbxproj
@@ -14,7 +14,6 @@
 		34921F681BFA0A6900737D6E /* styled_point.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34921F631BFA0A6900737D6E /* styled_point.hpp */; };
 		674A29F01B26FD6F001A525C /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A29EE1B26FD5F001A525C /* testingmain.cpp */; };
 		674A2A0D1B26FE62001A525C /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29F11B26FE62001A525C /* libalohalitics.a */; };
-		674A2A0E1B26FE62001A525C /* libanim.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29F21B26FE62001A525C /* libanim.a */; };
 		674A2A0F1B26FE62001A525C /* libapi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29F31B26FE62001A525C /* libapi.a */; };
 		674A2A101B26FE62001A525C /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29F41B26FE62001A525C /* libbase.a */; };
 		674A2A111B26FE62001A525C /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29F51B26FE62001A525C /* libcoding.a */; };
@@ -29,7 +28,6 @@
 		674A2A1E1B26FE62001A525C /* libosrm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A021B26FE62001A525C /* libosrm.a */; };
 		674A2A1F1B26FE62001A525C /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A031B26FE62001A525C /* libplatform.a */; };
 		674A2A201B26FE62001A525C /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A041B26FE62001A525C /* libprotobuf.a */; };
-		674A2A211B26FE62001A525C /* librender.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A051B26FE62001A525C /* librender.a */; };
 		674A2A221B26FE62001A525C /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A061B26FE62001A525C /* librouting.a */; };
 		674A2A231B26FE62001A525C /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A071B26FE62001A525C /* libsearch.a */; };
 		674A2A251B26FE62001A525C /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A091B26FE62001A525C /* libstorage.a */; };
@@ -39,8 +37,6 @@
 		674A2A2C1B26FF38001A525C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A2B1B26FF38001A525C /* IOKit.framework */; };
 		674A2A2E1B26FF4F001A525C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A2D1B26FF4F001A525C /* Cocoa.framework */; };
 		674A2A2F1B26FF7B001A525C /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675345BB1A4054AD00A0A8C3 /* libmap.a */; };
-		674A2A301B26FFA6001A525C /* libgraphics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29FD1B26FE62001A525C /* libgraphics.a */; };
-		674A2A311B26FFB5001A525C /* libgui.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A29FE1B26FE62001A525C /* libgui.a */; };
 		674A2A331B26FFE9001A525C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A2A321B26FFE9001A525C /* OpenGL.framework */; };
 		674A2A361B27011A001A525C /* working_time_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A2A351B27011A001A525C /* working_time_tests.cpp */; };
 		674A2A381B2715FB001A525C /* osm_opening_hours.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674A2A371B2715FB001A525C /* osm_opening_hours.hpp */; };
@@ -113,7 +109,6 @@
 		674A29DF1B26FD1C001A525C /* map_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = map_tests; sourceTree = BUILT_PRODUCTS_DIR; };
 		674A29EE1B26FD5F001A525C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
 		674A29F11B26FE62001A525C /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-xcode-build/Debug/libalohalitics.a"; sourceTree = "<group>"; };
-		674A29F21B26FE62001A525C /* libanim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libanim.a; path = "../../../omim-xcode-build/Debug/libanim.a"; sourceTree = "<group>"; };
 		674A29F31B26FE62001A525C /* libapi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libapi.a; path = "../../../omim-xcode-build/Debug/libapi.a"; sourceTree = "<group>"; };
 		674A29F41B26FE62001A525C /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug/libbase.a"; sourceTree = "<group>"; };
 		674A29F51B26FE62001A525C /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = "<group>"; };
@@ -124,18 +119,15 @@
 		674A29FA1B26FE62001A525C /* libgenerator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgenerator.a; path = "../../../omim-xcode-build/Debug/libgenerator.a"; sourceTree = "<group>"; };
 		674A29FB1B26FE62001A525C /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "../../../omim-xcode-build/Debug/libgeometry.a"; sourceTree = "<group>"; };
 		674A29FC1B26FE62001A525C /* libgflags.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgflags.a; path = "../../../omim-xcode-build/Debug/libgflags.a"; sourceTree = "<group>"; };
-		674A29FD1B26FE62001A525C /* libgraphics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgraphics.a; path = "../../../omim-xcode-build/Debug/libgraphics.a"; sourceTree = "<group>"; };
-		674A29FE1B26FE62001A525C /* libgui.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgui.a; path = "../../../omim-xcode-build/Debug/libgui.a"; sourceTree = "<group>"; };
 		674A29FF1B26FE62001A525C /* libindexer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libindexer.a; path = "../../../omim-xcode-build/Debug/libindexer.a"; sourceTree = "<group>"; };
 		674A2A001B26FE62001A525C /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = "../../../omim-xcode-build/Debug/libjansson.a"; sourceTree = "<group>"; };
 		674A2A011B26FE62001A525C /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../omim-xcode-build/Debug/libopening_hours.a"; sourceTree = "<group>"; };
 		674A2A021B26FE62001A525C /* libosrm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosrm.a; path = "../../../omim-xcode-build/Debug/libosrm.a"; sourceTree = "<group>"; };
 		674A2A031B26FE62001A525C /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "../../../omim-xcode-build/Debug/libplatform.a"; sourceTree = "<group>"; };
 		674A2A041B26FE62001A525C /* libprotobuf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprotobuf.a; path = "../../../omim-xcode-build/Debug/libprotobuf.a"; sourceTree = "<group>"; };
-		674A2A051B26FE62001A525C /* librender.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librender.a; path = "../../../omim-xcode-build/Debug/librender.a"; sourceTree = "<group>"; };
 		674A2A061B26FE62001A525C /* librouting.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting.a; path = "../../../omim-xcode-build/Debug/librouting.a"; sourceTree = "<group>"; };
 		674A2A071B26FE62001A525C /* libsearch.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsearch.a; path = "../../../omim-xcode-build/Debug/libsearch.a"; sourceTree = "<group>"; };
-		674A2A081B26FE62001A525C /* libsgitess.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsgitess.a; path = "/Volumes/AltHD/omim/xcode/sgitess/../../../omim-xcode-build/Debug/libsgitess.a"; sourceTree = "<absolute>"; };
+		674A2A081B26FE62001A525C /* libsgitess.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsgitess.a; path = "../../../omim-xcode-build/Debug/libsgitess.a"; sourceTree = "<group>"; };
 		674A2A091B26FE62001A525C /* libstorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstorage.a; path = "../../../omim-xcode-build/Debug/libstorage.a"; sourceTree = "<group>"; };
 		674A2A0A1B26FE62001A525C /* libsuccinct.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsuccinct.a; path = "../../../omim-xcode-build/Debug/libsuccinct.a"; sourceTree = "<group>"; };
 		674A2A0B1B26FE62001A525C /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "../../../omim-xcode-build/Debug/libtomcrypt.a"; sourceTree = "<group>"; };
@@ -178,7 +170,7 @@
 		67F1837D1BD5049500AB1840 /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "../../../omim-xcode-build/Debug/libagg.a"; sourceTree = "<group>"; };
 		67F1837E1BD5049500AB1840 /* liblodepng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblodepng.a; path = "../../../omim-xcode-build/Debug/liblodepng.a"; sourceTree = "<group>"; };
 		67F1837F1BD5049500AB1840 /* libminizip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminizip.a; path = "../../../omim-xcode-build/Debug/libminizip.a"; sourceTree = "<group>"; };
-		67F183801BD5049500AB1840 /* libtess2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtess2.a; path = "/Volumes/AltHD/mapsme/omim/xcode/tess2/../../../omim-xcode-build/Debug/libtess2.a"; sourceTree = "<absolute>"; };
+		67F183801BD5049500AB1840 /* libtess2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtess2.a; path = "../../../omim-xcode-build/Debug/libtess2.a"; sourceTree = "<group>"; };
 		67F183851BD504ED00AB1840 /* libsystem_configuration.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsystem_configuration.tbd; path = usr/lib/system/libsystem_configuration.tbd; sourceTree = SDKROOT; };
 		67F183871BD5050900AB1840 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
@@ -195,14 +187,11 @@
 				67F183841BD5049500AB1840 /* libtess2.a in Frameworks */,
 				67F183751BD5041700AB1840 /* libz.tbd in Frameworks */,
 				674A2A331B26FFE9001A525C /* OpenGL.framework in Frameworks */,
-				674A2A311B26FFB5001A525C /* libgui.a in Frameworks */,
-				674A2A301B26FFA6001A525C /* libgraphics.a in Frameworks */,
 				674A2A2F1B26FF7B001A525C /* libmap.a in Frameworks */,
 				674A2A2E1B26FF4F001A525C /* Cocoa.framework in Frameworks */,
 				674A2A2C1B26FF38001A525C /* IOKit.framework in Frameworks */,
 				674A2A2A1B26FF24001A525C /* CoreFoundation.framework in Frameworks */,
 				674A2A0D1B26FE62001A525C /* libalohalitics.a in Frameworks */,
-				674A2A0E1B26FE62001A525C /* libanim.a in Frameworks */,
 				674A2A0F1B26FE62001A525C /* libapi.a in Frameworks */,
 				674A2A101B26FE62001A525C /* libbase.a in Frameworks */,
 				674A2A111B26FE62001A525C /* libcoding.a in Frameworks */,
@@ -217,7 +206,6 @@
 				674A2A1E1B26FE62001A525C /* libosrm.a in Frameworks */,
 				674A2A1F1B26FE62001A525C /* libplatform.a in Frameworks */,
 				674A2A201B26FE62001A525C /* libprotobuf.a in Frameworks */,
-				674A2A211B26FE62001A525C /* librender.a in Frameworks */,
 				674A2A221B26FE62001A525C /* librouting.a in Frameworks */,
 				674A2A231B26FE62001A525C /* libsearch.a in Frameworks */,
 				674A2A251B26FE62001A525C /* libstorage.a in Frameworks */,
@@ -260,7 +248,6 @@
 				674A2A2B1B26FF38001A525C /* IOKit.framework */,
 				674A2A291B26FF24001A525C /* CoreFoundation.framework */,
 				674A29F11B26FE62001A525C /* libalohalitics.a */,
-				674A29F21B26FE62001A525C /* libanim.a */,
 				674A29F31B26FE62001A525C /* libapi.a */,
 				674A29F41B26FE62001A525C /* libbase.a */,
 				674A29F51B26FE62001A525C /* libcoding.a */,
@@ -271,15 +258,12 @@
 				674A29FA1B26FE62001A525C /* libgenerator.a */,
 				674A29FB1B26FE62001A525C /* libgeometry.a */,
 				674A29FC1B26FE62001A525C /* libgflags.a */,
-				674A29FD1B26FE62001A525C /* libgraphics.a */,
-				674A29FE1B26FE62001A525C /* libgui.a */,
 				674A29FF1B26FE62001A525C /* libindexer.a */,
 				674A2A001B26FE62001A525C /* libjansson.a */,
 				674A2A011B26FE62001A525C /* libopening_hours.a */,
 				674A2A021B26FE62001A525C /* libosrm.a */,
 				674A2A031B26FE62001A525C /* libplatform.a */,
 				674A2A041B26FE62001A525C /* libprotobuf.a */,
-				674A2A051B26FE62001A525C /* librender.a */,
 				674A2A061B26FE62001A525C /* librouting.a */,
 				674A2A071B26FE62001A525C /* libsearch.a */,
 				674A2A081B26FE62001A525C /* libsgitess.a */,
diff --git a/xcode/mapshot/mapshot.xcodeproj/project.pbxproj b/xcode/mapshot/mapshot.xcodeproj/project.pbxproj
index 1989ccbe27..c7ad44264e 100644
--- a/xcode/mapshot/mapshot.xcodeproj/project.pbxproj
+++ b/xcode/mapshot/mapshot.xcodeproj/project.pbxproj
@@ -59,39 +59,39 @@
 		675D21311BFB6F3D00717E4F /* mapshot */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mapshot; sourceTree = BUILT_PRODUCTS_DIR; };
 		675D213B1BFB6F7E00717E4F /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
 		675D213C1BFB717400717E4F /* mapshot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mapshot.cpp; sourceTree = "<group>"; };
-		675D213E1BFB76B000717E4F /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "/Volumes/AltHD/mapsme/omim/xcode/base/../../../omim-xcode-build/Debug/libbase.a"; sourceTree = "<absolute>"; };
-		675D21401BFB76B000717E4F /* libmap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmap.a; path = "/Volumes/AltHD/mapsme/omim/xcode/map/../../../omim-xcode-build/Debug/libmap.a"; sourceTree = "<absolute>"; };
-		675D21441BFB779A00717E4F /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "/Volumes/AltHD/mapsme/omim/xcode/alohalitics/../../../omim-xcode-build/Debug/libalohalitics.a"; sourceTree = "<absolute>"; };
-		675D21451BFB779A00717E4F /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "/Volumes/AltHD/mapsme/omim/xcode/coding/../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = "<absolute>"; };
-		675D21461BFB779A00717E4F /* libdrape_frontend.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdrape_frontend.a; path = "/Volumes/AltHD/mapsme/omim/xcode/drape_frontend/../../../omim-xcode-build/Debug/libdrape_frontend.a"; sourceTree = "<absolute>"; };
-		675D21471BFB779A00717E4F /* libdrape.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdrape.a; path = "/Volumes/AltHD/mapsme/omim/xcode/drape/../../../omim-xcode-build/Debug/libdrape.a"; sourceTree = "<absolute>"; };
-		675D21481BFB779A00717E4F /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpat.a; path = "/Volumes/AltHD/mapsme/omim/xcode/expat/../../../omim-xcode-build/Debug/libexpat.a"; sourceTree = "<absolute>"; };
-		675D21491BFB779A00717E4F /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "/Volumes/AltHD/mapsme/omim/xcode/freetype/../../../omim-xcode-build/Debug/libfreetype.a"; sourceTree = "<absolute>"; };
-		675D214A1BFB779A00717E4F /* libfribidi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfribidi.a; path = "/Volumes/AltHD/mapsme/omim/xcode/fribidi/../../../omim-xcode-build/Debug/libfribidi.a"; sourceTree = "<absolute>"; };
-		675D214B1BFB779A00717E4F /* libindexer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libindexer.a; path = "/Volumes/AltHD/mapsme/omim/xcode/indexer/../../../omim-xcode-build/Debug/libindexer.a"; sourceTree = "<absolute>"; };
-		675D214C1BFB779A00717E4F /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = "/Volumes/AltHD/mapsme/omim/xcode/jansson/../../../omim-xcode-build/Debug/libjansson.a"; sourceTree = "<absolute>"; };
-		675D214D1BFB779A00717E4F /* libosrm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosrm.a; path = "/Volumes/AltHD/mapsme/omim/xcode/osrm/../../../omim-xcode-build/Debug/libosrm.a"; sourceTree = "<absolute>"; };
-		675D214E1BFB779A00717E4F /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "/Volumes/AltHD/mapsme/omim/xcode/platform/../../../omim-xcode-build/Debug/libplatform.a"; sourceTree = "<absolute>"; };
-		675D214F1BFB779A00717E4F /* libprotobuf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprotobuf.a; path = "/Volumes/AltHD/mapsme/omim/xcode/protobuf/../../../omim-xcode-build/Debug/libprotobuf.a"; sourceTree = "<absolute>"; };
-		675D21501BFB779A00717E4F /* librouting.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting.a; path = "/Volumes/AltHD/mapsme/omim/xcode/routing/../../../omim-xcode-build/Debug/librouting.a"; sourceTree = "<absolute>"; };
-		675D21511BFB779A00717E4F /* libsearch.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsearch.a; path = "/Volumes/AltHD/mapsme/omim/xcode/search/../../../omim-xcode-build/Debug/libsearch.a"; sourceTree = "<absolute>"; };
-		675D21521BFB779A00717E4F /* libstorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstorage.a; path = "/Volumes/AltHD/mapsme/omim/xcode/storage/../../../omim-xcode-build/Debug/libstorage.a"; sourceTree = "<absolute>"; };
-		675D21531BFB779A00717E4F /* libsuccinct.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsuccinct.a; path = "/Volumes/AltHD/mapsme/omim/xcode/succinct/../../../omim-xcode-build/Debug/libsuccinct.a"; sourceTree = "<absolute>"; };
-		675D21541BFB779A00717E4F /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "/Volumes/AltHD/mapsme/omim/xcode/tomcrypt/../../../omim-xcode-build/Debug/libtomcrypt.a"; sourceTree = "<absolute>"; };
+		675D213E1BFB76B000717E4F /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug/libbase.a"; sourceTree = "<group>"; };
+		675D21401BFB76B000717E4F /* libmap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmap.a; path = "../../../omim-xcode-build/Debug/libmap.a"; sourceTree = "<group>"; };
+		675D21441BFB779A00717E4F /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-xcode-build/Debug/libalohalitics.a"; sourceTree = "<group>"; };
+		675D21451BFB779A00717E4F /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = "<group>"; };
+		675D21461BFB779A00717E4F /* libdrape_frontend.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdrape_frontend.a; path = "../../../omim-xcode-build/Debug/libdrape_frontend.a"; sourceTree = "<group>"; };
+		675D21471BFB779A00717E4F /* libdrape.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdrape.a; path = "../../../omim-xcode-build/Debug/libdrape.a"; sourceTree = "<group>"; };
+		675D21481BFB779A00717E4F /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpat.a; path = "../../../omim-xcode-build/Debug/libexpat.a"; sourceTree = "<group>"; };
+		675D21491BFB779A00717E4F /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "../../../omim-xcode-build/Debug/libfreetype.a"; sourceTree = "<group>"; };
+		675D214A1BFB779A00717E4F /* libfribidi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfribidi.a; path = "../../../omim-xcode-build/Debug/libfribidi.a"; sourceTree = "<group>"; };
+		675D214B1BFB779A00717E4F /* libindexer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libindexer.a; path = "../../../omim-xcode-build/Debug/libindexer.a"; sourceTree = "<group>"; };
+		675D214C1BFB779A00717E4F /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = "../../../omim-xcode-build/Debug/libjansson.a"; sourceTree = "<group>"; };
+		675D214D1BFB779A00717E4F /* libosrm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosrm.a; path = "../../../omim-xcode-build/Debug/libosrm.a"; sourceTree = "<group>"; };
+		675D214E1BFB779A00717E4F /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "../../../omim-xcode-build/Debug/libplatform.a"; sourceTree = "<group>"; };
+		675D214F1BFB779A00717E4F /* libprotobuf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprotobuf.a; path = "../../../omim-xcode-build/Debug/libprotobuf.a"; sourceTree = "<group>"; };
+		675D21501BFB779A00717E4F /* librouting.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting.a; path = "../../../omim-xcode-build/Debug/librouting.a"; sourceTree = "<group>"; };
+		675D21511BFB779A00717E4F /* libsearch.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsearch.a; path = "../../../omim-xcode-build/Debug/libsearch.a"; sourceTree = "<group>"; };
+		675D21521BFB779A00717E4F /* libstorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstorage.a; path = "../../../omim-xcode-build/Debug/libstorage.a"; sourceTree = "<group>"; };
+		675D21531BFB779A00717E4F /* libsuccinct.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsuccinct.a; path = "../../../omim-xcode-build/Debug/libsuccinct.a"; sourceTree = "<group>"; };
+		675D21541BFB779A00717E4F /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "../../../omim-xcode-build/Debug/libtomcrypt.a"; sourceTree = "<group>"; };
 		675D21711BFB827B00717E4F /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		675D21731BFB828200717E4F /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		675D21751BFB828900717E4F /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		675D21771BFB829000717E4F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
-		675D21791BFB84BA00717E4F /* libapi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libapi.a; path = "/Volumes/AltHD/mapsme/omim/xcode/api/../../../omim-xcode-build/Debug/libapi.a"; sourceTree = "<absolute>"; };
-		675D217A1BFB84BA00717E4F /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "/Volumes/AltHD/mapsme/omim/xcode/geometry/../../../omim-xcode-build/Debug/libgeometry.a"; sourceTree = "<absolute>"; };
-		675D217B1BFB84BA00717E4F /* libminizip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminizip.a; path = "/Volumes/AltHD/mapsme/omim/xcode/minizip/../../../omim-xcode-build/Debug/libminizip.a"; sourceTree = "<absolute>"; };
-		675D217C1BFB84BA00717E4F /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "/Volumes/AltHD/mapsme/omim/xcode/opening_hours/../../../omim-xcode-build/Debug/libopening_hours.a"; sourceTree = "<absolute>"; };
+		675D21791BFB84BA00717E4F /* libapi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libapi.a; path = "../../../omim-xcode-build/Debug/libapi.a"; sourceTree = "<group>"; };
+		675D217A1BFB84BA00717E4F /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "../../../omim-xcode-build/Debug/libgeometry.a"; sourceTree = "<group>"; };
+		675D217B1BFB84BA00717E4F /* libminizip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libminizip.a; path = "../../../omim-xcode-build/Debug/libminizip.a"; sourceTree = "<group>"; };
+		675D217C1BFB84BA00717E4F /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../omim-xcode-build/Debug/libopening_hours.a"; sourceTree = "<group>"; };
 		675D21811BFB85E800717E4F /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		675D21831BFB86F400717E4F /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		675D21C71BFB8F7C00717E4F /* libsdf_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsdf_image.a; path = "../../../omim-xcode-build/Debug/libsdf_image.a"; sourceTree = "<group>"; };
 		675D21C81BFB8F7C00717E4F /* libstb_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstb_image.a; path = "../../../omim-xcode-build/Debug/libstb_image.a"; sourceTree = "<group>"; };
 		675D21CB1BFB907F00717E4F /* liblodepng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblodepng.a; path = "../../../omim-xcode-build/Debug/liblodepng.a"; sourceTree = "<group>"; };
-		675D21CE1BFDDF9300717E4F /* libgflags.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgflags.a; path = "/Volumes/AltHD/mapsme/omim/xcode/gflags/../../../omim-xcode-build/Debug/libgflags.a"; sourceTree = "<absolute>"; };
+		675D21CE1BFDDF9300717E4F /* libgflags.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgflags.a; path = "../../../omim-xcode-build/Debug/libgflags.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj
index 5a4e34f319..743209ffa8 100644
--- a/xcode/search/search.xcodeproj/project.pbxproj
+++ b/xcode/search/search.xcodeproj/project.pbxproj
@@ -92,16 +92,16 @@
 		671C621A1AE9227C00076BD0 /* string_intersection_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_intersection_test.cpp; sourceTree = "<group>"; };
 		671C621B1AE9227C00076BD0 /* string_match_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_match_test.cpp; sourceTree = "<group>"; };
 		671C62241AE9229A00076BD0 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
-		671C62271AE9233200076BD0 /* libindexer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libindexer.a; path = ../../../../../../Volumes/AltHD/Xcode/DerivedData/Build/Products/Debug/libindexer.a; sourceTree = "<group>"; };
-		671C62291AE9233C00076BD0 /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = ../../../../../../Volumes/AltHD/Xcode/DerivedData/Build/Products/Debug/libplatform.a; sourceTree = "<group>"; };
+		671C62271AE9233200076BD0 /* libindexer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libindexer.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libindexer.a"; sourceTree = "<group>"; };
+		671C62291AE9233C00076BD0 /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libplatform.a"; sourceTree = "<group>"; };
 		671C622B1AE9238B00076BD0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		671C622D1AE923A300076BD0 /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = ../../../../../../Volumes/AltHD/Xcode/DerivedData/Build/Products/Debug/libcoding.a; sourceTree = "<group>"; };
+		671C622D1AE923A300076BD0 /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libcoding.a"; sourceTree = "<group>"; };
 		671C622F1AE9243E00076BD0 /* QtCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QtCore.framework; path = ../../../../../../usr/local/Cellar/qt5/5.3.2/lib/QtCore.framework; sourceTree = "<group>"; };
 		671C62311AE9245900076BD0 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
-		671C62331AE924AB00076BD0 /* libprotobuf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprotobuf.a; path = ../../../../../../usr/local/Cellar/protobuf/2.6.1/lib/libprotobuf.a; sourceTree = "<group>"; };
-		671C62351AE924BD00076BD0 /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = ../../../../../../Volumes/AltHD/Xcode/DerivedData/Build/Products/Debug/libtomcrypt.a; sourceTree = "<group>"; };
-		671C62371AE924CE00076BD0 /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = ../../../../../../Volumes/AltHD/Xcode/DerivedData/Build/Products/Debug/libbase.a; sourceTree = "<group>"; };
-		671C62391AE924E600076BD0 /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = ../../../../../../Volumes/AltHD/Xcode/DerivedData/Build/Products/Debug/libgeometry.a; sourceTree = "<group>"; };
+		671C62331AE924AB00076BD0 /* libprotobuf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprotobuf.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libprotobuf.a"; sourceTree = "<group>"; };
+		671C62351AE924BD00076BD0 /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libtomcrypt.a"; sourceTree = "<group>"; };
+		671C62371AE924CE00076BD0 /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libbase.a"; sourceTree = "<group>"; };
+		671C62391AE924E600076BD0 /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libgeometry.a"; sourceTree = "<group>"; };
 		675346B01A4055CF00A0A8C3 /* libsearch.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsearch.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		675346BE1A40560D00A0A8C3 /* algos.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = algos.hpp; sourceTree = "<group>"; };
 		675346BF1A40560D00A0A8C3 /* approximate_string_match.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = approximate_string_match.cpp; sourceTree = "<group>"; };
@@ -425,11 +425,6 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_SHADOW = NO;
 				HEADER_SEARCH_PATHS = "$(inherited)";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					/Volumes/AltHD/Xcode/DerivedData/Build/Products/Debug,
-					/usr/local/Cellar/protobuf/2.6.1/lib,
-				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -446,11 +441,6 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_SHADOW = NO;
 				HEADER_SEARCH_PATHS = "$(inherited)";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					/Volumes/AltHD/Xcode/DerivedData/Build/Products/Debug,
-					/usr/local/Cellar/protobuf/2.6.1/lib,
-				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;