Use old SDL_sound again... again

linux/Makefile

@@ -198,18 +198,27 @@ $(DOWNLOADS)/sdl2_image/autogen.sh:
 	$(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z
 
 # SDL_sound
-sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL2_sound.a
+sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL_sound.a
 
-$(LIBDIR)/libSDL2_sound.a: $(DOWNLOADS)/sdl_sound/cmakebuild/Makefile
+$(LIBDIR)/libSDL_sound.a: $(DOWNLOADS)/sdl_sound/Makefile
-	cd $(DOWNLOADS)/sdl_sound/cmakebuild; \
+	cd $(DOWNLOADS)/sdl_sound; \
 	make -j$(NPROC); make install
 
-$(DOWNLOADS)/sdl_sound/cmakebuild/Makefile: $(DOWNLOADS)/sdl_sound/CMakeLists.txt
+$(DOWNLOADS)/sdl_sound/Makefile: $(DOWNLOADS)/sdl_sound/configure
-	cd $(DOWNLOADS)/sdl_sound; mkdir -p cmakebuild; cd cmakebuild; \
+	cd $(DOWNLOADS)/sdl_sound; \
-	$(CMAKE) -DSDLSOUND_BUILD_SHARED=false -DSDLSOUND_BUILD_TEST=false
+	$(CONFIGURE) \
+	--disable-sdltest --disable-modplug \
+	--disable-flac --disable-speex \
+	--disable-physfs --disable-raw \
+	--disable-mikmod --disable-au \
+	--disable-voc --disable-shn \
+	--enable-static=yes --enable-shared=no
 
-$(DOWNLOADS)/sdl_sound/CMakeLists.txt:
+$(DOWNLOADS)/sdl_sound/configure: $(DOWNLOADS)/sdl_sound/bootstrap
-	$(CLONE) $(GITLAB)/mkxp-z/SDL_sound $(DOWNLOADS)/sdl_sound -b v2.0
+	cd $(DOWNLOADS)/sdl_sound; ./bootstrap
+
+$(DOWNLOADS)/sdl_sound/bootstrap:
+	$(CLONE) $(GITLAB)/mkxp-z/SDL_sound $(DOWNLOADS)/sdl_sound
 
 # SDL2 (ttf)
 sdl2ttf: init_dirs sdl2 freetype $(LIBDIR)/libSDL2_ttf.a

macos/Dependencies/dependencies.make

@@ -201,18 +201,27 @@ $(DOWNLOADS)/sdl2_image/autogen.sh:
 	$(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z
 
 # SDL_sound
-sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL2_sound.a
+sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL_sound.a
 
-$(LIBDIR)/libSDL2_sound.a: $(DOWNLOADS)/sdl_sound/cmakebuild/Makefile
+$(LIBDIR)/libSDL_sound.a: $(DOWNLOADS)/sdl_sound/Makefile
-	cd $(DOWNLOADS)/sdl_sound/cmakebuild; \
+	cd $(DOWNLOADS)/sdl_sound; \
 	make -j$(NPROC); make install
 
-$(DOWNLOADS)/sdl_sound/cmakebuild/Makefile: $(DOWNLOADS)/sdl_sound/CMakeLists.txt
+$(DOWNLOADS)/sdl_sound/Makefile: $(DOWNLOADS)/sdl_sound/configure
-	cd $(DOWNLOADS)/sdl_sound; mkdir -p cmakebuild; cd cmakebuild; \
+	cd $(DOWNLOADS)/sdl_sound; \
-	$(CMAKE) -DSDLSOUND_BUILD_SHARED=false -DSDLSOUND_BUILD_TEST=false
+	$(CONFIGURE) \
+	--disable-sdltest --disable-modplug \
+	--disable-flac --disable-speex \
+	--disable-physfs --disable-raw \
+	--disable-mikmod --disable-au \
+	--disable-voc --disable-shn \
+	--enable-static=yes --enable-shared=no
 
-$(DOWNLOADS)/sdl_sound/CMakeLists.txt:
+$(DOWNLOADS)/sdl_sound/configure: $(DOWNLOADS)/sdl_sound/bootstrap
-	$(CLONE) $(GITLAB)/mkxp-z/SDL_sound $(DOWNLOADS)/sdl_sound -b v2.0
+	cd $(DOWNLOADS)/sdl_sound; ./bootstrap
+
+$(DOWNLOADS)/sdl_sound/bootstrap:
+	$(CLONE) $(GITLAB)/mkxp-z/SDL_sound $(DOWNLOADS)/sdl_sound
 	
 # SDL2 (ttf)
 sdl2ttf: init_dirs sdl2 freetype $(LIBDIR)/libSDL2_ttf.a

macos/mkxp-z.xcodeproj/project.pbxproj

@@ -242,6 +242,10 @@
 		3B480E9F25DCD174001686B4 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B480E9E25DCD16D001686B4 /* GameController.framework */; };
 		3B480EA025DCD175001686B4 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B480E9E25DCD16D001686B4 /* GameController.framework */; };
 		3B480EA125DCD176001686B4 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B480E9E25DCD16D001686B4 /* GameController.framework */; };
