version 1.28

Shaw02 · Dec 12, 2018 · f90518f · f90518f
1 parent c8d12fb
commit f90518f
Show file tree

Hide file tree

Showing 79 changed files with 1,328 additions and 5,018 deletions.
diff --git a/bin/nsc.exe b/bin/nsc.exe
diff --git a/bin/nsd.bin b/bin/nsd.bin
diff --git a/bin/nsd_all.bin b/bin/nsd_all.bin
diff --git a/bin/nsd_all2.bin b/bin/nsd_all2.bin
diff --git a/bin/nsd_fds.bin b/bin/nsd_fds.bin
diff --git a/bin/nsd_hfe4.bin b/bin/nsd_hfe4.bin
diff --git a/bin/nsd_hfx4.bin b/bin/nsd_hfx4.bin
diff --git a/bin/nsd_mmc5.bin b/bin/nsd_mmc5.bin
diff --git a/bin/nsd_n163.bin b/bin/nsd_n163.bin
diff --git a/bin/nsd_oall.bin b/bin/nsd_oall.bin
diff --git a/bin/nsd_opll.bin b/bin/nsd_opll.bin
diff --git a/bin/nsd_s5b.bin b/bin/nsd_s5b.bin
diff --git a/bin/nsd_se.bin b/bin/nsd_se.bin
diff --git a/bin/nsd_vrc6.bin b/bin/nsd_vrc6.bin
diff --git a/bin/nsd_vrc7.bin b/bin/nsd_vrc7.bin
diff --git a/doc/nsdl.chm b/doc/nsdl.chm
diff --git a/doc/readme.txt b/doc/readme.txt
@@ -1,6 +1,6 @@
 +-----------------------------------------------------------------------------
 | �^�C�g�� | NES Sound Driver Library
-|�t�@�C����| NSDL127.ZIP
+|�t�@�C����| NSDL128.ZIP
 | �J�e�S�� | Sound Driver for NES
 | ����@�� | NES (Nintendo Entertainment System)
 |�O��\�t�g| cc65 (Complete cross development package for 65(C)02 systems.)
@@ -28,4 +28,4 @@ This is developed as object library, and user application can control it.
 �Etwitter	https://twitter.com/sha_w_
 ========================================================================
 
-����̃t�@�C���́yNSDL127.ZIP�z�ł��B
+����̃t�@�C���́yNSDL128.ZIP�z�ł��B
diff --git a/include/makefile.BAK b/include/makefile.BAK
@@ -0,0 +1,82 @@
+#==============================================================================
+#	NES Sound Driver & library (NSD.lib)
+#		Make file
+#------------------------------------------------------------------------------
+#
+#	Copyright (c) 2012 A.Watanabe (S.W.), All rights reserved.
+#	For conditions of distribution and use, see copyright notice
+#	  in "nsd.h" or "nsd.inc".
+#
+#==============================================================================
+
+########################################
+#;	LOG files
+########################################
+
+LOG_FILE    =	comlog.txt		#�e�R�}���h�̕W���o�͐�ł��B
+ERRLOG_FILE =	errlog.txt		#�e�R�}���h�̃G���[�o�͐�ł��B
+BLDLOG_FILE =	buildlog.txt		#make.exe�̏o�͐�ł��B
+
+
+
+########################################
+#;	Define of build tools & option
+########################################
+
+#---------------
+#;  MML Compiler (for Music & SE data)
+MC      = $(TOOL_PASS)nsc
+MCFLAGS = -a -e
+
+#---------------
+#;  C Compiler
+CC      = $(TOOL_PASS)cl65
+CFLAGS  = -t none -I$(INC_PASS) --listing $*.lst --list-bytes 255 -c -o
+
+#---------------
+#;  Assembler
+AS      = $(TOOL_PASS)ca65
+ASFLAGS = -t none -I$(INC_PASS) --listing $*.lst --list-bytes 255
+
+#---------------
+#;  Archiver
+AR      = $(TOOL_PASS)ar65
+ARFLAGS = a
+
+#---------------
+#;  Linker
+LINKER  = $(TOOL_PASS)ld65
+LDFLAGS = -C $(CFG_FILE) -L$(LIB_PASS) -v -m $(MAP_FILE) -vm -o
+
+#---------------
+#;  File delete
+RM      = del
+
+#---------------
+#;  File copy
+CP      = copy
+
+
+
+#===============================
+#; �ˑ��֌W�i�w�b�_�[�t�@�C�������A�ˑ��֌W�ɒǉ����邽�߂ɁA��`�j
+
+%.o : %.s $(INC_FILES)			#;".inc"�t�@�C�����X�V���ꂽ�ꍇ�́A.s�́A�S���A�Z���u������B
+	@echo [Assemble] : $< >>$(ERRLOG_FILE)
+	$(AS) $(ASFLAGS) $< 1>>$(LOG_FILE) 2>>$(ERRLOG_FILE)
+
+
+%.o : %.c $(H_FILES)			#;".h"�t�@�C�����X�V���ꂽ�ꍇ�́A.c�́A�S���R���p�C������B
+	@echo [Compile] : $< >>$(ERRLOG_FILE)
+	$(CC)  $(CFLAGS) $*.o $< 1>>$(LOG_FILE) 2>>$(ERRLOG_FILE)
+
+
+%.s : %.mml $(DMC_FILES)		#;".dmc"�t�@�C�����X�V���ꂽ�ꍇ�́A.mml�́A�S���R���p�C������B
+	@echo ======================================================== >>$(LOG_FILE)
+	@echo [Compile] : $< >>$(LOG_FILE)
+	@echo ======================================================== >>$(LOG_FILE)
+	@echo [Compile] : $< >>$(ERRLOG_FILE)
+	$(MC) $(MCFLAGS) $< 1>>$(LOG_FILE) 2>>$(ERRLOG_FILE)
+
+%.s : %.bmp
+
diff --git a/include/makefile.mk b/include/makefile.mk
@@ -31,7 +31,7 @@ MCFLAGS = -a -e
 #---------------
 #;  C Compiler
 CC      = $(TOOL_PASS)cl65
