Fix compile

src/engine/platform/fmshared_OPM.h

@@ -22,21 +22,21 @@
 
 #include "fmsharedbase.h"
 
-#define ADDR_MULT_DT 0x40
-#define ADDR_TL 0x60
-#define ADDR_RS_AR 0x80
-#define ADDR_AM_DR 0xa0
-#define ADDR_DT2_D2R 0xc0
-#define ADDR_SL_RR 0xe0
-#define ADDR_NOTE 0x28
-#define ADDR_KF 0x30
-#define ADDR_FMS_AMS 0x38
-#define ADDR_LR_FB_ALG 0x20
-
 #define NOTE_LINEAR(x) (((x)<<6)+baseFreqOff+log2(parent->song.tuning/440.0)*12.0*64.0)
 
 class DivPlatformOPMBase: public DivPlatformFMBase {
   protected:
+    const unsigned char ADDR_MULT_DT=0x40;
+    const unsigned char ADDR_TL=0x60;
+    const unsigned char ADDR_RS_AR=0x80;
+    const unsigned char ADDR_AM_DR=0xa0;
+    const unsigned char ADDR_DT2_D2R=0xc0;
+    const unsigned char ADDR_SL_RR=0xe0;
+    const unsigned char ADDR_NOTE=0x28;
+    const unsigned char ADDR_KF=0x30;
+    const unsigned char ADDR_FMS_AMS=0x38;
+    const unsigned char ADDR_LR_FB_ALG=0x20;
+
     const unsigned short opOffs[4]={
       0x00, 0x08, 0x10, 0x18
     };

src/engine/platform/fmshared_OPN.h

@@ -22,18 +22,6 @@
 
 #include "fmsharedbase.h"
 
-#define ADDR_MULT_DT 0x30
-#define ADDR_TL 0x40
-#define ADDR_RS_AR 0x50
-#define ADDR_AM_DR 0x60
-#define ADDR_DT2_D2R 0x70
-#define ADDR_SL_RR 0x80
-#define ADDR_SSG 0x90
-#define ADDR_FREQ 0xa0
-#define ADDR_FREQH 0xa4
-#define ADDR_FB_ALG 0xb0
-#define ADDR_LRAF 0xb4
-
 #define CHIP_FREQBASE fmFreqBase
 #define CHIP_DIVIDER fmDivBase
 
@@ -100,6 +88,18 @@
 
 class DivPlatformOPNBase: public DivPlatformFMBase {
   protected:
+    const unsigned char ADDR_MULT_DT=0x30;
+    const unsigned char ADDR_TL=0x40;
+    const unsigned char ADDR_RS_AR=0x50;
+    const unsigned char ADDR_AM_DR=0x60;
+    const unsigned char ADDR_DT2_D2R=0x70;
+    const unsigned char ADDR_SL_RR=0x80;
+    const unsigned char ADDR_SSG=0x90;
+    const unsigned char ADDR_FREQ=0xa0;
+    const unsigned char ADDR_FREQH=0xa4;
+    const unsigned char ADDR_FB_ALG=0xb0;
+    const unsigned char ADDR_LRAF=0xb4;
+
     const unsigned short opOffs[4]={
       0x00, 0x04, 0x08, 0x0c
     };

src/engine/platform/genesis.cpp

@@ -22,10 +22,6 @@
 #include <string.h>
 #include <math.h>
 
-static unsigned char konOffs[6]={
-  0, 1, 2, 4, 5, 6
-};
-
 #define IS_REALLY_MUTED(x) (isMuted[x] && (x<5 || !softPCM || (isMuted[5] && isMuted[6])))
 
 const char* DivPlatformGenesis::getEffectName(unsigned char effect) {

src/engine/platform/genesis.h

@@ -36,6 +36,10 @@ class DivPlatformGenesis: public DivDispatch, public DivPlatformOPNBase {
       0x00, 0x01, 0x02, 0x100, 0x101, 0x102
     };
 
+    const unsigned char konOffs[6]={
+      0, 1, 2, 4, 5, 6
+    };
+
     struct Channel {
       DivInstrumentFM state;
       DivMacroInt std;