Merge pull request #5 from MikuAuahDark/replace-mpg123

Replace Mpg123 with dr_mp3

platform/unix/configure.ac

@@ -55,7 +55,6 @@ with_clean_luaversion=`printf ${with_luaversion} | sed 's/\.//g'`
 m4_include([configure-modules-pre.ac])
 
 # Other features that can be enabled/disabled
-AC_ARG_ENABLE([mpg123], AC_HELP_STRING([--disable-mpg123], [Disable mp3 support, for patent-free builds]), [], [enable_mpg123=yes])
 AC_ARG_ENABLE([gme], AC_HELP_STRING([--enable-gme], [Enable GME support, for more chiptuney goodness]), [], [enable_gme=no])
 
 # Dependencies we always use
@@ -71,12 +70,9 @@ AS_VAR_IF([enable_module_font], [yes], [ACLOVE_DEP_FREETYPE2], [])
 AS_VAR_IF([enable_module_sound], [yes], [
 	ACLOVE_DEP_LIBMODPLUG
 	ACLOVE_DEP_VORBISFILE
-], [enable_mpg123=no])
+], [])
 AS_VAR_IF([enable_module_video], [yes], [ACLOVE_DEP_THEORA], [])
 AS_VAR_IF([enable_gme], [yes], [ACLOVE_DEP_GME], [])
-AS_VAR_IF([enable_mpg123], [no],
-	  AC_DEFINE([LOVE_NOMPG123], [], [Build without mpg123]),
-	  [ACLOVE_DEP_MPG123])
 
 # Add flags for optional libraries
 AC_ARG_ENABLE([library-enet], [  --disable-library-enet    Turn off library enet], [], [enable_library_enet=yes])
@@ -117,7 +113,6 @@ AS_VAR_IF([enable_exe], [no], [], #else
 	  AC_DEFINE([LOVE_BUILD_EXE], [], [Skip building launcher]))
 
 AM_CONDITIONAL([LOVE_BUILD_EXE], [test "x$enable_exe" != xno])
-AM_CONDITIONAL([LOVE_NOMPG123], [test "x$enable_mpg123" = xno])
 AM_CONDITIONAL([LOVE_TARGET_OSX], [test "x$enable_osx" != xno])
 
 # Automatic script file rebuilding

platform/unix/debian/control.in

@@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 9),
                luajit,
                libluajit-5.1-dev,
                libmodplug-dev,
-               libmpg123-dev,
                libopenal-dev,
                libphysfs-dev,
                libsdl2-dev (>= 2.0.1),

platform/unix/exclude

@@ -1,5 +1,3 @@
 \./libraries/luasocket/libluasocket/wsocket.*
 \./love\.cpp
-\./modules/sound/lullaby/Mpg123Decoder\.cpp
-\./modules/sound/lullaby/Mpg123Decoder\.h
 \./libraries/glslang/glslang/OSDependent/Windows

platform/unix/genmodules

@@ -45,14 +45,6 @@ genmodules()
 			printf "${FILES:0:${#FILES}-2}\n\n"
 			modulelist+=("$module")
 		fi
-
-		if [[ "$module" = "sound" ]]; then
-			printf "if !LOVE_NOMPG123\n"
-			printf "liblove_module_$module += \\\\\n"
-			printf "\t./modules/sound/lullaby/Mpg123Decoder.cpp \\\\\n"
-			printf "\t./modules/sound/lullaby/Mpg123Decoder.h\n"
-			printf "endif\n\n"
-		fi
 	done
 
 	cd ../libraries