+		3B4937AC267BFEBB00D358E5 /* libSDL_sound.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B4937AB267BFEBB00D358E5 /* libSDL_sound.a */; };
+		3B4937AE267BFED000D358E5 /* libSDL_sound.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B4937AD267BFED000D358E5 /* libSDL_sound.a */; };
+		3B4937B0267BFEF900D358E5 /* libSDL_sound.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B4937AF267BFEF900D358E5 /* libSDL_sound.a */; };
+		3B4937B1267BFEF900D358E5 /* libSDL_sound.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B4937AF267BFEF900D358E5 /* libSDL_sound.a */; };
 		3B522DA9259BAA42003301C4 /* libfluidsynth.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B522DA1259BAA13003301C4 /* libfluidsynth.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		3B522DAA259BAA4A003301C4 /* libfluidsynth.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B522DA1259BAA13003301C4 /* libfluidsynth.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		3B522DAB259BAA4C003301C4 /* libfluidsynth.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B522DA1259BAA13003301C4 /* libfluidsynth.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
@@ -284,10 +288,6 @@
 		3B5E1F1F25A8820D0086FFDC /* libEGL.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B5E1F0925A881FB0086FFDC /* libEGL.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		3B5E1F2025A8820F0086FFDC /* libGLESv2.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B5E1F0A25A881FB0086FFDC /* libGLESv2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		3B97F77025E6178200A569B5 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B480E9E25DCD16D001686B4 /* GameController.framework */; };
-		3B97F77225E617E000A569B5 /* libSDL2_sound.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B97F77125E617E000A569B5 /* libSDL2_sound.a */; };
-		3B97F77425E6180100A569B5 /* libSDL2_sound.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B97F77325E6180100A569B5 /* libSDL2_sound.a */; };
-		3B97F77625E6182100A569B5 /* libSDL2_sound.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B97F77525E6182100A569B5 /* libSDL2_sound.a */; };
-		3B97F77725E6182100A569B5 /* libSDL2_sound.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B97F77525E6182100A569B5 /* libSDL2_sound.a */; };
 		3BA08E9B256638C900449CFF /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B46925651C1B003DAD8A /* AudioToolbox.framework */; };
 		3BA69454263DAB53004194EB /* libnsgif.c in Sources */ = {isa = PBXBuildFile; fileRef = 3BA6944E263DAB53004194EB /* libnsgif.c */; };
 		3BA69455263DAB53004194EB /* libnsgif.c in Sources */ = {isa = PBXBuildFile; fileRef = 3BA6944E263DAB53004194EB /* libnsgif.c */; };
