Skip to content

Commit 73926a6

Browse files
authored
Merge pull request #105 from OpenDriver2/develop-SoapyMan
Beta - bug fixes
2 parents 656590a + 8953ae0 commit 73926a6

Some content is hidden

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

53 files changed

+1703
-265
lines changed

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@
2727
.vs/*
2828
PSXToolchain/GameSRC*
2929
PSXToolchain/Overlay*
30-
PSXToolchain/0_CD_DATA/*
3130
PSXToolchain/PsyQ/*
3231
PSXToolchain/mipsel-unknown-elf/*
33-
PSXToolchain/REDRIVER2.bin
34-
PSXToolchain/REDRIVER2.cue
32+
PSXToolchain/CDSrc/0_CD_DATA/*
33+
PSXToolchain/CDSrc/REDRIVER2.bin
34+
PSXToolchain/CDSrc/REDRIVER2.cue
35+
PSXToolchain/CDSrc/*.txt
3536
src_rebuild/dependencies/*
3637
src_rebuild/.vs/*
3738
src_rebuild/bin/*
File renamed without changes.
File renamed without changes.

PSXToolchain/redriver2_cd.xml renamed to PSXToolchain/CDSrc/redriver2_cd.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,12 @@
114114
<file name = "VOICES2.BLK" type = "data" source="0_CD_DATA\SOUND\VOICES2.BLK"/>
115115
</dir>
116116

117+
<dir name = "REPLAYS">
118+
<file name = "ATTRACT.400" type = "data" source="0_CD_DATA\REPLAYS\ATTRACT.400"/>
119+
</dir>
117120
</dir>
118121

122+
119123

120124
</directory_tree>
121125

PSXToolchain/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
PSYQ_DIR ?= X:/PsyQ
2+
NPSYQ_DIR ?= X:/NPsyQ
23

34
OBJDIR = obj
4-
BINDIR ?= 0_CD_DATA/
5+
BINDIR ?= CDSrc/0_CD_DATA/
56
TARGET = DRIVER2
67
TYPE = ps-exe
78
BUILD = Release
@@ -90,7 +91,7 @@ SRCS += \
9091
$(SOURCES)/C/leadai.c
9192

9293
SRCS += $(PSYQ_DIR)/common/crt0/crt0.s
93-
INCL = $(SOURCES) $(PSYQ_DIR)/include
94+
INCL = $(SOURCES) $(PSYQ_DIR)/include $(NPSYQ_DIR)/include
9495

9596
DEFS = PSX NTSC_VERSION RELOC DEBUG_OPTIONS
9697

@@ -106,4 +107,4 @@ LDFLAGS += -Wl,--start-group
106107
LDFLAGS += $(addprefix -l,$(LIBS))
107108
LDFLAGS += -Wl,--end-group
108109

109-
include common.mk
110+
include NPsyQ/common.mk
File renamed without changes.

0 commit comments

Comments
 (0)