From daa112e2ac8c963befd07cfa7cb3284183271e55 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 9 Apr 2016 10:51:19 +0300 Subject: [PATCH] Fixed OS X compilation after floating point merge Header files from Carbon framework caused a few symbol conflicts --- src/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9f1fb8a7d..17229da39 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -169,6 +169,12 @@ else() set( FMOD_INC_PATH_SUFFIXES PATH_SUFFIXES inc ) set( FMOD_LIB_PATH_SUFFIXES PATH_SUFFIXES lib ) set( NO_GTK ON ) + + # Prevent inclusion of fp.h and FixMath.h from Carbon framework + # Declarations from these files are not used but cause the following conflicts: + # - redefinition of 'FixedToFloat' and 'FloatToFixed' macros + # - redefinition of 'pi' as different kind of symbol + add_definitions( -D__FP__ -D__FIXMATH__ ) else() option( NO_GTK "Disable GTK+ dialogs (Not applicable to Windows)" ) option( VALGRIND "Add special Valgrind sequences to self-modifying code" )