Merge pull request #105 from OpenDriver2/develop-SoapyMan

Beta - bug fixes

.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/redriver2_cd.xml → PSXToolchain/CDSrc/redriver2_cd.xml

@@ -114,8 +114,12 @@
 					<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