Merge branch 'master' into jgrpp

# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp

cmake/CompileFlags.cmake

@@ -134,18 +134,20 @@ macro(compile_flags)
         endif()
 
         if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-            add_compile_options(
-                -fno-stack-check
-            )
-
-            include(CheckCXXCompilerFlag)
-            check_cxx_compiler_flag("-mno-sse4" NO_SSE4_FOUND)
-
-            if(NO_SSE4_FOUND)
+            if (NOT CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
                 add_compile_options(
-                    # Don't use SSE4 for general sources to increase compatibility.
-                    -mno-sse4
+                    -fno-stack-check
                 )
+
+                include(CheckCXXCompilerFlag)
+                check_cxx_compiler_flag("-mno-sse4" NO_SSE4_FOUND)
+
+                if(NO_SSE4_FOUND)
+                    add_compile_options(
+                        # Don't use SSE4 for general sources to increase compatibility.
+                        -mno-sse4
+                    )
+                endif()
             endif()
         endif()
     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")