Merge pull request #439 from AKuHAK/modules_sync

Module makefiles synced with mainstream SDK
ps2homebrew · Jun 18, 2021 · 58c268b · 58c268b
2 parents 08fc57b + 6639cbf
commit 58c268b
Show file tree

Hide file tree

Showing 32 changed files with 56 additions and 120 deletions.
diff --git a/modules/Rules.bin.make b/modules/Rules.bin.make
@@ -1,7 +1,12 @@
+BIN2C = $(PS2SDK)/bin/bin2c
+BIN2S = $(PS2SDK)/bin/bin2s
+BIN2O = $(PS2SDK)/bin/bin2o
+IOP_SRC_DIR = ./
+
 all: $(IOP_BIN)
 
 clean:
-	rm -f $(IOP_BIN) $(IOP_OBJS)
+	rm -r -f $(IOP_BIN) $(IOP_OBJS) $(IOP_OBJS_DIR) $(IOP_BIN_DIR) $(IOP_LIB_DIR)
 
 rebuild: clean all
 

diff --git a/modules/Rules.make b/modules/Rules.make
diff --git a/modules/bdmevent/Makefile b/modules/bdmevent/Makefile
@@ -5,4 +5,4 @@ IOP_INCS += -I../../include/
 
 include $(PS2SDK)/Defs.make
 include ../Rules.bin.make
-include ../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/debug/ioptrap/Makefile b/modules/debug/ioptrap/Makefile
@@ -3,4 +3,4 @@ IOP_OBJS = ioptrap.o handler.o breakpoint.o imports.o exports.o
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/debug/ps2link/Makefile b/modules/debug/ps2link/Makefile
@@ -17,4 +17,4 @@ endif
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/debug/ps2link/imports.lst b/modules/debug/ps2link/imports.lst
@@ -33,6 +33,16 @@ ioman_IMPORTS_end
 
 ps2ip_IMPORTS_start
 I_lwip_send
+#ifdef DEBUG
+I_lwip_sendto
+I_lwip_socket
+I_lwip_listen
+I_lwip_recv
+I_lwip_recvfrom
+I_lwip_close
+I_lwip_bind
+I_lwip_accept
+#endif
 ps2ip_IMPORTS_end
 
 sifcmd_IMPORTS_start

diff --git a/modules/debug/udptty-ingame/Makefile b/modules/debug/udptty-ingame/Makefile
@@ -6,4 +6,4 @@ IOP_CFLAGS += -DKPRTTY
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/ds34bt/iop/Makefile b/modules/ds34bt/iop/Makefile
@@ -3,4 +3,4 @@ IOP_OBJS = ds34bt.o smsutils.o imports.o
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/ds34usb/iop/Makefile b/modules/ds34usb/iop/Makefile
@@ -3,4 +3,4 @@ IOP_OBJS = ds34usb.o smsutils.o imports.o
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/hdd/xhdd/Makefile b/modules/hdd/xhdd/Makefile
@@ -5,4 +5,4 @@ IOP_INCS += -I../common
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/iopcore/cdvdfsv/Makefile b/modules/iopcore/cdvdfsv/Makefile
@@ -9,4 +9,4 @@ endif
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/iopcore/cdvdman/Makefile b/modules/iopcore/cdvdman/Makefile
@@ -49,8 +49,6 @@ IOP_OBJS += dev9.o
 IOP_CFLAGS += -D__USE_DEV9
 endif
 
-IOP_OBJS := $(IOP_OBJS:%=$(IOP_OBJS_DIR)%)
-
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/iopcore/eesync/Makefile b/modules/iopcore/eesync/Makefile
@@ -3,4 +3,4 @@ IOP_OBJS = eesync.o imports.o
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/iopcore/imgdrv/Makefile b/modules/iopcore/imgdrv/Makefile
@@ -3,4 +3,4 @@ IOP_OBJS = imgdrv.o imports.o
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/iopcore/patches/apemodpatch/Makefile b/modules/iopcore/patches/apemodpatch/Makefile
@@ -3,4 +3,4 @@ IOP_OBJS = main.o imports.o
 
 include $(PS2SDK)/Defs.make
 include ../../../Rules.bin.make
-include ../../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/iopcore/patches/cleareffects/Makefile b/modules/iopcore/patches/cleareffects/Makefile
@@ -3,4 +3,4 @@ IOP_OBJS = main.o imports.o
 
 include $(PS2SDK)/Defs.make
 include ../../../Rules.bin.make
-include ../../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/iopcore/patches/f2techioppatch/Makefile b/modules/iopcore/patches/f2techioppatch/Makefile
@@ -3,4 +3,4 @@ IOP_OBJS = main.o imports.o
 
 include $(PS2SDK)/Defs.make
 include ../../../Rules.bin.make
-include ../../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/iopcore/patches/iremsndpatch/Makefile b/modules/iopcore/patches/iremsndpatch/Makefile
@@ -3,4 +3,4 @@ IOP_OBJS = main.o asm.o imports.o
 
 include $(PS2SDK)/Defs.make
 include ../../../Rules.bin.make
