diff --git a/iop/Rules.make b/iop/Rules.make index d1097eb6363..7348c2e9309 100644 --- a/iop/Rules.make +++ b/iop/Rules.make @@ -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 diff --git a/iop/arcade/acata/Makefile b/iop/arcade/acata/Makefile index cfe053d545c..52290658862 100644 --- a/iop/arcade/acata/Makefile +++ b/iop/arcade/acata/Makefile @@ -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 \ diff --git a/iop/arcade/acatad/Makefile b/iop/arcade/acatad/Makefile index cef933c2eb9..6d71008159d 100644 --- a/iop/arcade/acatad/Makefile +++ b/iop/arcade/acatad/Makefile @@ -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 \ diff --git a/iop/arcade/accdvd/Makefile b/iop/arcade/accdvd/Makefile index f43c5ca6851..ed370b485dc 100644 --- a/iop/arcade/accdvd/Makefile +++ b/iop/arcade/accdvd/Makefile @@ -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 \ diff --git a/iop/arcade/accdvde/Makefile b/iop/arcade/accdvde/Makefile index 9fe243b0e92..df0e5f9e733 100644 --- a/iop/arcade/accdvde/Makefile +++ b/iop/arcade/accdvde/Makefile @@ -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 \ diff --git a/iop/arcade/accore/Makefile b/iop/arcade/accore/Makefile index c7b9d12003f..81ddc51b387 100644 --- a/iop/arcade/accore/Makefile +++ b/iop/arcade/accore/Makefile @@ -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 \ diff --git a/iop/arcade/acdev/Makefile b/iop/arcade/acdev/Makefile index 38a9f6649f1..7b77aaaf341 100644 --- a/iop/arcade/acdev/Makefile +++ b/iop/arcade/acdev/Makefile @@ -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 \ diff --git a/iop/arcade/acdev9/Makefile b/iop/arcade/acdev9/Makefile index e2a58964f92..cdffeb1fcab 100644 --- a/iop/arcade/acdev9/Makefile +++ b/iop/arcade/acdev9/Makefile @@ -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 \ diff --git a/iop/arcade/acflash/Makefile b/iop/arcade/acflash/Makefile index 601ea351c18..51ae881cf2d 100644 --- a/iop/arcade/acflash/Makefile +++ b/iop/arcade/acflash/Makefile @@ -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 \ diff --git a/iop/arcade/acfpgald/Makefile b/iop/arcade/acfpgald/Makefile index 807fbb1df89..61543bd7409 100644 --- a/iop/arcade/acfpgald/Makefile +++ b/iop/arcade/acfpgald/Makefile @@ -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 \ diff --git a/iop/arcade/acjv/Makefile b/iop/arcade/acjv/Makefile index 7024ed2cf04..080d4958e47 100644 --- a/iop/arcade/acjv/Makefile +++ b/iop/arcade/acjv/Makefile @@ -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 \ diff --git a/iop/arcade/acjvld/Makefile b/iop/arcade/acjvld/Makefile index bbc8401fb2c..9b268e25962 100644 --- a/iop/arcade/acjvld/Makefile +++ b/iop/arcade/acjvld/Makefile @@ -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 \ diff --git a/iop/arcade/acmem/Makefile b/iop/arcade/acmem/Makefile index 23290d8b1d9..498989cafe8 100644 --- a/iop/arcade/acmem/Makefile +++ b/iop/arcade/acmem/Makefile @@ -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 \ diff --git a/iop/arcade/acmeme/Makefile b/iop/arcade/acmeme/Makefile index 93dac8d9109..d185a2a4c2b 100644 --- a/iop/arcade/acmeme/Makefile +++ b/iop/arcade/acmeme/Makefile @@ -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 \ diff --git a/iop/arcade/acram/Makefile b/iop/arcade/acram/Makefile index 3085c22b70d..5539568a12f 100644 --- a/iop/arcade/acram/Makefile +++ b/iop/arcade/acram/Makefile @@ -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 \ diff --git a/iop/arcade/acrtc/Makefile b/iop/arcade/acrtc/Makefile index fe3e9f8f1ff..523a00f2561 100644 --- a/iop/arcade/acrtc/Makefile +++ b/iop/arcade/acrtc/Makefile @@ -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 \ diff --git a/iop/arcade/acsram/Makefile b/iop/arcade/acsram/Makefile index 4fd66d73ab9..d1b4d229efe 100644 --- a/iop/arcade/acsram/Makefile +++ b/iop/arcade/acsram/Makefile @@ -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 \ diff --git a/iop/arcade/actimer/Makefile b/iop/arcade/actimer/Makefile index 0e005288fb0..f5f96dd5d73 100644 --- a/iop/arcade/actimer/Makefile +++ b/iop/arcade/actimer/Makefile @@ -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 \ diff --git a/iop/arcade/acuart/Makefile b/iop/arcade/acuart/Makefile index 8cfa60848c5..19ef82cccaf 100644 --- a/iop/arcade/acuart/Makefile +++ b/iop/arcade/acuart/Makefile @@ -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 diff --git a/iop/cdvd/cdfs/Makefile b/iop/cdvd/cdfs/Makefile index 88dd15ca5ed..642ca1e6b75 100644 --- a/iop/cdvd/cdfs/Makefile +++ b/iop/cdvd/cdfs/Makefile @@ -8,18 +8,18 @@ # 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_IMPORT_INCS += \ + cdvd/cdvdman \ + debug/sior \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = main.o cdfs_iop.o imports.o diff --git a/iop/cdvd/cdvdfsv/Makefile b/iop/cdvd/cdvdfsv/Makefile index a1c886cca99..938490765d0 100644 --- a/iop/cdvd/cdvdfsv/Makefile +++ b/iop/cdvd/cdvdfsv/Makefile @@ -8,18 +8,18 @@ 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_IMPORT_INCS += \ + cdvd/cdvdman \ + system/dmacman \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = cdvdfsv.o imports.o exports.o diff --git a/iop/cdvd/cdvdman/Makefile b/iop/cdvd/cdvdman/Makefile index ed9e2365261..979ecaa2a9a 100644 --- a/iop/cdvd/cdvdman/Makefile +++ b/iop/cdvd/cdvdman/Makefile @@ -8,15 +8,15 @@ 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_IMPORT_INCS += \ + system/dmacman \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = cdvdman.o imports.o exports.o diff --git a/iop/cdvd/cdvdstm/Makefile b/iop/cdvd/cdvdstm/Makefile index 2c7d968daa6..88b480ecadb 100644 --- a/iop/cdvd/cdvdstm/Makefile +++ b/iop/cdvd/cdvdstm/Makefile @@ -8,16 +8,16 @@ 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_IMPORT_INCS += \ + cdvd/cdvdman \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = cdvdstm.o imports.o exports.o diff --git a/iop/cdvd/poffsim/Makefile b/iop/cdvd/poffsim/Makefile index c16a488249c..cf562a5b632 100644 --- a/iop/cdvd/poffsim/Makefile +++ b/iop/cdvd/poffsim/Makefile @@ -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/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + system/sysmem \ + system/threadman IOP_OBJS = \ poweroff.o \ diff --git a/iop/cdvd/xesdrv/Makefile b/iop/cdvd/xesdrv/Makefile index 61553bce261..a572a427cf1 100644 --- a/iop/cdvd/xesdrv/Makefile +++ b/iop/cdvd/xesdrv/Makefile @@ -8,10 +8,10 @@ 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_IMPORT_INCS += \ + system/iomanx \ + system/loadcore \ + system/threadman IOP_OBJS = xesdrv.o imports.o diff --git a/iop/debug/iop_sbusdbg/Makefile b/iop/debug/iop_sbusdbg/Makefile index e13da04cdb1..53df17862a1 100644 --- a/iop/debug/iop_sbusdbg/Makefile +++ b/iop/debug/iop_sbusdbg/Makefile @@ -6,21 +6,22 @@ # 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/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_INCS += -I$(PS2SDKSRC)/common/sbus/include + +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + debug/iopdebug \ + system/excepman \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/modload \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = main.o sbus_dbg_low.o sbus_tty.o sbus_dbg.o imports.o diff --git a/iop/debug/iopdebug/Makefile b/iop/debug/iopdebug/Makefile index e6e48df457e..7dac3774d64 100644 --- a/iop/debug/iopdebug/Makefile +++ b/iop/debug/iopdebug/Makefile @@ -6,19 +6,19 @@ # 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/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_IMPORT_INCS += \ + cdvd/cdvdman \ + system/excepman \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/modload \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = main.o iop_debug.o iop_exceptions.o iop_dbg_low.o imports.o exports.o diff --git a/iop/debug/ioptrap/Makefile b/iop/debug/ioptrap/Makefile index 9608ff25793..316d7adef1a 100644 --- a/iop/debug/ioptrap/Makefile +++ b/iop/debug/ioptrap/Makefile @@ -9,13 +9,13 @@ # IOP_CFLAGS += -DTEST_TRAP IOP_CFLAGS += -DIOPTRAP_PRINT_MODULE_NAME -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/excepman/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/threadman/include +IOP_IMPORT_INCS += \ + system/excepman \ + system/loadcore \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = ioptrap.o handler.o breakpoint.o exports.o imports.o diff --git a/iop/debug/ppctty/Makefile b/iop/debug/ppctty/Makefile index b12a41d08e4..e4792afd74d 100644 --- a/iop/debug/ppctty/Makefile +++ b/iop/debug/ppctty/Makefile @@ -6,16 +6,16 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += \ - -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/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + system/excepman \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/modload \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = main.o tty.o imports.o diff --git a/iop/debug/sior/Makefile b/iop/debug/sior/Makefile index d6702abe1be..863d4764fed 100644 --- a/iop/debug/sior/Makefile +++ b/iop/debug/sior/Makefile @@ -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/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 += \ + system/loadcore \ + system/sifcmd \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = sior.o xprintf.o exports.o imports.o diff --git a/iop/debug/thmon/Makefile b/iop/debug/thmon/Makefile index 9ed9629e28b..0abeb9bfe5d 100644 --- a/iop/debug/thmon/Makefile +++ b/iop/debug/thmon/Makefile @@ -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/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 \ - -I$(PS2SDKSRC)/iop/system/threadman/src/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman \ + system/threadman/src IOP_OBJS = thmon.o imports.o diff --git a/iop/dev9/atad/Makefile b/iop/dev9/atad/Makefile index 5635ab41824..1721983a9ee 100644 --- a/iop/dev9/atad/Makefile +++ b/iop/dev9/atad/Makefile @@ -32,12 +32,12 @@ ATA_USE_AIFDEV9 ?= 0 IOP_BIN ?= ps2atad.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/dev9/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 += \ + dev9/dev9 \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = ps2atad.o imports.o exports.o diff --git a/iop/dev9/dev9/Makefile b/iop/dev9/dev9/Makefile index 0dd66c317eb..d28a3bae3d1 100644 --- a/iop/dev9/dev9/Makefile +++ b/iop/dev9/dev9/Makefile @@ -20,16 +20,16 @@ DEV9_ENABLE_AIF ?= 0 IOP_BIN ?= ps2dev9.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/poweroff/include \ - -I$(PS2SDKSRC)/iop/system/dmacman/include \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/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/threadman/include +IOP_IMPORT_INCS += \ + dev9/poweroff \ + system/dmacman \ + system/intrman \ + system/ioman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = ps2dev9.o exports.o imports.o diff --git a/iop/dev9/extflash/Makefile b/iop/dev9/extflash/Makefile index bac2a7b3a7b..f433f63e6ef 100644 --- a/iop/dev9/extflash/Makefile +++ b/iop/dev9/extflash/Makefile @@ -8,18 +8,18 @@ IOP_BIN_ALTNAMES = flash.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/dev9/include \ - -I$(PS2SDKSRC)/iop/sound/libsd/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/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include \ - -I$(PS2SDKSRC)/iop/system/vblank/include +IOP_IMPORT_INCS += \ + dev9/dev9 \ + sound/libsd \ + system/dmacman \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman \ + system/vblank IOP_OBJS = extflash.o exports.o imports.o diff --git a/iop/dev9/hdpro_atad/Makefile b/iop/dev9/hdpro_atad/Makefile index 28ce4f0e583..874466a87fa 100644 --- a/iop/dev9/hdpro_atad/Makefile +++ b/iop/dev9/hdpro_atad/Makefile @@ -8,13 +8,13 @@ IOP_BIN ?= hdproatad.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/atad/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/threadman/include +IOP_IMPORT_INCS += \ + dev9/atad \ + system/intrman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = hdproatad.o exports.o imports.o diff --git a/iop/dev9/poweroff/Makefile b/iop/dev9/poweroff/Makefile index 970f9a2a2bf..b7163f37f01 100644 --- a/iop/dev9/poweroff/Makefile +++ b/iop/dev9/poweroff/Makefile @@ -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/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/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/sifcmd \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = poweroff.o imports.o exports.o diff --git a/iop/dev9/pvrdrv/Makefile b/iop/dev9/pvrdrv/Makefile index 816bee8b784..64d31a046d1 100644 --- a/iop/dev9/pvrdrv/Makefile +++ b/iop/dev9/pvrdrv/Makefile @@ -8,13 +8,13 @@ IOP_BIN ?= dvrdrv.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/dev9/include \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + dev9/dev9 \ + system/intrman \ + system/loadcore \ + system/stdio \ + system/sysmem \ + system/threadman IOP_OBJS = dvrdrv.o exports.o imports.o diff --git a/iop/dvrp/dvr/Makefile b/iop/dvrp/dvr/Makefile index 7a58fdc7f6f..54d7ec2b5cb 100644 --- a/iop/dvrp/dvr/Makefile +++ b/iop/dvrp/dvr/Makefile @@ -8,13 +8,13 @@ IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/pvrdrv/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/threadman/include +IOP_IMPORT_INCS += \ + dev9/pvrdrv \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = dvr.o imports.o diff --git a/iop/dvrp/dvrav/Makefile b/iop/dvrp/dvrav/Makefile index a7cea56060d..67ac86a75bd 100644 --- a/iop/dvrp/dvrav/Makefile +++ b/iop/dvrp/dvrav/Makefile @@ -8,13 +8,13 @@ IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/pvrdrv/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/threadman/include +IOP_IMPORT_INCS += \ + dev9/pvrdrv \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = dvrav.o imports.o diff --git a/iop/dvrp/dvrdv/Makefile b/iop/dvrp/dvrdv/Makefile index ff78960d3b1..1161b64335c 100644 --- a/iop/dvrp/dvrdv/Makefile +++ b/iop/dvrp/dvrdv/Makefile @@ -8,12 +8,12 @@ IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/pvrdrv/include \ - -I$(PS2SDKSRC)/iop/system/iomanx/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + dev9/pvrdrv \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/threadman IOP_OBJS = dvrdv.o imports.o diff --git a/iop/dvrp/dvrfile/Makefile b/iop/dvrp/dvrfile/Makefile index 167002f39e2..8ceb4960ffb 100644 --- a/iop/dvrp/dvrfile/Makefile +++ b/iop/dvrp/dvrfile/Makefile @@ -8,13 +8,13 @@ IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/pvrdrv/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/threadman/include +IOP_IMPORT_INCS += \ + dev9/pvrdrv \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = dvrfile.o imports.o diff --git a/iop/dvrp/dvripl/Makefile b/iop/dvrp/dvripl/Makefile index 901f42e4e36..54f7ad1a7d8 100644 --- a/iop/dvrp/dvripl/Makefile +++ b/iop/dvrp/dvripl/Makefile @@ -8,14 +8,14 @@ IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/pvrdrv/include \ - -I$(PS2SDKSRC)/iop/system/iomanx/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include \ - -I$(PS2SDKSRC)/iop/system/timrman/include +IOP_IMPORT_INCS += \ + dev9/pvrdrv \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysmem \ + system/threadman \ + system/timrman IOP_OBJS = dvripl.o imports.o diff --git a/iop/dvrp/dvrmisc/Makefile b/iop/dvrp/dvrmisc/Makefile index 75124393ade..40d4ea84472 100644 --- a/iop/dvrp/dvrmisc/Makefile +++ b/iop/dvrp/dvrmisc/Makefile @@ -8,13 +8,13 @@ IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/pvrdrv/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/threadman/include +IOP_IMPORT_INCS += \ + dev9/pvrdrv \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = dvrmisc.o imports.o diff --git a/iop/fs/adddrv/Makefile b/iop/fs/adddrv/Makefile index ce9aa03f63e..d1dc3e6fc18 100644 --- a/iop/fs/adddrv/Makefile +++ b/iop/fs/adddrv/Makefile @@ -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 = adddrv.o imports.o diff --git a/iop/fs/addrom2/Makefile b/iop/fs/addrom2/Makefile index 99dd7f7f7d5..8d4097684bd 100644 --- a/iop/fs/addrom2/Makefile +++ b/iop/fs/addrom2/Makefile @@ -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 = addrom2.o imports.o diff --git a/iop/fs/bdm/Makefile b/iop/fs/bdm/Makefile index 793e1b95d10..dac212d5050 100644 --- a/iop/fs/bdm/Makefile +++ b/iop/fs/bdm/Makefile @@ -8,13 +8,13 @@ # IOP_CFLAGS += -DDEBUG -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/fs/libbdm/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 += \ + fs/libbdm \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = main.o bdm.o part_driver.o part_driver_mbr.o part_driver_gpt.o imports.o exports.o IOP_LIB_ARCHIVES = $(PS2SDKSRC)/iop/fs/libbdm/lib/libbdm.a diff --git a/iop/fs/bdmfs_fatfs/Makefile b/iop/fs/bdmfs_fatfs/Makefile index ecd0731a4a0..d03dce42d61 100644 --- a/iop/fs/bdmfs_fatfs/Makefile +++ b/iop/fs/bdmfs_fatfs/Makefile @@ -19,22 +19,23 @@ ifeq ($(DEBUG_EXTREME),1) IOP_CFLAGS += -DDEBUG_EXTREME endif -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/fs/bdm/include \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/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 \ - -I$(FATFS)/source/include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + fs/bdm \ + system/intrman \ + system/ioman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman + +IOP_INCS += -I$(FATFS)/source/include IOP_LIBS += -lgcc -FATFS_OBJS = diskio.o ff.o ffsystem.o ffunicode.o +FATFS_OBJS = diskio.o ff.o ffsystem.o ffunicode.o IOP_OBJS = main.o imports.o fs_driver.o $(FATFS_OBJS) diff --git a/iop/fs/bdmfs_vfat/Makefile b/iop/fs/bdmfs_vfat/Makefile index 6fcb8f60335..45810aaa6d4 100644 --- a/iop/fs/bdmfs_vfat/Makefile +++ b/iop/fs/bdmfs_vfat/Makefile @@ -12,18 +12,19 @@ VFAT_SRC_DIR = $(VFAT_PATH)/src/ # IOP_CFLAGS += -DDEBUG -DDEBUG_EXTREME -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/fs/bdm/include \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/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 \ - -I$(VFAT_SRC_DIR)/include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + fs/bdm \ + system/intrman \ + system/ioman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman + +IOP_INCS += -I$(VFAT_SRC_DIR)/include IOP_OBJS = fs_driver.o fat_driver.o fat_write.o scache.o main.o imports.o diff --git a/iop/fs/devfs/Makefile b/iop/fs/devfs/Makefile index 114ec193010..1633fd5244c 100644 --- a/iop/fs/devfs/Makefile +++ b/iop/fs/devfs/Makefile @@ -8,14 +8,14 @@ IOP_CFLAGS += -DIOMANX_OLD_NAME_ADDDELDRV=0 -IOP_INCS += \ - -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_IMPORT_INCS += \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = devfs.o exports.o imports.o diff --git a/iop/fs/eromdrv/Makefile b/iop/fs/eromdrv/Makefile index c7f68eafcd0..cadbdf1cf68 100644 --- a/iop/fs/eromdrv/Makefile +++ b/iop/fs/eromdrv/Makefile @@ -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/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/sysclib \ + system/sysmem IOP_OBJS = eromdrv.o imports.o diff --git a/iop/fs/fakehost/Makefile b/iop/fs/fakehost/Makefile index dcfed49fb6b..8be0637ebc3 100644 --- a/iop/fs/fakehost/Makefile +++ b/iop/fs/fakehost/Makefile @@ -8,17 +8,17 @@ IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/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_IMPORT_INCS += \ + system/intrman \ + system/ioman \ + system/iomanx \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = fakehost.o nprintf.o imports.o diff --git a/iop/fs/fileio/Makefile b/iop/fs/fileio/Makefile index 7734fd02a4b..92f6d1cb5ab 100644 --- a/iop/fs/fileio/Makefile +++ b/iop/fs/fileio/Makefile @@ -8,15 +8,15 @@ IOP_BIN ?= fileio.irx -IOP_INCS += \ - -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/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysmem \ + system/threadman IOP_OBJS = fileio.o imports.o diff --git a/iop/fs/filexio/Makefile b/iop/fs/filexio/Makefile index e3b54c789ec..8164c650991 100644 --- a/iop/fs/filexio/Makefile +++ b/iop/fs/filexio/Makefile @@ -10,16 +10,16 @@ IOP_BIN ?= fileXio.irx IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 -IOP_INCS += \ - -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_IMPORT_INCS += \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = fileXio_iop.o imports.o diff --git a/iop/fs/http/Makefile b/iop/fs/http/Makefile index 0088e7b3793..ccac38facc5 100644 --- a/iop/fs/http/Makefile +++ b/iop/fs/http/Makefile @@ -8,19 +8,19 @@ IOP_BIN ?= ps2http.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/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 \ - -I$(PS2SDKSRC)/iop/tcpip/dns/include \ - -I$(PS2SDKSRC)/iop/tcpip/tcpip/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/ioman \ + system/iomanx \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman \ + tcpip/dns \ + tcpip/tcpip IOP_OBJS = ps2http.o imports.o diff --git a/iop/fs/libbdm/Makefile b/iop/fs/libbdm/Makefile index 8b10f99c5ff..112bc61df49 100644 --- a/iop/fs/libbdm/Makefile +++ b/iop/fs/libbdm/Makefile @@ -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/fs/bdm/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include +IOP_IMPORT_INCS += \ + fs/bdm \ + system/stdio \ + system/sysclib \ + system/sysmem IOP_OBJS = bd_defrag.o bd_cache.o IOP_LIB = libbdm.a diff --git a/iop/fs/netfs/Makefile b/iop/fs/netfs/Makefile index aefc963b13c..4f5fc46241d 100644 --- a/iop/fs/netfs/Makefile +++ b/iop/fs/netfs/Makefile @@ -8,15 +8,15 @@ IOP_BIN ?= ps2netfs.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/ioman/include \ - -I$(PS2SDKSRC)/iop/system/iomanx/include \ - -I$(PS2SDKSRC)/iop/system/iopmgr/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 \ - -I$(PS2SDKSRC)/iop/tcpip/tcpip/include +IOP_IMPORT_INCS += \ + system/ioman \ + system/iomanx \ + system/iopmgr \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/threadman \ + tcpip/tcpip IOP_OBJS = ps2netfs.o ps2_fio.o devscan.o imports.o diff --git a/iop/fs/romdrv/Makefile b/iop/fs/romdrv/Makefile index f71494f01b8..d8f1170c933 100644 --- a/iop/fs/romdrv/Makefile +++ b/iop/fs/romdrv/Makefile @@ -9,11 +9,11 @@ # Enable the romGetDevice function? ROMDRV_EXPORT_DEVICES ?= 1 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/sysclib IOP_OBJS = romdrv.o imports.o exports.o diff --git a/iop/fs/subfile/Makefile b/iop/fs/subfile/Makefile index 667bf772a6c..cc6ac5b7bbd 100644 --- a/iop/fs/subfile/Makefile +++ b/iop/fs/subfile/Makefile @@ -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/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/sysclib \ + system/sysmem IOP_OBJS = subfile.o imports.o diff --git a/iop/hdd/apa/Makefile b/iop/hdd/apa/Makefile index 2ecb52a097d..d4eebd8ff0e 100644 --- a/iop/hdd/apa/Makefile +++ b/iop/hdd/apa/Makefile @@ -26,33 +26,34 @@ IOP_BIN ?= ps2hdd.irx IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 -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/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include \ - -I$(LIBAPA_PATH)include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman + +IOP_INCS += -I$(LIBAPA_PATH)include APA_OBJS = password.o misc.o cache.o apa.o journal.o free.o IOP_OBJS = hdd_fio.o hdd_blkio.o hdd.o imports.o $(APA_OBJS) ifneq (x$(APA_USE_DEV9),x0) IOP_CFLAGS += -DAPA_USE_DEV9 -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/dev9/include +IOP_IMPORT_INCS += dev9/dev9 endif ifneq (x$(APA_USE_ATAD),x0) IOP_CFLAGS += -DAPA_USE_ATAD -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/atad/include +IOP_IMPORT_INCS += dev9/atad endif ifneq (x$(APA_USE_BDM),x0) IOP_CFLAGS += -DAPA_USE_BDM -IOP_INCS += -I$(PS2SDKSRC)/iop/fs/bdm/include +IOP_IMPORT_INCS += fs/bdm endif ifneq (x$(APA_USE_IOMANX),x0) diff --git a/iop/hdd/fsck/Makefile b/iop/hdd/fsck/Makefile index 68c3278aa87..b5049080276 100644 --- a/iop/hdd/fsck/Makefile +++ b/iop/hdd/fsck/Makefile @@ -15,18 +15,19 @@ IOP_BIN ?= fsck.irx IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 IOP_CFLAGS += -DPFS_OSD_VER -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/dev9/atad/include \ - -I$(PS2SDKSRC)/iop/dev9/poweroff/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 \ - -I$(LIBPFS_PATH)include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + dev9/atad \ + dev9/poweroff \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman + +IOP_INCS += -I$(LIBPFS_PATH)include IOP_LIBS += -lgcc diff --git a/iop/hdd/fssk/Makefile b/iop/hdd/fssk/Makefile index 09296c61f9c..d74b5f7cf80 100644 --- a/iop/hdd/fssk/Makefile +++ b/iop/hdd/fssk/Makefile @@ -15,18 +15,19 @@ IOP_BIN ?= fssk.irx IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 IOP_CFLAGS += -DPFS_OSD_VER -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/dev9/atad/include \ - -I$(PS2SDKSRC)/iop/dev9/poweroff/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 \ - -I$(LIBPFS_PATH)include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + dev9/atad \ + dev9/poweroff \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman + +IOP_INCS += -I$(LIBPFS_PATH)include IOP_LIBS += -lgcc diff --git a/iop/hdd/hdck/Makefile b/iop/hdd/hdck/Makefile index edbc14a76a5..110a14c57a1 100644 --- a/iop/hdd/hdck/Makefile +++ b/iop/hdd/hdck/Makefile @@ -19,19 +19,20 @@ IOP_CFLAGS += -DAPA_OSD_VER # If desired, uncomment to build a version of HDCK that checks for crosslinked partitions(unofficial). IOP_CFLAGS += -DHDCK_CHECK_CROSSLINK=1 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/dev9/atad/include \ - -I$(PS2SDKSRC)/iop/dev9/dev9/include \ - -I$(PS2SDKSRC)/iop/dev9/poweroff/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 \ - -I$(LIBAPA_PATH)include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + dev9/atad \ + dev9/dev9 \ + dev9/poweroff \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman + +IOP_INCS += -I$(LIBAPA_PATH)include APA_OBJS = misc.o cache.o apa.o journal.o IOP_OBJS = hdck.o misc_hdck.o imports.o $(APA_OBJS) diff --git a/iop/hdd/hdsk/Makefile b/iop/hdd/hdsk/Makefile index 88aa9813907..4fbef869da6 100644 --- a/iop/hdd/hdsk/Makefile +++ b/iop/hdd/hdsk/Makefile @@ -18,19 +18,20 @@ IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 IOP_CFLAGS += -DAPA_OSD_VER -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/dev9/atad/include \ - -I$(PS2SDKSRC)/iop/dev9/dev9/include \ - -I$(PS2SDKSRC)/iop/dev9/poweroff/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 \ - -I$(LIBAPA_PATH)include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + dev9/atad \ + dev9/dev9 \ + dev9/poweroff \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman + +IOP_INCS += -I$(LIBAPA_PATH)include APA_OBJS = misc.o cache.o apa.o journal.o free.o IOP_OBJS = hdsk.o misc_hdsk.o sim.o imports.o $(APA_OBJS) diff --git a/iop/hdd/pfs/Makefile b/iop/hdd/pfs/Makefile index 276dbd11374..91eb2d19920 100644 --- a/iop/hdd/pfs/Makefile +++ b/iop/hdd/pfs/Makefile @@ -14,18 +14,19 @@ IOP_BIN ?= ps2fs.irx IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/dev9/atad/include \ - -I$(PS2SDKSRC)/iop/dev9/poweroff/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 \ - -I$(LIBPFS_PATH)include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + dev9/atad \ + dev9/poweroff \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman + +IOP_INCS += -I$(LIBPFS_PATH)include IOP_LIBS += -lgcc diff --git a/iop/iLink/IEEE1394_bd/Makefile b/iop/iLink/IEEE1394_bd/Makefile index 77bdb67a559..60c7f0eaac7 100644 --- a/iop/iLink/IEEE1394_bd/Makefile +++ b/iop/iLink/IEEE1394_bd/Makefile @@ -10,18 +10,18 @@ IOP_CFLAGS += -mno-check-zero-division # -DSIF_CALLBACKS_12_13 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/fs/bdm/include \ - -I$(PS2SDKSRC)/iop/iLink/iLinkman/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/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + fs/bdm \ + iLink/iLinkman \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/sifcmd \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_LIBS += -lgcc diff --git a/iop/iLink/IEEE1394_disk/Makefile b/iop/iLink/IEEE1394_disk/Makefile index 062b04d4568..46a4e56c607 100644 --- a/iop/iLink/IEEE1394_disk/Makefile +++ b/iop/iLink/IEEE1394_disk/Makefile @@ -15,19 +15,20 @@ IOP_CFLAGS += -DBUILDING_IEEE1394_DISK IOP_CFLAGS += -mno-check-zero-division # -DSIF_CALLBACKS_12_13 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/iLink/iLinkman/include \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/include \ - -I$(PS2SDKSRC)/iop/system/iomanx/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 \ - -I$(VFAT_SRC_DIR)/include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + iLink/iLinkman \ + system/intrman \ + system/ioman \ + system/iomanx \ + system/loadcore \ + system/sifcmd \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman + +IOP_INCS += -I$(VFAT_SRC_DIR)/include IOP_OBJS = sbp2_driver.o imports.o main.o scsi.o fat_write.o fs_driver.o scache.o fat_driver.o part_driver.o diff --git a/iop/iLink/iLinkman/Makefile b/iop/iLink/iLinkman/Makefile index 69bad80e466..d251126abd7 100644 --- a/iop/iLink/iLinkman/Makefile +++ b/iop/iLink/iLinkman/Makefile @@ -8,16 +8,16 @@ IOP_CFLAGS += -mno-check-zero-division -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/system/dmacman/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 += \ + cdvd/cdvdman \ + system/dmacman \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = imports.o exports.o iLink.o iLink_PHY.o iLink_internal.o iLink_crom.o iLink_intr.o iLink_TxRx.o iLink_DMA.o diff --git a/iop/memorycard/mcman/Makefile b/iop/memorycard/mcman/Makefile index d064e9cb5fa..4f6946636c3 100644 --- a/iop/memorycard/mcman/Makefile +++ b/iop/memorycard/mcman/Makefile @@ -17,20 +17,20 @@ MCMAN_BUILDING_VMCMAN ?= 0 # IOP_CFLAGS += -DSIO_DEBUG -DDEBUG -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/debug/sior/include \ - -I$(PS2SDKSRC)/iop/security/secrman/include \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/include \ - -I$(PS2SDKSRC)/iop/system/iomanx/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/modload/include \ - -I$(PS2SDKSRC)/iop/system/sio2man/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include \ - -I$(PS2SDKSRC)/iop/system/timrman/include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + debug/sior \ + security/secrman \ + system/intrman \ + system/ioman \ + system/iomanx \ + system/loadcore \ + system/modload \ + system/sio2man \ + system/stdio \ + system/sysclib \ + system/threadman \ + system/timrman IOP_OBJS = \ main.o \ @@ -48,7 +48,7 @@ endif ifneq (x$(MCMAN_BUILDING_XFROMMAN),x0) IOP_CFLAGS += -DBUILDING_XFROMMAN -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/extflash/include +IOP_IMPORT_INCS += dev9/extflash endif ifneq (x$(MCMAN_BUILDING_VMCMAN),x0) diff --git a/iop/memorycard/mcserv/Makefile b/iop/memorycard/mcserv/Makefile index 4fdf9b60fb4..928f57ebbd8 100644 --- a/iop/memorycard/mcserv/Makefile +++ b/iop/memorycard/mcserv/Makefile @@ -11,16 +11,16 @@ MCMAN_BUILDING_XMCSERV ?= 1 # IOP_CFLAGS += -DSIO_DEBUG -DDEBUG -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/debug/sior/include \ - -I$(PS2SDKSRC)/iop/memorycard/mcman/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/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + debug/sior \ + memorycard/mcman \ + system/intrman \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = mcserv.o imports.o exports.o diff --git a/iop/network/netman/Makefile b/iop/network/netman/Makefile index 6b75ee26b02..a5bd481d5f0 100644 --- a/iop/network/netman/Makefile +++ b/iop/network/netman/Makefile @@ -8,15 +8,15 @@ IOP_CFLAGS += -mno-check-zero-division -IOP_INCS += \ - -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/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = netman.o rpc_server.o rpc_client.o imports.o exports.o diff --git a/iop/network/smap/Makefile b/iop/network/smap/Makefile index 2a705f7e17c..af6f7496dce 100644 --- a/iop/network/smap/Makefile +++ b/iop/network/smap/Makefile @@ -25,15 +25,15 @@ SMAP_RX_PACKETS_POLLING_MODE ?= 1 IOP_PREFER_GPOPT = 16384 IOP_CFLAGS += -mno-check-zero-division -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/dev9/include \ - -I$(PS2SDKSRC)/iop/system/dmacman/include \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/modload/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + dev9/dev9 \ + system/dmacman \ + system/intrman \ + system/loadcore \ + system/modload \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = ipstack.o main.o smap.o xfer.o imports.o exports.o @@ -47,7 +47,7 @@ endif ifneq (x$(SMAP_PS2IP),x0) IOP_CFLAGS += -DBUILDING_SMAP_PS2IP=1 -IOP_INCS += -I$(PS2SDKSRC)/iop/tcpip/tcpip/include +IOP_IMPORT_INCS += tcpip/tcpip endif ifneq (x$(SMAP_MODULAR),x0) diff --git a/iop/network/smbman/Makefile b/iop/network/smbman/Makefile index 0141b0d9c84..9fa9ea96126 100644 --- a/iop/network/smbman/Makefile +++ b/iop/network/smbman/Makefile @@ -8,16 +8,16 @@ # IOP_CFLAGS += -DDEBUG -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/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/threadman/include \ - -I$(PS2SDKSRC)/iop/tcpip/tcpip/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/ioman \ + system/iomanx \ + system/loadcore \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/threadman \ + tcpip/tcpip IOP_LIBS += -lgcc diff --git a/iop/network/spduart/Makefile b/iop/network/spduart/Makefile index ce78a4e026e..29969f8c991 100644 --- a/iop/network/spduart/Makefile +++ b/iop/network/spduart/Makefile @@ -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/dev9/dev9/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/threadman/include +IOP_IMPORT_INCS += \ + dev9/dev9 \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = spduart.o imports.o exports.o diff --git a/iop/network/udptty/Makefile b/iop/network/udptty/Makefile index 2ce4dea4b8c..e29792e1f2a 100644 --- a/iop/network/udptty/Makefile +++ b/iop/network/udptty/Makefile @@ -8,15 +8,15 @@ IOP_CFLAGS += -DKPRTTY -IOP_INCS += \ - -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 \ - -I$(PS2SDKSRC)/iop/tcpip/tcpip/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman \ + tcpip/tcpip IOP_OBJS = udptty.o imports.o exports.o diff --git a/iop/security/secrman/Makefile b/iop/security/secrman/Makefile index b5be313bdc2..a2812bcd8f1 100644 --- a/iop/security/secrman/Makefile +++ b/iop/security/secrman/Makefile @@ -9,14 +9,14 @@ # Define to 1, to enable runtime support for both CEX and DEX units. DEX_SUPPORT ?= 1 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/modload/include \ - -I$(PS2SDKSRC)/iop/system/sio2man/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + system/ioman \ + system/loadcore \ + system/modload \ + system/sio2man \ + system/stdio \ + system/sysclib IOP_OBJS = secrman.o MechaAuth.o CardAuth.o keyman.o imports.o exports.o diff --git a/iop/security/secrsif/Makefile b/iop/security/secrsif/Makefile index c70b3ad1aef..b153d1749dc 100644 --- a/iop/security/secrsif/Makefile +++ b/iop/security/secrsif/Makefile @@ -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/security/secrman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sifcmd/include \ - -I$(PS2SDKSRC)/iop/system/sifman/include \ - -I$(PS2SDKSRC)/iop/system/sio2man/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + security/secrman \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/sio2man \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = secrsif.o imports.o exports.o diff --git a/iop/sio/mx4sio_bd/Makefile b/iop/sio/mx4sio_bd/Makefile index d7d636d06cb..6f9aa493b2d 100644 --- a/iop/sio/mx4sio_bd/Makefile +++ b/iop/sio/mx4sio_bd/Makefile @@ -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/fs/bdm/include \ - -I$(PS2SDKSRC)/iop/system/dmacman/include \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sio2man/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + fs/bdm \ + system/dmacman \ + system/intrman \ + system/loadcore \ + system/sio2man \ + system/stdio \ + system/sysclib \ + system/threadman IOP_LIBS += -lgcc diff --git a/iop/sound/ahx/Makefile b/iop/sound/ahx/Makefile index 76273cafe5a..bdc035fa894 100644 --- a/iop/sound/ahx/Makefile +++ b/iop/sound/ahx/Makefile @@ -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/sound/libsd/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/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + sound/libsd \ + system/intrman \ + system/loadcore \ + system/sifcmd \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = hw.o ahx_irx.o spu2.o imports.o AHX.o diff --git a/iop/sound/audsrv/Makefile b/iop/sound/audsrv/Makefile index 92a8fd14938..f0306c8e8e5 100755 --- a/iop/sound/audsrv/Makefile +++ b/iop/sound/audsrv/Makefile @@ -6,16 +6,16 @@ # Licenced under GNU Library General Public License version 2 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/sound/libsd/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/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + sound/libsd \ + system/intrman \ + system/loadcore \ + system/sifcmd \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = audsrv.o upsamplers.o hw.o rpc_server.o rpc_client.o common.o cdrom.o imports.o exports.o adpcm.o diff --git a/iop/sound/clearspu/Makefile b/iop/sound/clearspu/Makefile index 2b76db39cb7..171ac21b375 100644 --- a/iop/sound/clearspu/Makefile +++ b/iop/sound/clearspu/Makefile @@ -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/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/stdio \ + system/sysclib IOP_OBJS = \ clearspu.o \ diff --git a/iop/sound/libsd/Makefile b/iop/sound/libsd/Makefile index f3b693b2683..13d84d1ef56 100644 --- a/iop/sound/libsd/Makefile +++ b/iop/sound/libsd/Makefile @@ -8,13 +8,13 @@ IOP_BIN_ALTNAMES = freesd.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/intrman/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/threadman/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/threadman IOP_OBJS = libsd.o imports.o exports.o diff --git a/iop/sound/libsnd2/Makefile b/iop/sound/libsnd2/Makefile index a7793767ef0..0604fe2cac1 100644 --- a/iop/sound/libsnd2/Makefile +++ b/iop/sound/libsnd2/Makefile @@ -6,16 +6,16 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/sound/libspu2/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 \ - -I$(PS2SDKSRC)/iop/system/timrman/include \ - -I$(PS2SDKSRC)/iop/system/vblank/include +IOP_IMPORT_INCS += \ + sound/libspu2 \ + system/intrman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman \ + system/timrman \ + system/vblank IOP_OBJS = \ cc_0.o \ diff --git a/iop/sound/libspu2/Makefile b/iop/sound/libspu2/Makefile index 18374904b64..b3b663ba63a 100644 --- a/iop/sound/libspu2/Makefile +++ b/iop/sound/libspu2/Makefile @@ -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/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 +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem IOP_OBJS = \ config.o \ diff --git a/iop/sound/ps2snd/Makefile b/iop/sound/ps2snd/Makefile index 85bf66f5537..c9ab308e917 100644 --- a/iop/sound/ps2snd/Makefile +++ b/iop/sound/ps2snd/Makefile @@ -8,15 +8,15 @@ IOP_CFLAGS += -std=c99 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/sound/libsd/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/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + sound/libsd \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/sifcmd \ + system/stdio \ + system/sysmem \ + system/threadman IOP_OBJS = ps2snd.o adpcm-stream.o imports.o diff --git a/iop/sound/rspu2drv/Makefile b/iop/sound/rspu2drv/Makefile index 36cda6f306a..922867271d0 100644 --- a/iop/sound/rspu2drv/Makefile +++ b/iop/sound/rspu2drv/Makefile @@ -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/sound/libspu2/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/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include \ - -I$(PS2SDKSRC)/iop/system/vblank/include +IOP_IMPORT_INCS += \ + sound/libspu2 \ + system/intrman \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman \ + system/vblank IOP_OBJS = \ imports.o \ diff --git a/iop/startup/Makefile b/iop/startup/Makefile index 8b5f47aeb0f..d9c21a34bce 100644 --- a/iop/startup/Makefile +++ b/iop/startup/Makefile @@ -8,8 +8,8 @@ IOP_LIB = libdummy.a -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/stdio/include +IOP_IMPORT_INCS += \ + system/stdio IOP_OBJS = crt0.o # disable array bounds warning for __do_global_ctors diff --git a/iop/system/alloc/Makefile b/iop/system/alloc/Makefile index caa63e3f93c..5f1a6ccfdc1 100644 --- a/iop/system/alloc/Makefile +++ b/iop/system/alloc/Makefile @@ -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/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + system/loadcore \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = alloc.o exports.o imports.o diff --git a/iop/system/boardinf/Makefile b/iop/system/boardinf/Makefile index 91d9b477ca4..9e1f67da515 100644 --- a/iop/system/boardinf/Makefile +++ b/iop/system/boardinf/Makefile @@ -6,8 +6,8 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/loadcore/include +IOP_IMPORT_INCS += \ + system/loadcore IOP_OBJS = \ boardinf.o \ diff --git a/iop/system/dmacman/Makefile b/iop/system/dmacman/Makefile index 099d4ac59f4..642f99f78e6 100644 --- a/iop/system/dmacman/Makefile +++ b/iop/system/dmacman/Makefile @@ -8,10 +8,10 @@ IOP_BIN ?= dmacman.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/sysmem IOP_OBJS = dmacman.o exports.o imports.o diff --git a/iop/system/eeconf/Makefile b/iop/system/eeconf/Makefile index 9087ccd4b1b..0be76732d22 100644 --- a/iop/system/eeconf/Makefile +++ b/iop/system/eeconf/Makefile @@ -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/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include +IOP_IMPORT_INCS += \ + system/loadcore \ + system/sysclib \ + system/sysmem IOP_OBJS = \ eeconf.o \ diff --git a/iop/system/eesync/Makefile b/iop/system/eesync/Makefile index b637c61867f..f17dcca177a 100644 --- a/iop/system/eesync/Makefile +++ b/iop/system/eesync/Makefile @@ -18,13 +18,13 @@ EESYNC_REGISTER_EXPORTS ?= 1 # Check IOP boot parameter to see if initialization should be skipped? EESYNC_CHECK_ILOADP ?= 1 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sifman/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/sifman \ + system/sysclib \ + system/sysmem IOP_OBJS = eesync.o exports.o imports.o diff --git a/iop/system/excepman/Makefile b/iop/system/excepman/Makefile index efbb3f65413..dda53ebfc8c 100644 --- a/iop/system/excepman/Makefile +++ b/iop/system/excepman/Makefile @@ -8,9 +8,9 @@ IOP_BIN ?= excepman.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include +IOP_IMPORT_INCS += \ + system/loadcore \ + system/sysmem IOP_OBJS = excepman.o exports.o imports.o diff --git a/iop/system/heaplib/Makefile b/iop/system/heaplib/Makefile index 632b7bb5ba3..f6fc9f26d8e 100644 --- a/iop/system/heaplib/Makefile +++ b/iop/system/heaplib/Makefile @@ -8,9 +8,9 @@ IOP_BIN ?= heaplib.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include +IOP_IMPORT_INCS += \ + system/loadcore \ + system/sysmem IOP_OBJS = heaplib.o exports.o imports.o diff --git a/iop/system/igreeting/Makefile b/iop/system/igreeting/Makefile index 4e2ec033f1b..1e515b1fb91 100644 --- a/iop/system/igreeting/Makefile +++ b/iop/system/igreeting/Makefile @@ -9,13 +9,13 @@ # Build DTL-T variant? IGREETING_DTL_T ?= 0 -IOP_INCS += \ - -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 +IOP_IMPORT_INCS += \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem IOP_OBJS = igreeting.o imports.o diff --git a/iop/system/intrman/Makefile b/iop/system/intrman/Makefile index ca03df461a4..554ee77bd78 100644 --- a/iop/system/intrman/Makefile +++ b/iop/system/intrman/Makefile @@ -11,9 +11,9 @@ INTRMAN_PS1 ?= 0 IOP_BIN ?= intrman.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/excepman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include +IOP_IMPORT_INCS += \ + system/excepman \ + system/loadcore IOP_OBJS = intrman.o exports.o imports.o diff --git a/iop/system/ioman/Makefile b/iop/system/ioman/Makefile index 1776a8cc4fd..5972c82ed46 100644 --- a/iop/system/ioman/Makefile +++ b/iop/system/ioman/Makefile @@ -8,12 +8,12 @@ IOP_BIN ?= ioman.irx -IOP_INCS += \ - -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 +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem IOP_OBJS = ioman.o exports.o imports.o diff --git a/iop/system/iomanx/Makefile b/iop/system/iomanx/Makefile index da29dcaeca7..6aace4e012c 100644 --- a/iop/system/iomanx/Makefile +++ b/iop/system/iomanx/Makefile @@ -10,13 +10,13 @@ IOP_BIN ?= iomanX.irx IOP_CFLAGS += -DIOMANX_OLD_NAME_ADDDELDRV=0 -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_ENABLE_LEGACY_IOMAN_HOOK -DIOMAN_USE_FILE_STRUCT_TEMP_STACK -IOP_INCS += \ - -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 += \ + system/intrman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = iomanX.o ioman_sbv.o exports.o imports.o diff --git a/iop/system/iopmgr/Makefile b/iop/system/iopmgr/Makefile index fbee5563b1b..efe0692f7d5 100644 --- a/iop/system/iopmgr/Makefile +++ b/iop/system/iopmgr/Makefile @@ -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/system/ioman/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 +IOP_IMPORT_INCS += \ + system/ioman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib IOP_OBJS = main.o smod.o slib.o devices.o commandline.o imports.o exports.o diff --git a/iop/system/loadcore/Makefile b/iop/system/loadcore/Makefile index 3b3a4bbad18..6cfdfb17da7 100644 --- a/iop/system/loadcore/Makefile +++ b/iop/system/loadcore/Makefile @@ -8,8 +8,8 @@ IOP_BIN ?= loadcore.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/sysmem/include +IOP_IMPORT_INCS += \ + system/sysmem IOP_OBJS = loadcore.o exports.o imports.o diff --git a/iop/system/loadfile/Makefile b/iop/system/loadfile/Makefile index 68a00dad27b..5d7c93a8038 100644 --- a/iop/system/loadfile/Makefile +++ b/iop/system/loadfile/Makefile @@ -8,17 +8,17 @@ IOP_BIN ?= loadfile.irx -IOP_INCS += \ - -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_IMPORT_INCS += \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/modload \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = loadfile.o eeelfloader.o imports.o diff --git a/iop/system/modload/Makefile b/iop/system/modload/Makefile index cbb9437b677..ef3794353b6 100644 --- a/iop/system/modload/Makefile +++ b/iop/system/modload/Makefile @@ -8,14 +8,14 @@ IOP_BIN ?= modload.irx -IOP_INCS += \ - -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 += \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = modload.o imports.o exports.o diff --git a/iop/system/mtapman/Makefile b/iop/system/mtapman/Makefile index 049d5711f6d..bbc79c1fe10 100644 --- a/iop/system/mtapman/Makefile +++ b/iop/system/mtapman/Makefile @@ -8,13 +8,13 @@ IOP_BIN_ALTNAMES ?= freemtap.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sifcmd/include \ - -I$(PS2SDKSRC)/iop/system/sifman/include \ - -I$(PS2SDKSRC)/iop/system/sio2man/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/sio2man \ + system/stdio \ + system/threadman IOP_OBJS = freemtap.o rpcservers.o exports.o imports.o diff --git a/iop/system/padman/Makefile b/iop/system/padman/Makefile index 51c5cc9865e..04ad2183549 100644 --- a/iop/system/padman/Makefile +++ b/iop/system/padman/Makefile @@ -10,17 +10,17 @@ IOP_BIN_ALTNAMES ?= freepad.irx # IOP_CFLAGS += -DDEBUG -IOP_INCS += \ - -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/sio2man/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 \ - -I$(PS2SDKSRC)/iop/system/vblank/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/sio2man \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman \ + system/vblank IOP_OBJS = freepad.o rpcserver.o exports.o imports.o padInit.o padPortOpen.o padMiscFuncs.o sio2Cmds.o padData.o padCmds.o diff --git a/iop/system/reboot/Makefile b/iop/system/reboot/Makefile index 7890b615244..5c3ea7d75de 100644 --- a/iop/system/reboot/Makefile +++ b/iop/system/reboot/Makefile @@ -8,14 +8,14 @@ IOP_BIN ?= reboot.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/intrman/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/threadman/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/modload \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/threadman IOP_OBJS = reboot.o imports.o diff --git a/iop/system/rmman/Makefile b/iop/system/rmman/Makefile index c40dee57f46..78e2170889e 100644 --- a/iop/system/rmman/Makefile +++ b/iop/system/rmman/Makefile @@ -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/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/sifcmd/include \ - -I$(PS2SDKSRC)/iop/system/sifman/include \ - -I$(PS2SDKSRC)/iop/system/sio2man/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include \ - -I$(PS2SDKSRC)/iop/system/vblank/include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/sio2man \ + system/stdio \ + system/threadman \ + system/vblank IOP_OBJS = rmman.o exports.o imports.o diff --git a/iop/system/sbusintr/Makefile b/iop/system/sbusintr/Makefile index e8b821ef5c4..3e236513295 100644 --- a/iop/system/sbusintr/Makefile +++ b/iop/system/sbusintr/Makefile @@ -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/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sifman/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/sifman IOP_OBJS = sbusintr.o exports.o imports.o diff --git a/iop/system/sifcmd/Makefile b/iop/system/sifcmd/Makefile index e6621f447a8..42acc77b1b0 100644 --- a/iop/system/sifcmd/Makefile +++ b/iop/system/sifcmd/Makefile @@ -8,12 +8,12 @@ IOP_BIN ?= sifcmd.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sifman/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/sifman \ + system/stdio \ + system/threadman IOP_OBJS = sifcmd.o sifrpc.o exports.o imports.o diff --git a/iop/system/sifinit/Makefile b/iop/system/sifinit/Makefile index 75fce1fca77..f6d9c7f5c07 100644 --- a/iop/system/sifinit/Makefile +++ b/iop/system/sifinit/Makefile @@ -8,10 +8,10 @@ IOP_BIN ?= sifinit.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sifman/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include +IOP_IMPORT_INCS += \ + system/loadcore \ + system/sifman \ + system/stdio IOP_OBJS = sifinit.o imports.o diff --git a/iop/system/sifman/Makefile b/iop/system/sifman/Makefile index 9e9533a3c60..a74ea6344d4 100644 --- a/iop/system/sifman/Makefile +++ b/iop/system/sifman/Makefile @@ -8,9 +8,9 @@ IOP_BIN ?= sifman.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore IOP_OBJS = sifman.o exports.o imports.o diff --git a/iop/system/siftoo/Makefile b/iop/system/siftoo/Makefile index 6e16e95bdf4..5965390c763 100644 --- a/iop/system/siftoo/Makefile +++ b/iop/system/siftoo/Makefile @@ -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/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sbusintr/include \ - -I$(PS2SDKSRC)/iop/system/sifman/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/sbusintr \ + system/sifman \ + system/stdio IOP_OBJS = siftoo.o pipe.o exports.o imports.o diff --git a/iop/system/sio2man/Makefile b/iop/system/sio2man/Makefile index 3469eb1cbd4..554933aba11 100644 --- a/iop/system/sio2man/Makefile +++ b/iop/system/sio2man/Makefile @@ -14,14 +14,14 @@ SIO2MAN_ENABLE_NANO ?= 0 IOP_BIN_ALTNAMES ?= freesio2.irx rsio2man.irx sio2man-old.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/dmacman/include \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sio2man/include \ - -I$(PS2SDKSRC)/iop/system/stdio/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include +IOP_IMPORT_INCS += \ + system/dmacman \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/sio2man \ + system/stdio \ + system/threadman IOP_OBJS = sio2man.o log.o imports.o exports.o diff --git a/iop/system/ssbusc/Makefile b/iop/system/ssbusc/Makefile index e2b3731260e..0e2d07e54da 100644 --- a/iop/system/ssbusc/Makefile +++ b/iop/system/ssbusc/Makefile @@ -8,9 +8,9 @@ IOP_BIN ?= ssbusc.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore IOP_OBJS = ssbusc.o exports.o imports.o diff --git a/iop/system/stdio/Makefile b/iop/system/stdio/Makefile index 1ec7b1bc6f6..01f6b8b88d8 100644 --- a/iop/system/stdio/Makefile +++ b/iop/system/stdio/Makefile @@ -8,10 +8,10 @@ IOP_BIN ?= stdio.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/ioman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include +IOP_IMPORT_INCS += \ + system/ioman \ + system/loadcore \ + system/sysclib IOP_OBJS = stdio.o exports.o imports.o diff --git a/iop/system/sysclib/Makefile b/iop/system/sysclib/Makefile index bccad32685f..79fe75b3c40 100644 --- a/iop/system/sysclib/Makefile +++ b/iop/system/sysclib/Makefile @@ -17,8 +17,8 @@ USE_FULL_PRINTF ?= 0 IOP_CFLAGS += -D_COMPILING_NEWLIB -DPRINTF_ALIAS_STANDARD_FUNCTION_NAMES=1 -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/loadcore/include +IOP_IMPORT_INCS += \ + system/loadcore IOP_OBJS = _start.o imports.o exports.o diff --git a/iop/system/threadman/Makefile b/iop/system/threadman/Makefile index 720adead9d3..3f16031a4ef 100644 --- a/iop/system/threadman/Makefile +++ b/iop/system/threadman/Makefile @@ -8,14 +8,14 @@ IOP_BIN ?= threadman.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/heaplib/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/timrman/include +IOP_IMPORT_INCS += \ + system/heaplib \ + system/intrman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/timrman IOP_OBJS = thcommon.o thbase.o thsemap.o thmsgbx.o thevent.o thfpool.o thvpool.o imports.o exports.o diff --git a/iop/system/timrman/Makefile b/iop/system/timrman/Makefile index 5df5d2505c8..7c2a1374787 100644 --- a/iop/system/timrman/Makefile +++ b/iop/system/timrman/Makefile @@ -11,9 +11,9 @@ TIMRMAN_PS1 ?= 0 IOP_BIN_ALTNAMES ?= timemani.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/loadcore/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore IOP_OBJS = timrman.o imports.o exports.o diff --git a/iop/system/udnl/Makefile b/iop/system/udnl/Makefile index 0a7ef98d8a5..ffa9a834888 100644 --- a/iop/system/udnl/Makefile +++ b/iop/system/udnl/Makefile @@ -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/system/dmacman/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 += \ + system/dmacman \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = udnl.o udnl_asm.o imports.o diff --git a/iop/system/vblank/Makefile b/iop/system/vblank/Makefile index fca75879e6e..1c151f58fcb 100644 --- a/iop/system/vblank/Makefile +++ b/iop/system/vblank/Makefile @@ -8,11 +8,11 @@ IOP_BIN ?= vblank.irx -IOP_INCS += \ - -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 += \ + system/intrman \ + system/loadcore \ + system/sysclib \ + system/threadman IOP_OBJS = vblank.o exports.o imports.o diff --git a/iop/tcpip/tcpip/Makefile b/iop/tcpip/tcpip/Makefile index 837899746da..fada0932d84 100644 --- a/iop/tcpip/tcpip/Makefile +++ b/iop/tcpip/tcpip/Makefile @@ -32,13 +32,15 @@ ifdef PS2IP_DNS IOP_CFLAGS += -DPS2IP_DNS endif +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman + IOP_INCS += \ - -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 \ -I$(LWIP)/src/include \ -I$(LWIP)/src/include/ipv4 \ -I$(PS2IP_BASE)/include diff --git a/iop/tcpip/tcpips/Makefile b/iop/tcpip/tcpips/Makefile index 3db4e8c52ea..9489c3678a8 100644 --- a/iop/tcpip/tcpips/Makefile +++ b/iop/tcpip/tcpips/Makefile @@ -19,15 +19,15 @@ ifeq ($(PS2IP_DNS),1) IOP_CFLAGS += -DPS2IP_DNS endif -IOP_INCS += \ - -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/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include \ - -I$(PS2SDKSRC)/iop/tcpip/tcpip/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/loadcore \ + system/sifcmd \ + system/sifman \ + system/stdio \ + system/sysclib \ + system/threadman \ + tcpip/tcpip IOP_OBJS = ps2ips.o imports.o diff --git a/iop/usb/camera/Makefile b/iop/usb/camera/Makefile index c2ca480e553..9c875500259 100644 --- a/iop/usb/camera/Makefile +++ b/iop/usb/camera/Makefile @@ -8,19 +8,19 @@ IOP_BIN ?= ps2cam.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/sound/libsd/include \ - -I$(PS2SDKSRC)/iop/system/dmacman/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/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include \ - -I$(PS2SDKSRC)/iop/system/vblank/include \ - -I$(PS2SDKSRC)/iop/usb/usbd/include +IOP_IMPORT_INCS += \ + sound/libsd \ + system/dmacman \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/sifcmd \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman \ + system/vblank \ + usb/usbd IOP_OBJS = ps2cam.o imports.o diff --git a/iop/usb/keyboard/Makefile b/iop/usb/keyboard/Makefile index 837386bc21b..cd1a19195df 100644 --- a/iop/usb/keyboard/Makefile +++ b/iop/usb/keyboard/Makefile @@ -8,17 +8,17 @@ IOP_BIN ?= ps2kbd.irx -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/system/dmacman/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/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include \ - -I$(PS2SDKSRC)/iop/usb/usbd/include +IOP_IMPORT_INCS += \ + system/dmacman \ + system/intrman \ + system/ioman \ + system/loadcore \ + system/sifcmd \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman \ + usb/usbd IOP_OBJS = ps2kbd.o imports.o diff --git a/iop/usb/mouse/Makefile b/iop/usb/mouse/Makefile index 66706cf5667..9a95422299d 100644 --- a/iop/usb/mouse/Makefile +++ b/iop/usb/mouse/Makefile @@ -8,16 +8,16 @@ IOP_BIN ?= ps2mouse.irx -IOP_INCS += \ - -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/stdio/include \ - -I$(PS2SDKSRC)/iop/system/sysclib/include \ - -I$(PS2SDKSRC)/iop/system/sysmem/include \ - -I$(PS2SDKSRC)/iop/system/threadman/include \ - -I$(PS2SDKSRC)/iop/usb/usbd/include +IOP_IMPORT_INCS += \ + system/intrman \ + system/iomanx \ + system/loadcore \ + system/sifcmd \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman \ + usb/usbd IOP_OBJS = ps2mouse.o imports.o diff --git a/iop/usb/usbd/Makefile b/iop/usb/usbd/Makefile index d4ac11f96bb..1aed3c465ed 100644 --- a/iop/usb/usbd/Makefile +++ b/iop/usb/usbd/Makefile @@ -8,13 +8,13 @@ IOP_PREFER_GPOPT = 16384 -IOP_INCS += \ - -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 += \ + system/intrman \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman IOP_OBJS = \ hub.o \ diff --git a/iop/usb/usbd_mini/Makefile b/iop/usb/usbd_mini/Makefile index 7652c09d95a..1e2e7e71396 100644 --- a/iop/usb/usbd_mini/Makefile +++ b/iop/usb/usbd_mini/Makefile @@ -9,6 +9,6 @@ IOP_SRC_DIR = $(PS2SDKSRC)/iop/usb/usbd/src/ IOP_CFLAGS += -DMINI_DRIVER -IOP_CFLAGS += -I$(PS2SDKSRC)/iop/usb/usbd/include/ +IOP_IMPORT_INCS += usb/usbd/ include $(PS2SDKSRC)/iop/usb/usbd/Makefile diff --git a/iop/usb/usbhdfsd/Makefile b/iop/usb/usbhdfsd/Makefile index fdc691be5f3..0f59ac2cca6 100644 --- a/iop/usb/usbhdfsd/Makefile +++ b/iop/usb/usbhdfsd/Makefile @@ -13,18 +13,19 @@ VFAT_SRC_DIR = $(VFAT_PATH)/src/ # IOP_CFLAGS += -DDEBUG IOP_CFLAGS += -DBUILDING_USBHDFSD -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ - -I$(PS2SDKSRC)/iop/system/intrman/include \ - -I$(PS2SDKSRC)/iop/system/ioman/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 \ - -I$(PS2SDKSRC)/iop/usb/usbd/include \ - -I$(VFAT_SRC_DIR)/include +IOP_IMPORT_INCS += \ + cdvd/cdvdman \ + system/intrman \ + system/ioman \ + system/iomanx \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/sysmem \ + system/threadman \ + usb/usbd + +IOP_INCS += -I$(VFAT_SRC_DIR)/include IOP_OBJS = usb_driver.o fs_driver.o part_driver.o fat_driver.o fat_write.o scache.o usbhdfsd.o api.o imports.o exports.o diff --git a/iop/usb/usbmass_bd/Makefile b/iop/usb/usbmass_bd/Makefile index 0bb62baceee..23e0aae3b34 100644 --- a/iop/usb/usbmass_bd/Makefile +++ b/iop/usb/usbmass_bd/Makefile @@ -8,13 +8,13 @@ # IOP_CFLAGS += -DDEBUG -IOP_INCS += \ - -I$(PS2SDKSRC)/iop/fs/bdm/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 \ - -I$(PS2SDKSRC)/iop/usb/usbd/include +IOP_IMPORT_INCS += \ + fs/bdm \ + system/loadcore \ + system/stdio \ + system/sysclib \ + system/threadman \ + usb/usbd IOP_LIBS += -lgcc