summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-05-20 01:33:23 +0200
committerarchshift <admin@archshift.com>2014-05-20 01:42:34 +0200
commit9216c96f48b498788b78739655b64caf95307fe3 (patch)
treedf7dfb8abf88902341ec27d3c9795243f03b996e /CMakeLists.txt
parentImproved clarity and whitespace (diff)
downloadyuzu-9216c96f48b498788b78739655b64caf95307fe3.tar
yuzu-9216c96f48b498788b78739655b64caf95307fe3.tar.gz
yuzu-9216c96f48b498788b78739655b64caf95307fe3.tar.bz2
yuzu-9216c96f48b498788b78739655b64caf95307fe3.tar.lz
yuzu-9216c96f48b498788b78739655b64caf95307fe3.tar.xz
yuzu-9216c96f48b498788b78739655b64caf95307fe3.tar.zst
yuzu-9216c96f48b498788b78739655b64caf95307fe3.zip
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt10
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)
project(citra)
-SET(CMAKE_CXX_FLAGS "-std=c++11 -fpermissive")
+SET(CXX_COMPILE_FLAGS "-std=c++11 -fpermissive")
# silence some spam
add_definitions(-Wno-attributes)
add_definitions(-DSINGLETHREADED)
-add_definitions(${GCC_COMPILE_FLAGS})
+add_definitions(${CXX_COMPILE_FLAGS})
# dependency checking
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules/")
@@ -21,14 +21,14 @@ pkg_search_module(GLFW REQUIRED glfw3)
# corefoundation is required only on OSX
IF (APPLE)
FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation)
- SET(CMAKE_CXX_FLAGS "-stdlib=libc++")
- SET(CMAKE_EXE_LINKER_FLAGS "-stdlib=libc++")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
ENDIF (APPLE)
#external includes
include_directories(${GLFW_INCLUDE_DIRS})
include_directories(${OPENGL_INCLUDE_DIR})
-include_directories(${GLEW_INCLUDE_DIR})
+include_directories(${GLEW_INCLUDE_PATH})
# workaround for GLFW linking on OSX
link_directories(${GLFW_LIBRARY_DIRS})