- added 'inline_n.h' for Nugget PsyQ, reorganize build environment

.gitignore

@@ -27,11 +27,12 @@
 .vs/*
 PSXToolchain/GameSRC*
 PSXToolchain/Overlay*
-PSXToolchain/0_CD_DATA/*
 PSXToolchain/PsyQ/*
 PSXToolchain/mipsel-unknown-elf/*
-PSXToolchain/REDRIVER2.bin
-PSXToolchain/REDRIVER2.cue
+PSXToolchain/CDSrc/0_CD_DATA/*
+PSXToolchain/CDSrc/REDRIVER2.bin
+PSXToolchain/CDSrc/REDRIVER2.cue
+PSXToolchain/CDSrc/*.txt
 src_rebuild/dependencies/*
 src_rebuild/.vs/*
 src_rebuild/bin/*

PSXToolchain/CDSrc/redriver2_cd.xml

@@ -114,7 +114,11 @@
 					<file name = "VOICES2.BLK"	type = "data"	source="0_CD_DATA\SOUND\VOICES2.BLK"/>
 				</dir>
 
+				<dir name = "REPLAYS">
+					<file name = "ATTRACT.400"	type = "data"	source="0_CD_DATA\REPLAYS\ATTRACT.400"/>
 				</dir>
+			</dir>
+
 
 		
 		</directory_tree>

PSXToolchain/Makefile

@@ -1,7 +1,8 @@
 PSYQ_DIR 	?= X:/PsyQ
+NPSYQ_DIR 	?= X:/NPsyQ
 
 OBJDIR		= obj
-BINDIR 		?= 0_CD_DATA/
+BINDIR 		?= CDSrc/0_CD_DATA/
 TARGET      = DRIVER2
 TYPE        = ps-exe
 BUILD       = Release
@@ -90,7 +91,7 @@ SRCS += \
   $(SOURCES)/C/leadai.c
   
 SRCS += $(PSYQ_DIR)/common/crt0/crt0.s 
-INCL = $(SOURCES) $(PSYQ_DIR)/include
+INCL = $(SOURCES) $(PSYQ_DIR)/include $(NPSYQ_DIR)/include
 
 DEFS = PSX NTSC_VERSION RELOC DEBUG_OPTIONS
 
@@ -106,4 +107,4 @@ LDFLAGS += -Wl,--start-group
 LDFLAGS += $(addprefix -l,$(LIBS))
 LDFLAGS += -Wl,--end-group
 
-include common.mk
+include NPsyQ/common.mk

PSXToolchain/README.md

@@ -3,5 +3,8 @@
 In order to start building a Playstation version of **REDRIVER2** you'll need to perform following steps:
 
  - Put **mipsel-unknown-elf** toolchain to this folder (https://github.com/majenkotech/mipsel-unknown-elf/releases)
- - Obtain Psy-Q libraries converted for latest GCC
+ - Install **make**
+ - Obtain **Psy-Q SDK** converted for *latest GCC*
  - Execute **psx_build.bat**
+ - Execute **psx_makecd.bat**
+ - Locate and use **CDSrc/REDRIVER2.bin** and **cue** files

PSXToolchain/psx_build.bat

@@ -3,9 +3,6 @@ set REDRIVER_FOLDER=%cd%/..
 rem Make a symlink
 mklink /J %REDRIVER_FOLDER%\PSXToolchain\GameSRC %REDRIVER_FOLDER%\src_rebuild
 
-rem Create output folder
-mkdir 0_CD_DATA
-
 rem Create a virtual drive
 SUBST X: %REDRIVER_FOLDER%\PSXToolchain
 

PSXToolchain/psx_makecd.bat

@@ -1,3 +1,4 @@
+cd CDSrc
 mkpsxiso.exe -lba2 redriver2.txt -lba redriver2_.txt redriver2_cd.xml
 
 pause

src_rebuild/Game/driver2.h

@@ -11,7 +11,12 @@
 #include <libetc.h>
 #include <libapi.h>
 
+#ifdef PSX
+#include <inline_n.h>		// for Nugget PsyQ which doesn't use DMPSX
+#else
 #include <inline_c.h>
+#endif
+
 #include <gtemac.h>
 
 #include <strings.h>