diff options
| author | Alex Zolotarev <alex@mapswithme.com> | 2013-04-17 14:27:12 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:53:16 +0300 |
| commit | 66eae08188648fd31ffe504b9a46a6a4f7f1241f (patch) | |
| tree | 4b9e612a28d5960014cad6edfa0d323515887d0c /3party | |
| parent | a4206cd2535038d8c0fa0e89b0562a175681fba4 (diff) | |
[win][mingw] Some compilation fixes
Diffstat (limited to '3party')
| -rw-r--r-- | 3party/protobuf/protobuf.pro | 2 | ||||
| -rw-r--r-- | 3party/sgitess/GL/glu.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/3party/protobuf/protobuf.pro b/3party/protobuf/protobuf.pro index 9c7ae7c7f8..0bf5d8a0e0 100644 --- a/3party/protobuf/protobuf.pro +++ b/3party/protobuf/protobuf.pro @@ -68,7 +68,7 @@ SOURCES += \ } -linux*|android* { +linux*|android*|win32-g++ { SOURCES += src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc } diff --git a/3party/sgitess/GL/glu.h b/3party/sgitess/GL/glu.h index d0267d70c7..cbd59c796c 100644 --- a/3party/sgitess/GL/glu.h +++ b/3party/sgitess/GL/glu.h @@ -63,7 +63,7 @@ // By VNG: In defines below, in looks like we have a _DLL (wtf???). // But now we are linking like static library, so we should redefine GLAPI. -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__MINGW32__) #undef GLAPI #define GLAPI extern #endif |