From 727e6edc97b0b7978e7df039149a5d1599e4e4f1 Mon Sep 17 00:00:00 2001
From: Thomas A <curioustommy@protonmail.com>
Date: Sun, 5 Feb 2023 17:41:29 -0800
Subject: [PATCH] Fix Building

---
 CMakeLists.txt | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe72928..223cfc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,27 +7,42 @@ set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 0)
 set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
 set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "")
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc -nostdinc++ -fno-rtti -fno-exceptions -funwind-tables -ggdb -O0")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBUNWIND_IS_NATIVE_ONLY -nostdinc -nostdinc++ -fno-rtti -fno-exceptions -funwind-tables -ggdb -O0")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse -msse2 -msse3 -w -nostdinc -fno-rtti -funwind-tables -ggdb -O0")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__DARWIN_UNIX03 -fPIC -w")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,-flat_namespace -Wl,-undefined,suppress")
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libunwind/src)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libunwind/include)
 
-set(libunwind_sources
-	src/libuwind.cxx
-	src/Registers.S
-	src/unw_getcontext.S
-	src/UnwindLevel1.c
-	src/UnwindLevel1-gcc-ext.c
-	src/Unwind-sjlj.c
+set(LIBUNWIND_CXX_SOURCES
+    libunwind/src/libunwind.cpp
+    libunwind/src/Unwind-EHABI.cpp
+    libunwind/src/Unwind-seh.cpp
+	libunwind/src/Unwind_AppleExtras.cpp
+)
+
+set(LIBUNWIND_C_SOURCES
+    libunwind/src/UnwindLevel1.c
+    libunwind/src/UnwindLevel1-gcc-ext.c
+    libunwind/src/Unwind-sjlj.c
+)
+
+set(LIBUNWIND_ASM_SOURCES
+    libunwind/src/UnwindRegistersRestore.S
+    libunwind/src/UnwindRegistersSave.S
+)
+
+set(LIBUNWIND_SOURCES
+    ${LIBUNWIND_CXX_SOURCES}
+    ${LIBUNWIND_C_SOURCES}
+    ${LIBUNWIND_ASM_SOURCES}
 )
 
 set(DYLIB_INSTALL_NAME "/usr/lib/system/libunwind.dylib")
 add_circular(unwind FAT
 	SOURCES
-		${libunwind_sources}
+		${LIBUNWIND_SOURCES}
 	SIBLINGS
 		system_c
 		keymgr
@@ -37,7 +52,7 @@ add_circular(unwind FAT
 #make_fat(unwind)
 
 include(darling_static_lib)
-add_darling_static_library(unwind_static SOURCES ${libunwind_sources})
+add_darling_static_library(unwind_static SOURCES ${LIBUNWIND_SOURCES})
 set_target_properties(unwind_static PROPERTIES COMPILE_FLAGS "-DNDEBUG=1")
 make_fat(unwind_static)