gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[win][mingw] Some compilation fixes

Browse source
This commit is contained in:
Alex Zolotarev 2013-04-17 13:27:12 +03:00 • committed by Alex Zolotarev
parent a4206cd253
commit 66eae08188
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3party/protobuf/protobuf.pro
View file

@ -68,7 +68,7 @@ SOURCES += \
}
linux*|android* {
linux*|android*|win32-g++ {
SOURCES += src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
}

2
3party/sgitess/GL/glu.h
View file

@ -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

2
base/object_tracker.cpp
View file

@ -6,6 +6,8 @@
#ifndef OMIM_OS_WINDOWS
#include <signal.h>
#else
#include "../std/windows.hpp"
#endif

2
base/timer.cpp
View file

@ -17,7 +17,7 @@ Timer::Timer()
double Timer::LocalTime()
{
#ifdef OMIM_OS_WINDOWS
#ifdef OMIM_OS_WINDOWS_NATIVE
FILETIME ft;
GetSystemTimeAsFileTime(&ft);
uint64_t val = ft.dwHighDateTime;