again with xm...

src/render.cpp

@@ -9,13 +9,11 @@
   #include "string_.h"
   #define POPEN _popen
   #define PCLOSE _pclose
-  constexpr auto PWRITE_MODE = "wb";
+constexpr auto PWRITE_MODE = "wb";
-  constexpr auto PREAD_MODE = "r";
 #elif __unix__
   #define POPEN popen
   #define PCLOSE pclose
-  constexpr auto PWRITE_MODE = "w";
+constexpr auto PWRITE_MODE = "w";
-  constexpr auto PREAD_MODE = "r";
 #endif
 
 #include "log.h"

src/resource/audio.cpp

@@ -7,16 +7,7 @@
 #include <utility>
 #include <vector>
 
-#ifdef _MSC_VER
+#include "xm_wrapper.h"
-  #ifndef __attribute__
-    #define __attribute__(x)
-  #endif
-  #ifndef restrict
-    #define restrict __restrict
-  #endif
-#endif
-
-#include <xm.h>
 
 namespace anm2ed::resource
 {

src/resource/xm_music.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stddef.h>
-#include <xm.h>
+#include "xm_wrapper.h"
 
 namespace anm2ed::resource::xm
 {

src/resource/xm_wrapper.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#ifdef _MSC_VER
+  #ifndef __attribute__
+    #define __attribute__(x)
+  #endif
+  #ifndef restrict
+    #define restrict
+  #endif
+#endif
+
+#include <xm.h>