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

Move IOP module headers to module directories #688

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Move IOP module headers to module directories #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df68fb4
refactor: buildsystem iop use module include dirs
uyjulian Dec 8, 2024
202c6f3
refactor: move includes to iop module dirs
uyjulian Dec 8, 2024
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
14 changes: 14 additions & 0 deletions common/sbus/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@ EE_CFLAGS += -fno-builtin-printf

EE_OBJS = ps2_sbus.o ee_sbus.o ps2_sif.o ee_sif2.o sif2cmd.o ee_low.o

IOP_INCS += \
-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
-I$(PS2SDKSRC)/iop/system/excepman/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/ioman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/modload/include \
-I$(PS2SDKSRC)/iop/system/sifcmd/include \
-I$(PS2SDKSRC)/iop/system/sifman/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/sysmem/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS_DIR = iop_obj/

IOP_OBJS = ps2_sbus.o iop_sbus.o ps2_sif.o iop_sif2.o sif2cmd.o imports.o exports.o
Expand Down
4 changes: 4 additions & 0 deletions ee/iopreboot/src/imgdrv/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@

IOP_BIN ?= imgdrv.irx

IOP_INCS += \
-I$(PS2SDKSRC)/iop/system/ioman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include

IOP_OBJS = imgdrv.o imports.o

include $(PS2SDKSRC)/Defs.make
Expand Down
8 changes: 7 additions & 1 deletion iop/arcade/acata/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/arcade/actimer/include
-I$(PS2SDKSRC)/iop/arcade/actimer/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/sysmem/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = \
acata-entry.o \
Expand Down
8 changes: 6 additions & 2 deletions iop/arcade/acatad/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/arcade/acata/include \
-I$(PS2SDKSRC)/iop/dev9/atad/include
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/dev9/atad/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = \
acatad.o \
Expand Down
10 changes: 9 additions & 1 deletion iop/arcade/accdvd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,16 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/acata/include \
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/arcade/acata/include
-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/ioman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/sysmem/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = \
accdvdi-entry.o \
Expand Down
11 changes: 9 additions & 2 deletions iop/arcade/accdvde/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,17 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/arcade/accdvd/include \
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/arcade/acmem/include \
-I$(PS2SDKSRC)/iop/arcade/acram/include
-I$(PS2SDKSRC)/iop/arcade/acram/include \
-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/sifcmd/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = \
accdvde-entry.o \
Expand Down
6 changes: 5 additions & 1 deletion iop/arcade/accore/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/acdev/include
-I$(PS2SDKSRC)/iop/arcade/acdev/include \
-I$(PS2SDKSRC)/iop/system/dmacman/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/stdio/include

IOP_OBJS = \
accore-entry.o \
Expand Down
6 changes: 5 additions & 1 deletion iop/arcade/acdev/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/fs/romdrv/include
-I$(PS2SDKSRC)/iop/fs/romdrv/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/ssbusc/include \
-I$(PS2SDKSRC)/iop/system/sysmem/include

IOP_OBJS = \
acdev.o \
Expand Down
4 changes: 3 additions & 1 deletion iop/arcade/acdev9/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/dev9/dev9/include
-I$(PS2SDKSRC)/iop/dev9/dev9/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/stdio/include

IOP_OBJS = \
acdev9.o \
Expand Down
5 changes: 4 additions & 1 deletion iop/arcade/acflash/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = \
acflash-entry.o \
Expand Down
6 changes: 5 additions & 1 deletion iop/arcade/acfpgald/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/system/ioman/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = \
fpgald.o \
Expand Down
3 changes: 2 additions & 1 deletion iop/arcade/acjv/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include

IOP_OBJS = \
acjv-entry.o \
Expand Down
5 changes: 4 additions & 1 deletion iop/arcade/acjvld/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/system/ioman/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include

IOP_OBJS = \
jvld.o \
Expand Down
7 changes: 6 additions & 1 deletion iop/arcade/acmem/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/sifcmd/include \
-I$(PS2SDKSRC)/iop/system/sifman/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = \
acmem-entry.o \
Expand Down
8 changes: 7 additions & 1 deletion iop/arcade/acmeme/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/acjv/include \
-I$(PS2SDKSRC)/iop/arcade/acmem/include \
-I$(PS2SDKSRC)/iop/arcade/acram/include \
-I$(PS2SDKSRC)/iop/arcade/acsram/include
-I$(PS2SDKSRC)/iop/arcade/acsram/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/sifcmd/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/sysmem/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = \
acmeme-entry.o \
Expand Down
8 changes: 7 additions & 1 deletion iop/arcade/acram/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/sysmem/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = \
acram-entry.o \
Expand Down
6 changes: 6 additions & 0 deletions iop/arcade/acrtc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
# Licenced under Academic Free License version 2.0
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
-I$(PS2SDKSRC)/iop/system/sifcmd/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = \
iopmain.o \
imports.o
Expand Down
3 changes: 2 additions & 1 deletion iop/arcade/acsram/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include

