From 40b7d95e9b16252d1aebb0706f3bba885f6e67cf Mon Sep 17 00:00:00 2001
From: spicyjpeg <88942473+spicyjpeg@users.noreply.github.com>
Date: Mon, 7 Feb 2022 01:06:33 +0100
Subject: Add LIBPSN00B_GENERATOR option, fix .incbin alignment

---
 libpsn00b/cmake/flags.cmake | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'libpsn00b')

diff --git a/libpsn00b/cmake/flags.cmake b/libpsn00b/cmake/flags.cmake
index 249c5b4..e31773f 100644
--- a/libpsn00b/cmake/flags.cmake
+++ b/libpsn00b/cmake/flags.cmake
@@ -5,10 +5,10 @@
 # directories and compiler flags when a target is linked against them. The
 # following targets are currently defined:
 # - psn00bsdk_common
-# - psn00bsdk_object_lib (same as psn00bsdk_common)
 # - psn00bsdk_static_exe
 # - psn00bsdk_dynamic_exe
 # - psn00bsdk_static_lib
+# - psn00bsdk_object_lib (same as psn00bsdk_static_lib)
 # - psn00bsdk_shared_lib
 # - psn00bsdk_module_lib (same as psn00bsdk_shared_lib)
 #
@@ -21,12 +21,7 @@ add_library(psn00bsdk_common INTERFACE)
 
 foreach(
 	_target IN ITEMS
-		object_lib
-		static_exe
-		dynamic_exe
-		static_lib
-		shared_lib
-		module_lib
+	static_exe dynamic_exe static_lib object_lib shared_lib module_lib
 )
 	add_library          (psn00bsdk_${_target} INTERFACE)
 	target_link_libraries(psn00bsdk_${_target} INTERFACE psn00bsdk_common)
@@ -128,6 +123,8 @@ target_compile_options(
 		-Wa,--strip-local-absolute
 )
 
+target_link_libraries(psn00bsdk_object_lib INTERFACE psn00bsdk_static_lib)
+
 # Options for dynamically-loaded libraries:
 # - Position-independent code enabled
 # - GP-relative addressing disabled (incompatible with ABI calls)
-- 
cgit v1.2.3