diff options
| author |  Jeffrey Pfau | 2016-11-09 23:05:46 -0800 |
|---|---|---|
| committer | Jeffrey Pfau | 2016-12-13 09:41:55 -0800 |
| commit | 07ab936f1246ae91c83c70b2d80b695c6883f28a (patch) | |
| tree | a011671d656d719e561fc38d4cea4fc308b94937 | |
| parent | Merge pull request #2315 from JamePeng/fix-gsp_gpu-code (diff) | |
| download | yuzu-07ab936f1246ae91c83c70b2d80b695c6883f28a.tar.gz yuzu-07ab936f1246ae91c83c70b2d80b695c6883f28a.tar.xz yuzu-07ab936f1246ae91c83c70b2d80b695c6883f28a.zip | |
CMakeLists: Autodetect clang and only then use libc++
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c02c96840..2c00690c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -183,8 +183,10 @@ IF (APPLE) | |||
| 183 | FIND_LIBRARY(COCOA_LIBRARY Cocoa) # Umbrella framework for everything GUI-related | 183 | FIND_LIBRARY(COCOA_LIBRARY Cocoa) # Umbrella framework for everything GUI-related |
| 184 | set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY}) | 184 | set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY}) |
| 185 | 185 | ||
| 186 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") | 186 | if (CMAKE_CXX_COMPILER_ID STREQUAL Clang) |
| 187 | set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") | 187 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") |
| 188 | set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") | ||
| 189 | endif() | ||
| 188 | ELSEIF (WIN32) | 190 | ELSEIF (WIN32) |
| 189 | # WSAPoll and SHGetKnownFolderPath (AppData/Roaming) didn't exist before WinNT 6.x (Vista) | 191 | # WSAPoll and SHGetKnownFolderPath (AppData/Roaming) didn't exist before WinNT 6.x (Vista) |
| 190 | add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600) | 192 | add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600) |