Skip to content

Commit b305bbe

Browse files
sezerosezero
committed
external libs, libmodplug: Add BWSB General Digital Music module loader
Based on patch by Alice Rowan (Lachesis) - see: Konstanty/libmodplug#57
1 parent 36a7a03 commit b305bbe

File tree

10 files changed

+505
-19
lines changed

10 files changed

+505
-19
lines changed

‎Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
AA5314B71FE0FE2E0025C9BE /* music_mpg123.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406251F9609BC00EDAF53 /* music_mpg123.c */; };
177177
AA5314B81FE0FE2E0025C9BE /* load_far.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215517653A9800662B9C /* load_far.cpp */; };
178178
AA5314B91FE0FE2E0025C9BE /* load_it.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215617653A9800662B9C /* load_it.cpp */; };
179+
AA5314BA1FE0FE2E0025C9BE /* load_gdm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215717653A9800662B9C /* load_gdm.cpp */; };
179180
AA5314BB1FE0FE2E0025C9BE /* load_mdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215817653A9800662B9C /* load_mdl.cpp */; };
180181
AA5314BC1FE0FE2E0025C9BE /* bitwriter.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71231F9BC91C00A6BC31 /* bitwriter.c */; };
181182
AA5314BD1FE0FE2E0025C9BE /* load_med.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215917653A9800662B9C /* load_med.cpp */; };
@@ -235,6 +236,7 @@
235236
AA60217917653A9800662B9C /* load_dsm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215417653A9800662B9C /* load_dsm.cpp */; };
236237
AA60217A17653A9800662B9C /* load_far.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215517653A9800662B9C /* load_far.cpp */; };
237238
AA60217B17653A9800662B9C /* load_it.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215617653A9800662B9C /* load_it.cpp */; };
239+
AA60217C17653A9800662B9C /* load_gdm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215717653A9800662B9C /* load_gdm.cpp */; };
238240
AA60217D17653A9800662B9C /* load_mdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215817653A9800662B9C /* load_mdl.cpp */; };
239241
AA60217E17653A9800662B9C /* load_med.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215917653A9800662B9C /* load_med.cpp */; };
240242
AA60217F17653A9800662B9C /* load_mid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215A17653A9800662B9C /* load_mid.cpp */; };
@@ -394,6 +396,7 @@
394396
AA60215417653A9800662B9C /* load_dsm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_dsm.cpp; path = src/load_dsm.cpp; sourceTree = "<group>"; };
395397
AA60215517653A9800662B9C /* load_far.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_far.cpp; path = src/load_far.cpp; sourceTree = "<group>"; };
396398
AA60215617653A9800662B9C /* load_it.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_it.cpp; path = src/load_it.cpp; sourceTree = "<group>"; };
399+
AA60215717653A9800662B9C /* load_gdm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_gdm.cpp; path = src/load_gdm.cpp; sourceTree = "<group>"; };
397400
AA60215817653A9800662B9C /* load_mdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mdl.cpp; path = src/load_mdl.cpp; sourceTree = "<group>"; };
398401
AA60215917653A9800662B9C /* load_med.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_med.cpp; path = src/load_med.cpp; sourceTree = "<group>"; };
399402
AA60215A17653A9800662B9C /* load_mid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mid.cpp; path = src/load_mid.cpp; sourceTree = "<group>"; };
@@ -701,6 +704,7 @@
701704
AA60215417653A9800662B9C /* load_dsm.cpp */,
702705
AA60215517653A9800662B9C /* load_far.cpp */,
703706
AA60215617653A9800662B9C /* load_it.cpp */,
707+
AA60215717653A9800662B9C /* load_gdm.cpp */,
704708
AA60215817653A9800662B9C /* load_mdl.cpp */,
705709
AA60215917653A9800662B9C /* load_med.cpp */,
706710
AA60215A17653A9800662B9C /* load_mid.cpp */,
@@ -1075,6 +1079,7 @@
10751079
AA5314B71FE0FE2E0025C9BE /* music_mpg123.c in Sources */,
10761080
AA5314B81FE0FE2E0025C9BE /* load_far.cpp in Sources */,
10771081
AA5314B91FE0FE2E0025C9BE /* load_it.cpp in Sources */,
1082+
AA5314BA1FE0FE2E0025C9BE /* load_gdm.cpp in Sources */,
10781083
AA5314BB1FE0FE2E0025C9BE /* load_mdl.cpp in Sources */,
10791084
AA5314BC1FE0FE2E0025C9BE /* bitwriter.c in Sources */,
10801085
AA5314BD1FE0FE2E0025C9BE /* load_med.cpp in Sources */,
@@ -1189,6 +1194,7 @@
11891194
AAE406451F9609BD00EDAF53 /* music_mpg123.c in Sources */,
11901195
AA60217A17653A9800662B9C /* load_far.cpp in Sources */,
11911196
AA60217B17653A9800662B9C /* load_it.cpp in Sources */,
1197+
AA60217C17653A9800662B9C /* load_gdm.cpp in Sources */,
11921198
AA60217D17653A9800662B9C /* load_mdl.cpp in Sources */,
11931199
AA1C71411F9BC92000A6BC31 /* bitwriter.c in Sources */,
11941200
AA60217E17653A9800662B9C /* load_med.cpp in Sources */,

