From fa6a859646d83736bccb647ae0aefda28d1c73d7 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sun, 21 Jun 2015 08:16:36 +0200
Subject: [PATCH] Made FM cores compile only in group, that way it always work
 (nw)

---
 scripts/src/sound.lua | 98 +++++++++++--------------------------------
 src/emu/sound/fm.h    | 12 +++---
 src/emu/sound/fmopl.h |  6 +--
 3 files changed, 34 insertions(+), 82 deletions(-)

diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
index 1bd78f8ed35..1c94d013c21 100644
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@@ -1142,24 +1142,6 @@ if (SOUNDS["YM2151"]~=null) then
 	}
 end
 
-if (SOUNDS["YM2203"]~=null) then
-	defines {
-		"BUILD_YM2203=1",
-	}
-	files {
-		MAME_DIR .. "src/emu/sound/2203intf.c",
-		MAME_DIR .. "src/emu/sound/2203intf.h",
-		MAME_DIR .. "src/emu/sound/ay8910.c",
-		MAME_DIR .. "src/emu/sound/ay8910.h",
-		MAME_DIR .. "src/emu/sound/fm.c",
-		MAME_DIR .. "src/emu/sound/fm.h",
-	}
-else
-	defines {
-		"BUILD_YM2203=0",
-	}
-end
-
 if (SOUNDS["YM2413"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/2413intf.c",
@@ -1169,10 +1151,20 @@ if (SOUNDS["YM2413"]~=null) then
 	}
 end
 
-if (SOUNDS["YM2608"]~=null) then
-	defines {
-		"BUILD_YM2608=1",
+if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then	
+--if (SOUNDS["YM2203"]~=null) then	
+	files {
+		MAME_DIR .. "src/emu/sound/2203intf.c",
+		MAME_DIR .. "src/emu/sound/2203intf.h",
+		MAME_DIR .. "src/emu/sound/ay8910.c",
+		MAME_DIR .. "src/emu/sound/ay8910.h",
+		MAME_DIR .. "src/emu/sound/fm.c",
+		MAME_DIR .. "src/emu/sound/fm.h",
 	}
+--end
+
+
+--if (SOUNDS["YM2608"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/2608intf.c", 
 		MAME_DIR .. "src/emu/sound/2608intf.h", 
@@ -1183,17 +1175,9 @@ if (SOUNDS["YM2608"]~=null) then
 		MAME_DIR .. "src/emu/sound/ymdeltat.c",
 		MAME_DIR .. "src/emu/sound/ymdeltat.h",
 	}
-else
-	defines {
-		"BUILD_YM2608=0",
-	}
-end
+--end
 
-if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then
-	defines {
-		"BUILD_YM2610=1",
-		"BUILD_YM2610B=1",
-	}
+--if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/2610intf.c", 
 		MAME_DIR .. "src/emu/sound/2610intf.h", 
@@ -1204,18 +1188,9 @@ if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then
 		MAME_DIR .. "src/emu/sound/ymdeltat.c",
 		MAME_DIR .. "src/emu/sound/ymdeltat.h",
 	}
-else	
-	defines {
-		"BUILD_YM2610=0",
-		"BUILD_YM2610B=0",
-	}
-end
+--end
 
-if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
-	defines {
-		"BUILD_YM2612=1",
-		"BUILD_YM3438=1",
-	}
+--if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/2612intf.c", 
 		MAME_DIR .. "src/emu/sound/2612intf.h", 
@@ -1223,17 +1198,11 @@ if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
 		MAME_DIR .. "src/emu/sound/ay8910.h", 
 		MAME_DIR .. "src/emu/sound/fm2612.c",
 	}
-else	
-	defines {
-		"BUILD_YM2612=0",
-		"BUILD_YM3438=0",
-	}
+--end
 end
 
-if (SOUNDS["YM3812"]~=null) then
-	defines {
-		"BUILD_YM3812=1",
-	}
+if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) then
+--if (SOUNDS["YM3812"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/3812intf.c", 
 		MAME_DIR .. "src/emu/sound/3812intf.h", 
@@ -1242,16 +1211,9 @@ if (SOUNDS["YM3812"]~=null) then
 		MAME_DIR .. "src/emu/sound/ymdeltat.c",
 		MAME_DIR .. "src/emu/sound/ymdeltat.h",
 	}
-else	
-	defines {
-		"BUILD_YM3812=0",
-	}
-end
+--end
 
-if (SOUNDS["YM3526"]~=null) then
-	defines {
-		"BUILD_YM3526=1",
-	}
+--if (SOUNDS["YM3526"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/3526intf.c", 
 		MAME_DIR .. "src/emu/sound/3526intf.h", 
@@ -1260,16 +1222,9 @@ if (SOUNDS["YM3526"]~=null) then
 		MAME_DIR .. "src/emu/sound/ymdeltat.c",
 		MAME_DIR .. "src/emu/sound/ymdeltat.h",
 	}
-else	
-	defines {
-		"BUILD_YM3526=0",
-	}
-end
+--end
 
-if (SOUNDS["Y8950"]~=null) then
-	defines {
-		"BUILD_Y8950=1",
-	}
+--if (SOUNDS["Y8950"]~=null) then
 	files {
 		MAME_DIR .. "src/emu/sound/8950intf.c", 
 		MAME_DIR .. "src/emu/sound/8950intf.h", 
@@ -1278,10 +1233,7 @@ if (SOUNDS["Y8950"]~=null) then
 		MAME_DIR .. "src/emu/sound/ymdeltat.c",
 		MAME_DIR .. "src/emu/sound/ymdeltat.h",
 	}
-else	
-	defines {
-		"BUILD_Y8950=0",
-	}
+--end
 end
 
 if (SOUNDS["YMF262"]~=null) then
diff --git a/src/emu/sound/fm.h b/src/emu/sound/fm.h
index 4a94d057541..878f753b599 100644
--- a/src/emu/sound/fm.h
+++ b/src/emu/sound/fm.h
@@ -11,12 +11,12 @@
 #define __FM_H__
 
 /* --- select emulation chips --- */
-//#define BUILD_YM2203  (1)       /* build YM2203(OPN)   emulator */
-//#define BUILD_YM2608  (1)       /* build YM2608(OPNA)  emulator */
-//#define BUILD_YM2610  (1)       /* build YM2610(OPNB)  emulator */
-//#define BUILD_YM2610B (1)       /* build YM2610B(OPNB?)emulator */
-//#define BUILD_YM2612  (1)       /* build YM2612(OPN2)  emulator */
-//#define BUILD_YM3438  (1)       /* build YM3438(OPN) emulator */
+#define BUILD_YM2203  (1)       /* build YM2203(OPN)   emulator */
+#define BUILD_YM2608  (1)       /* build YM2608(OPNA)  emulator */
+#define BUILD_YM2610  (1)       /* build YM2610(OPNB)  emulator */
+#define BUILD_YM2610B (1)       /* build YM2610B(OPNB?)emulator */
+#define BUILD_YM2612  (1)       /* build YM2612(OPN2)  emulator */
+#define BUILD_YM3438  (1)       /* build YM3438(OPN) emulator */
 
 /* select bit size of output : 8 or 16 */
 #define FM_SAMPLE_BITS 16
diff --git a/src/emu/sound/fmopl.h b/src/emu/sound/fmopl.h
index 4cd121714a9..3b0cda28c9f 100644
--- a/src/emu/sound/fmopl.h
+++ b/src/emu/sound/fmopl.h
@@ -6,9 +6,9 @@
 #define __FMOPL_H__
 
 /* --- select emulation chips --- */
-//#define BUILD_YM3812 (1)
-//#define BUILD_YM3526 (1)
-//#define BUILD_Y8950  (1)
+#define BUILD_YM3812 (1)
+#define BUILD_YM3526 (1)
+#define BUILD_Y8950  (1)
 
 /* select output bits size of output : 8 or 16 */
 #define OPL_SAMPLE_BITS 16