WINVER definition moved to CMake and cleanup
This commit is contained in:
parent
cf5b8483fc
commit
0c22e52f52
|
@ -182,14 +182,14 @@ IF (APPLE)
|
|||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
|
||||
ELSEIF(MINGW)
|
||||
ELSEIF (WIN32)
|
||||
#WSAPoll and other fileutil.cpp functionalities didn't exist before WinNT 6.x (Vista and up)
|
||||
add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600)
|
||||
set(PLATFORM_LIBRARIES winmm ws2_32)
|
||||
if (MINGW)
|
||||
# PSAPI is the Process Status API
|
||||
set(PLATFORM_LIBRARIES winmm ws2_32 psapi imm32 version)
|
||||
|
||||
# WSAPoll functionality doesn't exist before WinNT 6.x (Vista and up)
|
||||
add_definitions(-D_WIN32_WINNT=0x0600)
|
||||
ELSEIF(WIN32)
|
||||
set(PLATFORM_LIBRARIES winmm ws2_32)
|
||||
ENDIF (MINGW)
|
||||
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
|
||||
set(PLATFORM_LIBRARIES rt)
|
||||
ENDIF (APPLE)
|
||||
|
|
|
@ -26,9 +26,6 @@
|
|||
#define stat _stat64
|
||||
#define fstat _fstat64
|
||||
#define fileno _fileno
|
||||
// Windows version, at least Vista is required to obtain AppData Path
|
||||
#define WINVER 0x0600
|
||||
#define _WIN32_WINNT 0x0600
|
||||
#else
|
||||
#ifdef __APPLE__
|
||||
#include <sys/param.h>
|
||||
|
|
Reference in New Issue