Skip to content

Commit 608331b

Browse files
fjtrujyfjtrujy
authored
Merge pull request #744 from israpps/patch-23
[IOP] flexible approach for import search paths
2 parents 17465e3 + c20873e commit 608331b

File tree

127 files changed

+1003
-986
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+1003
-986
lines changed

‎iop/Rules.make‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ endif
2323
# include dir
2424
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
2525

26+
ifdef IOP_IMPORT_INCS
27+
IOP_INCS += $(addprefix -I$(PS2SDKSRC)/iop/, $(addsuffix /include, $(IOP_IMPORT_INCS)))
28+
endif
29+
2630
# Optimization compiler flags
2731
IOP_OPTFLAGS ?= -Os
2832

‎iop/arcade/acata/Makefile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
IOP_INCS += \
10-
-I$(PS2SDKSRC)/iop/arcade/accore/include \
11-
-I$(PS2SDKSRC)/iop/arcade/actimer/include \
12-
-I$(PS2SDKSRC)/iop/system/intrman/include \
13-
-I$(PS2SDKSRC)/iop/system/loadcore/include \
14-
-I$(PS2SDKSRC)/iop/system/stdio/include \
15-
-I$(PS2SDKSRC)/iop/system/sysclib/include \
16-
-I$(PS2SDKSRC)/iop/system/sysmem/include \
17-
-I$(PS2SDKSRC)/iop/system/threadman/include
9+
IOP_IMPORT_INCS += \
10+
arcade/accore \
11+
arcade/actimer \
12+
system/intrman \
13+
system/loadcore \
14+
system/stdio \
15+
system/sysclib \
16+
system/sysmem \
17+
system/threadman
1818

1919
IOP_OBJS = \
2020
acata-entry.o \

‎iop/arcade/acatad/Makefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
IOP_INCS += \
10-
-I$(PS2SDKSRC)/iop/arcade/acata/include \
11-
-I$(PS2SDKSRC)/iop/arcade/accore/include \
12-
-I$(PS2SDKSRC)/iop/dev9/atad/include \
13-
-I$(PS2SDKSRC)/iop/system/loadcore/include \
14-
-I$(PS2SDKSRC)/iop/system/stdio/include \
15-
-I$(PS2SDKSRC)/iop/system/sysclib/include \
16-
-I$(PS2SDKSRC)/iop/system/threadman/include
9+
IOP_IMPORT_INCS += \
10+
arcade/acata \
11+
arcade/accore \
12+
dev9/atad \
13+
system/loadcore \
14+
system/stdio \
15+
system/sysclib \
16+
system/threadman
1717

1818
IOP_OBJS = \
1919
acatad.o \

‎iop/arcade/accdvd/Makefile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
IOP_INCS += \
10-
-I$(PS2SDKSRC)/iop/arcade/acata/include \
11-
-I$(PS2SDKSRC)/iop/arcade/accore/include \
12-
-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
13-
-I$(PS2SDKSRC)/iop/system/intrman/include \
14-
-I$(PS2SDKSRC)/iop/system/ioman/include \
15-
-I$(PS2SDKSRC)/iop/system/loadcore/include \
16-
-I$(PS2SDKSRC)/iop/system/stdio/include \
17-
-I$(PS2SDKSRC)/iop/system/sysclib/include \
18-
-I$(PS2SDKSRC)/iop/system/sysmem/include \
19-
-I$(PS2SDKSRC)/iop/system/threadman/include
9+
IOP_IMPORT_INCS += \
10+
arcade/acata \
11+
arcade/accore \
12+
cdvd/cdvdman \
13+
system/intrman \
14+
system/ioman \
15+
system/loadcore \
16+
system/stdio \
17+
system/sysclib \
18+
system/sysmem \
19+
system/threadman
2020

2121
IOP_OBJS = \
2222
accdvdi-entry.o \

