Updating macOS CMake; building fat binary by default

Author: andrewfb

proj/cmake/libcinder_configure.cmake

@@ -7,6 +7,7 @@ set( CINDER_INC_DIR		"${CINDER_PATH}/include" )
 
 if( NOT CINDER_MSW )
 	add_definitions( -Wfatal-errors )
+	add_definitions( -DHAVE_UNISTD_H )
 endif()
 
 list( APPEND CMAKE_MODULE_PATH ${CINDER_CMAKE_DIR} ${CMAKE_CURRENT_LIST_DIR}/modules )

proj/cmake/libcinder_source_files.cmake

@@ -397,6 +397,7 @@ if( NOT CINDER_FREETYPE_USE_SYSTEM )
 		${CINDER_SRC_DIR}/freetype/base/fttype1.c
 		${CINDER_SRC_DIR}/freetype/base/ftwinfnt.c
 		${CINDER_SRC_DIR}/freetype/raster/raster.c
+		${CINDER_SRC_DIR}/freetype/raster/rastpic.c
 		${CINDER_SRC_DIR}/freetype/smooth/smooth.c
 		${CINDER_SRC_DIR}/freetype/autofit/autofit.c
 		${CINDER_SRC_DIR}/freetype/bzip2/ftbzip2.c

proj/cmake/platform_macosx.cmake

@@ -2,6 +2,11 @@ cmake_minimum_required( VERSION 3.10 FATAL_ERROR )
 
 set( CINDER_PLATFORM "Cocoa" )
 
+# Build universal binaries for macOS (arm64 + x86_64) to match Xcode default behavior
+if( NOT CMAKE_OSX_ARCHITECTURES )
+	set( CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "macOS architectures" FORCE )
+endif()
+
 # append mac specific source files
 list( APPEND SRC_SET_COCOA
 	${CINDER_SRC_DIR}/cinder/CaptureImplAvFoundation.mm