citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Support for C++11 on OSX

This commit is contained in:
archshift 2014-04-30 23:47:38 -07:00
parent 704075f04a
commit 7817d6c79a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -22,8 +22,7 @@ pkg_search_module(GLFW REQUIRED glfw3)
IF (APPLE) IF (APPLE)
FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation)
SET(CMAKE_CXX_FLAGS "-stdlib=libc++") SET(CMAKE_CXX_FLAGS "-stdlib=libc++")
SET(CMAKE_CXX_FLAGS_DEBUG "-stdlib=libc++") SET(CMAKE_EXE_LINKER_FLAGS "-stdlib=libc++")
SET(CMAKE_CXX_FLAGS_RELEASE "-stdlib=libc++")
ENDIF (APPLE) ENDIF (APPLE)
#external includes #external includes

4
src/common/common.h
View File

@ -25,7 +25,7 @@
#define HAVE_CXX11_SYNTAX 1 #define HAVE_CXX11_SYNTAX 1
#endif #endif
//#if HAVE_CXX11_SYNTAX #if HAVE_CXX11_SYNTAX
// An inheritable class to disallow the copy constructor and operator= functions // An inheritable class to disallow the copy constructor and operator= functions
class NonCopyable class NonCopyable
{ {
@ -37,7 +37,7 @@ private:
NonCopyable(NonCopyable&); NonCopyable(NonCopyable&);
NonCopyable& operator=(NonCopyable& other); NonCopyable& operator=(NonCopyable& other);
}; };
//#endif #endif
#include "common/log.h" #include "common/log.h"
#include "common/common_types.h" #include "common/common_types.h"