mirror of
https://github.com/mkxp-z/mkxp-z.git
synced 2025-09-10 12:02:53 +02:00
Revert using libnyquist
This commit is contained in:
Snowdream
parent
88ba39197d
commit
689911510a
6 changed files with 35 additions and 89 deletions
|
|
@ -235,22 +235,6 @@ $(DOWNLOADS)/sdl2_image/configure: $(DOWNLOADS)/sdl2_image/autogen.sh
|
|||
$(DOWNLOADS)/sdl2_image/autogen.sh:
|
||||
$(CLONE) $(GITLAB)/mkxp-z/SDL_image_old $(DOWNLOADS)/sdl2_image -b mkxp-z
|
||||
|
||||
# libnyquist
|
||||
libnyquist: init_dirs sdl2 $(LIBDIR)/libnyquist.a
|
||||
|
||||
$(LIBDIR)/libnyquist.a: $(DOWNLOADS)/libnyquist/cmakebuild/Makefile
|
||||
cd $(DOWNLOADS)/libnyquist/cmakebuild; \
|
||||
make -j$(NPROC); make install
|
||||
|
||||
$(DOWNLOADS)/libnyquist/cmakebuild/Makefile: $(DOWNLOADS)/libnyquist/CMakeLists.txt
|
||||
cd $(DOWNLOADS)/libnyquist; mkdir -p cmakebuild; cd cmakebuild; \
|
||||
$(CMAKE) \
|
||||
-DLIBNYQUIST_BUILD_EXAMPLES=no \
|
||||
-DCMAKE_CXX_STANDARD=11
|
||||
|
||||
$(DOWNLOADS)/libnyquist/CMakeLists.txt:
|
||||
$(CLONE) $(GITLAB)/mkxp-z/libnyquist $(DOWNLOADS)/libnyquist
|
||||
|
||||
# SDL_sound
|
||||
sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL2_sound.a
|
||||
|
||||
|
|
@ -368,5 +352,5 @@ powerwash: clean-downloads
|
|||
clean-downloads:
|
||||
-rm -rf downloads
|
||||
|
||||
deps-core: libtheora libvorbis pixman libpng libjpeg physfs sdl2 sdl2image libnyquist sdlsound sdl2ttf openal openssl fluidsynth uchardet iconv
|
||||
deps-core: libtheora libvorbis pixman libpng libjpeg physfs sdl2 sdl2image sdlsound sdl2ttf openal openssl fluidsynth uchardet iconv
|
||||
everything: deps-core autoconf ruby
|
||||
|
|
|
|||
|
|
@ -218,23 +218,6 @@ $(DOWNLOADS)/sdl2_image/CMakeLists.txt:
|
|||
$(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z
|
||||
|
||||
|
||||
# libnyquist
|
||||
libnyquist: init_dirs sdl2 $(LIBDIR)/libnyquist.a
|
||||
|
||||
$(LIBDIR)/libnyquist.a: $(DOWNLOADS)/libnyquist/cmakebuild/Makefile
|
||||
cd $(DOWNLOADS)/libnyquist/cmakebuild; \
|
||||
make -j$(NPROC); make install
|
||||
|
||||
$(DOWNLOADS)/libnyquist/cmakebuild/Makefile: $(DOWNLOADS)/libnyquist/CMakeLists.txt
|
||||
cd $(DOWNLOADS)/libnyquist; mkdir -p cmakebuild; cd cmakebuild; \
|
||||
$(CMAKE) \
|
||||
-DLIBNYQUIST_BUILD_EXAMPLES=no \
|
||||
-DCMAKE_CXX_STANDARD=11
|
||||
|
||||
$(DOWNLOADS)/libnyquist/CMakeLists.txt:
|
||||
$(CLONE) $(GITLAB)/mkxp-z/libnyquist $(DOWNLOADS)/libnyquist
|
||||
|
||||
|
||||
# SDL_sound
|
||||
sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL2_sound.a
|
||||
|
||||
|
|
@ -350,5 +333,5 @@ clean-downloads:
|
|||
clean-compiled:
|
||||
-rm -rf build-$(SDK)-$(ARCH)
|
||||
|
||||
deps-core: libtheora libvorbis pixman libpng physfs uchardet sdl2 sdl2image libnyquist sdlsound sdl2ttf openal openssl
|
||||
deps-core: libtheora libvorbis pixman libpng physfs uchardet sdl2 sdl2image sdlsound sdl2ttf openal openssl
|
||||
everything: deps-core autoconf ruby
|
||||
|
|
|
|||
|
|
@ -187,6 +187,7 @@
|
|||
3B1C23C825A19C600075EF5D /* libopenal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B5A8444256A0F6300BAF2E5 /* libopenal.a */; };
|
||||
3B1C23C925A19C600075EF5D /* libpixman-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080E9256879FC0006849F /* libpixman-1.a */; };
|
||||
3B1C23CA25A19C600075EF5D /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081582568D3A60006849F /* AppKit.framework */; };
|
||||
3B1C23CB25A19C600075EF5D /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FD256879FE0006849F /* libogg.a */; };
|
||||
3B1C23CC25A19C600075EF5D /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080EB256879FC0006849F /* libSDL2.a */; };
|
||||
3B1C23CD25A19C600075EF5D /* libturbojpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081492568A5F60006849F /* libturbojpeg.a */; };
|
||||
3B1C23CE25A19C600075EF5D /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081452568A5C60006849F /* libpng.a */; };
|
||||
|
|
@ -373,6 +374,7 @@
|
|||
3BBE88042705A73400A574AE /* libsteam_api.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B1C241125A1A7120075EF5D /* libsteam_api.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
|
||||
3BBE88052705A73400A574AE /* libGLESv2.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B5E1F0A25A881FB0086FFDC /* libGLESv2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
|
||||
3BBE880B2705AA8F00A574AE /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B522DC8259BFEDF003301C4 /* libcrypto.a */; };
|
||||
3BBE880E2705AAF200A574AE /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D822584F3780063AFF1 /* libogg.a */; };
|
||||
3BBE880F2705AAFF00A574AE /* libSDL2_ttf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D832584F3780063AFF1 /* libSDL2_ttf.a */; };
|
||||
3BBE88102705AB0400A574AE /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D7A2584F3780063AFF1 /* libvorbisenc.a */; };
|
||||
3BBE88112705AB0900A574AE /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B522DC9259BFEDF003301C4 /* libssl.a */; };
|
||||
|
|
@ -478,6 +480,7 @@
|
|||
3BC65E282584F4290063AFF1 /* libSDL2main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D892584F3910063AFF1 /* libSDL2main.a */; };
|
||||
3BC65E2B2584F4290063AFF1 /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D7B2584F3780063AFF1 /* libphysfs.a */; };
|
||||
3BC65E2C2584F4290063AFF1 /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D7A2584F3780063AFF1 /* libvorbisenc.a */; };
|
||||
3BC65E2D2584F4290063AFF1 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D822584F3780063AFF1 /* libogg.a */; };
|
||||
3BC65E2E2584F4290063AFF1 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC65D862584F3780063AFF1 /* libSDL2.a */; };
|
||||
3BD2B6E72565AEC0003DAD8A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B47A256534BA003DAD8A /* IOKit.framework */; };
|
||||
3BD2B6ED2565AEC0003DAD8A /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BD2B46825651C12003DAD8A /* libiconv.tbd */; };
|
||||
|
|
@ -493,6 +496,7 @@
|
|||
3BE0810E256879FE0006849F /* libSDL2_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080F0256879FD0006849F /* libSDL2_image.a */; };
|
||||
3BE08119256879FE0006849F /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FB256879FE0006849F /* libvorbisenc.a */; };
|
||||
3BE0811A256879FE0006849F /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FC256879FE0006849F /* libfreetype.a */; };
|
||||
3BE0811B256879FE0006849F /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FD256879FE0006849F /* libogg.a */; };
|
||||
3BE0811D256879FE0006849F /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE080FF256879FE0006849F /* libphysfs.a */; };
|
||||
3BE081462568A5C60006849F /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081452568A5C60006849F /* libpng.a */; };
|
||||
3BE0814A2568A5F60006849F /* libturbojpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE081492568A5F60006849F /* libturbojpeg.a */; };
|
||||
|
|
@ -518,10 +522,6 @@
|
|||
96573E83279152DC002C3E77 /* TouchBar.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 96573E80279152DC002C3E77 /* TouchBar.xcassets */; };
|
||||
96573E84279152DC002C3E77 /* TouchBar.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 96573E80279152DC002C3E77 /* TouchBar.xcassets */; };
|
||||
96D8EDD128728DCE00A331EA /* gamecontrollerdb.txt in Resources */ = {isa = PBXBuildFile; fileRef = 96D8EDD028728DCA00A331EA /* gamecontrollerdb.txt */; };
|
||||
96F18E2C2886472F00487D1C /* libnyquist.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96F18E2A288646E800487D1C /* libnyquist.a */; };
|
||||
96F18E2D2886473400487D1C /* libnyquist.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96F18E2A288646E800487D1C /* libnyquist.a */; };
|
||||
96F18E2E2886473900487D1C /* libnyquist.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96F18E2B2886472200487D1C /* libnyquist.a */; };
|
||||
96F18E2F2886473F00487D1C /* libnyquist.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96F18E2B2886472200487D1C /* libnyquist.a */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXContainerItemProxy section */
|
||||
|
|
@ -1054,6 +1054,7 @@
|
|||
3BC65D7D2584F3780063AFF1 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "Dependencies/build-macosx-universal/lib/libfreetype.a"; sourceTree = "<group>"; };
|
||||
3BC65D7E2584F3780063AFF1 /* libturbojpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libturbojpeg.a; path = "Dependencies/build-macosx-universal/lib/libturbojpeg.a"; sourceTree = "<group>"; };
|
||||
3BC65D812584F3780063AFF1 /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = "Dependencies/build-macosx-universal/lib/libvorbisfile.a"; sourceTree = "<group>"; };
|
||||
3BC65D822584F3780063AFF1 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "Dependencies/build-macosx-universal/lib/libogg.a"; sourceTree = "<group>"; };
|
||||
3BC65D832584F3780063AFF1 /* libSDL2_ttf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_ttf.a; path = "Dependencies/build-macosx-universal/lib/libSDL2_ttf.a"; sourceTree = "<group>"; };
|
||||
3BC65D842584F3780063AFF1 /* libopenal.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopenal.a; path = "Dependencies/build-macosx-universal/lib/libopenal.a"; sourceTree = "<group>"; };
|
||||
3BC65D852584F3780063AFF1 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "Dependencies/build-macosx-universal/lib/libvorbis.a"; sourceTree = "<group>"; };
|
||||
|
|
@ -1084,6 +1085,7 @@
|
|||
3BE080FA256879FE0006849F /* libSDL2_test.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2_test.a; path = "Dependencies/build-macosx-x86_64/lib/libSDL2_test.a"; sourceTree = "<group>"; };
|
||||
3BE080FB256879FE0006849F /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisenc.a; path = "Dependencies/build-macosx-x86_64/lib/libvorbisenc.a"; sourceTree = "<group>"; };
|
||||
3BE080FC256879FE0006849F /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = "Dependencies/build-macosx-x86_64/lib/libfreetype.a"; sourceTree = "<group>"; };
|
||||
3BE080FD256879FE0006849F /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "Dependencies/build-macosx-x86_64/lib/libogg.a"; sourceTree = "<group>"; };
|
||||
3BE080FF256879FE0006849F /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libphysfs.a; path = "Dependencies/build-macosx-x86_64/lib/libphysfs.a"; sourceTree = "<group>"; };
|
||||
3BE081452568A5C60006849F /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "Dependencies/build-macosx-x86_64/lib/libpng.a"; sourceTree = "<group>"; };
|
||||
3BE081492568A5F60006849F /* libturbojpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libturbojpeg.a; path = "Dependencies/build-macosx-x86_64/lib/libturbojpeg.a"; sourceTree = "<group>"; };
|
||||
|
|
@ -1109,8 +1111,6 @@
|
|||
96573E7B27913B46002C3E77 /* TouchBar.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = TouchBar.h; path = views/TouchBar.h; sourceTree = "<group>"; };
|
||||
96573E80279152DC002C3E77 /* TouchBar.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = TouchBar.xcassets; path = views/TouchBar.xcassets; sourceTree = "<group>"; };
|
||||
96D8EDD028728DCA00A331EA /* gamecontrollerdb.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = gamecontrollerdb.txt; path = ../assets/gamecontrollerdb.txt; sourceTree = "<group>"; };
|
||||
96F18E2A288646E800487D1C /* libnyquist.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libnyquist.a; path = "Dependencies/build-macosx-universal/lib/libnyquist.a"; sourceTree = "<group>"; };
|
||||
96F18E2B2886472200487D1C /* libnyquist.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libnyquist.a; path = "Dependencies/build-macosx-x86_64/lib/libnyquist.a"; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
|
|
@ -1129,13 +1129,13 @@
|
|||
3B1C23C325A19C600075EF5D /* libSDL2_ttf.a in Frameworks */,
|
||||
3B1C23C425A19C600075EF5D /* libvorbisenc.a in Frameworks */,
|
||||
3B1C23C525A19C600075EF5D /* libssl.a in Frameworks */,
|
||||
96F18E2F2886473F00487D1C /* libnyquist.a in Frameworks */,
|
||||
3B1C23C725A19C600075EF5D /* libcrypto.a in Frameworks */,
|
||||
3B1C23C825A19C600075EF5D /* libopenal.a in Frameworks */,
|
||||
3B1BC0ED266F924B00794D22 /* libuchardet.a in Frameworks */,
|
||||
3B1C23C925A19C600075EF5D /* libpixman-1.a in Frameworks */,
|
||||
3B5E1F1225A881FB0086FFDC /* libGLESv2.dylib in Frameworks */,
|
||||
3B1C23CA25A19C600075EF5D /* AppKit.framework in Frameworks */,
|
||||
3B1C23CB25A19C600075EF5D /* libogg.a in Frameworks */,
|
||||
3B1C23CC25A19C600075EF5D /* libSDL2.a in Frameworks */,
|
||||
3B1C23CD25A19C600075EF5D /* libturbojpeg.a in Frameworks */,
|
||||
3B1C23CE25A19C600075EF5D /* libpng.a in Frameworks */,
|
||||
|
|
@ -1180,12 +1180,12 @@
|
|||
3BBE88102705AB0400A574AE /* libvorbisenc.a in Frameworks */,
|
||||
3BBE88112705AB0900A574AE /* libssl.a in Frameworks */,
|
||||
3BBE88142705AB1A00A574AE /* libuchardet.a in Frameworks */,
|
||||
96F18E2D2886473400487D1C /* libnyquist.a in Frameworks */,
|
||||
3BBE88132705AB1700A574AE /* libopenal.a in Frameworks */,
|
||||
3BBE88162705AC0800A574AE /* libpixman-1.a in Frameworks */,
|
||||
3BBE87D72705A73400A574AE /* libGLESv2.dylib in Frameworks */,
|
||||
3BBE87D82705A73400A574AE /* AppKit.framework in Frameworks */,
|
||||
3BBE88172705AC0C00A574AE /* libSDL2.a in Frameworks */,
|
||||
3BBE880E2705AAF200A574AE /* libogg.a in Frameworks */,
|
||||
3BBE88182705AC1400A574AE /* libturbojpeg.a in Frameworks */,
|
||||
3BBE87DD2705A73400A574AE /* libEGL.dylib in Frameworks */,
|
||||
3BBE88212705AD3D00A574AE /* libpng16.a in Frameworks */,
|
||||
|
|
@ -1221,9 +1221,9 @@
|
|||
files = (
|
||||
96563585279A5ADA003D6A75 /* libtheora.a in Frameworks */,
|
||||
3BC65E2C2584F4290063AFF1 /* libvorbisenc.a in Frameworks */,
|
||||
3BC65E2D2584F4290063AFF1 /* libogg.a in Frameworks */,
|
||||
3BAEB1442673DBE700AC177B /* libuchardet.a in Frameworks */,
|
||||
3B522DCC259BFEE0003301C4 /* libssl.a in Frameworks */,
|
||||
96F18E2C2886472F00487D1C /* libnyquist.a in Frameworks */,
|
||||
3B5E1F0B25A881FB0086FFDC /* libEGL.dylib in Frameworks */,
|
||||
3BC65E222584F4290063AFF1 /* libSDL2_ttf.a in Frameworks */,
|
||||
3BF5B4BD2685881D00A3B240 /* libSDL2_sound.a in Frameworks */,
|
||||
|
|
@ -1266,13 +1266,13 @@
|
|||
3BE0810D256879FE0006849F /* libSDL2_ttf.a in Frameworks */,
|
||||
3BE08119256879FE0006849F /* libvorbisenc.a in Frameworks */,
|
||||
3B522DD6259BFF2D003301C4 /* libssl.a in Frameworks */,
|
||||
96F18E2E2886473900487D1C /* libnyquist.a in Frameworks */,
|
||||
3B522DD8259BFF2D003301C4 /* libcrypto.a in Frameworks */,
|
||||
3B5A8445256A0F6300BAF2E5 /* libopenal.a in Frameworks */,
|
||||
3B1BC0EC266F924B00794D22 /* libuchardet.a in Frameworks */,
|
||||
3BE08107256879FE0006849F /* libpixman-1.a in Frameworks */,
|
||||
3B5E1F1025A881FB0086FFDC /* libGLESv2.dylib in Frameworks */,
|
||||
3B1C233025A16CB20075EF5D /* AppKit.framework in Frameworks */,
|
||||
3BE0811B256879FE0006849F /* libogg.a in Frameworks */,
|
||||
3BE08109256879FE0006849F /* libSDL2.a in Frameworks */,
|
||||
3BE0814A2568A5F60006849F /* libturbojpeg.a in Frameworks */,
|
||||
3BE081462568A5C60006849F /* libpng.a in Frameworks */,
|
||||
|
|
@ -1725,7 +1725,7 @@
|
|||
3B522DA1259BAA13003301C4 /* libfluidsynth.dylib */,
|
||||
3B1C230D25A144BF0075EF5D /* libruby.3.1.dylib */,
|
||||
96563584279A5ADA003D6A75 /* libtheora.a */,
|
||||
96F18E2A288646E800487D1C /* libnyquist.a */,
|
||||
3BC65D822584F3780063AFF1 /* libogg.a */,
|
||||
3BC65D842584F3780063AFF1 /* libopenal.a */,
|
||||
3BC65D7B2584F3780063AFF1 /* libphysfs.a */,
|
||||
3BC65D882584F3780063AFF1 /* libpixman-1.a */,
|
||||
|
|
@ -1846,8 +1846,8 @@
|
|||
3BE080FC256879FE0006849F /* libfreetype.a */,
|
||||
3B1BC0EB266F924B00794D22 /* libuchardet.a */,
|
||||
3B5A8444256A0F6300BAF2E5 /* libopenal.a */,
|
||||
3BE080FD256879FE0006849F /* libogg.a */,
|
||||
3BE081452568A5C60006849F /* libpng.a */,
|
||||
96F18E2B2886472200487D1C /* libnyquist.a */,
|
||||
3BE081492568A5F60006849F /* libturbojpeg.a */,
|
||||
3BE080FF256879FE0006849F /* libphysfs.a */,
|
||||
3B1C230A25A144A10075EF5D /* libruby.3.1.dylib */,
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#include "util.h"
|
||||
#include "debugwriter.h"
|
||||
|
||||
#include <libnyquist/Decoders.h>
|
||||
#include <SDL_sound.h>
|
||||
|
||||
#define SE_CACHE_MEM (10*1024*1024) // 10 MB
|
||||
|
||||
|
|
@ -187,7 +187,6 @@ void SoundEmitter::stop()
|
|||
struct SoundOpenHandler : FileSystem::OpenHandler
|
||||
{
|
||||
SoundBuffer *buffer;
|
||||
std::string error;
|
||||
|
||||
SoundOpenHandler()
|
||||
: buffer(0)
|
||||
|
|
@ -195,31 +194,29 @@ struct SoundOpenHandler : FileSystem::OpenHandler
|
|||
|
||||
bool tryRead(SDL_RWops &ops, const char *ext)
|
||||
{
|
||||
nqr::AudioData audioData;
|
||||
{
|
||||
nqr::NyquistIO io;
|
||||
std::vector<uint8_t> vec(SDL_RWsize(&ops));
|
||||
SDL_RWread(&ops, vec.data(), vec.size(), vec.size());
|
||||
try {
|
||||
io.Load(&audioData, ext, vec);
|
||||
} catch(std::runtime_error &e) {
|
||||
error = e.what();
|
||||
SDL_RWclose(&ops);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Sound_Sample *sample = Sound_NewSample(&ops, ext, 0, STREAM_BUF_SIZE);
|
||||
|
||||
if (!sample)
|
||||
{
|
||||
SDL_RWclose(&ops);
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Do all of the decoding in the handler so we don't have
|
||||
* to keep the source ops around */
|
||||
uint8_t sampleSize = sizeof(float);
|
||||
uint32_t decBytes = Sound_DecodeAll(sample);
|
||||
uint8_t sampleSize = formatSampleSize(sample->actual.format);
|
||||
uint32_t sampleCount = decBytes / sampleSize;
|
||||
|
||||
buffer = new SoundBuffer;
|
||||
buffer->bytes = (uint32_t)audioData.samples.size() * sampleSize;
|
||||
buffer->bytes = sampleSize * sampleCount;
|
||||
|
||||
ALenum alFormat = chooseALFormat(sampleSize, audioData.channelCount);
|
||||
ALenum alFormat = chooseALFormat(sampleSize, sample->actual.channels);
|
||||
|
||||
AL::Buffer::uploadData(buffer->alBuffer, alFormat, audioData.samples.data(),
|
||||
buffer->bytes, audioData.sampleRate);
|
||||
AL::Buffer::uploadData(buffer->alBuffer, alFormat, sample->buffer,
|
||||
buffer->bytes, sample->actual.rate);
|
||||
|
||||
Sound_FreeSample(sample);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -249,7 +246,7 @@ SoundBuffer *SoundEmitter::allocateBuffer(const std::string &filename)
|
|||
{
|
||||
char buf[512];
|
||||
snprintf(buf, sizeof(buf), "Unable to decode sound: %s: %s",
|
||||
filename.c_str(), handler.error.c_str());
|
||||
filename.c_str(), Sound_GetError());
|
||||
Debug() << buf;
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -3,11 +3,9 @@ openal = dependency('openal', static: build_static, method: 'pkg-config')
|
|||
theora = dependency('theora', static: build_static)
|
||||
vorbisfile = dependency('vorbisfile', static: build_static)
|
||||
vorbis = dependency('vorbis', static: build_static)
|
||||
# Nyquist also includes ogg symbols, so do not link libogg to mkxp-z itself
|
||||
ogg = dependency('ogg', static: build_static).partial_dependency(includes: true, compile_args: true)
|
||||
ogg = dependency('ogg', static: build_static)
|
||||
sdl2 = dependency('SDL2', static: build_static)
|
||||
sdl_sound = compilers['cpp'].find_library('SDL2_sound')
|
||||
libnyquist = compilers['cpp'].find_library('nyquist')
|
||||
sdl2_ttf = dependency('SDL2_ttf', static: build_static)
|
||||
freetype = dependency('freetype2', static: build_static)
|
||||
sdl2_image = dependency('SDL2_image', static: build_static)
|
||||
|
|
@ -85,7 +83,7 @@ global_include_dirs += include_directories('.',
|
|||
'util', 'util/sigslot', 'util/sigslot/adapter'
|
||||
)
|
||||
|
||||
global_dependencies += [openal, zlib, bz2, sdl2, libnyquist, sdl_sound, pixman, physfs, theora, vorbisfile, vorbis, ogg, sdl2_ttf, freetype, sdl2_image, png, jpeg, iconv, uchardet]
|
||||
global_dependencies += [openal, zlib, bz2, sdl2, sdl_sound, pixman, physfs, theora, vorbisfile, vorbis, ogg, sdl2_ttf, freetype, sdl2_image, png, jpeg, iconv, uchardet]
|
||||
if host_system == 'windows'
|
||||
global_dependencies += compilers['cpp'].find_library('wsock32')
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -218,22 +218,6 @@ $(DOWNLOADS)/sdl2_image/configure: $(DOWNLOADS)/sdl2_image/autogen.sh
|
|||
$(DOWNLOADS)/sdl2_image/autogen.sh:
|
||||
$(CLONE) $(GITLAB)/mkxp-z/SDL_image_old $(DOWNLOADS)/sdl2_image -b mkxp-z
|
||||
|
||||
# libnyquist
|
||||
libnyquist: init_dirs sdl2 $(LIBDIR)/libnyquist.a
|
||||
|
||||
$(LIBDIR)/libnyquist.a: $(DOWNLOADS)/libnyquist/cmakebuild/Makefile
|
||||
cd $(DOWNLOADS)/libnyquist/cmakebuild; \
|
||||
make -j$(NPROC); make install
|
||||
|
||||
$(DOWNLOADS)/libnyquist/cmakebuild/Makefile: $(DOWNLOADS)/libnyquist/CMakeLists.txt
|
||||
cd $(DOWNLOADS)/libnyquist; mkdir -p cmakebuild; cd cmakebuild; \
|
||||
$(CMAKE) \
|
||||
-DLIBNYQUIST_BUILD_EXAMPLES=no \
|
||||
-DCMAKE_CXX_STANDARD=11
|
||||
|
||||
$(DOWNLOADS)/libnyquist/CMakeLists.txt:
|
||||
$(CLONE) $(GITLAB)/mkxp-z/libnyquist $(DOWNLOADS)/libnyquist
|
||||
|
||||
# SDL_sound
|
||||
sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL2_sound.a
|
||||
|
||||
|
|
@ -354,5 +338,5 @@ powerwash: clean-downloads
|
|||
clean-downloads:
|
||||
-rm -rf downloads
|
||||
|
||||
deps-core: libtheora libvorbis pixman libpng libjpeg physfs sdl2 sdl2image libnyquist sdlsound sdl2ttf openal openssl fluidsynth uchardet
|
||||
deps-core: libtheora libvorbis pixman libpng libjpeg physfs sdl2 sdl2image sdlsound sdl2ttf openal openssl fluidsynth uchardet
|
||||
everything: deps-core autoconf ruby
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue