diff --git a/common/sbus/Makefile b/common/sbus/Makefile index 65637cd8c11..b04f9a99bab 100644 --- a/common/sbus/Makefile +++ b/common/sbus/Makefile @@ -13,6 +13,20 @@ EE_CFLAGS += -fno-builtin-printf EE_OBJS = ps2_sbus.o ee_sbus.o ps2_sif.o ee_sif2.o sif2cmd.o ee_low.o +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ + -I$(PS2SDKSRC)/iop/system/excepman/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/ioman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/modload/include \ + -I$(PS2SDKSRC)/iop/system/sifcmd/include \ + -I$(PS2SDKSRC)/iop/system/sifman/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include + IOP_OBJS_DIR = iop_obj/ IOP_OBJS = ps2_sbus.o iop_sbus.o ps2_sif.o iop_sif2.o sif2cmd.o imports.o exports.o diff --git a/ee/iopreboot/src/imgdrv/Makefile b/ee/iopreboot/src/imgdrv/Makefile index e1ecbfb05df..07faf220aa2 100644 --- a/ee/iopreboot/src/imgdrv/Makefile +++ b/ee/iopreboot/src/imgdrv/Makefile @@ -7,6 +7,10 @@ IOP_BIN ?= imgdrv.irx +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/ioman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include + IOP_OBJS = imgdrv.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/arcade/acata/Makefile b/iop/arcade/acata/Makefile index e0f8caf0e51..cfe053d545c 100644 --- a/iop/arcade/acata/Makefile +++ b/iop/arcade/acata/Makefile @@ -8,7 +8,13 @@ IOP_INCS += \ -I$(PS2SDKSRC)/iop/arcade/accore/include \ - -I$(PS2SDKSRC)/iop/arcade/actimer/include + -I$(PS2SDKSRC)/iop/arcade/actimer/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include IOP_OBJS = \ acata-entry.o \ diff --git a/iop/arcade/acatad/Makefile b/iop/arcade/acatad/Makefile index a663698ecf3..cef933c2eb9 100644 --- a/iop/arcade/acatad/Makefile +++ b/iop/arcade/acatad/Makefile @@ -7,9 +7,13 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/arcade/accore/include \ -I$(PS2SDKSRC)/iop/arcade/acata/include \ - -I$(PS2SDKSRC)/iop/dev9/atad/include + -I$(PS2SDKSRC)/iop/arcade/accore/include \ + -I$(PS2SDKSRC)/iop/dev9/atad/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include IOP_OBJS = \ acatad.o \ diff --git a/iop/arcade/accdvd/Makefile b/iop/arcade/accdvd/Makefile index d04abaf88fe..f43c5ca6851 100644 --- a/iop/arcade/accdvd/Makefile +++ b/iop/arcade/accdvd/Makefile @@ -7,8 +7,16 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ + -I$(PS2SDKSRC)/iop/arcade/acata/include \ -I$(PS2SDKSRC)/iop/arcade/accore/include \ - -I$(PS2SDKSRC)/iop/arcade/acata/include + -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/ioman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include IOP_OBJS = \ accdvdi-entry.o \ diff --git a/iop/arcade/accdvde/Makefile b/iop/arcade/accdvde/Makefile index 7dc8d936416..9fe243b0e92 100644 --- a/iop/arcade/accdvde/Makefile +++ b/iop/arcade/accdvde/Makefile @@ -7,10 +7,17 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/arcade/accore/include \ -I$(PS2SDKSRC)/iop/arcade/accdvd/include \ + -I$(PS2SDKSRC)/iop/arcade/accore/include \ -I$(PS2SDKSRC)/iop/arcade/acmem/include \ - -I$(PS2SDKSRC)/iop/arcade/acram/include + -I$(PS2SDKSRC)/iop/arcade/acram/include \ + -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/sifcmd/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include IOP_OBJS = \ accdvde-entry.o \ diff --git a/iop/arcade/accore/Makefile b/iop/arcade/accore/Makefile index 0301ce7c3a8..c7b9d12003f 100644 --- a/iop/arcade/accore/Makefile +++ b/iop/arcade/accore/Makefile @@ -7,7 +7,11 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/arcade/acdev/include + -I$(PS2SDKSRC)/iop/arcade/acdev/include \ + -I$(PS2SDKSRC)/iop/system/dmacman/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include IOP_OBJS = \ accore-entry.o \ diff --git a/iop/arcade/acdev/Makefile b/iop/arcade/acdev/Makefile index 835f850d483..38a9f6649f1 100644 --- a/iop/arcade/acdev/Makefile +++ b/iop/arcade/acdev/Makefile @@ -7,7 +7,11 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/fs/romdrv/include + -I$(PS2SDKSRC)/iop/fs/romdrv/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/ssbusc/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include IOP_OBJS = \ acdev.o \ diff --git a/iop/arcade/acdev9/Makefile b/iop/arcade/acdev9/Makefile index c0549e6ae27..e2a58964f92 100644 --- a/iop/arcade/acdev9/Makefile +++ b/iop/arcade/acdev9/Makefile @@ -7,7 +7,9 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/dev9/dev9/include + -I$(PS2SDKSRC)/iop/dev9/dev9/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include IOP_OBJS = \ acdev9.o \ diff --git a/iop/arcade/acflash/Makefile b/iop/arcade/acflash/Makefile index fc3e52e0fd9..601ea351c18 100644 --- a/iop/arcade/acflash/Makefile +++ b/iop/arcade/acflash/Makefile @@ -7,7 +7,10 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/arcade/accore/include + -I$(PS2SDKSRC)/iop/arcade/accore/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include IOP_OBJS = \ acflash-entry.o \ diff --git a/iop/arcade/acfpgald/Makefile b/iop/arcade/acfpgald/Makefile index ac019657bb3..807fbb1df89 100644 --- a/iop/arcade/acfpgald/Makefile +++ b/iop/arcade/acfpgald/Makefile @@ -7,7 +7,11 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/arcade/accore/include + -I$(PS2SDKSRC)/iop/arcade/accore/include \ + -I$(PS2SDKSRC)/iop/system/ioman/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include IOP_OBJS = \ fpgald.o \ diff --git a/iop/arcade/acjv/Makefile b/iop/arcade/acjv/Makefile index b829f3ae64b..7024ed2cf04 100644 --- a/iop/arcade/acjv/Makefile +++ b/iop/arcade/acjv/Makefile @@ -7,7 +7,8 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/arcade/accore/include + -I$(PS2SDKSRC)/iop/arcade/accore/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include IOP_OBJS = \ acjv-entry.o \ diff --git a/iop/arcade/acjvld/Makefile b/iop/arcade/acjvld/Makefile index 46040175fce..bbc8401fb2c 100644 --- a/iop/arcade/acjvld/Makefile +++ b/iop/arcade/acjvld/Makefile @@ -7,7 +7,10 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/arcade/accore/include + -I$(PS2SDKSRC)/iop/arcade/accore/include \ + -I$(PS2SDKSRC)/iop/system/ioman/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include IOP_OBJS = \ jvld.o \ diff --git a/iop/arcade/acmem/Makefile b/iop/arcade/acmem/Makefile index caf076ec447..23290d8b1d9 100644 --- a/iop/arcade/acmem/Makefile +++ b/iop/arcade/acmem/Makefile @@ -7,7 +7,12 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/arcade/accore/include + -I$(PS2SDKSRC)/iop/arcade/accore/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/sifcmd/include \ + -I$(PS2SDKSRC)/iop/system/sifman/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include IOP_OBJS = \ acmem-entry.o \ diff --git a/iop/arcade/acmeme/Makefile b/iop/arcade/acmeme/Makefile index b507eb5178d..93dac8d9109 100644 --- a/iop/arcade/acmeme/Makefile +++ b/iop/arcade/acmeme/Makefile @@ -11,7 +11,13 @@ IOP_INCS += \ -I$(PS2SDKSRC)/iop/arcade/acjv/include \ -I$(PS2SDKSRC)/iop/arcade/acmem/include \ -I$(PS2SDKSRC)/iop/arcade/acram/include \ - -I$(PS2SDKSRC)/iop/arcade/acsram/include + -I$(PS2SDKSRC)/iop/arcade/acsram/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/sifcmd/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include IOP_OBJS = \ acmeme-entry.o \ diff --git a/iop/arcade/acram/Makefile b/iop/arcade/acram/Makefile index c7fc63257f8..3085c22b70d 100644 --- a/iop/arcade/acram/Makefile +++ b/iop/arcade/acram/Makefile @@ -7,7 +7,13 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/arcade/accore/include + -I$(PS2SDKSRC)/iop/arcade/accore/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include IOP_OBJS = \ acram-entry.o \ diff --git a/iop/arcade/acrtc/Makefile b/iop/arcade/acrtc/Makefile index b2cc466d202..fe3e9f8f1ff 100644 --- a/iop/arcade/acrtc/Makefile +++ b/iop/arcade/acrtc/Makefile @@ -6,6 +6,12 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ + -I$(PS2SDKSRC)/iop/system/sifcmd/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include + IOP_OBJS = \ iopmain.o \ imports.o diff --git a/iop/arcade/acsram/Makefile b/iop/arcade/acsram/Makefile index 9aa5d59451e..4fd66d73ab9 100644 --- a/iop/arcade/acsram/Makefile +++ b/iop/arcade/acsram/Makefile @@ -7,7 +7,8 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/arcade/accore/include + -I$(PS2SDKSRC)/iop/arcade/accore/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include IOP_OBJS = \ acsram-entry.o \ diff --git a/iop/arcade/actimer/Makefile b/iop/arcade/actimer/Makefile index 6d1eaaa516b..0e005288fb0 100644 --- a/iop/arcade/actimer/Makefile +++ b/iop/arcade/actimer/Makefile @@ -7,7 +7,11 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/arcade/accore/include + -I$(PS2SDKSRC)/iop/arcade/accore/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include IOP_OBJS = \ actimer-entry.o \ diff --git a/iop/arcade/acuart/Makefile b/iop/arcade/acuart/Makefile index ba9728cc87e..8cfa60848c5 100644 --- a/iop/arcade/acuart/Makefile +++ b/iop/arcade/acuart/Makefile @@ -7,7 +7,14 @@ # Review ps2sdk README & LICENSE files for further details. IOP_INCS += \ - -I$(PS2SDKSRC)/iop/arcade/accore/include + -I$(PS2SDKSRC)/iop/arcade/accore/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/ioman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include ADD_TTY ?= 0 diff --git a/iop/cdvd/cdfs/Makefile b/iop/cdvd/cdfs/Makefile index d7d05e40eaf..88dd15ca5ed 100644 --- a/iop/cdvd/cdfs/Makefile +++ b/iop/cdvd/cdfs/Makefile @@ -8,6 +8,19 @@ # IOP_CFLAGS += -DSIO_DEBUG -DDEBUG +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ + -I$(PS2SDKSRC)/iop/debug/sior/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/ioman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/sifcmd/include \ + -I$(PS2SDKSRC)/iop/system/sifman/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include + IOP_OBJS = main.o cdfs_iop.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/cdvd/cdvdfsv/Makefile b/iop/cdvd/cdvdfsv/Makefile index 1ab7933182f..a1c886cca99 100644 --- a/iop/cdvd/cdvdfsv/Makefile +++ b/iop/cdvd/cdvdfsv/Makefile @@ -7,6 +7,20 @@ # Review ps2sdk README & LICENSE files for further details. IOP_CFLAGS += -DBUILDING_CDVD_MODULE + +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ + -I$(PS2SDKSRC)/iop/system/dmacman/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/iomanx/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/sifcmd/include \ + -I$(PS2SDKSRC)/iop/system/sifman/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include + IOP_OBJS = cdvdfsv.o imports.o exports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/cdvd/cdvdman/Makefile b/iop/cdvd/cdvdman/Makefile index 8c03c234e1a..ed9e2365261 100644 --- a/iop/cdvd/cdvdman/Makefile +++ b/iop/cdvd/cdvdman/Makefile @@ -7,6 +7,17 @@ # Review ps2sdk README & LICENSE files for further details. IOP_CFLAGS += -DBUILDING_CDVD_MODULE + +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/dmacman/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/iomanx/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include + IOP_OBJS = cdvdman.o imports.o exports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/cdvd/cdvdstm/Makefile b/iop/cdvd/cdvdstm/Makefile index ac576d8852e..2c7d968daa6 100644 --- a/iop/cdvd/cdvdstm/Makefile +++ b/iop/cdvd/cdvdstm/Makefile @@ -7,6 +7,18 @@ # Review ps2sdk README & LICENSE files for further details. IOP_CFLAGS += -DBUILDING_CDVD_MODULE + +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/iomanx/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/sifman/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include + IOP_OBJS = cdvdstm.o imports.o exports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/cdvd/xesdrv/Makefile b/iop/cdvd/xesdrv/Makefile index b3695b80f72..61553bce261 100644 --- a/iop/cdvd/xesdrv/Makefile +++ b/iop/cdvd/xesdrv/Makefile @@ -7,6 +7,12 @@ # Review ps2sdk README & LICENSE files for further details. IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 + +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/iomanx/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include + IOP_OBJS = xesdrv.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/debug/iop_sbusdbg/Makefile b/iop/debug/iop_sbusdbg/Makefile index acb2ca04859..e13da04cdb1 100644 --- a/iop/debug/iop_sbusdbg/Makefile +++ b/iop/debug/iop_sbusdbg/Makefile @@ -6,7 +6,21 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += -I$(PS2SDKSRC)/common/sbus/include -I$(PS2SDKSRC)/iop/debug/iopdebug/include +IOP_INCS += \ + -I$(PS2SDKSRC)/common/sbus/include \ + -I$(PS2SDKSRC)/iop/cdvd/cdvdman/include \ + -I$(PS2SDKSRC)/iop/debug/iopdebug/include \ + -I$(PS2SDKSRC)/iop/system/excepman/include \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/ioman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/modload/include \ + -I$(PS2SDKSRC)/iop/system/sifcmd/include \ + -I$(PS2SDKSRC)/iop/system/sifman/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include IOP_OBJS = main.o sbus_dbg_low.o sbus_tty.o sbus_dbg.o imports.o diff --git a/iop/debug/iopdebug/Makefile b/iop/debug/iopdebug/Makefile index b7b3a77b83e..e6e48df457e 100644 --- a/iop/debug/iopdebug/Makefile +++ b/iop/debug/iopdebug/Makefile @@ -6,6 +6,20 @@ # 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_OBJS = main.o iop_debug.o iop_exceptions.o iop_dbg_low.o imports.o exports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/debug/ioptrap/Makefile b/iop/debug/ioptrap/Makefile index 74cadab8aec..9608ff25793 100644 --- a/iop/debug/ioptrap/Makefile +++ b/iop/debug/ioptrap/Makefile @@ -9,6 +9,14 @@ # 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_OBJS = ioptrap.o handler.o breakpoint.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/debug/ppctty/Makefile b/iop/debug/ppctty/Makefile index f989ec96c06..b12a41d08e4 100644 --- a/iop/debug/ppctty/Makefile +++ b/iop/debug/ppctty/Makefile @@ -6,16 +6,25 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += +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_OBJS = main.o tty.o imports.o ifeq ($(KPRINTF), 1) - IOP_CFLAGS += -DKPRINTF +IOP_CFLAGS += -DKPRINTF endif ifeq ($(DEBUG), 1) - IOP_CFLAGS += -DDEBUG +IOP_CFLAGS += -DDEBUG endif include $(PS2SDKSRC)/Defs.make diff --git a/iop/debug/sior/Makefile b/iop/debug/sior/Makefile index 3d1dc73a6ea..d6702abe1be 100644 --- a/iop/debug/sior/Makefile +++ b/iop/debug/sior/Makefile @@ -6,6 +6,13 @@ # 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_OBJS = sior.o xprintf.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/dev9/atad/Makefile b/iop/dev9/atad/Makefile index 07639f5eb92..5635ab41824 100644 --- a/iop/dev9/atad/Makefile +++ b/iop/dev9/atad/Makefile @@ -32,7 +32,13 @@ ATA_USE_AIFDEV9 ?= 0 IOP_BIN ?= ps2atad.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/dev9/include +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_OBJS = ps2atad.o imports.o exports.o ifeq ($(ATA_SCE_AUTH_HDD),1) diff --git a/iop/dev9/dev9/Makefile b/iop/dev9/dev9/Makefile index 93ea4c154d9..0dd66c317eb 100644 --- a/iop/dev9/dev9/Makefile +++ b/iop/dev9/dev9/Makefile @@ -20,7 +20,17 @@ DEV9_ENABLE_AIF ?= 0 IOP_BIN ?= ps2dev9.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/poweroff/include +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_OBJS = ps2dev9.o exports.o imports.o ifeq ($(DEV9_SKIP_SMAP_INIT),1) diff --git a/iop/dev9/extflash/Makefile b/iop/dev9/extflash/Makefile index 89206193a90..bac2a7b3a7b 100644 --- a/iop/dev9/extflash/Makefile +++ b/iop/dev9/extflash/Makefile @@ -8,7 +8,18 @@ IOP_BIN_ALTNAMES = flash.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/dev9/include +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_OBJS = extflash.o exports.o imports.o diff --git a/iop/dev9/hdpro_atad/Makefile b/iop/dev9/hdpro_atad/Makefile index 172ba15d0e4..28ce4f0e583 100644 --- a/iop/dev9/hdpro_atad/Makefile +++ b/iop/dev9/hdpro_atad/Makefile @@ -8,7 +8,13 @@ IOP_BIN ?= hdproatad.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/atad/include +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_OBJS = hdproatad.o exports.o imports.o diff --git a/iop/dev9/poweroff/Makefile b/iop/dev9/poweroff/Makefile index 6a27820d797..970f9a2a2bf 100644 --- a/iop/dev9/poweroff/Makefile +++ b/iop/dev9/poweroff/Makefile @@ -6,6 +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/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/sifcmd/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include + IOP_OBJS = poweroff.o imports.o exports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/dev9/pvrdrv/Makefile b/iop/dev9/pvrdrv/Makefile index 53a3f676147..816bee8b784 100644 --- a/iop/dev9/pvrdrv/Makefile +++ b/iop/dev9/pvrdrv/Makefile @@ -1,7 +1,21 @@ +# _____ ___ ____ ___ ____ +# ____| | ____| | | |____| +# | ___| |____ ___| ____| | \ PS2DEV Open Source Project. +#----------------------------------------------------------------------- +# Copyright 2021-2021, ps2dev - http://www.ps2dev.org +# Licenced under Academic Free License version 2.0 +# Review ps2sdk README & LICENSE files for further details. IOP_BIN ?= dvrdrv.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/dev9/include +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_OBJS = dvrdrv.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/dvrp/dvr/Makefile b/iop/dvrp/dvr/Makefile index 674fabe02bb..7a58fdc7f6f 100644 --- a/iop/dvrp/dvr/Makefile +++ b/iop/dvrp/dvr/Makefile @@ -6,8 +6,16 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/pvrdrv/include 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_OBJS = dvr.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/dvrp/dvrav/Makefile b/iop/dvrp/dvrav/Makefile index 4d825670ac5..a7cea56060d 100644 --- a/iop/dvrp/dvrav/Makefile +++ b/iop/dvrp/dvrav/Makefile @@ -6,8 +6,16 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/pvrdrv/include 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_OBJS = dvrav.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/dvrp/dvrdv/Makefile b/iop/dvrp/dvrdv/Makefile index 131522c96c8..ff78960d3b1 100644 --- a/iop/dvrp/dvrdv/Makefile +++ b/iop/dvrp/dvrdv/Makefile @@ -6,8 +6,15 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/pvrdrv/include 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_OBJS = dvrdv.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/dvrp/dvrfile/Makefile b/iop/dvrp/dvrfile/Makefile index 6b878dcffeb..167002f39e2 100644 --- a/iop/dvrp/dvrfile/Makefile +++ b/iop/dvrp/dvrfile/Makefile @@ -6,8 +6,16 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/pvrdrv/include 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_OBJS = dvrfile.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/dvrp/dvripl/Makefile b/iop/dvrp/dvripl/Makefile index 6632bf1c0fd..901f42e4e36 100644 --- a/iop/dvrp/dvripl/Makefile +++ b/iop/dvrp/dvripl/Makefile @@ -6,8 +6,17 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/pvrdrv/include 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_OBJS = dvripl.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/dvrp/dvrmisc/Makefile b/iop/dvrp/dvrmisc/Makefile index b4514869886..75124393ade 100644 --- a/iop/dvrp/dvrmisc/Makefile +++ b/iop/dvrp/dvrmisc/Makefile @@ -6,8 +6,16 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/pvrdrv/include 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_OBJS = dvrmisc.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/fs/adddrv/Makefile b/iop/fs/adddrv/Makefile index 1eaada104d6..ce9aa03f63e 100644 --- a/iop/fs/adddrv/Makefile +++ b/iop/fs/adddrv/Makefile @@ -6,7 +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 +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_OBJS = adddrv.o imports.o diff --git a/iop/fs/addrom2/Makefile b/iop/fs/addrom2/Makefile index 9a97811227c..99dd7f7f7d5 100644 --- a/iop/fs/addrom2/Makefile +++ b/iop/fs/addrom2/Makefile @@ -6,7 +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 +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_OBJS = addrom2.o imports.o diff --git a/iop/fs/bdm/Makefile b/iop/fs/bdm/Makefile index e37ce29fc7b..793e1b95d10 100644 --- a/iop/fs/bdm/Makefile +++ b/iop/fs/bdm/Makefile @@ -8,9 +8,16 @@ # 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_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 -IOP_CFLAGS += -I$(PS2SDKSRC)/iop/fs/libbdm/include/ include $(PS2SDKSRC)/Defs.make include $(PS2SDKSRC)/iop/Rules.bin.make diff --git a/iop/fs/bdmfs_fatfs/Makefile b/iop/fs/bdmfs_fatfs/Makefile index 2f05d6c9b73..ecd0731a4a0 100644 --- a/iop/fs/bdmfs_fatfs/Makefile +++ b/iop/fs/bdmfs_fatfs/Makefile @@ -19,13 +19,24 @@ ifeq ($(DEBUG_EXTREME),1) IOP_CFLAGS += -DDEBUG_EXTREME endif -IOP_INCS += -I$(PS2SDKSRC)/iop/fs/bdm/include -I$(FATFS)/source/include +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_LIBS += -lgcc FATFS_OBJS = diskio.o ff.o ffsystem.o ffunicode.o IOP_OBJS = main.o imports.o fs_driver.o $(FATFS_OBJS) -IOP_LIBS = -static-libgcc -lgcc - include $(PS2SDKSRC)/Defs.make include $(PS2SDKSRC)/iop/Rules.bin.make diff --git a/iop/fs/bdmfs_vfat/Makefile b/iop/fs/bdmfs_vfat/Makefile index aa115687b14..6fcb8f60335 100644 --- a/iop/fs/bdmfs_vfat/Makefile +++ b/iop/fs/bdmfs_vfat/Makefile @@ -12,7 +12,18 @@ VFAT_SRC_DIR = $(VFAT_PATH)/src/ # IOP_CFLAGS += -DDEBUG -DDEBUG_EXTREME -IOP_INCS += -I$(PS2SDKSRC)/iop/fs/bdm/include -I$(VFAT_SRC_DIR)/include +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_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 82371b09f83..114ec193010 100644 --- a/iop/fs/devfs/Makefile +++ b/iop/fs/devfs/Makefile @@ -8,6 +8,15 @@ 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_OBJS = devfs.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/fs/eromdrv/Makefile b/iop/fs/eromdrv/Makefile index 951442c60d7..c7f68eafcd0 100644 --- a/iop/fs/eromdrv/Makefile +++ b/iop/fs/eromdrv/Makefile @@ -6,6 +6,13 @@ # 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_OBJS = eromdrv.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/fs/fakehost/Makefile b/iop/fs/fakehost/Makefile index 6a9e799b1b3..dcfed49fb6b 100644 --- a/iop/fs/fakehost/Makefile +++ b/iop/fs/fakehost/Makefile @@ -8,6 +8,18 @@ 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_OBJS = fakehost.o nprintf.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/fs/fileio/Makefile b/iop/fs/fileio/Makefile index 2044f90cc8c..7734fd02a4b 100644 --- a/iop/fs/fileio/Makefile +++ b/iop/fs/fileio/Makefile @@ -8,6 +8,16 @@ 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_OBJS = fileio.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/fs/filexio/Makefile b/iop/fs/filexio/Makefile index 299fe77eae8..e3b54c789ec 100644 --- a/iop/fs/filexio/Makefile +++ b/iop/fs/filexio/Makefile @@ -10,6 +10,17 @@ 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_OBJS = fileXio_iop.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/fs/http/Makefile b/iop/fs/http/Makefile index 52c6f960f15..0088e7b3793 100644 --- a/iop/fs/http/Makefile +++ b/iop/fs/http/Makefile @@ -8,7 +8,19 @@ IOP_BIN ?= ps2http.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/tcpip/tcpip/include -I$(PS2SDKSRC)/iop/tcpip/dns/include +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_OBJS = ps2http.o imports.o diff --git a/iop/fs/libbdm/Makefile b/iop/fs/libbdm/Makefile index e11c9369b68..8b10f99c5ff 100644 --- a/iop/fs/libbdm/Makefile +++ b/iop/fs/libbdm/Makefile @@ -6,7 +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 +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_OBJS = bd_defrag.o bd_cache.o IOP_LIB = libbdm.a diff --git a/iop/fs/netfs/Makefile b/iop/fs/netfs/Makefile index 085faa32a19..aefc963b13c 100644 --- a/iop/fs/netfs/Makefile +++ b/iop/fs/netfs/Makefile @@ -8,7 +8,15 @@ IOP_BIN ?= ps2netfs.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/system/iopmgr/include -I$(PS2SDKSRC)/iop/tcpip/tcpip/include +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_OBJS = ps2netfs.o ps2_fio.o devscan.o imports.o diff --git a/iop/fs/romdrv/Makefile b/iop/fs/romdrv/Makefile index 0c566191ff5..f71494f01b8 100644 --- a/iop/fs/romdrv/Makefile +++ b/iop/fs/romdrv/Makefile @@ -6,11 +6,17 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_OBJS = romdrv.o imports.o exports.o - # 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_OBJS = romdrv.o imports.o exports.o + ifneq (x$(ROMDRV_EXPORT_DEVICES),x0) IOP_CFLAGS += -DROMDRV_EXPORT_DEVICES endif diff --git a/iop/fs/subfile/Makefile b/iop/fs/subfile/Makefile index 6bd4107f6f7..667bf772a6c 100644 --- a/iop/fs/subfile/Makefile +++ b/iop/fs/subfile/Makefile @@ -6,6 +6,13 @@ # 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_OBJS = subfile.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/hdd/apa/Makefile b/iop/hdd/apa/Makefile index cbfe65cb4ac..2ecb52a097d 100644 --- a/iop/hdd/apa/Makefile +++ b/iop/hdd/apa/Makefile @@ -6,19 +6,6 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -LIBAPA_PATH = $(PS2SDKSRC)/iop/hdd/libapa/ - -LIBAPA_SRC_DIR = $(LIBAPA_PATH)src/ - -IOP_BIN ?= ps2hdd.irx - -IOP_INCS += -I$(LIBAPA_PATH)include - -IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 - -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) - # Depend on dev9 module for poweroff callback? APA_USE_DEV9 ?= 1 @@ -31,6 +18,28 @@ APA_USE_BDM ?= 0 # Depend on iomanX module for block device interface? APA_USE_IOMANX ?= 0 +LIBAPA_PATH = $(PS2SDKSRC)/iop/hdd/libapa/ + +LIBAPA_SRC_DIR = $(LIBAPA_PATH)src/ + +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 + +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 diff --git a/iop/hdd/fsck/Makefile b/iop/hdd/fsck/Makefile index 2d002969edf..68c3278aa87 100644 --- a/iop/hdd/fsck/Makefile +++ b/iop/hdd/fsck/Makefile @@ -12,11 +12,22 @@ LIBPFS_SRC_DIR = $(LIBPFS_PATH)src/ IOP_BIN ?= fsck.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/atad/include -I$(PS2SDKSRC)/iop/dev9/poweroff/include -I$(LIBPFS_PATH)include - 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_LIBS += -lgcc PFS_OBJS = bitmap.o inode.o journal.o misc.o super.o cache.o block.o diff --git a/iop/hdd/fssk/Makefile b/iop/hdd/fssk/Makefile index 6f1a9b1561c..09296c61f9c 100644 --- a/iop/hdd/fssk/Makefile +++ b/iop/hdd/fssk/Makefile @@ -12,11 +12,22 @@ LIBPFS_SRC_DIR = $(LIBPFS_PATH)src/ IOP_BIN ?= fssk.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/atad/include -I$(PS2SDKSRC)/iop/dev9/poweroff/include -I$(LIBPFS_PATH)include - 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_LIBS += -lgcc PFS_OBJS = bitmap.o inode.o dir.o journal.o misc.o super.o superWrite.o cache.o block.o blockWrite.o diff --git a/iop/hdd/hdck/Makefile b/iop/hdd/hdck/Makefile index b24413879e2..edbc14a76a5 100644 --- a/iop/hdd/hdck/Makefile +++ b/iop/hdd/hdck/Makefile @@ -12,8 +12,6 @@ LIBAPA_SRC_DIR = $(LIBAPA_PATH)src/ IOP_BIN ?= hdck.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/poweroff/include -I$(PS2SDKSRC)/iop/dev9/dev9/include -I$(PS2SDKSRC)/iop/dev9/atad/include -I$(LIBAPA_PATH)include - IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_OLD_NAME_ADDDELDRV=0 IOP_CFLAGS += -DAPA_OSD_VER @@ -21,6 +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 + 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 f4e87a98fbe..88aa9813907 100644 --- a/iop/hdd/hdsk/Makefile +++ b/iop/hdd/hdsk/Makefile @@ -14,12 +14,24 @@ LIBAPA_SRC_DIR = $(LIBAPA_PATH)src/ IOP_BIN ?= hdsk.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/poweroff/include -I$(PS2SDKSRC)/iop/dev9/dev9/include -I$(PS2SDKSRC)/iop/dev9/atad/include -I$(LIBAPA_PATH)include - 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 + 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 8fce6e93646..276dbd11374 100644 --- a/iop/hdd/pfs/Makefile +++ b/iop/hdd/pfs/Makefile @@ -12,10 +12,21 @@ LIBPFS_SRC_DIR = $(LIBPFS_PATH)src/ IOP_BIN ?= ps2fs.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/atad/include -I$(PS2SDKSRC)/iop/dev9/poweroff/include -I$(LIBPFS_PATH)include - 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_LIBS += -lgcc PFS_OBJS = bitmap.o dir.o inode.o journal.o misc.o super.o superWrite.o cache.o block.o blockWrite.o diff --git a/iop/iLink/IEEE1394_bd/Makefile b/iop/iLink/IEEE1394_bd/Makefile index 53295032dd1..77bdb67a559 100644 --- a/iop/iLink/IEEE1394_bd/Makefile +++ b/iop/iLink/IEEE1394_bd/Makefile @@ -10,12 +10,22 @@ IOP_CFLAGS += -mno-check-zero-division # -DSIF_CALLBACKS_12_13 -IOP_INCS += -I$(PS2SDKSRC)/iop/iLink/iLinkman/include -IOP_INCS += -I$(PS2SDKSRC)/iop/fs/bdm/include +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_OBJS = sbp2_driver.o imports.o main.o scsi.o +IOP_LIBS += -lgcc -IOP_LDFLAGS = -lgcc +IOP_OBJS = sbp2_driver.o imports.o main.o scsi.o include $(PS2SDKSRC)/Defs.make include $(PS2SDKSRC)/iop/Rules.bin.make diff --git a/iop/iLink/IEEE1394_disk/Makefile b/iop/iLink/IEEE1394_disk/Makefile index 253a9cd1d86..062b04d4568 100644 --- a/iop/iLink/IEEE1394_disk/Makefile +++ b/iop/iLink/IEEE1394_disk/Makefile @@ -15,7 +15,19 @@ IOP_CFLAGS += -DBUILDING_IEEE1394_DISK IOP_CFLAGS += -mno-check-zero-division # -DSIF_CALLBACKS_12_13 -IOP_INCS += -I$(PS2SDKSRC)/iop/iLink/iLinkman/include -I$(VFAT_SRC_DIR)/include +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_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 5ebc0936d52..69bad80e466 100644 --- a/iop/iLink/iLinkman/Makefile +++ b/iop/iLink/iLinkman/Makefile @@ -8,6 +8,17 @@ 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_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 include $(PS2SDKSRC)/Defs.make diff --git a/iop/memorycard/mcman/Makefile b/iop/memorycard/mcman/Makefile index f647354feb2..d064e9cb5fa 100644 --- a/iop/memorycard/mcman/Makefile +++ b/iop/memorycard/mcman/Makefile @@ -6,9 +6,31 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. +# Build the newer version of the memory card module? +MCMAN_BUILDING_XMCMAN ?= 1 + +# Read from the dev9 external flash ROM instead of the memory card? +MCMAN_BUILDING_XFROMMAN ?= 0 + +# Read from a file on the filesystem insead of the memory card? +MCMAN_BUILDING_VMCMAN ?= 0 + # IOP_CFLAGS += -DSIO_DEBUG -DDEBUG -IOP_INCS += -I$(PS2SDKSRC)/iop/system/sio2man/include +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_OBJS = \ main.o \ @@ -20,15 +42,6 @@ IOP_OBJS = \ imports.o \ exports.o -# Build the newer version of the memory card module? -MCMAN_BUILDING_XMCMAN ?= 1 - -# Read from the dev9 external flash ROM instead of the memory card? -MCMAN_BUILDING_XFROMMAN ?= 0 - -# Read from a file on the filesystem insead of the memory card? -MCMAN_BUILDING_VMCMAN ?= 0 - ifneq (x$(MCMAN_BUILDING_XMCMAN),x0) IOP_CFLAGS += -DBUILDING_XMCMAN endif diff --git a/iop/memorycard/mcserv/Makefile b/iop/memorycard/mcserv/Makefile index 2faf4cbada6..4fdf9b60fb4 100644 --- a/iop/memorycard/mcserv/Makefile +++ b/iop/memorycard/mcserv/Makefile @@ -6,15 +6,24 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. +# Build the newer version of the memory card server module? +MCMAN_BUILDING_XMCSERV ?= 1 + # IOP_CFLAGS += -DSIO_DEBUG -DDEBUG -IOP_INCS += -I$(PS2SDKSRC)/iop/memorycard/mcman/include +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_OBJS = mcserv.o imports.o exports.o -# Build the newer version of the memory card server module? -MCMAN_BUILDING_XMCSERV ?= 1 - ifneq (x$(MCMAN_BUILDING_XMCSERV),x0) IOP_CFLAGS += -DBUILDING_XMCSERV endif diff --git a/iop/network/netman/Makefile b/iop/network/netman/Makefile index b1b7e4abda4..6b75ee26b02 100644 --- a/iop/network/netman/Makefile +++ b/iop/network/netman/Makefile @@ -8,6 +8,16 @@ 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_OBJS = netman.o rpc_server.o rpc_client.o imports.o exports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/network/smap/Makefile b/iop/network/smap/Makefile index 4a1b596d6d9..2a705f7e17c 100644 --- a/iop/network/smap/Makefile +++ b/iop/network/smap/Makefile @@ -25,6 +25,18 @@ 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_OBJS = ipstack.o main.o smap.o xfer.o imports.o exports.o + ifneq (x$(LWIP_DHCP),x0) IOP_CFLAGS += -DLWIP_DHCP=1 endif @@ -46,10 +58,6 @@ ifneq (x$(SMAP_RX_PACKETS_POLLING_MODE),x0) IOP_CFLAGS += -DSMAP_RX_PACKETS_POLLING_MODE=1 endif -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/dev9/include - -IOP_OBJS = ipstack.o main.o smap.o xfer.o imports.o exports.o - include $(PS2SDKSRC)/Defs.make include $(PS2SDKSRC)/iop/Rules.bin.make include $(PS2SDKSRC)/iop/Rules.make diff --git a/iop/network/smbman/Makefile b/iop/network/smbman/Makefile index 1f6a158afee..0141b0d9c84 100644 --- a/iop/network/smbman/Makefile +++ b/iop/network/smbman/Makefile @@ -8,9 +8,18 @@ # IOP_CFLAGS += -DDEBUG -IOP_INCS += -I$(PS2SDKSRC)/iop/tcpip/tcpip/include +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_LDFLAGS += -lgcc +IOP_LIBS += -lgcc IOP_OBJS = smbman.o smb_fio.o smb.o poll.o auth.o des.o md4.o imports.o diff --git a/iop/network/spduart/Makefile b/iop/network/spduart/Makefile index 025af77fbe2..ce78a4e026e 100644 --- a/iop/network/spduart/Makefile +++ b/iop/network/spduart/Makefile @@ -6,7 +6,15 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/dev9/include +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_OBJS = spduart.o imports.o exports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/network/udptty/Makefile b/iop/network/udptty/Makefile index ef74c757baa..2ce4dea4b8c 100644 --- a/iop/network/udptty/Makefile +++ b/iop/network/udptty/Makefile @@ -8,7 +8,16 @@ IOP_CFLAGS += -DKPRTTY -IOP_INCS += -I$(PS2SDKSRC)/iop/tcpip/tcpip/include +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_OBJS = udptty.o imports.o exports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/security/secrman/Makefile b/iop/security/secrman/Makefile index fd5a02a068e..b5be313bdc2 100644 --- a/iop/security/secrman/Makefile +++ b/iop/security/secrman/Makefile @@ -6,13 +6,20 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += -I$(PS2SDKSRC)/iop/system/sio2man/include/ - -IOP_OBJS = secrman.o MechaAuth.o CardAuth.o keyman.o imports.o exports.o - # 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_OBJS = secrman.o MechaAuth.o CardAuth.o keyman.o imports.o exports.o + ifneq (x$(DEX_SUPPORT),x9) IOP_CFLAGS += -DDEX_SUPPORT=1 endif diff --git a/iop/security/secrsif/Makefile b/iop/security/secrsif/Makefile index 6d6e0aafd17..c70b3ad1aef 100644 --- a/iop/security/secrsif/Makefile +++ b/iop/security/secrsif/Makefile @@ -6,7 +6,15 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += -I$(PS2SDKSRC)/iop/system/sio2man/include/ +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_OBJS = secrsif.o imports.o exports.o diff --git a/iop/sio/mx4sio_bd/Makefile b/iop/sio/mx4sio_bd/Makefile index ddbbd06c4c5..d7d636d06cb 100644 --- a/iop/sio/mx4sio_bd/Makefile +++ b/iop/sio/mx4sio_bd/Makefile @@ -6,11 +6,19 @@ # 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/sio2man/include +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_OBJS += spi_sdcard_crc7.o spi_sdcard_driver.o crc16.o ioplib.o sio2man_hook.o mx4sio.o imports.o +IOP_LIBS += -lgcc -IOP_LDFLAGS = -lgcc +IOP_OBJS += spi_sdcard_crc7.o spi_sdcard_driver.o crc16.o ioplib.o sio2man_hook.o mx4sio.o imports.o include $(PS2SDKSRC)/Defs.make include $(PS2SDKSRC)/iop/Rules.bin.make diff --git a/iop/sound/ahx/Makefile b/iop/sound/ahx/Makefile index 80ab15354df..76273cafe5a 100644 --- a/iop/sound/ahx/Makefile +++ b/iop/sound/ahx/Makefile @@ -6,7 +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 +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_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 08721127d97..92a8fd14938 100755 --- a/iop/sound/audsrv/Makefile +++ b/iop/sound/audsrv/Makefile @@ -6,6 +6,17 @@ # 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_OBJS = audsrv.o upsamplers.o hw.o rpc_server.o rpc_client.o common.o cdrom.o imports.o exports.o adpcm.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/sound/clearspu/Makefile b/iop/sound/clearspu/Makefile index db918d1b578..2b76db39cb7 100644 --- a/iop/sound/clearspu/Makefile +++ b/iop/sound/clearspu/Makefile @@ -6,6 +6,12 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/stdio/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include + IOP_OBJS = \ clearspu.o \ imports.o diff --git a/iop/sound/libsd/Makefile b/iop/sound/libsd/Makefile index 1973c0eeb62..c9bfa3aca72 100644 --- a/iop/sound/libsd/Makefile +++ b/iop/sound/libsd/Makefile @@ -8,6 +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 + IOP_OBJS = freesd.o batch.o block.o effect.o voice.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/sound/libsnd2/Makefile b/iop/sound/libsnd2/Makefile index 103766364c8..a7793767ef0 100644 --- a/iop/sound/libsnd2/Makefile +++ b/iop/sound/libsnd2/Makefile @@ -6,7 +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 +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_OBJS = \ cc_0.o \ diff --git a/iop/sound/libspu2/Makefile b/iop/sound/libspu2/Makefile index 6af54d269b4..18374904b64 100644 --- a/iop/sound/libspu2/Makefile +++ b/iop/sound/libspu2/Makefile @@ -6,6 +6,13 @@ # 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_OBJS = \ config.o \ s_cb.o \ diff --git a/iop/sound/ps2snd/Makefile b/iop/sound/ps2snd/Makefile index 85af2bc0549..85bf66f5537 100644 --- a/iop/sound/ps2snd/Makefile +++ b/iop/sound/ps2snd/Makefile @@ -8,6 +8,16 @@ 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_OBJS = ps2snd.o adpcm-stream.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/sound/rspu2drv/Makefile b/iop/sound/rspu2drv/Makefile index 46537f8c837..36cda6f306a 100644 --- a/iop/sound/rspu2drv/Makefile +++ b/iop/sound/rspu2drv/Makefile @@ -6,7 +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 +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_OBJS = \ imports.o \ diff --git a/iop/startup/Makefile b/iop/startup/Makefile index 09dbd23592e..364218a7e95 100644 --- a/iop/startup/Makefile +++ b/iop/startup/Makefile @@ -6,8 +6,11 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. - IOP_LIB = libdummy.a + +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/stdio/include + IOP_OBJS = crt0.o # disable array bounds warning for __do_global_ctors IOP_WARNFLAGS += -Wno-array-bounds diff --git a/iop/system/alloc/Makefile b/iop/system/alloc/Makefile index 2427ad7e17c..caa63e3f93c 100644 --- a/iop/system/alloc/Makefile +++ b/iop/system/alloc/Makefile @@ -6,6 +6,12 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/sysclib/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include \ + -I$(PS2SDKSRC)/iop/system/threadman/include + IOP_OBJS = alloc.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/dmacman/Makefile b/iop/system/dmacman/Makefile index b36d77bb399..099d4ac59f4 100644 --- a/iop/system/dmacman/Makefile +++ b/iop/system/dmacman/Makefile @@ -8,6 +8,11 @@ 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_OBJS = dmacman.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/eesync/Makefile b/iop/system/eesync/Makefile index ac1baa38bcd..b637c61867f 100644 --- a/iop/system/eesync/Makefile +++ b/iop/system/eesync/Makefile @@ -6,8 +6,6 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_OBJS = eesync.o exports.o imports.o - # Wipe EE kernel space? EESYNC_WIPE_EE_KERNEL_SPACE ?= 0 @@ -20,6 +18,16 @@ 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_OBJS = eesync.o exports.o imports.o + ifneq (x$(EESYNC_WIPE_EE_KERNEL_SPACE),x0) IOP_CFLAGS += -DEESYNC_WIPE_EE_KERNEL_SPACE endif diff --git a/iop/system/excepman/Makefile b/iop/system/excepman/Makefile index 18ab696d762..efbb3f65413 100644 --- a/iop/system/excepman/Makefile +++ b/iop/system/excepman/Makefile @@ -8,6 +8,10 @@ IOP_BIN ?= excepman.irx +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include + IOP_OBJS = excepman.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/heaplib/Makefile b/iop/system/heaplib/Makefile index 34c7f5b8b57..632b7bb5ba3 100644 --- a/iop/system/heaplib/Makefile +++ b/iop/system/heaplib/Makefile @@ -8,6 +8,10 @@ IOP_BIN ?= heaplib.irx +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/loadcore/include \ + -I$(PS2SDKSRC)/iop/system/sysmem/include + IOP_OBJS = heaplib.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/intrman/Makefile b/iop/system/intrman/Makefile index 421447323fa..ca03df461a4 100644 --- a/iop/system/intrman/Makefile +++ b/iop/system/intrman/Makefile @@ -6,11 +6,15 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_BIN ?= intrman.irx - # Enable compatibility with PS1 mode? INTRMAN_PS1 ?= 0 +IOP_BIN ?= intrman.irx + +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/excepman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include + IOP_OBJS = intrman.o exports.o imports.o ifneq (x$(INTRMAN_PS1),x0) diff --git a/iop/system/ioman/Makefile b/iop/system/ioman/Makefile index 7bffcb53089..1776a8cc4fd 100644 --- a/iop/system/ioman/Makefile +++ b/iop/system/ioman/Makefile @@ -8,6 +8,13 @@ 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_OBJS = ioman.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/iomanx/Makefile b/iop/system/iomanx/Makefile index 50232801eb4..6b341443e7e 100644 --- a/iop/system/iomanx/Makefile +++ b/iop/system/iomanx/Makefile @@ -10,6 +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 + IOP_OBJS = iomanX.o ioman_sbv.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/iopmgr/Makefile b/iop/system/iopmgr/Makefile index deedf69de2b..fbee5563b1b 100644 --- a/iop/system/iopmgr/Makefile +++ b/iop/system/iopmgr/Makefile @@ -6,6 +6,13 @@ # 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_OBJS = main.o smod.o slib.o devices.o commandline.o imports.o exports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/loadcore/Makefile b/iop/system/loadcore/Makefile index 6fb8f647965..3b3a4bbad18 100644 --- a/iop/system/loadcore/Makefile +++ b/iop/system/loadcore/Makefile @@ -8,6 +8,9 @@ IOP_BIN ?= loadcore.irx +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/sysmem/include + IOP_OBJS = loadcore.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/loadfile/Makefile b/iop/system/loadfile/Makefile index 33713623a34..68a00dad27b 100644 --- a/iop/system/loadfile/Makefile +++ b/iop/system/loadfile/Makefile @@ -8,6 +8,18 @@ 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_OBJS = loadfile.o eeelfloader.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/modload/Makefile b/iop/system/modload/Makefile index 1f33ab4b762..cbb9437b677 100644 --- a/iop/system/modload/Makefile +++ b/iop/system/modload/Makefile @@ -8,6 +8,15 @@ 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_OBJS = modload.o imports.o exports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/mtapman/Makefile b/iop/system/mtapman/Makefile index 38539796c1e..049d5711f6d 100644 --- a/iop/system/mtapman/Makefile +++ b/iop/system/mtapman/Makefile @@ -8,7 +8,13 @@ IOP_BIN_ALTNAMES ?= freemtap.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/system/sio2man/include +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_OBJS = freemtap.o rpcservers.o exports.o imports.o diff --git a/iop/system/padman/Makefile b/iop/system/padman/Makefile index f0f12d47481..11867a19719 100644 --- a/iop/system/padman/Makefile +++ b/iop/system/padman/Makefile @@ -10,7 +10,17 @@ IOP_BIN_ALTNAMES ?= freepad.irx # IOP_CFLAGS += -DDEBUG -IOP_INCS += -I$(PS2SDKSRC)/iop/system/sio2man/include +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_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 6a744e8da5f..7890b615244 100644 --- a/iop/system/reboot/Makefile +++ b/iop/system/reboot/Makefile @@ -8,6 +8,15 @@ 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_OBJS = reboot.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/rmman/Makefile b/iop/system/rmman/Makefile index 1cf91ed8cd1..842c4326048 100644 --- a/iop/system/rmman/Makefile +++ b/iop/system/rmman/Makefile @@ -6,7 +6,18 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += -I$(PS2SDKSRC)/iop/system/sio2man/include/ -I$(PS2SDKSRC)/iop/system/rsio2man/include/ +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/rsio2man/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_OBJS = rmman.o exports.o imports.o diff --git a/iop/system/rmtapman/Makefile b/iop/system/rmtapman/Makefile index ba276d31840..2e17509f91c 100644 --- a/iop/system/rmtapman/Makefile +++ b/iop/system/rmtapman/Makefile @@ -12,6 +12,7 @@ IOP_SRC_DIR = $(PS2SDKSRC)/iop/system/mtapman/src/ IOP_CFLAGS += -DSIO2MAN_V2 -IOP_INCS += -I$(PS2SDKSRC)/iop/system/rsio2man/include/ +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/rsio2man/include/ include $(PS2SDKSRC)/iop/system/mtapman/Makefile diff --git a/iop/system/sbusintr/Makefile b/iop/system/sbusintr/Makefile index 3368d16b5c0..e8b821ef5c4 100644 --- a/iop/system/sbusintr/Makefile +++ b/iop/system/sbusintr/Makefile @@ -6,6 +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/sifman/include + IOP_OBJS = sbusintr.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/sifcmd/Makefile b/iop/system/sifcmd/Makefile index 4d3ac992241..e6621f447a8 100644 --- a/iop/system/sifcmd/Makefile +++ b/iop/system/sifcmd/Makefile @@ -8,6 +8,13 @@ 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_OBJS = sifcmd.o sifrpc.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/sifinit/Makefile b/iop/system/sifinit/Makefile index 1969619e372..75fce1fca77 100644 --- a/iop/system/sifinit/Makefile +++ b/iop/system/sifinit/Makefile @@ -8,6 +8,11 @@ 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_OBJS = sifinit.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/sifman/Makefile b/iop/system/sifman/Makefile index edf97b28174..9e9533a3c60 100644 --- a/iop/system/sifman/Makefile +++ b/iop/system/sifman/Makefile @@ -8,6 +8,10 @@ IOP_BIN ?= sifman.irx +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include + IOP_OBJS = sifman.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/siftoo/Makefile b/iop/system/siftoo/Makefile index 2272565cb7e..6e16e95bdf4 100644 --- a/iop/system/siftoo/Makefile +++ b/iop/system/siftoo/Makefile @@ -6,7 +6,12 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_INCS += -I$(PS2SDKSRC)/iop/system/sbusintr/include +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_OBJS = siftoo.o pipe.o exports.o imports.o diff --git a/iop/system/sio2man/Makefile b/iop/system/sio2man/Makefile index 4ba8e66668c..3f67d08ef07 100644 --- a/iop/system/sio2man/Makefile +++ b/iop/system/sio2man/Makefile @@ -6,10 +6,6 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_BIN_ALTNAMES ?= freesio2.irx - -IOP_OBJS = sio2man.o log.o imports.o exports.o - # Build the newer version of the SIO2 module with support for multitap? SIO2MAN_BUILDING_XSIO2MAN ?= 1 @@ -19,6 +15,19 @@ SIO2MAN_BUILDING_XSIO2MAN_V2 ?= 0 # Enable logging? SIO2MAN_ENABLE_LOGGING ?= 0 +IOP_BIN_ALTNAMES ?= freesio2.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_OBJS = sio2man.o log.o imports.o exports.o + ifneq (x$(SIO2MAN_BUILDING_XSIO2MAN),x0) IOP_CFLAGS += -DBUILDING_XSIO2MAN endif diff --git a/iop/system/ssbusc/Makefile b/iop/system/ssbusc/Makefile index a32a7137528..e2b3731260e 100644 --- a/iop/system/ssbusc/Makefile +++ b/iop/system/ssbusc/Makefile @@ -8,6 +8,10 @@ IOP_BIN ?= ssbusc.irx +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include + IOP_OBJS = ssbusc.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/stdio/Makefile b/iop/system/stdio/Makefile index dc434d730f6..1ec7b1bc6f6 100644 --- a/iop/system/stdio/Makefile +++ b/iop/system/stdio/Makefile @@ -8,6 +8,11 @@ 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_OBJS = stdio.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/sysclib/Makefile b/iop/system/sysclib/Makefile index aa6c5e8a7b1..bccad32685f 100644 --- a/iop/system/sysclib/Makefile +++ b/iop/system/sysclib/Makefile @@ -6,8 +6,6 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_OBJS = _start.o imports.o exports.o - # Use MIPS or C version? USE_MIPS_ASM ?= 1 @@ -17,6 +15,13 @@ USE_SIZE_OPTIMIZED ?= 0 # Use full version of printf? This will massively increase the file size USE_FULL_PRINTF ?= 0 +IOP_CFLAGS += -D_COMPILING_NEWLIB -DPRINTF_ALIAS_STANDARD_FUNCTION_NAMES=1 + +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/loadcore/include + +IOP_OBJS = _start.o imports.o exports.o + IOP_OBJS += nonstd/atob.o IOP_OBJS += nonstd/ctype.o IOP_OBJS += nonstd/_wmemcopy.o @@ -101,8 +106,6 @@ else IOP_CFLAGS += -DPRINTF_SUPPORT_DECIMAL_SPECIFIERS=0 -DPRINTF_SUPPORT_EXPONENTIAL_SPECIFIERS=0 -DPRINTF_SUPPORT_LONG_LONG=0 endif -IOP_CFLAGS += -D_COMPILING_NEWLIB -DPRINTF_ALIAS_STANDARD_FUNCTION_NAMES=1 - include $(PS2SDKSRC)/Defs.make include $(PS2SDKSRC)/iop/Rules.bin.make include $(PS2SDKSRC)/iop/Rules.make diff --git a/iop/system/threadman/Makefile b/iop/system/threadman/Makefile index 433c08dda36..720adead9d3 100644 --- a/iop/system/threadman/Makefile +++ b/iop/system/threadman/Makefile @@ -8,6 +8,15 @@ 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_OBJS = thcommon.o thbase.o thsemap.o thmsgbx.o thevent.o thfpool.o thvpool.o imports.o exports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/timrman/Makefile b/iop/system/timrman/Makefile index 2dd7890f0c4..5df5d2505c8 100644 --- a/iop/system/timrman/Makefile +++ b/iop/system/timrman/Makefile @@ -6,11 +6,15 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_BIN_ALTNAMES ?= timemani.irx - # Enable compatibility with PS1 mode? TIMRMAN_PS1 ?= 0 +IOP_BIN_ALTNAMES ?= timemani.irx + +IOP_INCS += \ + -I$(PS2SDKSRC)/iop/system/intrman/include \ + -I$(PS2SDKSRC)/iop/system/loadcore/include + IOP_OBJS = timrman.o imports.o exports.o ifneq (x$(TIMRMAN_PS1),x0) diff --git a/iop/system/udnl/Makefile b/iop/system/udnl/Makefile index 902f4ff04a9..0a7ef98d8a5 100644 --- a/iop/system/udnl/Makefile +++ b/iop/system/udnl/Makefile @@ -6,6 +6,16 @@ # 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_OBJS = udnl.o udnl_asm.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/system/vblank/Makefile b/iop/system/vblank/Makefile index 8ede1e4b966..fca75879e6e 100644 --- a/iop/system/vblank/Makefile +++ b/iop/system/vblank/Makefile @@ -8,6 +8,12 @@ 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_OBJS = vblank.o exports.o imports.o include $(PS2SDKSRC)/Defs.make diff --git a/iop/tcpip/tcpip/Makefile b/iop/tcpip/tcpip/Makefile index 34e53f7d024..837899746da 100644 --- a/iop/tcpip/tcpip/Makefile +++ b/iop/tcpip/tcpip/Makefile @@ -32,7 +32,16 @@ ifdef PS2IP_DNS IOP_CFLAGS += -DPS2IP_DNS endif -IOP_INCS += -I$(LWIP)/src/include -I$(LWIP)/src/include/ipv4 -I$(PS2IP_BASE)/include +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 ps2api_OBJECTS = api_lib.o api_msg.o api_netbuf.o err.o sockets.o tcpip.o ps2api_IPV4 = icmp.o ip.o ip4.o ip4_addr.o ip4_frag.o inet_chksum.o diff --git a/iop/tcpip/tcpips/Makefile b/iop/tcpip/tcpips/Makefile index cb03828db49..3db4e8c52ea 100644 --- a/iop/tcpip/tcpips/Makefile +++ b/iop/tcpip/tcpips/Makefile @@ -19,7 +19,15 @@ ifeq ($(PS2IP_DNS),1) IOP_CFLAGS += -DPS2IP_DNS endif -IOP_INCS += -I$(PS2SDKSRC)/iop/tcpip/tcpip/include +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_OBJS = ps2ips.o imports.o diff --git a/iop/usb/camera/Makefile b/iop/usb/camera/Makefile index 4d514cd3195..c2ca480e553 100644 --- a/iop/usb/camera/Makefile +++ b/iop/usb/camera/Makefile @@ -8,7 +8,19 @@ IOP_BIN ?= ps2cam.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/usb/usbd/include +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_OBJS = ps2cam.o imports.o diff --git a/iop/usb/keyboard/Makefile b/iop/usb/keyboard/Makefile index 24242528109..837386bc21b 100644 --- a/iop/usb/keyboard/Makefile +++ b/iop/usb/keyboard/Makefile @@ -8,7 +8,17 @@ IOP_BIN ?= ps2kbd.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/usb/usbd/include +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_OBJS = ps2kbd.o imports.o diff --git a/iop/usb/mouse/Makefile b/iop/usb/mouse/Makefile index 85a57cfef1d..66706cf5667 100644 --- a/iop/usb/mouse/Makefile +++ b/iop/usb/mouse/Makefile @@ -8,7 +8,16 @@ IOP_BIN ?= ps2mouse.irx -IOP_INCS += -I$(PS2SDKSRC)/iop/usb/usbd/include +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_OBJS = ps2mouse.o imports.o diff --git a/iop/usb/usbd/Makefile b/iop/usb/usbd/Makefile index f318316efbd..d4ac11f96bb 100644 --- a/iop/usb/usbd/Makefile +++ b/iop/usb/usbd/Makefile @@ -6,6 +6,16 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. +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_OBJS = \ hub.o \ mem.o \ @@ -23,7 +33,6 @@ IOP_OBJS = \ device.o \ imports.o \ exports.o -IOP_PREFER_GPOPT = 16384 include $(PS2SDKSRC)/Defs.make include $(PS2SDKSRC)/iop/Rules.bin.make diff --git a/iop/usb/usbhdfsd/Makefile b/iop/usb/usbhdfsd/Makefile index 68a20beafcc..fdc691be5f3 100644 --- a/iop/usb/usbhdfsd/Makefile +++ b/iop/usb/usbhdfsd/Makefile @@ -13,7 +13,18 @@ VFAT_SRC_DIR = $(VFAT_PATH)/src/ # IOP_CFLAGS += -DDEBUG IOP_CFLAGS += -DBUILDING_USBHDFSD -IOP_INCS += -I$(PS2SDKSRC)/iop/usb/usbd/include -I$(VFAT_SRC_DIR)/include +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_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 ec8aff537f4..0bb62baceee 100644 --- a/iop/usb/usbmass_bd/Makefile +++ b/iop/usb/usbmass_bd/Makefile @@ -8,10 +8,15 @@ # IOP_CFLAGS += -DDEBUG -IOP_INCS += -I$(PS2SDKSRC)/iop/usb/usbd/include -IOP_INCS += -I$(PS2SDKSRC)/iop/fs/bdm/include +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_LDFLAGS = -lgcc +IOP_LIBS += -lgcc IOP_OBJS = main.o usb_mass.o scsi.o imports.o