‎iop/arcade/accdvde/Makefile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
IOP_INCS += \
10-
-I$(PS2SDKSRC)/iop/arcade/accdvd/include \
11-
-I$(PS2SDKSRC)/iop/arcade/accore/include \
12-
-I$(PS2SDKSRC)/iop/arcade/acmem/include \
13-
-I$(PS2SDKSRC)/iop/arcade/acram/include \
14-
-I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \
15-
-I$(PS2SDKSRC)/iop/system/intrman/include \
16-
-I$(PS2SDKSRC)/iop/system/loadcore/include \
17-
-I$(PS2SDKSRC)/iop/system/sifcmd/include \
18-
-I$(PS2SDKSRC)/iop/system/stdio/include \
19-
-I$(PS2SDKSRC)/iop/system/sysclib/include \
20-
-I$(PS2SDKSRC)/iop/system/threadman/include
9+
IOP_IMPORT_INCS += \
10+
arcade/accdvd \
11+
arcade/accore \
12+
arcade/acmem \
13+
arcade/acram \
14+
cdvd/cdvdman \
15+
system/intrman \
16+
system/loadcore \
17+
system/sifcmd \
18+
system/stdio \
19+
system/sysclib \
20+
system/threadman
2121

2222
IOP_OBJS = \
2323
accdvde-entry.o \

‎iop/arcade/accore/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
IOP_INCS += \
10-
-I$(PS2SDKSRC)/iop/arcade/acdev/include \
11-
-I$(PS2SDKSRC)/iop/system/dmacman/include \
12-
-I$(PS2SDKSRC)/iop/system/intrman/include \
13-
-I$(PS2SDKSRC)/iop/system/loadcore/include \
14-
-I$(PS2SDKSRC)/iop/system/stdio/include
9+
IOP_IMPORT_INCS += \
10+
arcade/acdev \
11+
system/dmacman \
12+
system/intrman \
13+
system/loadcore \
14+
system/stdio
1515

1616
IOP_OBJS = \
1717
accore-entry.o \

‎iop/arcade/acdev/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
IOP_INCS += \
10-
-I$(PS2SDKSRC)/iop/fs/romdrv/include \
11-
-I$(PS2SDKSRC)/iop/system/intrman/include \
12-
-I$(PS2SDKSRC)/iop/system/loadcore/include \
13-
-I$(PS2SDKSRC)/iop/system/ssbusc/include \
14-
-I$(PS2SDKSRC)/iop/system/sysmem/include
9+
IOP_IMPORT_INCS += \
10+
fs/romdrv \
11+
system/intrman \
12+
system/loadcore \
13+
system/ssbusc \
14+
system/sysmem
1515

1616
IOP_OBJS = \
1717
acdev.o \

‎iop/arcade/acdev9/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
IOP_INCS += \
10-
-I$(PS2SDKSRC)/iop/dev9/dev9/include \
11-
-I$(PS2SDKSRC)/iop/system/loadcore/include \
12-
-I$(PS2SDKSRC)/iop/system/stdio/include
9+
IOP_IMPORT_INCS += \
10+
dev9/dev9 \
11+
system/loadcore \
12+
system/stdio
1313

1414
IOP_OBJS = \
1515
acdev9.o \

‎iop/arcade/acflash/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
IOP_INCS += \
10-
-I$(PS2SDKSRC)/iop/arcade/accore/include \
11-
-I$(PS2SDKSRC)/iop/system/loadcore/include \
12-
-I$(PS2SDKSRC)/iop/system/stdio/include \
13-
-I$(PS2SDKSRC)/iop/system/threadman/include
9+
IOP_IMPORT_INCS += \
10+
arcade/accore \
11+
system/loadcore \
12+
system/stdio \
13+
system/threadman
1414

1515
IOP_OBJS = \
1616
acflash-entry.o \

‎iop/arcade/acfpgald/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

9-
IOP_INCS += \
10-
-I$(PS2SDKSRC)/iop/arcade/accore/include \
11-
-I$(PS2SDKSRC)/iop/system/ioman/include \
12-
-I$(PS2SDKSRC)/iop/system/stdio/include \
13-
-I$(PS2SDKSRC)/iop/system/sysclib/include \
14-
-I$(PS2SDKSRC)/iop/system/threadman/include
9+
IOP_IMPORT_INCS += \
10+
arcade/accore \
11+
system/ioman \
12+
system/stdio \
13+
system/sysclib \
14+
system/threadman
1515

1616
IOP_OBJS = \
1717
fpgald.o \

0 commit comments

Comments
 (0)