diff --git a/desmume/src/frontend/cocoa/DeSmuME_Prefix.pch b/desmume/src/frontend/cocoa/DeSmuME_Prefix.pch
index e6ab1a310..3510dce8d 100644
--- a/desmume/src/frontend/cocoa/DeSmuME_Prefix.pch
+++ b/desmume/src/frontend/cocoa/DeSmuME_Prefix.pch
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012-2017 DeSmuME team
+	Copyright (C) 2012-2021 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -33,6 +33,8 @@
 #define LUA_USE_POSIX
 #define LUA_USE_DLOPEN
 
+#define GL_SILENCE_DEPRECATION
+
 #if defined(__i386__) || defined(__x86_64__)
 	#define HAVE_JIT
 #endif
diff --git a/desmume/src/frontend/cocoa/OGLDisplayOutput.cpp b/desmume/src/frontend/cocoa/OGLDisplayOutput.cpp
index d5fd41d9c..c2a979f69 100644
--- a/desmume/src/frontend/cocoa/OGLDisplayOutput.cpp
+++ b/desmume/src/frontend/cocoa/OGLDisplayOutput.cpp
@@ -5499,10 +5499,10 @@ OGLImage::OGLImage(OGLContextInfo *contextInfo, GLsizei imageWidth, GLsizei imag
 	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
 	
 	const GLint vtxBuffer[8] = {
-		-_normalWidth/2,  _normalHeight/2,
-		 _normalWidth/2,  _normalHeight/2,
-		-_normalWidth/2, -_normalHeight/2,
-		 _normalWidth/2, -_normalHeight/2
+		(GLint)(-_normalWidth/2.0), (GLint)( _normalHeight/2.0),
+        (GLint)( _normalWidth/2.0), (GLint)( _normalHeight/2.0),
+        (GLint)(-_normalWidth/2.0), (GLint)(-_normalHeight/2.0),
+        (GLint)( _normalWidth/2.0), (GLint)(-_normalHeight/2.0)
 	};
 	
 	// Set up VBOs
diff --git a/desmume/src/matrix.h b/desmume/src/matrix.h
index fdc6ba219..d3d0bce47 100644
--- a/desmume/src/matrix.h
+++ b/desmume/src/matrix.h
@@ -928,7 +928,7 @@ static void buffer_copy_or_constant_s32(void *__restrict dst, const void *__rest
 	s32 *dst_32 = (s32 *)dst;
 	
 	for (size_t i = 0; i < vecLength; i+=sizeof(s32))
-		dst_32[i] = (ENDIANSWAPSTORE) ? LOCAL_TO_LE_32(src_32[i] | c) : src_32[i] | c;
+		dst_32[i] = (NEEDENDIANSWAP) ? LOCAL_TO_LE_32(src_32[i] | c) : src_32[i] | c;
 #endif
 }
 
@@ -957,7 +957,7 @@ static void buffer_copy_or_constant_s32_fast(void *__restrict dst, void *__restr
 	s32 *dst_32 = (s32 *)dst;
 	
 	for (size_t i = 0; i < VECLENGTH; i+=sizeof(s32))
-		dst_32[i] = (ENDIANSWAPSTORE) ? LOCAL_TO_LE_32(src_32[i] | c) : src_32[i] | c;
+		dst_32[i] = (NEEDENDIANSWAP) ? LOCAL_TO_LE_32(src_32[i] | c) : src_32[i] | c;
 #endif
 }
 
diff --git a/desmume/src/types.h b/desmume/src/types.h
index 0a7929b01..b7bdfcc16 100644
--- a/desmume/src/types.h
+++ b/desmume/src/types.h
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2005 Guillaume Duhamel
-	Copyright (C) 2008-2019 DeSmuME team
+	Copyright (C) 2008-2021 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 
 // Determine CPU architecture for platforms that don't use the autoconf script
 #if defined(HOST_WINDOWS) || defined(DESMUME_COCOA)
-	#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64)
+	#if defined(__x86_64__) || defined(__LP64) || defined(__IA64__) || defined(_M_X64) || defined(_WIN64) || defined(__aarch64__) || defined(__ppc64__)
 		#define HOST_64
 	#else
 		#define HOST_32
diff --git a/desmume/src/version.cpp b/desmume/src/version.cpp
index 73c09a1b8..7c9bd0a2f 100755
--- a/desmume/src/version.cpp
+++ b/desmume/src/version.cpp
@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2009-2016 DeSmuME team
+	Copyright (C) 2009-2021 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -51,7 +51,11 @@
 #elif defined(__thumb__)
 	#define DESMUME_PLATFORM_STRING " ARM-Thumb"
 #elif defined(__aarch64__)
-	#define DESMUME_PLATFORM_STRING " AArch64"
+    #if defined(__APPLE__)
+	#define DESMUME_PLATFORM_STRING " ARM64"
+    #else
+    #define DESMUME_PLATFORM_STRING " AArch64"
+    #endif
 #elif defined(__ppc64__)
 	#define DESMUME_PLATFORM_STRING " PPC64"
 #elif defined(__ppc__) || defined(_M_PPC)