From 7a2e6dd9550376f7a0511e73b33194170d712384 Mon Sep 17 00:00:00 2001
From: spicyjpeg <88942473+spicyjpeg@users.noreply.github.com>
Date: Sun, 17 Oct 2021 00:32:59 +0200
Subject: CMake fixes, improved CPack support, Windows instructions

---
 libpsn00b/CMakeLists.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'libpsn00b/CMakeLists.txt')

diff --git a/libpsn00b/CMakeLists.txt b/libpsn00b/CMakeLists.txt
index 52914d3..bfe27c6 100644
--- a/libpsn00b/CMakeLists.txt
+++ b/libpsn00b/CMakeLists.txt
@@ -40,12 +40,13 @@ foreach(_library IN LISTS PSN00BSDK_LIBRARIES)
 	psn00bsdk_add_library(${_library} STATIC ${_sources})
 endforeach()
 
-# Extract libgcc's contents and merge them into libc after building.
+# Copy libgcc.a and merge the PSn00bSDK libc into it after building.
 add_custom_command(
 	TARGET  c POST_BUILD
-	COMMAND ${CMAKE_AR} x ${PSN00BSDK_LIBGCC}
-	COMMAND ${CMAKE_AR} rsuU $<TARGET_FILE:c> *.o
-	COMMENT "Merging libgcc contents into SDK libc"
+	COMMAND ${CMAKE_COMMAND} -E copy ${PSN00BSDK_LIBGCC} $<TARGET_FILE:c>
+	#COMMAND ${CMAKE_AR} rsuU $<TARGET_FILE:c> *.o
+	COMMAND ${CMAKE_AR} rsuU $<TARGET_FILE:c> $<JOIN:"$<TARGET_OBJECTS:c>"," ">
+	COMMENT "Merging SDK libc contents into libgcc"
 )
 
 ## Installation
-- 
cgit v1.2.3