Skip to content

[IOP] flexible approach for import search paths #744

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

Merged
fjtrujy merged 2 commits into from
Apr 25, 2025
Merged

[IOP] flexible approach for import search paths #744

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
eea0974
[IOP] flexible approach for import search paths
israpps Mar 28, 2025
c20873e
Merge branch 'master' into patch-23
fjtrujy Apr 25, 2025
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
4 changes: 4 additions & 0 deletions iop/Rules.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ endif
# include dir
IOP_INCS := $(IOP_INCS) -I$(IOP_SRC_DIR) -I$(IOP_SRC_DIR)include -I$(IOP_INC_DIR) -I$(PS2SDKSRC)/iop/kernel/include -I$(PS2SDKSRC)/common/include

ifdef IOP_IMPORT_INCS
IOP_INCS += $(addprefix -I$(PS2SDKSRC)/iop/, $(addsuffix /include, $(IOP_IMPORT_INCS)))
endif

# Optimization compiler flags
IOP_OPTFLAGS ?= -Os

Expand Down
18 changes: 9 additions & 9 deletions iop/arcade/acata/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
# Licenced under Academic Free License version 2.0
# Review ps2sdk README & LICENSE files for further details.

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/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_IMPORT_INCS += \
arcade/accore \
arcade/actimer \
system/intrman \
system/loadcore \
system/stdio \
system/sysclib \
system/sysmem \
system/threadman

IOP_OBJS = \
acata-entry.o \
Expand Down
16 changes: 8 additions & 8 deletions iop/arcade/acatad/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
# Licenced under Academic Free License version 2.0
# 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/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_IMPORT_INCS += \
arcade/acata \
arcade/accore \
dev9/atad \
system/loadcore \
system/stdio \
system/sysclib \
system/threadman

IOP_OBJS = \
acatad.o \
Expand Down
22 changes: 11 additions & 11 deletions iop/arcade/accdvd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
# Licenced under Academic Free License version 2.0
# 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/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_IMPORT_INCS += \
arcade/acata \
arcade/accore \
cdvd/cdvdman \
system/intrman \
system/ioman \
system/loadcore \
system/stdio \
system/sysclib \
system/sysmem \
system/threadman

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

IOP_INCS += \
-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/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_IMPORT_INCS += \
arcade/accdvd \
arcade/accore \
arcade/acmem \
arcade/acram \
cdvd/cdvdman \
system/intrman \
system/loadcore \
system/sifcmd \
system/stdio \
system/sysclib \
system/threadman

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

IOP_INCS += \
-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_IMPORT_INCS += \
arcade/acdev \
system/dmacman \
system/intrman \
system/loadcore \
system/stdio

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

IOP_INCS += \
-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_IMPORT_INCS += \
fs/romdrv \
system/intrman \
system/loadcore \
system/ssbusc \
system/sysmem

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

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

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

IOP_INCS += \
-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_IMPORT_INCS += \
arcade/accore \
system/loadcore \
system/stdio \
system/threadman

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

IOP_INCS += \
-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_IMPORT_INCS += \
arcade/accore \
system/ioman \
system/stdio \
system/sysclib \
system/threadman

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

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

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

IOP_INCS += \
-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_IMPORT_INCS += \
arcade/accore \
system/ioman \
system/stdio \
system/sysclib

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

IOP_INCS += \
-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_IMPORT_INCS += \
arcade/accore \
system/intrman \
system/loadcore \
system/sifcmd \
system/sifman \
system/threadman

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

IOP_INCS += \
-I$(PS2SDKSRC)/iop/arcade/accore/include \
-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/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_IMPORT_INCS += \
arcade/accore \
arcade/acjv \
arcade/acmem \
arcade/acram \
arcade/acsram \
system/loadcore \
system/sifcmd \
system/stdio \
system/sysclib \
system/sysmem \
system/threadman

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

IOP_INCS += \
-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_IMPORT_INCS += \
arcade/accore \
system/intrman \
system/loadcore \
system/stdio \
system/sysclib \
system/sysmem \
system/threadman

IOP_OBJS = \
acram-entry.o \
Expand Down
10 changes: 5 additions & 5 deletions iop/arcade/acrtc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
# 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_IMPORT_INCS += \
cdvd/cdvdman \
system/sifcmd \
system/stdio \
system/threadman

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

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

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

IOP_INCS += \
-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_IMPORT_INCS += \
arcade/accore \
system/intrman \
system/loadcore \
system/sysclib \
system/threadman

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

IOP_INCS += \
-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
IOP_IMPORT_INCS += \
arcade/accore \
system/intrman \
system/ioman \
system/loadcore \
system/stdio \
system/sysclib \
system/sysmem \
system/threadman

ADD_TTY ?= 0

Expand Down
Loading