Update soundtool to generate new NSS dependency rules

Author: dciabrin

tools/soundtool.py

@@ -301,42 +301,43 @@ def print_asset(name, module, bank):
 
     print("# dependencies for generated sound assets", file=f)
     print("# generated by soundtool.py (ngdevkit)", file=f)
-    print('', file=f)
-
-    print('GENERATED_MUSIC?=.', file=f)
-    print('', file=f)
 
     grouped_musics, _ = group_assets(desc)
 
     # Jump table macros
-    for group in sorted(iter(grouped_musics)):
+    groups = sorted(iter(grouped_musics))
+    use_bank = any([g>=0 for g in groups])
+
+    for group in groups:
         atype="Z80 bank %d"%group if group >= 0 else "fixed Z80 ROM"
-        print("#\n# assets for %s\n#\n"%atype, file=f)
+        print("\n#\n# assets for %s\n#\n"%atype, file=f)
+
+        drv="SOUND_DRIVER"
+        bank="SOUND_DRIVER_BANK%d"%group
 
         # fixed ROM: group == -1
         if group >= 0:
-            print("Z80_LDFLAGS+=-b BANK%d=0x8000\n"%group, file=f)
+            print("Z80_BANK_LDFLAGS+=-b BANK%d=0x8000\n"%group, file=f)
+            print("%s?=$(SOUND_DRIVER:%%.ihx=%%_%d.bank.bin)"%(bank, group), file=f)
+            print("$(%s): Z80_BANK_LDFLAGS=-b BANK%d=0x8000"%(bank, group), file=f)
+            print("$(MROM1): $(SOUND_DRIVER_BANK%d)"%(group), file=f)
+        elif use_bank:
+            print("$(MROM1): MROMPADSIZE=32768", file=f)
 
         for mod in grouped_musics[group]:
             mtype="BANK%d"%group if group >= 0 else "FIXED"
             gtype="BANK%d_MUSIC"%group if group >= 0 else "MUSIC"
             uri=mod['furnace']['uri']
             path=uri.split("://")[1]
             filename=os.path.splitext(os.path.basename(path))[0]
-            print("$(GENERATED_MUSIC)/instruments-%s.s: %s"%(filename, path), file=f)
-            print("$(GENERATED_MUSIC)/nss-%s.s: %s"%(filename, path), file=f)
-            print("Z80_%s_MUSIC+=$(GENERATED_MUSIC)/instruments-%s.s"%(mtype, filename), file=f)
-            print("Z80_%s_MUSIC+=$(GENERATED_MUSIC)/nss-%s.s"%(mtype, filename), file=f)
-            print("Z80_%s_OBJS=$(Z80_%s_MUSIC:%%.s=%%.rel)"%(gtype, mtype), file=f)
-            print("Z80_SOUND_SRCS+=$(Z80_%s_MUSIC)"%mtype, file=f)
-            if group >= 0:
-                print("Z80_MUSIC_OBJS+=$(Z80_BANK_PREFIX)%d.lib"%group, file=f)
-                print("$(Z80_BANK%d_MUSIC): Z80_FLAGS=-b %d"%(group, group), file=f)
-                print("$(Z80_BANK%d_MUSIC_OBJS): $(SAMPLES_INC)"%group, file=f)
-                print("$(Z80_BANK_PREFIX)%d.lib: $(Z80_BANK%d_MUSIC_OBJS)"%(group, group), file=f)
-                print("Z80_MUSIC_BANKS+=$(Z80_BANK_PREFIX)%d.bin"%group, file=f)
-
-            print('', file=f)
+            for ntype in ("instruments", "nss"):
+                print("")
+                if group >= 0:
+                    print("$(BUILDDIR_NSS)/%s-%s.s: NSS_FLAGS=-b %d"%(ntype, filename, group), file=f)
+                print("$(BUILDDIR_NSS)/%s-%s.s: %s"%(ntype, filename, path), file=f)
+                print("$(%s): $(BUILDDIR_NSS)/%s-%s.rel"%(drv, ntype, filename), file=f)
+                if group >= 0:
+                    print("$(%s): $(BUILDDIR_NSS)/%s-%s.rel"%(bank, ntype, filename), file=f)