-CFLAGS  = -t none -I$(INC_PASS) -c -o
+CFLAGS  = -t none -I$(INC_PASS) --listing $*.lst --list-bytes 255 -c -o
 
 #---------------
 #;  Assembler
@@ -71,11 +71,12 @@ CP      = copy
 	$(CC)  $(CFLAGS) $*.o $< 1>>$(LOG_FILE) 2>>$(ERRLOG_FILE)
 
 
-%.o : %.mml $(DMC_FILES)		#;".dmc"ファイルが更新された場合は、.mmlは、全部コンパイルする。
+%.s : %.mml $(DMC_FILES)		#;".dmc"ファイルが更新された場合は、.mmlは、全部コンパイルする。
+	@echo ======================================================== >>$(LOG_FILE)
+	@echo [Compile] : $< >>$(LOG_FILE)
+	@echo ======================================================== >>$(LOG_FILE)
 	@echo [Compile] : $< >>$(ERRLOG_FILE)
 	$(MC) $(MCFLAGS) $< 1>>$(LOG_FILE) 2>>$(ERRLOG_FILE)
-	$(AS) $(ASFLAGS) $*.s 1>>$(LOG_FILE) 2>>$(ERRLOG_FILE)
-	$(RM) $*.s 1>>$(LOG_FILE) 2>>$(ERRLOG_FILE)
 
-%.o : %.bmp
+%.s : %.bmp
 
diff --git a/lib/NSD.lib b/lib/NSD.lib
diff --git a/lib/NSD_ALL.lib b/lib/NSD_ALL.lib
diff --git a/lib/NSD_ALL2.lib b/lib/NSD_ALL2.lib
diff --git a/lib/NSD_FDS.lib b/lib/NSD_FDS.lib
diff --git a/lib/NSD_HFE4.lib b/lib/NSD_HFE4.lib
diff --git a/lib/NSD_HFX4.lib b/lib/NSD_HFX4.lib
diff --git a/lib/NSD_MMC5.lib b/lib/NSD_MMC5.lib
diff --git a/lib/NSD_N163.lib b/lib/NSD_N163.lib
diff --git a/lib/NSD_OALL.lib b/lib/NSD_OALL.lib
diff --git a/lib/NSD_OPLL.lib b/lib/NSD_OPLL.lib
diff --git a/lib/NSD_SE.lib b/lib/NSD_SE.lib
diff --git a/lib/NSD_VRC6.lib b/lib/NSD_VRC6.lib
diff --git a/lib/NSD_VRC7.lib b/lib/NSD_VRC7.lib
diff --git a/lib/NSD_s5b.lib b/lib/NSD_s5b.lib
diff --git a/sample/ca65/MAKEFILE b/sample/ca65/MAKEFILE
@@ -29,8 +29,12 @@ MAP_FILE   =	test.map
 
 #---------------
 #; �\�[�X�t�@�C��
-MAIN_FILES =	crt0.o			\
-		main.o			\
+MAIN_FILES =	ines.o			\
+		crt0.o			\
+		work.o			\
+		nmi_main.o		\
+		irq_main.o		\
+		main.o
 
 CHR_FILRS  =	neschar.o
 
@@ -47,7 +51,11 @@ MML_FILES  =	testmus.o
 
 #---------------
 #; �A�Z���u������p�w�b�_�[
-INC_FILES =	nsd.inc
+INC_FILES =	sample.inc		\
+		nsd.inc			\
+		macro.inc		\
+		struct.inc		\
+		work.inc
 
 #---------------
 #; �b����p�w�b�_�[

diff --git a/sample/ca65/buildlog.txt b/sample/ca65/buildlog.txt
diff --git a/sample/ca65/comlog.txt b/sample/ca65/comlog.txt