diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-12-01 00:47:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 00:47:08 +0100 |
| commit | 68c00ee771791e5975912c4e0d4be0fb5ab6b8fa (patch) | |
| tree | a7aefb2726e5efb1b4053c037f8181ad3c497e10 | |
| parent | Merge pull request #2243 from MerryMage/r15 (diff) | |
| parent | Appending PLATFORM_LIBRARIES instead of redefining them (diff) | |
| download | yuzu-68c00ee771791e5975912c4e0d4be0fb5ab6b8fa.tar yuzu-68c00ee771791e5975912c4e0d4be0fb5ab6b8fa.tar.gz yuzu-68c00ee771791e5975912c4e0d4be0fb5ab6b8fa.tar.bz2 yuzu-68c00ee771791e5975912c4e0d4be0fb5ab6b8fa.tar.lz yuzu-68c00ee771791e5975912c4e0d4be0fb5ab6b8fa.tar.xz yuzu-68c00ee771791e5975912c4e0d4be0fb5ab6b8fa.tar.zst yuzu-68c00ee771791e5975912c4e0d4be0fb5ab6b8fa.zip | |
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | src/common/file_util.cpp | 3 |
2 files changed, 8 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c9b7f86a..33d18f5ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,15 +182,15 @@ IF (APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") -ELSEIF(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) +ELSEIF (WIN32) + # WSAPoll and SHGetKnownFolderPath (AppData/Roaming) didn't exist before WinNT 6.x (Vista) + add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600) set(PLATFORM_LIBRARIES winmm ws2_32) -ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$") + IF (MINGW) + # PSAPI is the Process Status API + set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version) + ENDIF (MINGW) +ELSEIF (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$") set(PLATFORM_LIBRARIES rt) ENDIF (APPLE) diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 413a8e7e5..b6161f2dc 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -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> |