Skip to content

Commit 4ce04b9

Browse files
AKuHAKAKuHAK
authored
Merge pull request ps2homebrew#439 from AKuHAK/modules_sync
Module makefiles synced with mainstream SDK
2 parents 99d2e04 + 7a05815 commit 4ce04b9

File tree

32 files changed

+56
-120
lines changed

32 files changed

+56
-120
lines changed

‎modules/Rules.bin.make

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
BIN2C = $(PS2SDK)/bin/bin2c
2+
BIN2S = $(PS2SDK)/bin/bin2s
3+
BIN2O = $(PS2SDK)/bin/bin2o
4+
IOP_SRC_DIR = ./
5+
16
all: $(IOP_BIN)
27

38
clean:
4-
rm -f $(IOP_BIN) $(IOP_OBJS)
9+
rm -r -f $(IOP_BIN) $(IOP_OBJS) $(IOP_OBJS_DIR) $(IOP_BIN_DIR) $(IOP_LIB_DIR)
510

611
rebuild: clean all
712

‎modules/Rules.make

-83
This file was deleted.

‎modules/bdmevent/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ IOP_INCS += -I../../include/
55

66
include $(PS2SDK)/Defs.make
77
include ../Rules.bin.make
8-
include ../Rules.make
8+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/debug/ioptrap/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ IOP_OBJS = ioptrap.o handler.o breakpoint.o imports.o exports.o
33

44
include $(PS2SDK)/Defs.make
55
include ../../Rules.bin.make
6-
include ../../Rules.make
6+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/debug/ps2link/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ endif
1717

1818
include $(PS2SDK)/Defs.make
1919
include ../../Rules.bin.make
20-
include ../../Rules.make
20+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/debug/ps2link/imports.lst

+10
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ ioman_IMPORTS_end
3333

3434
ps2ip_IMPORTS_start
3535
I_lwip_send
36+
#ifdef DEBUG
37+
I_lwip_sendto
38+
I_lwip_socket
39+
I_lwip_listen
40+
I_lwip_recv
41+
I_lwip_recvfrom
42+
I_lwip_close
43+
I_lwip_bind
44+
I_lwip_accept
45+
#endif
3646
ps2ip_IMPORTS_end
3747

3848
sifcmd_IMPORTS_start

‎modules/debug/udptty-ingame/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ IOP_CFLAGS += -DKPRTTY
66

77
include $(PS2SDK)/Defs.make
88
include ../../Rules.bin.make
9-
include ../../Rules.make
9+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/ds34bt/iop/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ IOP_OBJS = ds34bt.o smsutils.o imports.o
33

44
include $(PS2SDK)/Defs.make
55
include ../../Rules.bin.make
6-
include ../../Rules.make
6+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/ds34usb/iop/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ IOP_OBJS = ds34usb.o smsutils.o imports.o
33

44
include $(PS2SDK)/Defs.make
55
include ../../Rules.bin.make
6-
include ../../Rules.make
6+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/hdd/xhdd/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ IOP_INCS += -I../common
55

66
include $(PS2SDK)/Defs.make
77
include ../../Rules.bin.make
8-
include ../../Rules.make
8+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/iopcore/cdvdfsv/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ endif
99

1010
include $(PS2SDK)/Defs.make
1111
include ../../Rules.bin.make
12-
include ../../Rules.make
12+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/iopcore/cdvdman/Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ IOP_OBJS += dev9.o
4949
IOP_CFLAGS += -D__USE_DEV9
5050
endif
5151

52-
IOP_OBJS := $(IOP_OBJS:%=$(IOP_OBJS_DIR)%)
53-
5452
include $(PS2SDK)/Defs.make
5553
include ../../Rules.bin.make
56-
include ../../Rules.make
54+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/iopcore/eesync/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ IOP_OBJS = eesync.o imports.o
33

44
include $(PS2SDK)/Defs.make
55
include ../../Rules.bin.make
6-
include ../../Rules.make
6+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/iopcore/imgdrv/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ IOP_OBJS = imgdrv.o imports.o
33

44
include $(PS2SDK)/Defs.make
55
include ../../Rules.bin.make
6-
include ../../Rules.make
6+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/iopcore/patches/apemodpatch/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ IOP_OBJS = main.o imports.o
33

44
include $(PS2SDK)/Defs.make
55
include ../../../Rules.bin.make
6-
include ../../../Rules.make
6+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/iopcore/patches/cleareffects/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ IOP_OBJS = main.o imports.o
33

44
include $(PS2SDK)/Defs.make
55
include ../../../Rules.bin.make
6-
include ../../../Rules.make
6+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/iopcore/patches/f2techioppatch/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ IOP_OBJS = main.o imports.o
33

44
include $(PS2SDK)/Defs.make
55
include ../../../Rules.bin.make
6-
include ../../../Rules.make
6+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/iopcore/patches/iremsndpatch/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ IOP_OBJS = main.o asm.o imports.o
33

44
include $(PS2SDK)/Defs.make
55
include ../../../Rules.bin.make
6-
include ../../../Rules.make
6+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/iopcore/resetspu/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ IOP_OBJS = resetspu.o imports.o
33

44
include $(PS2SDK)/Defs.make
55
include ../../Rules.bin.make
6-
include ../../Rules.make
6+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/iopcore/udnl-t300/Makefile

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
IOP_BIN = udnl.irx
22
IOP_OBJS = udnl.o udnl_asm.o imports.o IOPRP_img.o
33

