Fix recomp modding macros for C++ compatibility

Author: Mr-Wiseguy

.vscode/c_cpp_properties.json

@@ -16,6 +16,7 @@
             ],
             "compilerPath": "clang",
             "cStandard": "c99",
+            "cppStandard": "c++20",
             "intelliSenseMode": "clang-x86"
         }
     ],

Makefile

@@ -16,22 +16,26 @@ endif
 TARGET  := $(BUILD_DIR)/mod.elf
 
 LDSCRIPT := mod.ld
-CFLAGS   := -target mips -mips2 -mabi=32 -O2 -G0 -mno-abicalls -mno-odd-spreg -mno-check-zero-division \
-			-fomit-frame-pointer -ffast-math -fno-unsafe-math-optimizations -fno-builtin-memset \
-			-Wall -Wextra -Wno-incompatible-library-redeclaration -Wno-unused-parameter -Wno-unknown-pragmas -Wno-unused-variable \
-			-Wno-missing-braces -Wno-unsupported-floating-point-opt -Werror=section
-CPPFLAGS := -nostdinc -D_LANGUAGE_C -DMIPS -DF3DEX_GBI_2 -DF3DEX_GBI_PL -DGBI_DOWHILE -I include -I include/dummy_headers \
-			-I mm-decomp/include -I mm-decomp/src -I mm-decomp/extracted/n64-us -I mm-decomp/include/libc
-LDFLAGS  := -nostdlib -T $(LDSCRIPT) -Map $(BUILD_DIR)/mod.map --unresolved-symbols=ignore-all --emit-relocs -e 0 --no-nmagic
+ARCHFLAGS := -target mips -mips2 -mabi=32 -O2 -G0 -mno-abicalls -mno-odd-spreg -mno-check-zero-division \
+             -fomit-frame-pointer -ffast-math -fno-unsafe-math-optimizations -fno-builtin-memset
+WARNFLAGS := -Wall -Wextra -Wno-incompatible-library-redeclaration -Wno-unused-parameter -Wno-unknown-pragmas -Wno-unused-variable \
+             -Wno-missing-braces -Wno-unsupported-floating-point-opt -Werror=section
+CFLAGS   := $(ARCHFLAGS) $(WARNFLAGS) -D_LANGUAGE_C -nostdinc -ffunction-sections
+CPPFLAGS := -DMIPS -DF3DEX_GBI_2 -DF3DEX_GBI_PL -DGBI_DOWHILE -I include -I include/dummy_headers \
+            -I mm-decomp/include -I mm-decomp/src -I mm-decomp/extracted/n64-us -idirafter include/libc -idirafter mm-decomp/include/libc
+LDFLAGS  := -nostdlib -T $(LDSCRIPT) -Map $(BUILD_DIR)/mod.map --unresolved-symbols=ignore-all --emit-relocs -e 0 --no-nmagic -gc-sections
 
 C_SRCS := $(wildcard src/*.c)
 C_OBJS := $(addprefix $(BUILD_DIR)/, $(C_SRCS:.c=.o))
 C_DEPS := $(addprefix $(BUILD_DIR)/, $(C_SRCS:.c=.d))
 
+ALL_OBJS := $(C_OBJS)
+ALL_DEPS := $(C_DEPS)
+
 all: $(TARGET)
 
-$(TARGET): $(C_OBJS) $(LDSCRIPT) | $(BUILD_DIR)
-	$(LD) $(C_OBJS) $(LDFLAGS) -o $@
+$(TARGET): $(ALL_OBJS) $(LDSCRIPT) | $(BUILD_DIR)
+	$(LD) $(ALL_OBJS) $(LDFLAGS) -o $@
 
 $(BUILD_DIR) $(BUILD_DIR)/src:
 ifeq ($(OS),Windows_NT)
@@ -50,6 +54,6 @@ else
 	rm -rf $(BUILD_DIR)
 endif
 
--include $(C_DEPS)
+-include $(ALL_DEPS)
 
 .PHONY: clean all

include/modding.h

@@ -3,29 +3,38 @@
 
 // Do not edit these defines. They use special section names that the recomp mod tool recognizes for specific modding functionality.
 
+#ifdef __cplusplus
+#   define EXTERNC extern "C"
+#else
+#   define EXTERNC
+#endif
+
+// The RECOMP_IMPORT has the following attributes:
+//   noinline: Prevent import function definitions from being inlined, allowing the mod tool to find relocs. 
+//   weak: Allow import definitions to be in headers without triggering multiple definition errors.
 #define RECOMP_IMPORT(mod, func) \
     _Pragma("GCC diagnostic push") \
     _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") \
     _Pragma("GCC diagnostic ignored \"-Wreturn-type\"") \
-    __attribute__((noinline, weak, used, section(".recomp_import." mod))) func {} \
+    EXTERNC __attribute__((noinline, weak, used, section(".recomp_import." mod))) func {} \
     _Pragma("GCC diagnostic pop")
 
-#define RECOMP_EXPORT __attribute__((section(".recomp_export")))
+#define RECOMP_EXPORT EXTERNC __attribute__((retain, section(".recomp_export")))
 
-#define RECOMP_PATCH __attribute__((section(".recomp_patch")))
+#define RECOMP_PATCH EXTERNC __attribute__((retain, section(".recomp_patch")))
 
-#define RECOMP_FORCE_PATCH __attribute__((section(".recomp_force_patch")))
+#define RECOMP_FORCE_PATCH EXTERNC __attribute__((retain, section(".recomp_force_patch")))
 
 #define RECOMP_DECLARE_EVENT(func) \
     _Pragma("GCC diagnostic push") \
     _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") \
-    __attribute__((noinline, weak, used, section(".recomp_event"))) void func {} \
+    EXTERNC __attribute__((retain, noinline, weak, used, section(".recomp_event"))) void func {} \
     _Pragma("GCC diagnostic pop")
 
-#define RECOMP_CALLBACK(mod, event) __attribute__((section(".recomp_callback." mod ":" #event)))
+#define RECOMP_CALLBACK(mod, event) __attribute__((retain, section(".recomp_callback." mod ":" #event)))
 
-#define RECOMP_HOOK(func) __attribute__((section(".recomp_hook." func)))
+#define RECOMP_HOOK(func) __attribute__((retain, section(".recomp_hook." func)))
 
-#define RECOMP_HOOK_RETURN(func) __attribute__((section(".recomp_hook_return." func)))
+#define RECOMP_HOOK_RETURN(func) __attribute__((retain, section(".recomp_hook_return." func)))
 
 #endif

include/z64recomp_api.h

@@ -1,8 +1,11 @@
 #ifndef __Z64RECOMP_API_H__
 #define __Z64RECOMP_API_H__
 
-#include "z64actor.h"
 #include "modding.h"
+#include "PR/ultratypes.h"
+
+// Pull in the Actor typedef to avoid needing to include the entirety of z64actor.h.
+typedef struct Actor Actor;
 
 typedef u32 ActorExtensionId;