From 7ec4d3eb4b1aa0017f3176a46abb4ab825ee7ee3 Mon Sep 17 00:00:00 2001 From: Benny Franco Dennis Date: Sat, 6 Apr 2019 04:42:05 -0700 Subject: [PATCH] Fix MacOS compilation for 32 and 64 bits (#78) --- CMakeLists.txt | 4 ++-- Xcode/devilutionX.xcodeproj/project.pbxproj | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d086ac03a..3cd742280 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,6 +254,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_compile_options(devilutionx PRIVATE -Wno-ignored-attributes) # Fix: error: cast from pointer to smaller type 'unsigned char' loses information target_compile_options(devilution PRIVATE -fms-extensions -fms-compatibility -fms-compatibility-version=19.00) - - set_target_properties(devilutionx PROPERTIES LINK_FLAGS "-liconv") + # Silence appfat.cpp warnings + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing") endif() diff --git a/Xcode/devilutionX.xcodeproj/project.pbxproj b/Xcode/devilutionX.xcodeproj/project.pbxproj index c51eb441a..b82259b39 100644 --- a/Xcode/devilutionX.xcodeproj/project.pbxproj +++ b/Xcode/devilutionX.xcodeproj/project.pbxproj @@ -1317,6 +1317,7 @@ "-fms-extensions", "-fms-compatibility", "'-fms-compatibility-version=19.00'", + "-Wno-narrowing", "'-std=c++14'", ); OTHER_LIBTOOLFLAGS = " "; @@ -1460,6 +1461,7 @@ "-fms-extensions", "-fms-compatibility", "'-fms-compatibility-version=19.00'", + "-Wno-narrowing", "'-std=c++14'", ); OTHER_LIBTOOLFLAGS = " ";