‎external/libmodplug-0.8.9.0.patch‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff -ruN libmodplug-0.8.9.0.orig/Android.mk libmodplug-0.8.9.0/Android.mk
2-
--- libmodplug-0.8.9.0.orig/Android.mk 1969-12-31 16:00:00.000000000 -0800
3-
+++ libmodplug-0.8.9.0/Android.mk 2017-10-22 11:43:42.132552241 -0700
4-
@@ -0,0 +1,46 @@
1+
diff -ruN /dev/null libmodplug-0.8.9.0/Android.mk
2+
--- /dev/null
3+
+++ libmodplug-0.8.9.0/Android.mk
4+
@@ -0,0 +1,47 @@
55
+LOCAL_PATH := $(call my-dir)
66
+
77
+include $(CLEAR_VARS)
@@ -22,6 +22,7 @@ diff -ruN libmodplug-0.8.9.0.orig/Android.mk libmodplug-0.8.9.0/Android.mk
2222
+ src/load_dmf.cpp \
2323
+ src/load_dsm.cpp \
2424
+ src/load_far.cpp \
25+
+ src/load_gdm.cpp \
2526
+ src/load_it.cpp \
2627
+ src/load_mdl.cpp \
2728
+ src/load_med.cpp \
@@ -48,3 +49,4 @@ diff -ruN libmodplug-0.8.9.0.orig/Android.mk libmodplug-0.8.9.0/Android.mk
4849
+ src/sndmix.cpp
4950
+
5051
+include $(BUILD_STATIC_LIBRARY)
52+

‎external/libmodplug-0.8.9.0/Android.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ LOCAL_SRC_FILES += \
1818
src/load_dmf.cpp \
1919
src/load_dsm.cpp \
2020
src/load_far.cpp \
21+
src/load_gdm.cpp \
2122
src/load_it.cpp \
2223
src/load_mdl.cpp \
2324
src/load_med.cpp \

