diff options
| author | 2016-04-24 02:02:45 -0400 | |
|---|---|---|
| committer | 2016-04-24 02:02:45 -0400 | |
| commit | 0964a3ff530f2eb5b7ecdf9dfbb74deea890352d (patch) | |
| tree | c566efaf69f8d3564d1e678a0a31981a52794a8a /CMakeLists.txt | |
| parent | Merge pull request #1705 from LittleWhite-tb/compat_gcc49 (diff) | |
| parent | assert: Add _MSG variations for UNREACHABLE and UNIMPLEMENTED (diff) | |
| download | yuzu-0964a3ff530f2eb5b7ecdf9dfbb74deea890352d.tar.gz yuzu-0964a3ff530f2eb5b7ecdf9dfbb74deea890352d.tar.xz yuzu-0964a3ff530f2eb5b7ecdf9dfbb74deea890352d.zip | |
Merge pull request #1576 from smspillaz/fix-build-errors-03272016
Fix various build errors encountered on Clang 3.9 on OS X
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a0a161e7..ddde19760 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -65,8 +65,8 @@ endif() | |||
| 65 | message(STATUS "Target architecture: ${ARCHITECTURE}") | 65 | message(STATUS "Target architecture: ${ARCHITECTURE}") |
| 66 | 66 | ||
| 67 | if (NOT MSVC) | 67 | if (NOT MSVC) |
| 68 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wno-attributes -pthread") | 68 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wno-attributes") |
| 69 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") | 69 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") |
| 70 | 70 | ||
| 71 | if (ARCHITECTURE_x86_64) | 71 | if (ARCHITECTURE_x86_64) |
| 72 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1") | 72 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1") |
| @@ -135,6 +135,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules") | |||
| 135 | find_package(OpenGL REQUIRED) | 135 | find_package(OpenGL REQUIRED) |
| 136 | include_directories(${OPENGL_INCLUDE_DIR}) | 136 | include_directories(${OPENGL_INCLUDE_DIR}) |
| 137 | 137 | ||
| 138 | find_package(Threads REQUIRED) | ||
| 139 | |||
| 138 | if (ENABLE_SDL2) | 140 | if (ENABLE_SDL2) |
| 139 | if (CITRA_USE_BUNDLED_SDL2) | 141 | if (CITRA_USE_BUNDLED_SDL2) |
| 140 | # Detect toolchain and platform | 142 | # Detect toolchain and platform |