Update ResGen tests

Author: kynex7510

Tests/CMakeLists.txt

@@ -10,13 +10,13 @@ add_executable(dl-test-math MathApp.c)
 target_link_libraries(dl-test-math PRIVATE dl math-resolver)
 ctr_create_3dsx(dl-test-math)
 
-#add_executable(dl-test-interop InteropApp.c)
-#target_link_libraries(dl-test-interop PRIVATE dl libinterop-resolver)
-#ctr_create_3dsx(dl-test-interop)
+add_executable(dl-test-interop InteropApp.c)
+target_link_libraries(dl-test-interop PRIVATE dl interop-resolver)
+ctr_create_3dsx(dl-test-interop)
 
 install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/dl-test-math.3dsx
-#    ${CMAKE_CURRENT_BINARY_DIR}/dl-test-interop.3dsx
+    ${CMAKE_CURRENT_BINARY_DIR}/dl-test-interop.3dsx
     TYPE BIN
 )

Tests/InteropApp.c

@@ -10,19 +10,9 @@
 
 typedef void (*InteropFn)(const char*);
 
-static void stub() {}
-
-void* ctrdlProgramResolver(const char* sym) {
-    RESOLVER_ENTRY(consoleInit);
-    RESOLVER_ENTRY(consoleSelect);
-    RESOLVER_ENTRY(ctrdlThisHandle);
-    RESOLVER_ENTRY(ctrdlInfo);
-    RESOLVER_ENTRY(printf);
-    RESOLVER_ENTRY(ctrdlFreeInfo);
-    RESOLVER_ENTRY(dlclose);
-    RESOLVER_ENTRY(dlerror);
-    return stub;
-}
+// TODO: remove.
+void __register_frame_info(const void*, struct object*) {}
+void *__deregister_frame_info(const void *) {}
 
 int main(int argc, char* argv[]) {
     gfxInitDefault();

Tests/Libs/CMakeLists.txt

@@ -12,26 +12,31 @@ set(CMAKE_C_STANDARD_LIBRARIES "")
 set(CMAKE_CXX_STANDARD_LIBRARIES "")
 set(CMAKE_ASM_STANDARD_LIBRARIES "")
 
+# Add "libmath" library.
 add_library(math SHARED Math.c)
+target_link_libraries(math PRIVATE dl-shared)
 
+# Generate resolver for "libmath".
 add_custom_command(
-    OUTPUT /home/user/Documents/repos/CTRDL/Build/Tests/Libs/libmath.s # $<TARGET_FILE_DIR:math>/libmath.s
-    COMMAND ${RESGEN_PATH}/ResGen -b $<TARGET_FILE:math>
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libmath-resolver.s
+    COMMAND ${RESGEN_PATH}/ResGen $<TARGET_FILE:math> -o ${CMAKE_CURRENT_BINARY_DIR}/libmath-resolver.s
     DEPENDS math
 )
-add_library(math-resolver OBJECT $<TARGET_FILE_DIR:math>/libmath.s)
+
+# Add "libmath" resolver library (application will link to this).
+add_library(math-resolver OBJECT ${CMAKE_CURRENT_BINARY_DIR}/libmath-resolver.s)
 target_compile_options(math-resolver PRIVATE -g0)
 
-#add_library(interop SHARED Interop.c)
-#add_library(libinterop-resolver INTERFACE libinterop.s)
-#target_link_libraries(interop PRIVATE dl-shared)
-#add_custom_command(
-#    TARGET interop
-#    POST_BUILD
-#    COMMAND ${RESGEN_PATH}/ResGen -b $<TARGET_FILE:interop>
-#    BYPRODUCTS libinterop.s
-#)
-
-install(FILES $<TARGET_FILE:math> 
-#$<TARGET_FILE:interop>
-TYPE BIN)
+# Setup "libinterop" like above.
+add_library(interop SHARED Interop.c)
+target_link_libraries(interop PRIVATE dl-shared)
+
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libinterop-resolver.s
+    COMMAND ${RESGEN_PATH}/ResGen $<TARGET_FILE:interop> -o ${CMAKE_CURRENT_BINARY_DIR}/libinterop-resolver.s
+    DEPENDS interop
+)
+add_library(interop-resolver OBJECT ${CMAKE_CURRENT_BINARY_DIR}/libinterop-resolver.s)
+target_compile_options(interop-resolver PRIVATE -g0)
+
+install(FILES $<TARGET_FILE:math>  $<TARGET_FILE:interop> TYPE BIN)

Tests/MathApp.c

@@ -7,6 +7,7 @@
 
 typedef void (*DoMathFn)(int, int);
 
+// TODO: remove.
 void __register_frame_info(const void*, struct object*) {}
 void *__deregister_frame_info(const void *) {}