Move WIN32 native midi into win32 directory

win32/Makefile

@@ -8,7 +8,7 @@ TEST_CCFLAGS =
 
 GTEST_DIR = ../3rd/googletest/googletest
 
-CFILES = $(wildcard ../adplug/*.c) $(wildcard ../libmad/*.c) $(wildcard ../liboggvorbis/src/*.c) $(wildcard ../*.c) $(wildcard ../native_midi/*.c)
+CFILES = $(wildcard ../adplug/*.c) $(wildcard ../libmad/*.c) $(wildcard ../liboggvorbis/src/*.c) $(wildcard ../*.c) $(wildcard ../native_midi/*.c) $(wildcard ../win32/*.c)
 CPPFILES = $(wildcard ../adplug/*.cpp) $(wildcard ../*.cpp) $(wildcard ./*.cpp)
 RCFILES = $(wildcard ./sdlpal.rc)
 OBJFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o) $(RCFILES:.rc=.o)

win32/Makefile.mingw

@@ -8,7 +8,7 @@ TEST_CCFLAGS =
 
 GTEST_DIR = ../3rd/googletest/googletest
 
-CFILES = $(wildcard ../adplug/*.c) $(wildcard ../libmad/*.c) $(wildcard ../liboggvorbis/src/*.c) $(wildcard ../*.c) $(wildcard ../native_midi/*.c)
+CFILES = $(wildcard ../adplug/*.c) $(wildcard ../libmad/*.c) $(wildcard ../liboggvorbis/src/*.c) $(wildcard ../*.c) $(wildcard ../native_midi/*.c) $(wildcard ../win32/*.c)
 CPPFILES = $(wildcard ../adplug/*.cpp) $(wildcard ../*.cpp) $(wildcard ./*.cpp)
 RCFILES = $(wildcard ./sdlpal.rc)
 OBJFILES = $(CFILES:.c=.o) $(CPPFILES:.cpp=.o) $(RCFILES:.rc=.o)

native_midi/native_midi_win32.c

@@ -20,8 +20,6 @@
     florian.proff.schulze@gmx.net
 */
 
-#ifdef WIN32
-
 #include "SDL.h"
 
 /* everything below is currently one very big bad hack ;) Proff */
@@ -33,9 +31,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#include "native_midi.h"
-#include "native_midi_common.h"
-
+#include "native_midi/native_midi.h"
+#include "native_midi/native_midi_common.h"
+
 struct _NativeMidiSong {
   int MusicLoaded;
   int MusicPlaying;
@@ -318,5 +316,3 @@ const char *native_midi_error(void)
   return "";
 }
 
-#endif
-

win32/sdlpal.vcxproj

@@ -407,7 +407,6 @@
     <ClCompile Include="..\adplug\rix.cpp" />
     <ClCompile Include="..\adplug\surroundopl.cpp" />
     <ClCompile Include="..\native_midi\native_midi_common.c" />
-    <ClCompile Include="..\native_midi\native_midi_win32.c" />
     <ClCompile Include="..\libmad\bit.c" />
     <ClCompile Include="..\libmad\decoder.c" />
     <ClCompile Include="..\libmad\fixed.c" />
@@ -419,6 +418,7 @@
     <ClCompile Include="..\libmad\stream.c" />
     <ClCompile Include="..\libmad\synth.c" />
     <ClCompile Include="..\libmad\timer.c" />
+    <ClCompile Include="native_midi.c" />
     <ClCompile Include="win32.cpp" />
   </ItemGroup>
   <ItemGroup>

win32/sdlpal.vcxproj.filters

@@ -173,9 +173,6 @@
     <ClCompile Include="..\native_midi\native_midi_common.c">
       <Filter>native_midi</Filter>
     </ClCompile>
-    <ClCompile Include="..\native_midi\native_midi_win32.c">
-      <Filter>native_midi</Filter>
-    </ClCompile>
     <ClCompile Include="..\libmad\bit.c">
       <Filter>libmad</Filter>
     </ClCompile>
@@ -326,6 +323,9 @@
     <ClCompile Include="..\tests\test_swprintf.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
+    <ClCompile Include="native_midi.c">
+      <Filter>native_midi</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\ascii.h">