diff --git a/MacOSX/codecs/include/mikmod.h b/MacOSX/codecs/include/mikmod.h index 77f715ef..0fc10c2f 100644 --- a/MacOSX/codecs/include/mikmod.h +++ b/MacOSX/codecs/include/mikmod.h @@ -68,7 +68,7 @@ extern "C" { #define LIBMIKMOD_VERSION_MAJOR 3L #define LIBMIKMOD_VERSION_MINOR 3L -#define LIBMIKMOD_REVISION 2L +#define LIBMIKMOD_REVISION 3L #define LIBMIKMOD_VERSION \ ((LIBMIKMOD_VERSION_MAJOR<<16)| \ @@ -296,7 +296,7 @@ MIKMODAPI extern void MikMod_free(void*); */ typedef struct MREADER { - BOOL (*Seek)(struct MREADER*,long,int); + int (*Seek)(struct MREADER*,long,int); long (*Tell)(struct MREADER*); BOOL (*Read)(struct MREADER*,void*,size_t); int (*Get)(struct MREADER*); @@ -306,10 +306,10 @@ typedef struct MREADER { } MREADER; typedef struct MWRITER { - BOOL (*Seek)(struct MWRITER*, long, int); + int (*Seek)(struct MWRITER*, long, int); long (*Tell)(struct MWRITER*); BOOL (*Write)(struct MWRITER*, const void*, size_t); - BOOL (*Put)(struct MWRITER*, int); + int (*Put)(struct MWRITER*, int); } MWRITER; /* @@ -608,6 +608,7 @@ MIKMODAPI extern struct MLOADER load_stm; /* ScreamTracker 2 (by Future Crew) */ MIKMODAPI extern struct MLOADER load_stx; /* STMIK 0.2 (by Future Crew) */ MIKMODAPI extern struct MLOADER load_s3m; /* ScreamTracker 3 (by Future Crew) */ MIKMODAPI extern struct MLOADER load_ult; /* UltraTracker (by MAS) */ +MIKMODAPI extern struct MLOADER load_umx; /* Unreal UMX container of Epic Games */ MIKMODAPI extern struct MLOADER load_uni; /* MikMod and APlayer internal module format */ MIKMODAPI extern struct MLOADER load_xm; /* FastTracker 2 (by Triton) */ diff --git a/MacOSX/codecs/include/mikmod_config.txt b/MacOSX/codecs/include/mikmod_config.txt index 59e0a463..04e8c948 100644 --- a/MacOSX/codecs/include/mikmod_config.txt +++ b/MacOSX/codecs/include/mikmod_config.txt @@ -1,4 +1,4 @@ -libmikmod-3.3.2 +libmikmod-3.3.3 only the "nosound" driver (drv_nos) is included, all of the other libmikmod drivers were made "MISSING" drivers. we only need/register/use drv_nos here and nothing else. diff --git a/MacOSX/codecs/lib/libmikmod.dylib b/MacOSX/codecs/lib/libmikmod.dylib index 3589e7fe..fec12f64 100755 Binary files a/MacOSX/codecs/lib/libmikmod.dylib and b/MacOSX/codecs/lib/libmikmod.dylib differ diff --git a/Windows/codecs/include/mikmod.h b/Windows/codecs/include/mikmod.h index 77f715ef..0fc10c2f 100644 --- a/Windows/codecs/include/mikmod.h +++ b/Windows/codecs/include/mikmod.h @@ -68,7 +68,7 @@ extern "C" { #define LIBMIKMOD_VERSION_MAJOR 3L #define LIBMIKMOD_VERSION_MINOR 3L -#define LIBMIKMOD_REVISION 2L +#define LIBMIKMOD_REVISION 3L #define LIBMIKMOD_VERSION \ ((LIBMIKMOD_VERSION_MAJOR<<16)| \ @@ -296,7 +296,7 @@ MIKMODAPI extern void MikMod_free(void*); */ typedef struct MREADER { - BOOL (*Seek)(struct MREADER*,long,int); + int (*Seek)(struct MREADER*,long,int); long (*Tell)(struct MREADER*); BOOL (*Read)(struct MREADER*,void*,size_t); int (*Get)(struct MREADER*); @@ -306,10 +306,10 @@ typedef struct MREADER { } MREADER; typedef struct MWRITER { - BOOL (*Seek)(struct MWRITER*, long, int); + int (*Seek)(struct MWRITER*, long, int); long (*Tell)(struct MWRITER*); BOOL (*Write)(struct MWRITER*, const void*, size_t); - BOOL (*Put)(struct MWRITER*, int); + int (*Put)(struct MWRITER*, int); } MWRITER; /* @@ -608,6 +608,7 @@ MIKMODAPI extern struct MLOADER load_stm; /* ScreamTracker 2 (by Future Crew) */ MIKMODAPI extern struct MLOADER load_stx; /* STMIK 0.2 (by Future Crew) */ MIKMODAPI extern struct MLOADER load_s3m; /* ScreamTracker 3 (by Future Crew) */ MIKMODAPI extern struct MLOADER load_ult; /* UltraTracker (by MAS) */ +MIKMODAPI extern struct MLOADER load_umx; /* Unreal UMX container of Epic Games */ MIKMODAPI extern struct MLOADER load_uni; /* MikMod and APlayer internal module format */ MIKMODAPI extern struct MLOADER load_xm; /* FastTracker 2 (by Triton) */ diff --git a/Windows/codecs/include/mikmod_config.txt b/Windows/codecs/include/mikmod_config.txt index 59e0a463..04e8c948 100644 --- a/Windows/codecs/include/mikmod_config.txt +++ b/Windows/codecs/include/mikmod_config.txt @@ -1,4 +1,4 @@ -libmikmod-3.3.2 +libmikmod-3.3.3 only the "nosound" driver (drv_nos) is included, all of the other libmikmod drivers were made "MISSING" drivers. we only need/register/use drv_nos here and nothing else. diff --git a/Windows/codecs/x64/libmikmod-3.dll b/Windows/codecs/x64/libmikmod-3.dll index 96d71763..36557aa2 100644 Binary files a/Windows/codecs/x64/libmikmod-3.dll and b/Windows/codecs/x64/libmikmod-3.dll differ diff --git a/Windows/codecs/x64/libmikmod.dll.a b/Windows/codecs/x64/libmikmod.dll.a index e7aa44cc..1880e8d6 100644 Binary files a/Windows/codecs/x64/libmikmod.dll.a and b/Windows/codecs/x64/libmikmod.dll.a differ diff --git a/Windows/codecs/x64/libmikmod.lib b/Windows/codecs/x64/libmikmod.lib index 3428126f..bdef9291 100644 Binary files a/Windows/codecs/x64/libmikmod.lib and b/Windows/codecs/x64/libmikmod.lib differ diff --git a/Windows/codecs/x86/libmikmod-3.dll b/Windows/codecs/x86/libmikmod-3.dll index 6961e204..a165d1d4 100644 Binary files a/Windows/codecs/x86/libmikmod-3.dll and b/Windows/codecs/x86/libmikmod-3.dll differ diff --git a/Windows/codecs/x86/libmikmod.dll.a b/Windows/codecs/x86/libmikmod.dll.a index dfd07299..997e1253 100644 Binary files a/Windows/codecs/x86/libmikmod.dll.a and b/Windows/codecs/x86/libmikmod.dll.a differ diff --git a/Windows/codecs/x86/libmikmod.lib b/Windows/codecs/x86/libmikmod.lib index b6fee871..99d0eda0 100644 Binary files a/Windows/codecs/x86/libmikmod.lib and b/Windows/codecs/x86/libmikmod.lib differ