map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[win] Moved all WINVER defines to common.pri so they affect also 3party libs

Browse source
This commit is contained in:
Alex Zolotarev 2011-04-26 02:40:44 +02:00 • committed by Alex Zolotarev
parent ff62311bad
commit 370d442648
5 changed files with 35 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3party/gflags/src/mutex.h
View file

@ -117,7 +117,7 @@
#if defined(NO_THREADS)
typedef int MutexType; // to keep a lock-count
#elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__)
# define WIN32_LEAN_AND_MEAN // We only need minimal includes
//# define WIN32_LEAN_AND_MEAN // We only need minimal includes
# ifdef GMUTEX_TRYLOCK
// We need Windows NT or later for TryEnterCriticalSection(). If you
// don't need that functionality, you can remove these _WIN32_WINNT

2
3party/protobuf/src/google/protobuf/stubs/common.cc
View file

@ -39,7 +39,7 @@
//#include "config.h"
#if defined(_WIN32) && !defined(_BADA_SIMULATOR) && !defined(_BADA_DEVICE)
#define WIN32_LEAN_AND_MEAN // We only need minimal includes
//#define WIN32_LEAN_AND_MEAN // We only need minimal includes
#include <windows.h>
#define snprintf _snprintf // see comment in strutil.cc
#elif defined(HAVE_PTHREAD)

4
3party/sgitess/gluos.h
View file

@ -35,14 +35,14 @@
#include <stdio.h>
#include <malloc.h>
#define WIN32_LEAN_AND_MEAN
//#define WIN32_LEAN_AND_MEAN
#define NOGDI
#define NOIME
#ifndef NOMINMAX
#define NOMINMAX
#endif
#define _WIN32_WINNT 0x0400
//#define _WIN32_WINNT 0x0400
#ifndef STRICT
#define STRICT 1
#endif

8
common.pri
View file

@ -65,6 +65,14 @@ for(project, DEPENDENCIES) {
INCLUDEPATH += $$ROOT_DIR/3party/protobuf/src/
win32 {
DEFINES += _WIN32_WINNT=0x0501
DEFINES += WINVER=0x0501
DEFINES += _WIN32_IE=0x0501
DEFINES += WIN32_LEAN_AND_MEAN=1
DEFINES += NTDDI_VERSION=0x05010000
}
# Windows-specific options for all projects
win32-msvc2008 {
QMAKE_CLEAN += *.user

39
std/windows.hpp
View file

@ -1,24 +1,31 @@
#pragma once
// we support only Vista and above at the moment (due to conditional variables)
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT 0x0600
// These defines are moved to common.pri because
// they should be equal for all libraries, even for 3party ones
#ifdef WINVER
#undef WINVER
#endif
#define WINVER 0x0600
//#ifdef _WIN32_WINNT
// #undef _WIN32_WINNT
//#endif
//#define _WIN32_WINNT 0x0501
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
//#ifdef WINVER
// #undef WINVER
//#endif
//#define WINVER 0x0501
#ifdef _WIN32_IE
#undef _WIN32_IE
#endif
#define _WIN32_IE 0x0600
//#ifndef WIN32_LEAN_AND_MEAN
// #define WIN32_LEAN_AND_MEAN 1
//#endif
//#ifdef _WIN32_IE
// #undef _WIN32_IE
//#endif
//#define _WIN32_IE 0x0501
//#ifdef NTDDI_VERSION
// #undef NTDDI_VERSION
//#endif
//#define NTDDI_VERSION 0x05010000
#include <windows.h>