@@ -950,6 +950,9 @@
 		3B426F70256B8AC0009EA00F /* fs_std_fwd.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = fs_std_fwd.hpp; sourceTree = "<group>"; };
 		3B480E9325DCBDD6001686B4 /* sdl_codes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sdl_codes.h; path = views/sdl_codes.h; sourceTree = "<group>"; };
 		3B480E9E25DCD16D001686B4 /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; };
+		3B4937AB267BFEBB00D358E5 /* libSDL_sound.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL_sound.a; path = "Dependencies/build-macosx-universal/lib/libSDL_sound.a"; sourceTree = "<group>"; };
+		3B4937AD267BFED000D358E5 /* libSDL_sound.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL_sound.a; path = "Dependencies/build-macosx-arm64/lib/libSDL_sound.a"; sourceTree = "<group>"; };
+		3B4937AF267BFEF900D358E5 /* libSDL_sound.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL_sound.a; path = "Dependencies/build-macosx-x86_64/lib/libSDL_sound.a"; sourceTree = "<group>"; };
 		3B522DA1259BAA13003301C4 /* libfluidsynth.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfluidsynth.dylib; path = Dependencies/Frameworks/libfluidsynth.dylib; sourceTree = "<group>"; };
 		3B522DB2259BC037003301C4 /* net.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net.h; sourceTree = "<group>"; };
 		3B522DBD259BD046003301C4 /* httplib.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = httplib.h; sourceTree = "<group>"; };
@@ -974,9 +977,6 @@
 		3B5A8463256A46B200BAF2E5 /* systemImplApple.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = systemImplApple.mm; sourceTree = "<group>"; };
 		3B5E1F0925A881FB0086FFDC /* libEGL.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libEGL.dylib; path = Dependencies/Frameworks/ANGLE/libEGL.dylib; sourceTree = "<group>"; };
 		3B5E1F0A25A881FB0086FFDC /* libGLESv2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libGLESv2.dylib; path = Dependencies/Frameworks/ANGLE/libGLESv2.dylib; sourceTree = "<group>"; };
-		3B97F77125E617E000A569B5 /* libSDL2_sound.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_sound.a; path = "Dependencies/build-macosx-arm64/lib/libSDL2_sound.a"; sourceTree = "<group>"; };
-		3B97F77325E6180100A569B5 /* libSDL2_sound.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_sound.a; path = "Dependencies/build-macosx-universal/lib/libSDL2_sound.a"; sourceTree = "<group>"; };
-		3B97F77525E6182100A569B5 /* libSDL2_sound.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_sound.a; path = "Dependencies/build-macosx-x86_64/lib/libSDL2_sound.a"; sourceTree = "<group>"; };
 		3BA08EA4256641ED00449CFF /* Assets.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Assets.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		3BA08EA6256641EE00449CFF /* Assets.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Assets.plist; sourceTree = "<group>"; };
 		3BA6944E263DAB53004194EB /* libnsgif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libnsgif.c; sourceTree = "<group>"; };
@@ -1068,11 +1068,11 @@
 			files = (
 				3B1C23C325A19C600075EF5D /* libSDL2_ttf.a in Frameworks */,
 				3B1C23C425A19C600075EF5D /* libvorbisenc.a in Frameworks */,
+				3B4937B1267BFEF900D358E5 /* libSDL_sound.a in Frameworks */,
 				3B1C23C525A19C600075EF5D /* libssl.a in Frameworks */,
 				3B1C23C625A19C600075EF5D /* libSDL2main.a in Frameworks */,
 				3B1C23C725A19C600075EF5D /* libcrypto.a in Frameworks */,
 				3B1C23C825A19C600075EF5D /* libopenal.a in Frameworks */,
-				3B97F77725E6182100A569B5 /* libSDL2_sound.a in Frameworks */,
 				3B1BC0ED266F924B00794D22 /* libuchardet.a in Frameworks */,
 				3B1C23C925A19C600075EF5D /* libpixman-1.a in Frameworks */,
 				3B5E1F1225A881FB0086FFDC /* libGLESv2.dylib in Frameworks */,
@@ -1124,7 +1124,6 @@
 				3B5E1F0D25A881FB0086FFDC /* libEGL.dylib in Frameworks */,
 				3BC65D282584EDC60063AFF1 /* IOKit.framework in Frameworks */,
 				3BC65D2A2584EDC60063AFF1 /* Carbon.framework in Frameworks */,
-				3B97F77225E617E000A569B5 /* libSDL2_sound.a in Frameworks */,
 				3BC65D662584EED10063AFF1 /* libopenal.a in Frameworks */,
 				3BC65D2B2584EDC60063AFF1 /* AppKit.framework in Frameworks */,
 				3BC65D5B2584EED10063AFF1 /* libpixman-1.a in Frameworks */,
