From 7c01b5b398e478aa5751d85ddeefcd10fa1377b4 Mon Sep 17 00:00:00 2001
From: Hamza Tahboub <hamza.tahboub8@gmail.com>
Date: Mon, 28 Oct 2024 19:25:45 -0400
Subject: [PATCH] Added support for mac arm & newer libraries

---
 bgfx         |  2 +-
 bimg         |  2 +-
 bx           |  2 +-
 glfw         |  2 +-
 premake5.lua | 23 +++++++++++++----------
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/bgfx b/bgfx
index 379fc70..9dd50f9 160000
--- a/bgfx
+++ b/bgfx
@@ -1 +1 @@
-Subproject commit 379fc707ffe74262669b2b9bed3d03591de13620
+Subproject commit 9dd50f9631bb567bf467485e77ccdd4b05aff9a6
diff --git a/bimg b/bimg
index 663f724..0d1c78e 160000
--- a/bimg
+++ b/bimg
@@ -1 +1 @@
-Subproject commit 663f724186e26caf46494e389ed82409106205fb
+Subproject commit 0d1c78e77982f18a9174620bfa5762ffcca9d38c
diff --git a/bx b/bx
index 8832707..2cebc55 160000
--- a/bx
+++ b/bx
@@ -1 +1 @@
-Subproject commit 88327070b95df613915f3af7f7d03179f3838836
+Subproject commit 2cebc558eb314e324f01ef05735551f234f5ea13
diff --git a/glfw b/glfw
index 7dfd84c..b35641f 160000
--- a/glfw
+++ b/glfw
@@ -1 +1 @@
-Subproject commit 7dfd84c458dfa12b351c932b8281b13faf7b50b9
+Subproject commit b35641f4a3c62aa86a0b3c983d163bc0fe36026d
diff --git a/premake5.lua b/premake5.lua
index 1b43e3b..015d5e2 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -13,6 +13,8 @@ solution "bgfx-minimal-example"
 	configurations { "Release", "Debug" }
 	if os.is64bit() and not os.istarget("windows") then
 		platforms "x86_64"
+	elseif os.istarget("macosx") and io.popen("uname -m"):read("*a"):match("%S+") == "arm64" then
+		platforms "ARM"
 	else
 		platforms { "x86", "x86_64" }
 	end
@@ -31,6 +33,8 @@ solution "bgfx-minimal-example"
 		}
 		optimize "Debug"
 		symbols "On"
+	filter "platforms:ARM"
+		architecture "ARM"
 	filter "platforms:x86"
 		architecture "x86"
 	filter "platforms:x86_64"
@@ -54,7 +58,7 @@ end
 project "helloworld"
 	kind "ConsoleApp"
 	language "C++"
-	cppdialect "C++14"
+	cppdialect "C++17"
 	exceptionhandling "Off"
 	rtti "Off"
 	files "helloworld.cpp"
@@ -76,7 +80,7 @@ project "helloworld"
 project "helloworld_mt"
 	kind "ConsoleApp"
 	language "C++"
-	cppdialect "C++14"
+	cppdialect "C++17"
 	exceptionhandling "Off"
 	rtti "Off"
 	files "helloworld_mt.cpp"
@@ -98,7 +102,7 @@ project "helloworld_mt"
 project "bgfx"
 	kind "StaticLib"
 	language "C++"
-	cppdialect "C++14"
+	cppdialect "C++17"
 	exceptionhandling "Off"
 	rtti "Off"
 	defines "__STDC_FORMAT_MACROS"
@@ -138,7 +142,7 @@ project "bgfx"
 project "bimg"
 	kind "StaticLib"
 	language "C++"
-	cppdialect "C++14"
+	cppdialect "C++17"
 	exceptionhandling "Off"
 	rtti "Off"
 	files
@@ -147,21 +151,21 @@ project "bimg"
 		path.join(BIMG_DIR, "src/image.cpp"),
 		path.join(BIMG_DIR, "src/image_gnf.cpp"),
 		path.join(BIMG_DIR, "src/*.h"),
-		path.join(BIMG_DIR, "3rdparty/astc-codec/src/decoder/*.cc")
+		path.join(BIMG_DIR, "3rdparty/astc-encoder/source/*.cpp")
 	}
 	includedirs
 	{
 		path.join(BX_DIR, "include"),
 		path.join(BIMG_DIR, "include"),
-		path.join(BIMG_DIR, "3rdparty/astc-codec"),
-		path.join(BIMG_DIR, "3rdparty/astc-codec/include"),
+		path.join(BIMG_DIR, "3rdparty/astc-encoder/include"),
+		path.join(BIMG_DIR, "3rdparty/astc-encoder/source"),
 	}
 	setBxCompat()
 
 project "bx"
 	kind "StaticLib"
 	language "C++"
-	cppdialect "C++14"
+	cppdialect "C++17"
 	exceptionhandling "Off"
 	rtti "Off"
 	defines "__STDC_FORMAT_MACROS"
@@ -230,12 +234,11 @@ project "glfw"
 		files
 		{
 			path.join(GLFW_DIR, "src/cocoa_*.*"),
-			path.join(GLFW_DIR, "src/posix_thread.h"),
+			path.join(GLFW_DIR, "src/posix*.*"),
 			path.join(GLFW_DIR, "src/nsgl_context.h"),
 			path.join(GLFW_DIR, "src/egl_context.h"),
 			path.join(GLFW_DIR, "src/osmesa_context.h"),
 
-			path.join(GLFW_DIR, "src/posix_thread.c"),
 			path.join(GLFW_DIR, "src/nsgl_context.m"),
 			path.join(GLFW_DIR, "src/egl_context.c"),
 			path.join(GLFW_DIR, "src/nsgl_context.m"),