diff options
| author |  freiro | 2016-11-30 15:59:26 +0100 |
|---|---|---|
| committer | freiro | 2016-11-30 16:28:21 +0100 |
| commit | 35e979f041aed8a5fc1da3dde254ce11e6138562 (patch) | |
| tree | f0a7a46b6419f6ed6a901d9d8f42add39243cb6b | |
| parent | WINVER definition moved to CMake and cleanup (diff) | |
| download | yuzu-35e979f041aed8a5fc1da3dde254ce11e6138562.tar.gz yuzu-35e979f041aed8a5fc1da3dde254ce11e6138562.tar.xz yuzu-35e979f041aed8a5fc1da3dde254ce11e6138562.zip | |
Appending PLATFORM_LIBRARIES instead of redefining them
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a78028bc..33d18f5ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -183,12 +183,12 @@ IF (APPLE) | |||
| 183 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") | 183 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") |
| 184 | set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") | 184 | set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") |
| 185 | ELSEIF (WIN32) | 185 | ELSEIF (WIN32) |
| 186 | #WSAPoll and other fileutil.cpp functionalities didn't exist before WinNT 6.x (Vista and up) | 186 | # WSAPoll and SHGetKnownFolderPath (AppData/Roaming) didn't exist before WinNT 6.x (Vista) |
| 187 | add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600) | 187 | add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600) |
| 188 | set(PLATFORM_LIBRARIES winmm ws2_32) | 188 | set(PLATFORM_LIBRARIES winmm ws2_32) |
| 189 | if (MINGW) | 189 | IF (MINGW) |
| 190 | # PSAPI is the Process Status API | 190 | # PSAPI is the Process Status API |
| 191 | set(PLATFORM_LIBRARIES winmm ws2_32 psapi imm32 version) | 191 | set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version) |
| 192 | ENDIF (MINGW) | 192 | ENDIF (MINGW) |
| 193 | ELSEIF (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$") | 193 | ELSEIF (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$") |
| 194 | set(PLATFORM_LIBRARIES rt) | 194 | set(PLATFORM_LIBRARIES rt) |