@@ -1153,6 +1152,7 @@
 				3BC65D372584EDC60063AFF1 /* libiconv.tbd in Frameworks */,
 				3BC65D602584EED10063AFF1 /* libSDL2main.a in Frameworks */,
 				3BC65D5D2584EED10063AFF1 /* libvorbisenc.a in Frameworks */,
+				3B4937AE267BFED000D358E5 /* libSDL_sound.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1167,7 +1167,6 @@
 				3B5E1F0B25A881FB0086FFDC /* libEGL.dylib in Frameworks */,
 				3BC65E222584F4290063AFF1 /* libSDL2_ttf.a in Frameworks */,
 				3BC65E2B2584F4290063AFF1 /* libphysfs.a in Frameworks */,
-				3B97F77425E6180100A569B5 /* libSDL2_sound.a in Frameworks */,
 				3BC65DEB2584F3AD0063AFF1 /* IOKit.framework in Frameworks */,
 				3BC65E2E2584F4290063AFF1 /* libSDL2.a in Frameworks */,
 				3BC65DED2584F3AD0063AFF1 /* Carbon.framework in Frameworks */,
@@ -1196,6 +1195,7 @@
 				3BC65E202584F4290063AFF1 /* libpixman-1.a in Frameworks */,
 				3BC65E062584F3AD0063AFF1 /* libiconv.tbd in Frameworks */,
 				3BC65E262584F4290063AFF1 /* libpng16.a in Frameworks */,
+				3B4937AC267BFEBB00D358E5 /* libSDL_sound.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1205,11 +1205,11 @@
 			files = (
 				3BE0810D256879FE0006849F /* libSDL2_ttf.a in Frameworks */,
 				3BE08119256879FE0006849F /* libvorbisenc.a in Frameworks */,
+				3B4937B0267BFEF900D358E5 /* libSDL_sound.a in Frameworks */,
 				3B522DD6259BFF2D003301C4 /* libssl.a in Frameworks */,
 				3BE08102256879FE0006849F /* libSDL2main.a in Frameworks */,
 				3B522DD8259BFF2D003301C4 /* libcrypto.a in Frameworks */,
 				3B5A8445256A0F6300BAF2E5 /* libopenal.a in Frameworks */,
-				3B97F77625E6182100A569B5 /* libSDL2_sound.a in Frameworks */,
 				3B1BC0EC266F924B00794D22 /* libuchardet.a in Frameworks */,
 				3BE08107256879FE0006849F /* libpixman-1.a in Frameworks */,
 				3B5E1F1025A881FB0086FFDC /* libGLESv2.dylib in Frameworks */,
@@ -1654,8 +1654,8 @@
 				3BC65D4C2584EED10063AFF1 /* libphysfs.a */,
 				3BC65D4B2584EED10063AFF1 /* libpixman-1.a */,
 				3BC65D592584EED10063AFF1 /* libpng16.a */,
+				3B4937AD267BFED000D358E5 /* libSDL_sound.a */,
 				3B1C230625A142620075EF5D /* libruby.3.0.dylib */,
-				3B97F77125E617E000A569B5 /* libSDL2_sound.a */,
 				3BC65D522584EED10063AFF1 /* libSDL2_image.a */,
 				3BC65D532584EED10063AFF1 /* libSDL2_ttf.a */,
 				3BC65D552584EED10063AFF1 /* libSDL2.a */,
@@ -1683,8 +1683,8 @@
 				3BC65D7B2584F3780063AFF1 /* libphysfs.a */,
 				3BC65D882584F3780063AFF1 /* libpixman-1.a */,
 				3BC65D872584F3780063AFF1 /* libpng16.a */,
+				3B4937AB267BFEBB00D358E5 /* libSDL_sound.a */,
 				3BEA5D7125AC3CE300B6E359 /* libSDL2_image.a */,
-				3B97F77325E6180100A569B5 /* libSDL2_sound.a */,
 				3BC65D832584F3780063AFF1 /* libSDL2_ttf.a */,
 				3BC65D862584F3780063AFF1 /* libSDL2.a */,
 				3BC65D892584F3910063AFF1 /* libSDL2main.a */,
