diff options
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 76190c5e4..114e39207 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 2.6) | |||
| 2 | 2 | ||
| 3 | project(citra) | 3 | project(citra) |
| 4 | 4 | ||
| 5 | SET(CMAKE_CXX_FLAGS "-std=c++11 -fpermissive") | 5 | SET(CXX_COMPILE_FLAGS "-std=c++11 -fpermissive") |
| 6 | 6 | ||
| 7 | # silence some spam | 7 | # silence some spam |
| 8 | add_definitions(-Wno-attributes) | 8 | add_definitions(-Wno-attributes) |
| 9 | add_definitions(-DSINGLETHREADED) | 9 | add_definitions(-DSINGLETHREADED) |
| 10 | add_definitions(${GCC_COMPILE_FLAGS}) | 10 | add_definitions(${CXX_COMPILE_FLAGS}) |
| 11 | 11 | ||
| 12 | # dependency checking | 12 | # dependency checking |
| 13 | list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules/") | 13 | list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules/") |
| @@ -21,14 +21,14 @@ pkg_search_module(GLFW REQUIRED glfw3) | |||
| 21 | # corefoundation is required only on OSX | 21 | # corefoundation is required only on OSX |
| 22 | IF (APPLE) | 22 | IF (APPLE) |
| 23 | FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) | 23 | FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) |
| 24 | SET(CMAKE_CXX_FLAGS "-stdlib=libc++") | 24 | SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") |
| 25 | SET(CMAKE_EXE_LINKER_FLAGS "-stdlib=libc++") | 25 | SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") |
| 26 | ENDIF (APPLE) | 26 | ENDIF (APPLE) |
| 27 | 27 | ||
| 28 | #external includes | 28 | #external includes |
| 29 | include_directories(${GLFW_INCLUDE_DIRS}) | 29 | include_directories(${GLFW_INCLUDE_DIRS}) |
| 30 | include_directories(${OPENGL_INCLUDE_DIR}) | 30 | include_directories(${OPENGL_INCLUDE_DIR}) |
| 31 | include_directories(${GLEW_INCLUDE_DIR}) | 31 | include_directories(${GLEW_INCLUDE_PATH}) |
| 32 | 32 | ||
| 33 | # workaround for GLFW linking on OSX | 33 | # workaround for GLFW linking on OSX |
| 34 | link_directories(${GLFW_LIBRARY_DIRS}) | 34 | link_directories(${GLFW_LIBRARY_DIRS}) |