4+
BIN2C = $(PS2SDK)/bin/bin2c
5+
BIN2S = $(PS2SDK)/bin/bin2s
6+
BIN2O = $(PS2SDK)/bin/bin2o
7+
IOP_SRC_DIR = ./
8+
49
IOP_INCS += -I./include
510

611
all: $(IOP_BIN)
@@ -12,4 +17,4 @@ IOPRP_img.c:
1217
$(BIN2C) IOPRP.img IOPRP_img.c IOPRP_img
1318

1419
include $(PS2SDK)/Defs.make
15-
include ../../Rules.make
20+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/iopcore/udnl/Makefile

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
IOP_BIN = udnl.irx
22
IOP_OBJS = udnl.o udnl_asm.o imports.o
33

4+
BIN2C = $(PS2SDK)/bin/bin2c
5+
BIN2S = $(PS2SDK)/bin/bin2s
6+
BIN2O = $(PS2SDK)/bin/bin2o
7+
IOP_SRC_DIR = ./
8+
49
IOP_INCS += -I./include
510
ifeq ($(DECI2_DEBUG),1)
611
IOP_CFLAGS += -D__DECI2_DEBUG
@@ -21,4 +26,4 @@ IOPRP_DECI2_img.c:
2126
$(BIN2C) IOPRP_DECI2.img IOPRP_DECI2_img.c IOPRP_img
2227

2328
include $(PS2SDK)/Defs.make
24-
include ../../Rules.make
29+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/isofs/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ IOP_OBJS = isofs.o imports.o
33

44
include $(PS2SDK)/Defs.make
55
include ../Rules.bin.make
6-
include ../Rules.make
6+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/mcemu/Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ IOP_OBJS += device-bdm.o
2121
IOP_CFLAGS += -DBDM_DRIVER
2222
endif
2323

24-
IOP_OBJS := $(IOP_OBJS:%=$(IOP_OBJS_DIR)%)
25-
2624
ifeq ($(IOPCORE_DEBUG),1)
2725
IOP_CFLAGS += -DDEBUG
2826
endif
@@ -33,4 +31,4 @@ endif
3331

3432
include $(PS2SDK)/Defs.make
3533
include ../Rules.bin.make
36-
include ../Rules.make
34+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/network/SMSTCPIP/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ endif
3030

3131
include $(PS2SDK)/Defs.make
3232
include ../../Rules.bin.make
33-
include ../../Rules.make
33+
include $(PS2SDK)/samples/Makefile.iopglobal
3434

3535
ifneq ($(IOP_CC_VERSION),3.2.2)
3636
ifneq ($(IOP_CC_VERSION),3.2.3)

‎modules/network/SMSUTILS/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ IOP_INCS += -I../../iopcore/common
55

66
include $(PS2SDK)/Defs.make
77
include ../../Rules.bin.make
8-
include ../../Rules.make
8+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/network/httpclient/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ IOP_INCS += -I../common
55

66
include $(PS2SDK)/Defs.make
77
include ../../Rules.bin.make
8-
include ../../Rules.make
8+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/network/lwnbdsvr/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ IOP_BIN = lwnbdsvr.irx
22
IOP_OBJS = lwnbdsvr.o imports.o exports.o drivers/atad.o lwNBD/nbd_server.o
33

44
IOP_CFLAGS += -DPS2SDK
5-
IOP_INCS += -I../../iopcore/common -I../../../include/
5+
IOP_INCS += -I../../iopcore/common -I../../../include/
66

77
ifeq ($(DEBUG),1)
88
IOP_CFLAGS += -DDEBUG -DNBD_DEBUG
99
endif
1010

1111
include $(PS2SDK)/Defs.make
1212
include ../../Rules.bin.make
13-
include ../../Rules.make
13+
include $(PS2SDK)/samples/Makefile.iopglobal
1414

1515
ifneq ($(IOP_CC_VERSION),3.2.2)
1616
ifneq ($(IOP_CC_VERSION),3.2.3)

‎modules/network/nbns/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ IOP_INCS += -I../../../include
55

66
include $(PS2SDK)/Defs.make
77
include ../../Rules.bin.make
8-
include ../../Rules.make
8+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/network/smap-ingame/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ IOP_INCS += -I../../iopcore/common -I../common
55

66
include $(PS2SDK)/Defs.make
77
include ../../Rules.bin.make
8-
include ../../Rules.make
8+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/network/smbinit/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ IOP_INCS += -I../../iopcore/common
55

66
include $(PS2SDK)/Defs.make
77
include ../../Rules.bin.make
8-
include ../../Rules.make
8+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/pademu/Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ ifeq ($(VMC),1)
1818
IOP_CFLAGS += -DVMC
1919
endif
2020

21-
IOP_OBJS := $(IOP_OBJS:%=$(IOP_OBJS_DIR)%)
22-
2321
IOP_CFLAGS += -DUSE_SMSUTILS
2422

2523
include $(PS2SDK)/Defs.make
2624
include ../Rules.bin.make
27-
include ../Rules.make
25+
include $(PS2SDK)/samples/Makefile.iopglobal

‎modules/vmc/genvmc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ endif
77

88
include $(PS2SDK)/Defs.make
99
include ../../Rules.bin.make
10-
include ../../Rules.make
10+
include $(PS2SDK)/samples/Makefile.iopglobal

0 commit comments

Comments
 (0)