Browse Source

Support for C++11 on OSX

archshift 12 years ago
parent
commit
7817d6c79a
2 changed files with 4 additions and 5 deletions
  1. 2 3
      CMakeLists.txt
  2. 2 2
      src/common/common.h

+ 2 - 3
CMakeLists.txt

@@ -21,9 +21,8 @@ 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_DEBUG "-stdlib=libc++")
-    SET(CMAKE_CXX_FLAGS_RELEASE "-stdlib=libc++")
+	SET(CMAKE_CXX_FLAGS "-stdlib=libc++")
+	SET(CMAKE_EXE_LINKER_FLAGS "-stdlib=libc++")
 ENDIF (APPLE)
 ENDIF (APPLE)
 
 
 #external includes
 #external includes

+ 2 - 2
src/common/common.h

@@ -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"