Browse Source

Fix MacOS compilation for 32 and 64 bits (#78)

pull/79/head
Benny Franco Dennis 7 years ago committed by Anders Jenbo
parent
commit
7ec4d3eb4b
  1. 4
      CMakeLists.txt
  2. 2
      Xcode/devilutionX.xcodeproj/project.pbxproj

4
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()

2
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 = " ";

Loading…
Cancel
Save