@@ -1804,9 +1804,9 @@
 				3BE081492568A5F60006849F /* libturbojpeg.a */,
 				3BE080FF256879FE0006849F /* libphysfs.a */,
 				3B1C230A25A144A10075EF5D /* libruby.3.0.dylib */,
+				3B4937AF267BFEF900D358E5 /* libSDL_sound.a */,
 				3BE080E9256879FC0006849F /* libpixman-1.a */,
 				3BE080F0256879FD0006849F /* libSDL2_image.a */,
-				3B97F77525E6182100A569B5 /* libSDL2_sound.a */,
 				3BE080FA256879FE0006849F /* libSDL2_test.a */,
 				3BE080EF256879FD0006849F /* libSDL2_ttf.a */,
 				3BE080EB256879FC0006849F /* libSDL2.a */,

src/filesystem/filesystem.cpp

@@ -33,8 +33,6 @@
 
 #include <physfs.h>
 
-#include <SDL_sound.h>
-
 #include <algorithm>
 #include <stack>
 #include <stdio.h>

src/meson.build

@@ -4,7 +4,7 @@ vorbisfile = dependency('vorbisfile', static: build_static)
 vorbis = dependency('vorbis', static: build_static)
 ogg = dependency('ogg', static: build_static)
 sdl2 = dependency('SDL2', static: build_static)
-sdl_sound = compilers['cpp'].find_library('SDL2_sound')
+sdl_sound = dependency('SDL_sound', static: build_static)
 sdl2_ttf = dependency('SDL2_ttf', static: build_static)
 freetype = dependency('freetype2', static: build_static)
 sdl2_image = dependency('SDL2_image', static: build_static)

windows/Makefile

@@ -201,18 +201,27 @@ $(DOWNLOADS)/sdl2_image/autogen.sh:
 	$(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z
 
 # SDL_sound
-sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL2_sound.a
+sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL_sound.a
 
-$(LIBDIR)/libSDL2_sound.a: $(DOWNLOADS)/sdl_sound/cmakebuild/Makefile
+$(LIBDIR)/libSDL_sound.a: $(DOWNLOADS)/sdl_sound/Makefile
-	cd $(DOWNLOADS)/sdl_sound/cmakebuild; \
+	cd $(DOWNLOADS)/sdl_sound; \
 	make -j$(NPROC); make install
 
-$(DOWNLOADS)/sdl_sound/cmakebuild/Makefile: $(DOWNLOADS)/sdl_sound/CMakeLists.txt
+$(DOWNLOADS)/sdl_sound/Makefile: $(DOWNLOADS)/sdl_sound/configure
-	cd $(DOWNLOADS)/sdl_sound; mkdir -p cmakebuild; cd cmakebuild; \
+	cd $(DOWNLOADS)/sdl_sound; \
-	$(CMAKE) -DSDLSOUND_BUILD_SHARED=false -DSDLSOUND_BUILD_TEST=false
+	$(CONFIGURE) \
+	--disable-sdltest --disable-modplug \
+	--disable-flac --disable-speex \
+	--disable-physfs --disable-raw \
+	--disable-mikmod --disable-au \
+	--disable-voc --disable-shn \
+	--enable-static=yes --enable-shared=no
 
-$(DOWNLOADS)/sdl_sound/CMakeLists.txt:
+$(DOWNLOADS)/sdl_sound/configure: $(DOWNLOADS)/sdl_sound/bootstrap
-	$(CLONE) $(GITLAB)/mkxp-z/SDL_sound $(DOWNLOADS)/sdl_sound -b v2.0
+	cd $(DOWNLOADS)/sdl_sound; ./bootstrap
+
+$(DOWNLOADS)/sdl_sound/bootstrap:
+	$(CLONE) $(GITLAB)/mkxp-z/SDL_sound $(DOWNLOADS)/sdl_sound
 
 # SDL2 (ttf)
 sdl2ttf: init_dirs sdl2 freetype $(LIBDIR)/libSDL2_ttf.a