diff --git a/project/ToolkitBuild.xml b/project/ToolkitBuild.xml
index 7f806b0cb..157b58f21 100644
--- a/project/ToolkitBuild.xml
+++ b/project/ToolkitBuild.xml
@@ -270,6 +270,8 @@
       <compilerflag value="-DNME_SIMD_D" if="NME_SIMD_D" />
       <compilerflag value="${NME_SIMD_D}" if="NME_SIMD_D" />
       <compilerflag value="-I${ANGLE_DIR}/include" if="NME_ANGLE" />
+      <mflag value="-fobjc-arc" if="NME_LOCAL_TOOLKIT" />
+
 
       <cache value="1" unless="winrpi" />
       <cache value="1" asLibrary="true" if="winrpi NME_STATIC_LINK" />
diff --git a/project/toolkit/sdl/configs/mac/SDL_config.h b/project/toolkit/sdl/configs/mac/SDL_config.h
index 3fc1cfc7e..17ae45348 100644
--- a/project/toolkit/sdl/configs/mac/SDL_config.h
+++ b/project/toolkit/sdl/configs/mac/SDL_config.h
@@ -208,9 +208,15 @@
 #ifndef SDL_VIDEO_OPENGL_ES2
 #define SDL_VIDEO_OPENGL_ES2    1
 #endif
-#ifndef SDL_VIDEO_OPENGL_EGL
-#define SDL_VIDEO_OPENGL_EGL    0
+
+#ifdef SDL_VIDEO_OPENGL_EGL
+#undef SDL_VIDEO_OPENGL_EGL
 #endif
+
+//#ifndef SDL_VIDEO_OPENGL_EGL
+//#define SDL_VIDEO_OPENGL_EGL    0
+//#endif
+
 #ifndef SDL_VIDEO_OPENGL_CGL
 #define SDL_VIDEO_OPENGL_CGL    1
 #endif
diff --git a/project/toolkit/sdl/files.xml b/project/toolkit/sdl/files.xml
index c2a95e747..c7ba1f404 100644
--- a/project/toolkit/sdl/files.xml
+++ b/project/toolkit/sdl/files.xml
@@ -182,6 +182,8 @@
             <compilerflag value="-msse2" unless="HXCPP_ARM64" />
             <compilerflag value="-msse3" unless="HXCPP_ARM64" />
             <compilerflag value="-mssse3" unless="HXCPP_ARM64" />
+            <compilerflag value="-fobjc-arc" />
+            <compilerflag value="-Wno-deprecated-register" />
 
         </section>
 
@@ -313,7 +315,7 @@
         </section>
 
         <section if="android || ios || windows || rpi || tvos" >
-
+<error value="poo" />
             <file name="${NME_LIBSDL}src/video/SDL_egl.c" />
             <file name="${NME_LIBSDL}src/render/opengles/SDL_render_gles.c" />
             <file name="${NME_LIBSDL}src/render/opengles2/SDL_render_gles2.c" />
@@ -543,8 +545,9 @@
         <section if="mac">
 
             <file name="${NME_LIBSDL}src/audio/coreaudio/SDL_coreaudio.m" />
-            <file name="${NME_LIBSDL}src/joystick/darwin/SDL_sysjoystick.c" />
             <file name="${NME_LIBSDL}src/haptic/darwin/SDL_syshaptic.c" />
+            <file name="${NME_LIBSDL}src/joystick/darwin/SDL_iokitjoystick.c" />
+            <file name="${NME_LIBSDL}src/joystick/iphoneos/SDL_mfijoystick.m" />
             <file name="${NME_LIBSDL}src/hidapi/mac/hid.c" />
             <file name="${NME_LIBSDL}src/power/macosx/SDL_syspower.c" />
             <file name="${NME_LIBSDL}src/file/cocoa/SDL_rwopsbundlesupport.m" />
@@ -556,7 +559,6 @@
             <file name="${NME_LIBSDL}src/video/cocoa/SDL_cocoametalview.m" />
             <file name="${NME_LIBSDL}src/video/cocoa/SDL_cocoamodes.m" />
             <file name="${NME_LIBSDL}src/video/cocoa/SDL_cocoamouse.m" />
-            <file name="${NME_LIBSDL}src/video/cocoa/SDL_cocoamousetap.m" />
             <file name="${NME_LIBSDL}src/video/cocoa/SDL_cocoaopengl.m" />
             <file name="${NME_LIBSDL}src/video/cocoa/SDL_cocoaopengles.m" />
             <file name="${NME_LIBSDL}src/video/cocoa/SDL_cocoashape.m" />