diff --git a/src/render.cpp b/src/render.cpp index 09a7247..ba5618f 100644 --- a/src/render.cpp +++ b/src/render.cpp @@ -9,13 +9,11 @@ #include "string_.h" #define POPEN _popen #define PCLOSE _pclose - constexpr auto PWRITE_MODE = "wb"; - constexpr auto PREAD_MODE = "r"; +constexpr auto PWRITE_MODE = "wb"; #elif __unix__ #define POPEN popen #define PCLOSE pclose - constexpr auto PWRITE_MODE = "w"; - constexpr auto PREAD_MODE = "r"; +constexpr auto PWRITE_MODE = "w"; #endif #include "log.h" diff --git a/src/resource/audio.cpp b/src/resource/audio.cpp index 29b5c27..0f137cb 100644 --- a/src/resource/audio.cpp +++ b/src/resource/audio.cpp @@ -7,16 +7,7 @@ #include #include -#ifdef _MSC_VER - #ifndef __attribute__ - #define __attribute__(x) - #endif - #ifndef restrict - #define restrict __restrict - #endif -#endif - -#include +#include "xm_wrapper.h" namespace anm2ed::resource { diff --git a/src/resource/xm_music.h b/src/resource/xm_music.h index 9de74a0..af46aff 100644 --- a/src/resource/xm_music.h +++ b/src/resource/xm_music.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include "xm_wrapper.h" namespace anm2ed::resource::xm { @@ -1741,4 +1741,4 @@ namespace anm2ed::resource::xm 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa9, 0x00, 0xfe, 0x05, 0x08, 0x03, 0x0b, 0x84, 0x0b, 0x09, 0x01, 0x02, 0x03, 0x03, 0x00, 0xff, 0xfe, 0xfe, 0xfc, 0xfb, 0xfd, 0xff, 0xfc, 0x00, 0x00, 0x89, 0xfa, 0xf5, 0x0f, 0xf8, 0xf6, 0x00}; -} \ No newline at end of file +} diff --git a/src/resource/xm_wrapper.h b/src/resource/xm_wrapper.h new file mode 100644 index 0000000..d5a8b5a --- /dev/null +++ b/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