‎external/libmodplug-0.8.9.0/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ add_library(modplug ${LIB_TYPE}
112112
src/load_dmf.cpp
113113
src/load_dsm.cpp
114114
src/load_far.cpp
115+
src/load_gdm.cpp
115116
src/load_it.cpp
116117
src/load_mdl.cpp
117118
src/load_med.cpp

‎external/libmodplug-0.8.9.0/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ CSCOPE = cscope
191191
DIST_SUBDIRS = $(SUBDIRS)
192192
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libmodplug.pc.in \
193193
AUTHORS COPYING ChangeLog INSTALL NEWS README TODO compile \
194-
config.guess config.sub install-sh ltmain.sh missing
194+
config.guess config.sub depcomp install-sh ltmain.sh missing
195195
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
196196
distdir = $(PACKAGE)-$(VERSION)
197197
top_distdir = $(distdir)

‎external/libmodplug-0.8.9.0/src/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ libmodplug_la_SOURCES = tables.h \
3737
load_669.cpp \
3838
load_mt2.cpp \
3939
load_psm.cpp \
40+
load_gdm.cpp \
4041
load_abc.cpp \
4142
load_mid.cpp \
4243
load_pat.cpp \

‎external/libmodplug-0.8.9.0/src/Makefile.in‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ am_libmodplug_la_OBJECTS = sndmix.lo sndfile.lo snd_fx.lo snd_flt.lo \
141141
load_okt.lo load_mtm.lo load_mod.lo load_med.lo load_mdl.lo \
142142
load_it.lo load_far.lo load_dsm.lo load_dmf.lo load_dbm.lo \
143143
load_ams.lo load_amf.lo load_669.lo load_mt2.lo load_psm.lo \
144-
load_abc.lo load_mid.lo load_pat.lo modplug.lo
144+
load_gdm.lo load_abc.lo load_mid.lo load_pat.lo modplug.lo
145145
libmodplug_la_OBJECTS = $(am_libmodplug_la_OBJECTS)
146146
AM_V_lt = $(am__v_lt_@AM_V@)
147147
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -170,19 +170,19 @@ am__depfiles_remade = ./$(DEPDIR)/fastmix.Plo ./$(DEPDIR)/load_669.Plo \
170170
./$(DEPDIR)/load_abc.Plo ./$(DEPDIR)/load_amf.Plo \
171171
./$(DEPDIR)/load_ams.Plo ./$(DEPDIR)/load_dbm.Plo \
172172
./$(DEPDIR)/load_dmf.Plo ./$(DEPDIR)/load_dsm.Plo \
173-
./$(DEPDIR)/load_far.Plo ./$(DEPDIR)/load_it.Plo \
174-
./$(DEPDIR)/load_mdl.Plo ./$(DEPDIR)/load_med.Plo \
175-
./$(DEPDIR)/load_mid.Plo ./$(DEPDIR)/load_mod.Plo \
176-
./$(DEPDIR)/load_mt2.Plo ./$(DEPDIR)/load_mtm.Plo \
177-
./$(DEPDIR)/load_okt.Plo ./$(DEPDIR)/load_pat.Plo \
178-
./$(DEPDIR)/load_psm.Plo ./$(DEPDIR)/load_ptm.Plo \
179-
./$(DEPDIR)/load_s3m.Plo ./$(DEPDIR)/load_stm.Plo \
180-
./$(DEPDIR)/load_ult.Plo ./$(DEPDIR)/load_umx.Plo \
181-
./$(DEPDIR)/load_wav.Plo ./$(DEPDIR)/load_xm.Plo \
182-
./$(DEPDIR)/mmcmp.Plo ./$(DEPDIR)/modplug.Plo \
183-
./$(DEPDIR)/snd_dsp.Plo ./$(DEPDIR)/snd_flt.Plo \
184-
./$(DEPDIR)/snd_fx.Plo ./$(DEPDIR)/sndfile.Plo \
185-
./$(DEPDIR)/sndmix.Plo
173+
./$(DEPDIR)/load_far.Plo ./$(DEPDIR)/load_gdm.Plo \
174+
./$(DEPDIR)/load_it.Plo ./$(DEPDIR)/load_mdl.Plo \
175+
./$(DEPDIR)/load_med.Plo ./$(DEPDIR)/load_mid.Plo \
176+
./$(DEPDIR)/load_mod.Plo ./$(DEPDIR)/load_mt2.Plo \
177+
./$(DEPDIR)/load_mtm.Plo ./$(DEPDIR)/load_okt.Plo \
178+
./$(DEPDIR)/load_pat.Plo ./$(DEPDIR)/load_psm.Plo \
179+
./$(DEPDIR)/load_ptm.Plo ./$(DEPDIR)/load_s3m.Plo \
180+
./$(DEPDIR)/load_stm.Plo ./$(DEPDIR)/load_ult.Plo \
181+
./$(DEPDIR)/load_umx.Plo ./$(DEPDIR)/load_wav.Plo \
182+
./$(DEPDIR)/load_xm.Plo ./$(DEPDIR)/mmcmp.Plo \
183+
./$(DEPDIR)/modplug.Plo ./$(DEPDIR)/snd_dsp.Plo \
184+
./$(DEPDIR)/snd_flt.Plo ./$(DEPDIR)/snd_fx.Plo \
185+
./$(DEPDIR)/sndfile.Plo ./$(DEPDIR)/sndmix.Plo
186186
am__mv = mv -f
187187
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
188188
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -415,6 +415,7 @@ libmodplug_la_SOURCES = tables.h \
415415
load_669.cpp \
416416
load_mt2.cpp \
417417
load_psm.cpp \
418+
load_gdm.cpp \
418419
load_abc.cpp \
419420
load_mid.cpp \
420421
load_pat.cpp \
@@ -527,6 +528,7 @@ distclean-compile:
527528
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_dmf.Plo@am__quote@ # am--include-marker
528529
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_dsm.Plo@am__quote@ # am--include-marker
529530
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_far.Plo@am__quote@ # am--include-marker
531+
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_gdm.Plo@am__quote@ # am--include-marker
530532
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_it.Plo@am__quote@ # am--include-marker
531533
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_mdl.Plo@am__quote@ # am--include-marker
532534
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_med.Plo@am__quote@ # am--include-marker
@@ -743,6 +745,7 @@ distclean: distclean-am
743745
-rm -f ./$(DEPDIR)/load_dmf.Plo
744746
-rm -f ./$(DEPDIR)/load_dsm.Plo
745747
-rm -f ./$(DEPDIR)/load_far.Plo
748+
-rm -f ./$(DEPDIR)/load_gdm.Plo
746749
-rm -f ./$(DEPDIR)/load_it.Plo
747750
-rm -f ./$(DEPDIR)/load_mdl.Plo
748751
-rm -f ./$(DEPDIR)/load_med.Plo
@@ -821,6 +824,7 @@ maintainer-clean: maintainer-clean-am
821824
-rm -f ./$(DEPDIR)/load_dmf.Plo
822825
-rm -f ./$(DEPDIR)/load_dsm.Plo
823826
-rm -f ./$(DEPDIR)/load_far.Plo
827+
-rm -f ./$(DEPDIR)/load_gdm.Plo
824828
-rm -f ./$(DEPDIR)/load_it.Plo
825829
-rm -f ./$(DEPDIR)/load_mdl.Plo
826830
-rm -f ./$(DEPDIR)/load_med.Plo

‎external/libmodplug-0.8.9.0/src/libmodplug/sndfile.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ typedef const BYTE * LPCBYTE;
7070
#define MOD_TYPE_J2B 0x800000
7171
#define MOD_TYPE_ABC 0x1000000
7272
#define MOD_TYPE_PAT 0x2000000
73+
#define MOD_TYPE_GDM 0x40000000 // Fake type
7374
#define MOD_TYPE_UMX 0x80000000 // Fake type
7475
#define MAX_MODTYPE 24
7576

@@ -637,6 +638,7 @@ class MODPLUG_EXPORTPP CSoundFile
637638
BOOL ReadAMF(LPCBYTE lpStream, DWORD dwMemLength);
638639
BOOL ReadMT2(LPCBYTE lpStream, DWORD dwMemLength);
639640
BOOL ReadPSM(LPCBYTE lpStream, DWORD dwMemLength);
641+
BOOL ReadGDM(LPCBYTE lpStream, DWORD dwMemLength);
640642
BOOL ReadUMX(LPCBYTE lpStream, DWORD dwMemLength);
641643
BOOL ReadABC(LPCBYTE lpStream, DWORD dwMemLength);
642644
BOOL TestABC(LPCBYTE lpStream, DWORD dwMemLength);

0 commit comments

Comments
 (0)