Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Module makefiles synced with mainstream SDK #439

Merged
merged 1 commit into from
Jun 18, 2021
Merged

Module makefiles synced with mainstream SDK #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion modules/Rules.bin.make
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
83 changes: 0 additions & 83 deletions modules/Rules.make
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion modules/bdmevent/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ IOP_INCS += -I../../include/

include $(PS2SDK)/Defs.make
include ../Rules.bin.make
include ../Rules.make
include $(PS2SDK)/samples/Makefile.iopglobal
2 changes: 1 addition & 1 deletion modules/debug/ioptrap/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/debug/ps2link/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ endif

include $(PS2SDK)/Defs.make
include ../../Rules.bin.make
include ../../Rules.make
include $(PS2SDK)/samples/Makefile.iopglobal
10 changes: 10 additions & 0 deletions modules/debug/ps2link/imports.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/debug/udptty-ingame/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ IOP_CFLAGS += -DKPRTTY

include $(PS2SDK)/Defs.make
include ../../Rules.bin.make
include ../../Rules.make
include $(PS2SDK)/samples/Makefile.iopglobal
2 changes: 1 addition & 1 deletion modules/ds34bt/iop/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/ds34usb/iop/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/hdd/xhdd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ IOP_INCS += -I../common

include $(PS2SDK)/Defs.make
include ../../Rules.bin.make
include ../../Rules.make
include $(PS2SDK)/samples/Makefile.iopglobal
2 changes: 1 addition & 1 deletion modules/iopcore/cdvdfsv/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ endif

include $(PS2SDK)/Defs.make
include ../../Rules.bin.make
include ../../Rules.make
include $(PS2SDK)/samples/Makefile.iopglobal
4 changes: 1 addition & 3 deletions modules/iopcore/cdvdman/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/iopcore/eesync/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/iopcore/imgdrv/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/iopcore/patches/apemodpatch/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/iopcore/patches/cleareffects/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/iopcore/patches/f2techioppatch/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/iopcore/patches/iremsndpatch/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/iopcore/resetspu/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 6 additions & 1 deletion modules/iopcore/udnl-t300/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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
7 changes: 6 additions & 1 deletion modules/iopcore/udnl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion modules/isofs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions modules/mcemu/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -33,4 +31,4 @@ endif

include $(PS2SDK)/Defs.make
include ../Rules.bin.make
include ../Rules.make
include $(PS2SDK)/samples/Makefile.iopglobal
2 changes: 1 addition & 1 deletion modules/network/SMSTCPIP/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion modules/network/SMSUTILS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/network/httpclient/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ IOP_INCS += -I../common

include $(PS2SDK)/Defs.make
include ../../Rules.bin.make
include ../../Rules.make
include $(PS2SDK)/samples/Makefile.iopglobal
4 changes: 2 additions & 2 deletions modules/network/lwnbdsvr/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion modules/network/nbns/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ IOP_INCS += -I../../../include

include $(PS2SDK)/Defs.make
include ../../Rules.bin.make
include ../../Rules.make
include $(PS2SDK)/samples/Makefile.iopglobal
2 changes: 1 addition & 1 deletion modules/network/smap-ingame/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/network/smbinit/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions modules/pademu/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/vmc/genvmc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ endif

include $(PS2SDK)/Defs.make
include ../../Rules.bin.make
include ../../Rules.make
include $(PS2SDK)/samples/Makefile.iopglobal