external libs: rebuilt libmodplug.

libsdl-org · Nov 24, 2019 · 5669a23 · 5669a23
1 parent 39ed9ae
commit 5669a23
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 45 deletions.
diff --git a/VisualC/external/include/libmodplug/modplug.h b/VisualC/external/include/libmodplug/modplug.h
@@ -19,6 +19,12 @@ extern "C" {
 # else
 #   define MODPLUG_EXPORT __declspec(dllimport)			/* using libmodplug dll for windows */
 # endif
+#elif defined(__OS2__) && defined(__WATCOMC__)
+# if defined(MODPLUG_BUILD) && defined(__SW_BD)		/* building libmodplug as a dll for os/2 */
+#   define MODPLUG_EXPORT __declspec(dllexport)
+# else
+#   define MODPLUG_EXPORT					/* using dll or static libmodplug for os/2 */
+# endif
 #elif defined(MODPLUG_BUILD) && defined(SYM_VISIBILITY)
 #   define MODPLUG_EXPORT __attribute__((visibility("default")))
 #else
@@ -130,24 +136,6 @@ MODPLUG_EXPORT void ModPlug_SeekOrder(ModPlugFile* file,int order);
 MODPLUG_EXPORT int ModPlug_GetModuleType(ModPlugFile* file);
 MODPLUG_EXPORT char* ModPlug_GetMessage(ModPlugFile* file);
 
-#define MODPLUG_NO_FILESAVE /* experimental yet.  must match stdafx.h. */
-#ifndef MODPLUG_NO_FILESAVE
-/*
- * EXPERIMENTAL Export Functions
- */
-/*Export to a Scream Tracker 3 S3M module. EXPERIMENTAL (only works on Little-Endian platforms)*/
-MODPLUG_EXPORT char ModPlug_ExportS3M(ModPlugFile* file, const char* filepath);
-
-/*Export to an Extended Module (XM). EXPERIMENTAL (only works on Little-Endian platforms)*/
-MODPLUG_EXPORT char ModPlug_ExportXM(ModPlugFile* file, const char* filepath);
-
-/*Export to an Amiga MOD file. EXPERIMENTAL.*/
-MODPLUG_EXPORT char ModPlug_ExportMOD(ModPlugFile* file, const char* filepath);
-
-/*Export to an Impulse Tracker IT file. Should work OK in Little-Endian & Big-Endian platforms :-) */
-MODPLUG_EXPORT char ModPlug_ExportIT(ModPlugFile* file, const char* filepath);
-#endif /* MODPLUG_NO_FILESAVE */
-
 MODPLUG_EXPORT unsigned int ModPlug_NumInstruments(ModPlugFile* file);
 MODPLUG_EXPORT unsigned int ModPlug_NumSamples(ModPlugFile* file);
 MODPLUG_EXPORT unsigned int ModPlug_NumPatterns(ModPlugFile* file);
@@ -182,4 +170,4 @@ MODPLUG_EXPORT void ModPlug_UnloadMixerCallback(ModPlugFile* file) ;
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* MODPLUG_H__INCLUDED */
diff --git a/VisualC/external/lib/x64/libmodplug-1.dll b/VisualC/external/lib/x64/libmodplug-1.dll
diff --git a/VisualC/external/lib/x86/libmodplug-1.dll b/VisualC/external/lib/x86/libmodplug-1.dll
diff --git a/Xcode/Frameworks/modplug.framework/Versions/A/Headers/modplug.h b/Xcode/Frameworks/modplug.framework/Versions/A/Headers/modplug.h
@@ -19,6 +19,12 @@ extern "C" {
 # else
 #   define MODPLUG_EXPORT __declspec(dllimport)			/* using libmodplug dll for windows */
 # endif
+#elif defined(__OS2__) && defined(__WATCOMC__)
+# if defined(MODPLUG_BUILD) && defined(__SW_BD)		/* building libmodplug as a dll for os/2 */
+#   define MODPLUG_EXPORT __declspec(dllexport)
+# else
+#   define MODPLUG_EXPORT					/* using dll or static libmodplug for os/2 */
+# endif
 #elif defined(MODPLUG_BUILD) && defined(SYM_VISIBILITY)
 #   define MODPLUG_EXPORT __attribute__((visibility("default")))
 #else
@@ -130,24 +136,6 @@ MODPLUG_EXPORT void ModPlug_SeekOrder(ModPlugFile* file,int order);
 MODPLUG_EXPORT int ModPlug_GetModuleType(ModPlugFile* file);
 MODPLUG_EXPORT char* ModPlug_GetMessage(ModPlugFile* file);
 
-#define MODPLUG_NO_FILESAVE /* experimental yet.  must match stdafx.h. */
-#ifndef MODPLUG_NO_FILESAVE
-/*
- * EXPERIMENTAL Export Functions
- */
-/*Export to a Scream Tracker 3 S3M module. EXPERIMENTAL (only works on Little-Endian platforms)*/
-MODPLUG_EXPORT char ModPlug_ExportS3M(ModPlugFile* file, const char* filepath);
-
-/*Export to an Extended Module (XM). EXPERIMENTAL (only works on Little-Endian platforms)*/
-MODPLUG_EXPORT char ModPlug_ExportXM(ModPlugFile* file, const char* filepath);
-
-/*Export to an Amiga MOD file. EXPERIMENTAL.*/
-MODPLUG_EXPORT char ModPlug_ExportMOD(ModPlugFile* file, const char* filepath);
-
-/*Export to an Impulse Tracker IT file. Should work OK in Little-Endian & Big-Endian platforms :-) */
-MODPLUG_EXPORT char ModPlug_ExportIT(ModPlugFile* file, const char* filepath);
-#endif /* MODPLUG_NO_FILESAVE */
-
 MODPLUG_EXPORT unsigned int ModPlug_NumInstruments(ModPlugFile* file);
 MODPLUG_EXPORT unsigned int ModPlug_NumSamples(ModPlugFile* file);
 MODPLUG_EXPORT unsigned int ModPlug_NumPatterns(ModPlugFile* file);
@@ -182,4 +170,4 @@ MODPLUG_EXPORT void ModPlug_UnloadMixerCallback(ModPlugFile* file) ;
 } /* extern "C" */
 #endif
 
-#endif
+#endif /* MODPLUG_H__INCLUDED */
diff --git a/Xcode/Frameworks/modplug.framework/Versions/A/modplug b/Xcode/Frameworks/modplug.framework/Versions/A/modplug
diff --git a/external/libmodplug-0.8.9.0/src/load_it.cpp b/external/libmodplug-0.8.9.0/src/load_it.cpp
@@ -22,13 +22,6 @@ BYTE autovibit2xm[8] =
 //////////////////////////////////////////////////////////
 // Impulse Tracker IT file support
 
-static inline UINT ConvertVolParam(UINT value)
-//--------------------------------------------
-{
-	return (value > 9)  ? 9 : value;
-}
-
-
 BOOL CSoundFile::ITInstrToMPT(const void *p, INSTRUMENTHEADER *penv, UINT trkvers)
 //--------------------------------------------------------------------------------
 {