Merge branch 'master' of https://github.com/86Box/86Box

2022-02-14 19:48:02 +01:00
parent 4f1b49f9ad 8fa75131fa
commit d827e154e7
19 changed files with 162 additions and 94 deletions
--- a/src/include/86box/sound.h
+++ b/src/include/86box/sound.h
@@ -103,9 +103,11 @@ extern const device_t pas16_device;
 extern const device_t ps1snd_device;

 /* Tandy PSSJ */
-extern const device_t tndy_device;
 extern const device_t pssj_device;
+#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
 extern const device_t pssj_isa_device;
+extern const device_t tndy_device;
+#endif

 /* Creative Labs Sound Blaster */
 extern const device_t sb_1_device;