Browse Source

Merge branch 'hotfix/osx-lua-check-builtin-macro-collision-fix'

David Wimsey 11 years ago
parent
commit
38ea8ef14c
1 changed files with 11 additions and 0 deletions
  1. 11 0
      Build/CMakeLists.txt

+ 11 - 0
Build/CMakeLists.txt

@@ -73,6 +73,17 @@ if(NOT DEFINED ENV{SFML_ROOT})
 	set(ENV{SFML_ROOT} "${PROJECT_SOURCE_DIR}/../Dependencies")
 endif()
 
+#===================================
+# Plaform specific global hacks ====
+#===================================
+
+if(APPLE)
+	# Disables naked builtins from AssertMacros.h which
+	# This prevents naming collisions such as those from the check()
+	# function macro with LuaType::check
+	add_definitions(-D_ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0)
+endif(APPLE)
+
 #===================================
 # Build options ====================
 #===================================