[win] Fixed some compilation errors

11 files changed, 20 insertions, 18 deletions

diff --git a/base/object_tracker.cpp b/base/object_tracker.cpp
index 3ba5127e23..9b6ed574af 100644
--- a/base/object_tracker.cpp
+++ b/base/object_tracker.cpp
@@ -68,8 +68,8 @@ void BreakIntoDebugger()
 {
   /// @todo Probably we can make it more simple (like std::terminate).
 
-#ifdef OMIM_OS_WINDOWS
-  __debugbreak();
+#if defined(OMIM_OS_WINDOWS)
+  DebugBreak();
 #else
   kill(getpid(), SIGINT);
 #endif
diff --git a/coding/coding_tests/coding_tests.pro b/coding/coding_tests/coding_tests.pro
index 1eb3c5edc7..b4c46de468 100644
--- a/coding/coding_tests/coding_tests.pro
+++ b/coding/coding_tests/coding_tests.pro
@@ -9,6 +9,8 @@ DEPENDENCIES = coding base bzip2 zlib tomcrypt
 
 include($$ROOT_DIR/common.pri)
 
+win32-g++: LIBS *= -lpthread
+
 SOURCES += ../../testing/testingmain.cpp \
     endianness_test.cpp \
     varint_test.cpp \
diff --git a/geometry/geometry_tests/geometry_tests.pro b/geometry/geometry_tests/geometry_tests.pro
index f71ee12a64..c82411e938 100644
--- a/geometry/geometry_tests/geometry_tests.pro
+++ b/geometry/geometry_tests/geometry_tests.pro
@@ -10,6 +10,8 @@ DEPENDENCIES = indexer geometry base
 
 include($$ROOT_DIR/common.pri)
 
+win32-g++: LIBS *= -lpthread
+
 HEADERS += \
   equality.hpp \
   large_polygon.hpp \
diff --git a/graphics/defines.cpp b/graphics/defines.cpp
index 23bfa9e1f7..f924701dfa 100644
--- a/graphics/defines.cpp
+++ b/graphics/defines.cpp
@@ -2,6 +2,8 @@
 #include "../base/macros.hpp"
 #include "../base/logging.hpp"
 #include "../std/string.hpp"
+// for strcmp
+#include "../std/memcpy.hpp"
 
 namespace graphics
 {
diff --git a/graphics/opengl/framebuffer.cpp b/graphics/opengl/framebuffer.cpp
index a7bea0cb0a..e4b18fad3f 100644
--- a/graphics/opengl/framebuffer.cpp
+++ b/graphics/opengl/framebuffer.cpp
@@ -1,14 +1,14 @@
-#include "../base/SRC_FIRST.hpp"
-
 #include "framebuffer.hpp"
-#include "render_target.hpp"
 #include "renderbuffer.hpp"
 #include "opengl.hpp"
 #include "utils.hpp"
 
+#include "../render_target.hpp"
+
 #include "../../base/logging.hpp"
 #include "../../std/list.hpp"
 
+
 namespace graphics
 {
   namespace gl
diff --git a/graphics/opengl/geometry_renderer.cpp b/graphics/opengl/geometry_renderer.cpp
index a2e97d6f70..aa3d48c3ad 100644
--- a/graphics/opengl/geometry_renderer.cpp
+++ b/graphics/opengl/geometry_renderer.cpp
@@ -1,6 +1,5 @@
-#include "../base/SRC_FIRST.hpp"
 #include "geometry_renderer.hpp"
-#include "resource.hpp"
+#include "../resource.hpp"
 #include "base_texture.hpp"
 #include "texture.hpp"
 #include "buffer_object.hpp"
@@ -10,8 +9,8 @@
 #include "gl_render_context.hpp"
 #include "defines_conv.hpp"
 
-#include "../std/bind.hpp"
-#include "../base/logging.hpp"
+#include "../../std/bind.hpp"
+#include "../../base/logging.hpp"
 
 namespace graphics
 {
diff --git a/graphics/opengl/managed_texture.cpp b/graphics/opengl/managed_texture.cpp
index 2ffcca0de3..3dc86493aa 100644
--- a/graphics/opengl/managed_texture.cpp
+++ b/graphics/opengl/managed_texture.cpp
@@ -1,5 +1,3 @@
-#include "../base/SRC_FIRST.hpp"
-
 #include "../../base/shared_buffer_manager.hpp"
 
 #include "opengl.hpp"
diff --git a/graphics/opengl/renderbuffer.cpp b/graphics/opengl/renderbuffer.cpp
index a91d050568..32848e0b2c 100644
--- a/graphics/opengl/renderbuffer.cpp
+++ b/graphics/opengl/renderbuffer.cpp
@@ -1,12 +1,10 @@
-#include "../base/SRC_FIRST.hpp"
-
-#include "opengl.hpp"
 #include "renderbuffer.hpp"
+#include "opengl.hpp"
 #include "utils.hpp"
 
-#include "../base/logging.hpp"
+#include "../../base/logging.hpp"
 
-#include "../std/list.hpp"
+#include "../../std/list.hpp"
 
 namespace graphics
 {
diff --git a/graphics/opengl/storage.cpp b/graphics/opengl/storage.cpp
index 41f0a231fc..6578ddec39 100644
--- a/graphics/opengl/storage.cpp
+++ b/graphics/opengl/storage.cpp
@@ -1,7 +1,7 @@
 #include "storage.hpp"
 #include "buffer_object.hpp"
 
-#include "opengl/opengl.hpp"
+#include "opengl.hpp"
 
 namespace graphics
 {
diff --git a/graphics/opengl/vertex.cpp b/graphics/opengl/vertex.cpp
index 1d58bdc576..b1d07a59ca 100644
--- a/graphics/opengl/vertex.cpp
+++ b/graphics/opengl/vertex.cpp
@@ -1,7 +1,7 @@
 #include "vertex.hpp"
 #include "opengl.hpp"
 
-#include "../base/macros.hpp"
+#include "../../base/macros.hpp"
 
 namespace graphics
 {
diff --git a/storage/storage_tests/storage_tests.pro b/storage/storage_tests/storage_tests.pro
index 01356fd324..d58208591d 100644
--- a/storage/storage_tests/storage_tests.pro
+++ b/storage/storage_tests/storage_tests.pro
@@ -11,6 +11,7 @@ DEPENDENCIES = storage indexer platform coding base jansson tomcrypt expat
 include($$ROOT_DIR/common.pri)
 
 win32*: LIBS *= -lshell32
+win32-g++: LIBS *= -lpthread
 macx*: LIBS *= "-framework Foundation" "-framework IOKit"
 
 QT *= core