From 4eaf81cc4b9b0ae26a47a718f4d1eaaa64a90a2b Mon Sep 17 00:00:00 2001 From: Roza Date: Mon, 11 Jan 2021 03:11:17 -0500 Subject: [PATCH] Zap SDL2_sound subdir --- macos/Dependencies/dependencies.make | 2 +- meson.build | 3 --- windows/Makefile | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/macos/Dependencies/dependencies.make b/macos/Dependencies/dependencies.make index f7716ab5..aecbd815 100644 --- a/macos/Dependencies/dependencies.make +++ b/macos/Dependencies/dependencies.make @@ -196,7 +196,7 @@ $(DOWNLOADS)/sdl2_image/configure: $(DOWNLOADS)/sdl2_image/autogen.sh $(DOWNLOADS)/sdl2_image/autogen.sh: $(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z -# SDL2_sound +# SDL_sound sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL_sound.a $(LIBDIR)/libSDL_sound.a: $(DOWNLOADS)/sdl_sound/Makefile diff --git a/meson.build b/meson.build index 17983030..21b1310a 100644 --- a/meson.build +++ b/meson.build @@ -62,9 +62,6 @@ endif # BOOST UNORDERED global_include_dirs += include_directories('boost-unordered') -# SDL2_SOUND -subdir('SDL2_sound') - # GLES gfx_backend = get_option('gfx_backend') if gfx_backend == 'gles' diff --git a/windows/Makefile b/windows/Makefile index 02cb123e..60be25cf 100755 --- a/windows/Makefile +++ b/windows/Makefile @@ -183,7 +183,7 @@ $(DOWNLOADS)/sdl2_image/configure: $(DOWNLOADS)/sdl2_image/autogen.sh $(DOWNLOADS)/sdl2_image/autogen.sh: $(CLONE) $(GITLAB)/mkxp-z/SDL_image $(DOWNLOADS)/sdl2_image -b mkxp-z -# SDL2_sound +# SDL_sound sdlsound: init_dirs sdl2 libogg libvorbis $(LIBDIR)/libSDL_sound.a $(LIBDIR)/libSDL_sound.a: $(DOWNLOADS)/sdl_sound/Makefile