From d1fd4bd3e3940e1ee1797c9bef3d6244acc73dd3 Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Sat, 2 Apr 2016 22:55:24 +0900
Subject: [PATCH] No windows.h dependency in .h files

---
 src/sys/mako.cpp      |  1 +
 src/sys/mako.h        | 12 +-----------
 src/sys/mako_midi.cpp |  9 +++++++++
 src/sys/nact.cpp      |  1 +
 src/sys/nact_sys3.cpp |  1 +
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/sys/mako.cpp b/src/sys/mako.cpp
index 03672df..ed1fa23 100644
--- a/src/sys/mako.cpp
+++ b/src/sys/mako.cpp
@@ -177,6 +177,7 @@ void MAKO::notify_mci(int status)
 
 void MAKO::play_pcm(int page, bool loop)
 {
+	assert(false);
 #if defined(_USE_PCM)
 	static char header[44] = {
 		'R' , 'I' , 'F' , 'F' , 0x00, 0x00, 0x00, 0x00, 'W' , 'A' , 'V' , 'E' , 'f' , 'm' , 't' , ' ' ,
diff --git a/src/sys/mako.h b/src/sys/mako.h
index f1308cf..b2c60e6 100644
--- a/src/sys/mako.h
+++ b/src/sys/mako.h
@@ -7,8 +7,6 @@
 #ifndef _MAKO_H_
 #define _MAKO_H_
 
-#include <windows.h>
-#include <mmsystem.h>
 #include <stdio.h>
 #include <limits.h>
 #include <math.h>
@@ -19,7 +17,7 @@
 #define MAX_MMLS (128 * 1024)
 
 #define _USE_REAL_MIDI
-#define _USE_PCM
+//#define _USE_PCM
 
 class MAKO
 {
@@ -49,14 +47,6 @@ private:
 	static int thread(void* pvoid);
 	SDL_Thread* hThread;
 
-	// MIDI‰¹Œ¹
-	union UNION_MIDI_DATA {
-		DWORD msg;
-		BYTE data[4];
-	};
-	UNION_MIDI_DATA midi;
-	HMIDIOUT hMidi;
-
 	// MML
 	typedef struct {
 		uint8 data[MAX_MMLS];
diff --git a/src/sys/mako_midi.cpp b/src/sys/mako_midi.cpp
index 9bbbba1..ebfcf15 100644
--- a/src/sys/mako_midi.cpp
+++ b/src/sys/mako_midi.cpp
@@ -4,12 +4,21 @@
 	[ MAKO - midi ]
 */
 
+#include <windows.h>
+#include <mmsystem.h>
 #include "mako.h"
 #include "dri.h"
 
 #define next_mml(p) mml[p].data[mml[p].addr++]
 
 // MIDI‰¹Œ¹
+union UNION_MIDI_DATA {
+	DWORD msg;
+	BYTE data[4];
+};
+static UNION_MIDI_DATA midi;
+static HMIDIOUT hMidi;
+
 #define send_2bytes(d1, d2) { midi.data[0] = (BYTE)d1; midi.data[1] = (BYTE)d2; midiOutShortMsg(hMidi,midi.msg); }
 #define send_3bytes(d1, d2, d3) { midi.data[0] = (BYTE)d1; midi.data[1] = (BYTE)d2; midi.data[2] = (BYTE)d3 ;midiOutShortMsg(hMidi, midi.msg); }
 
diff --git a/src/sys/nact.cpp b/src/sys/nact.cpp
index 7176bdf..b9179c6 100644
--- a/src/sys/nact.cpp
+++ b/src/sys/nact.cpp
@@ -4,6 +4,7 @@
 	[ NACT ]
 */
 
+#include <windows.h>
 #include "nact.h"
 #include "ags.h"
 #include "mako.h"
diff --git a/src/sys/nact_sys3.cpp b/src/sys/nact_sys3.cpp
index 95e381c..86d1714 100644
--- a/src/sys/nact_sys3.cpp
+++ b/src/sys/nact_sys3.cpp
@@ -4,6 +4,7 @@
 	[ NACT - command ]
 */
 
+#include <windows.h>
 #include "nact.h"
 #include "ags.h"
 #include "mako.h"