[Scummvm-git-logs] scummvm master -> 4ec462f2d3a174776f8cd552beb4906662c860bc

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4ec462f2d3 ULTIMA: NUVIE: Fix Remaining Undefined Macro Definition Warnings


Commit: 4ec462f2d3a174776f8cd552beb4906662c860bc
    https://github.com/scummvm/scummvm/commit/4ec462f2d3a174776f8cd552beb4906662c860bc
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-21T22:20:52Z

Commit Message:
ULTIMA: NUVIE: Fix Remaining Undefined Macro Definition Warnings

These are emitted by GCC when -Wundef is passed.

Changed paths:
    engines/ultima/nuvie/sound/adplug/fm_opl.h
    engines/ultima/nuvie/sound/adplug/opl_class.h


diff --git a/engines/ultima/nuvie/sound/adplug/fm_opl.h b/engines/ultima/nuvie/sound/adplug/fm_opl.h
index 14f0dc96019..583f08560cd 100644
--- a/engines/ultima/nuvie/sound/adplug/fm_opl.h
+++ b/engines/ultima/nuvie/sound/adplug/fm_opl.h
@@ -28,6 +28,8 @@ namespace Ultima {
 namespace Nuvie {
 
 #define HAS_YM3812  1
+#define HAS_YM3526  0
+#define HAS_Y8950   0
 
 /* --- select emulation chips --- */
 #define BUILD_YM3812 (HAS_YM3812)
diff --git a/engines/ultima/nuvie/sound/adplug/opl_class.h b/engines/ultima/nuvie/sound/adplug/opl_class.h
index 00a529b8626..72f69257c9e 100644
--- a/engines/ultima/nuvie/sound/adplug/opl_class.h
+++ b/engines/ultima/nuvie/sound/adplug/opl_class.h
@@ -28,6 +28,8 @@ namespace Ultima {
 namespace Nuvie {
 
 #define HAS_YM3812  1
+#define HAS_YM3526  0
+#define HAS_Y8950   0
 
 /* --- select emulation chips --- */
 #define BUILD_YM3812 (HAS_YM3812)