IOP_OBJS = \
acsram-entry.o \
Expand Down
6 changes: 5 additions & 1 deletion iop/arcade/actimer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = \
actimer-entry.o \
Expand Down
9 changes: 8 additions & 1 deletion iop/arcade/acuart/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/ioman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/sysmem/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

ADD_TTY ?= 0

Expand Down
13 changes: 13 additions & 0 deletions iop/cdvd/cdfs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,19 @@

# IOP_CFLAGS += -DSIO_DEBUG -DDEBUG

IOP_INCS += \
-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
-I$(PS2SDKSRC)/iop/debug/sior/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/ioman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/sifcmd/include \
-I$(PS2SDKSRC)/iop/system/sifman/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/sysmem/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = main.o cdfs_iop.o imports.o

include $(PS2SDKSRC)/Defs.make
Expand Down
14 changes: 14 additions & 0 deletions iop/cdvd/cdvdfsv/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_CFLAGS += -DBUILDING_CDVD_MODULE

IOP_INCS += \
-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
-I$(PS2SDKSRC)/iop/system/dmacman/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/iomanx/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/sifcmd/include \
-I$(PS2SDKSRC)/iop/system/sifman/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/sysmem/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = cdvdfsv.o imports.o exports.o

include $(PS2SDKSRC)/Defs.make
Expand Down
0 iop/kernel/include/cdvdfsv.h → iop/cdvd/cdvdfsv/include/cdvdfsv.h
View file
Open in desktop
File renamed without changes.
11 changes: 11 additions & 0 deletions iop/cdvd/cdvdman/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_CFLAGS += -DBUILDING_CDVD_MODULE

IOP_INCS += \
-I$(PS2SDKSRC)/iop/system/dmacman/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/iomanx/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/sysmem/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = cdvdman.o imports.o exports.o

include $(PS2SDKSRC)/Defs.make
Expand Down
0 iop/kernel/include/cdvdman.h → iop/cdvd/cdvdman/include/cdvdman.h
View file
Open in desktop
File renamed without changes.
12 changes: 12 additions & 0 deletions iop/cdvd/cdvdstm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_CFLAGS += -DBUILDING_CDVD_MODULE

IOP_INCS += \
-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/iomanx/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/sifman/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/sysmem/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = cdvdstm.o imports.o exports.o

include $(PS2SDKSRC)/Defs.make
Expand Down
6 changes: 6 additions & 0 deletions iop/cdvd/xesdrv/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
# Review ps2sdk README & LICENSE files for further details.

IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0

IOP_INCS += \
-I$(PS2SDKSRC)/iop/system/iomanx/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = xesdrv.o imports.o

include $(PS2SDKSRC)/Defs.make
Expand Down
16 changes: 15 additions & 1 deletion iop/debug/iop_sbusdbg/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,21 @@
# Licenced under Academic Free License version 2.0
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += -I$(PS2SDKSRC)/common/sbus/include -I$(PS2SDKSRC)/iop/debug/iopdebug/include
IOP_INCS += \
-I$(PS2SDKSRC)/common/sbus/include \
-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
-I$(PS2SDKSRC)/iop/debug/iopdebug/include \
-I$(PS2SDKSRC)/iop/system/excepman/include \
-I$(PS2SDKSRC)/iop/system/intrman/include \
-I$(PS2SDKSRC)/iop/system/ioman/include \
-I$(PS2SDKSRC)/iop/system/loadcore/include \
-I$(PS2SDKSRC)/iop/system/modload/include \
-I$(PS2SDKSRC)/iop/system/sifcmd/include \
-I$(PS2SDKSRC)/iop/system/sifman/include \
-I$(PS2SDKSRC)/iop/system/stdio/include \
-I$(PS2SDKSRC)/iop/system/sysclib/include \
-I$(PS2SDKSRC)/iop/system/sysmem/include \
-I$(PS2SDKSRC)/iop/system/threadman/include

IOP_OBJS = main.o sbus_dbg_low.o sbus_tty.o sbus_dbg.o imports.o

Expand Down
Loading
Loading