Add erl, and build erl for patches

Author: Ziemas

cmake/utils.cmake

@@ -14,3 +14,19 @@ function(compile_multiple target srcfile)
     endforeach()
 endfunction()
 
+# Add an erl output for a given target
+function(target_add_erl target)
+    add_custom_command(OUTPUT "lib${target}.erl"
+        COMMAND ${CMAKE_C_COMPILER} -nostdlib -Wl,-r -Wl,-d -o "lib${target}.erl" $<TARGET_OBJECTS:${target}>
+        COMMAND ${CMAKE_STRIP} --strip-unneeded -R .mdebug.eabi64 -R .reginfo -R .comment lib${target}.erl
+        DEPENDS ${target}
+        COMMAND_EXPAND_LISTS
+    )
+    add_custom_target(${target}_erl ALL
+        DEPENDS lib${target}.erl
+    )
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${target}.erl
+        DESTINATION lib
+    )
+endfunction()
+

ee/CMakeLists.txt

@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.10)
 project(ps2sdk-ee C ASM)
 file(REAL_PATH ../ PS2SDKSRC_ROOT)
 
-set(EE_INC ${PS2SDKSRC_ROOT}/common/include ${PROJECT_SOURCE_DIR}/kernel/include ${PROJECT_SOURCE_DIR}/rpc/cdvd/include)
+set(EE_INC ${PS2SDKSRC_ROOT}/common/include ${PROJECT_SOURCE_DIR}/kernel/include ${PROJECT_SOURCE_DIR}/rpc/cdvd/include
+    ${PROJECT_SOURCE_DIR}/erl/include)
 
 add_subdirectory(kernel)
 add_subdirectory(libcglue)

ee/erl/CMakeLists.txt

@@ -0,0 +1,4 @@
+add_library(erl)
+target_include_directories(erl PUBLIC include)
+target_include_directories(erl PRIVATE ${EE_INC})
+target_sources(erl PRIVATE src/erl.c src/hashtab.c src/lookupa.c src/recycle.c)

ee/kernel/CMakeLists.txt

@@ -217,7 +217,7 @@ compile_multiple(kernel src/kernel.S OBJECTS
 	strncpy.o strlen.o memcpy.o memset.o __syscall.o GPfuncs.o _print.o
 )
 
-target_sources(kernel PRIVATE src/setup_syscalls.S src/debug.c)
+target_sources(kernel PRIVATE src/setup_syscalls.S src/debug.c src/erl-support.c)
 
 file(GLOB KERNEL_INCLUDE_FILES "include/*.h*")
 set_target_properties(kernel PROPERTIES PUBLIC_HEADER "${KERNEL_INCLUDE_FILES}")

ee/sbv/CMakeLists.txt

@@ -4,11 +4,11 @@ target_include_directories(patches PRIVATE ${EE_INC})
 target_sources(patches PRIVATE src/smem.c src/smod.c src/slib.c 
     src/patch_enable_lmb.c src/patch_disable_prefix_check.c
 	src/patch_user_mem_clear.c src/patch_fileio.c src/common.c 
-    #src/erl-support.c TODO
+    src/erl-support.c
 )
 
 file(GLOB PATCHES_INCLUDE_FILES "include/*.h*")
 set_target_properties(patches PROPERTIES PUBLIC_HEADER "${PATCHES_INCLUDE_FILES}")
-
 install(TARGETS patches)
 
+target_add_erl(patches)