-include ../../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/iopcore/resetspu/Makefile b/modules/iopcore/resetspu/Makefile
@@ -3,4 +3,4 @@ IOP_OBJS = resetspu.o imports.o
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/iopcore/udnl-t300/Makefile b/modules/iopcore/udnl-t300/Makefile
@@ -1,6 +1,11 @@
 IOP_BIN  = udnl.irx
 IOP_OBJS = udnl.o udnl_asm.o imports.o IOPRP_img.o
 
+BIN2C = $(PS2SDK)/bin/bin2c
+BIN2S = $(PS2SDK)/bin/bin2s
+BIN2O = $(PS2SDK)/bin/bin2o
+IOP_SRC_DIR = ./
+
 IOP_INCS += -I./include
 
 all: $(IOP_BIN)
@@ -12,4 +17,4 @@ IOPRP_img.c:
 	$(BIN2C) IOPRP.img IOPRP_img.c IOPRP_img
 
 include $(PS2SDK)/Defs.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/iopcore/udnl/Makefile b/modules/iopcore/udnl/Makefile
@@ -1,6 +1,11 @@
 IOP_BIN  = udnl.irx
 IOP_OBJS = udnl.o udnl_asm.o imports.o
 
+BIN2C = $(PS2SDK)/bin/bin2c
+BIN2S = $(PS2SDK)/bin/bin2s
+BIN2O = $(PS2SDK)/bin/bin2o
+IOP_SRC_DIR = ./
+
 IOP_INCS += -I./include
 ifeq ($(DECI2_DEBUG),1)
 IOP_CFLAGS += -D__DECI2_DEBUG
@@ -21,4 +26,4 @@ IOPRP_DECI2_img.c:
 	$(BIN2C) IOPRP_DECI2.img IOPRP_DECI2_img.c IOPRP_img
 
 include $(PS2SDK)/Defs.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/isofs/Makefile b/modules/isofs/Makefile
@@ -3,4 +3,4 @@ IOP_OBJS = isofs.o imports.o
 
 include $(PS2SDK)/Defs.make
 include ../Rules.bin.make
-include ../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/mcemu/Makefile b/modules/mcemu/Makefile
@@ -21,8 +21,6 @@ IOP_OBJS += device-bdm.o
 IOP_CFLAGS += -DBDM_DRIVER
 endif
 
-IOP_OBJS := $(IOP_OBJS:%=$(IOP_OBJS_DIR)%)
-
 ifeq ($(IOPCORE_DEBUG),1)
 IOP_CFLAGS += -DDEBUG
 endif
@@ -33,4 +31,4 @@ endif
 
 include $(PS2SDK)/Defs.make
 include ../Rules.bin.make
-include ../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/network/SMSTCPIP/Makefile b/modules/network/SMSTCPIP/Makefile
@@ -30,7 +30,7 @@ endif
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
 
 ifneq ($(IOP_CC_VERSION),3.2.2)
 ifneq ($(IOP_CC_VERSION),3.2.3)

diff --git a/modules/network/SMSUTILS/Makefile b/modules/network/SMSUTILS/Makefile
@@ -5,4 +5,4 @@ IOP_INCS += -I../../iopcore/common
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/network/httpclient/Makefile b/modules/network/httpclient/Makefile
@@ -5,4 +5,4 @@ IOP_INCS += -I../common
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/network/lwnbdsvr/Makefile b/modules/network/lwnbdsvr/Makefile
@@ -2,15 +2,15 @@ IOP_BIN = lwnbdsvr.irx
 IOP_OBJS = lwnbdsvr.o imports.o exports.o drivers/atad.o lwNBD/nbd_server.o
 
 IOP_CFLAGS += -DPS2SDK
-IOP_INCS += -I../../iopcore/common   -I../../../include/
+IOP_INCS += -I../../iopcore/common -I../../../include/
 
 ifeq ($(DEBUG),1)
 IOP_CFLAGS += -DDEBUG -DNBD_DEBUG
 endif
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
 
 ifneq ($(IOP_CC_VERSION),3.2.2)
 ifneq ($(IOP_CC_VERSION),3.2.3)

diff --git a/modules/network/nbns/Makefile b/modules/network/nbns/Makefile
@@ -5,4 +5,4 @@ IOP_INCS += -I../../../include
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/network/smap-ingame/Makefile b/modules/network/smap-ingame/Makefile
@@ -5,4 +5,4 @@ IOP_INCS += -I../../iopcore/common -I../common
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/network/smbinit/Makefile b/modules/network/smbinit/Makefile
@@ -5,4 +5,4 @@ IOP_INCS += -I../../iopcore/common
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/pademu/Makefile b/modules/pademu/Makefile
@@ -18,10 +18,8 @@ ifeq ($(VMC),1)
 IOP_CFLAGS += -DVMC
 endif
 
-IOP_OBJS := $(IOP_OBJS:%=$(IOP_OBJS_DIR)%)
-
 IOP_CFLAGS += -DUSE_SMSUTILS
 
 include $(PS2SDK)/Defs.make
 include ../Rules.bin.make
-include ../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal
diff --git a/modules/vmc/genvmc/Makefile b/modules/vmc/genvmc/Makefile
@@ -7,4 +7,4 @@ endif
 
 include $(PS2SDK)/Defs.make
 include ../../Rules.bin.make
-include ../../Rules.make
+include $(PS2SDK)/samples/Makefile.iopglobal