Remove libg7221_decode

CMakeLists.txt

@@ -26,9 +26,9 @@ option(USE_VORBIS "Use libvorbis for support of Vorbis" ON)
 option(USE_FFMPEG "Use FFmpeg for support of many codecs" ON)
 option(USE_MAIATRAC3PLUS "Use MAIATRAC3+ for support of ATRAC3+" OFF)
 set(MAIATRAC3PLUS_PATH CACHE PATH "Path to MAIATRAC3+")
+option(USE_G7221 "Use G7221 for support of ITU-T G.722.1 annex C" ON)
 if(WIN32)
 	# May need to see if it is possible to get these to work on non-Windows systems too
-	option(USE_G7221 "Use libg7221_decode for support of ITU-T G.722.1 annex C" ON)
 	option(USE_G719 "Use libg719_decode for support ITU-T G.719" ON)
 	option(USE_ATRAC9 "Use LibAtrac9 for support of ATRAC9" ON)
 	option(USE_CELT "Use libcelt for support of FSB CELT versions 0.6.1 and 0.11.0" ON)
@@ -232,8 +232,8 @@ message(STATUS "        MPEG: ${USE_MPEG}")
 message(STATUS "      Vorbis: ${USE_VORBIS}")
 message(STATUS "      FFmpeg: ${USE_FFMPEG}")
 message(STATUS "  MAIATRAC3+: ${USE_MAIATRAC3PLUS}")
+message(STATUS "     G.722.1: ${USE_G7221}")
 if(WIN32)
-	message(STATUS "     G.722.1: ${USE_G7221}")
 	message(STATUS "       G.719: ${USE_G719}")
 	message(STATUS "      ATRAC9: ${USE_ATRAC9}")
 	message(STATUS "    FSB CELT: ${USE_CELT}")

README.md

@@ -31,7 +31,6 @@ or you can get them here: https://github.com/losnoco/vgmstream/tree/master/ext_l
 Put the following files somewhere Windows can find them:
 - `libvorbis.dll`
 - `libmpg123-0.dll`
-- `libg7221_decode.dll`
 - `libg719_decode.dll`
 - `avcodec-vgmstream-58.dll`
 - `avformat-vgmstream-58.dll`

cli/Makefile

@@ -31,6 +31,13 @@ LIBAO_LIB_PATH = ../../libao/bin
 #endif
 
 
+# config libs
+VGM_ENABLE_G7221 = 1
+ifeq ($(VGM_ENABLE_G7221),1) 
+  CFLAGS  += -DVGM_USE_G7221
+endif
+
+
 ### external libs
 ifeq ($(TARGET_OS),Windows_NT)
 
@@ -48,13 +55,6 @@ ifeq ($(VGM_ENABLE_MPEG),1)
   TARGET_EXT_LIBS += libmpg123-0.a
 endif
 
-VGM_ENABLE_G7221 = 1
-ifeq ($(VGM_ENABLE_G7221),1) 
-  CFLAGS  += -DVGM_USE_G7221
-  LDFLAGS += -lg7221_decode
-  TARGET_EXT_LIBS += libg7221_decode.a
-endif
-
 VGM_ENABLE_G719 = 1
 ifeq ($(VGM_ENABLE_G719),1) 
   CFLAGS  += -DVGM_USE_G719

cli/vgmstream_cli.vcproj

@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libg719_decode.lib libg7221_decode.lib libmpg123-0.lib libvorbis.lib"
+				AdditionalDependencies="libg719_decode.lib libmpg123-0.lib libvorbis.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\ext_libs"
 				GenerateDebugInformation="true"
@@ -141,7 +141,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libg719_decode.lib libg7221_decode.lib libmpg123-0.lib libvorbis.lib"
+				AdditionalDependencies="libg719_decode.lib libmpg123-0.lib libvorbis.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\ext_libs"
 				GenerateDebugInformation="true"

cli/vgmstream_cli.vcxproj

@@ -81,7 +81,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg7221_decode.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -106,7 +106,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg7221_decode.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SubSystem>Console</SubSystem>

cmake/vgmstream.cmake

@@ -90,10 +90,6 @@ macro(setup_target TARGET)
 
 	if(USE_G7221)
 		target_compile_definitions(${TARGET} PRIVATE VGM_USE_G7221)
-		if(LINK)
-			add_dependencies(${TARGET} libg7221_decode)
-			target_link_libraries(${TARGET} ${VGM_BINARY_DIR}/ext_libs/libg7221_decode.lib)
-		endif()
 	endif()
 
 	if(USE_G719)
@@ -136,7 +132,6 @@ macro(install_dlls INSTALL_PREFIX)
 	# Paths to the DLLs
 	set(MPEG_DLL ${VGM_SOURCE_DIR}/ext_libs/libmpg123-0.dll)
 	set(VORBIS_DLL ${VGM_SOURCE_DIR}/ext_libs/libvorbis.dll)
-	set(G7221_DLL ${VGM_SOURCE_DIR}/ext_libs/libg7221_decode.dll)
 	set(G719_DLL ${VGM_SOURCE_DIR}/ext_libs/libg719_decode.dll)
 	set(FFMPEG_DLL
 		${VGM_SOURCE_DIR}/ext_libs/avcodec-vgmstream-58.dll

doc/BUILD.md

@@ -202,16 +202,6 @@ Adds support for MPEG (MP1/MP2/MP3).
 Must use autotools (sh configure, make, make install), though some scripts simplify the process: `makedll.sh`, `windows-builds.sh`.
 
 
-### libg7221_decode
-Adds support for ITU-T G.722.1 annex C (standardization of Polycom Siren 14).
-- Source: https://github.com/bnnm/vgmstream-g7221
-  - Alt lib (has volume problems): https://github.com/kode54/libg7221_decode
-  - licensed under the LGPL v3 (possibly invalid and Polycom's)
-- DLL: `libg7221_decode.dll`
-- unknown license (possibly invalid and Polycom's)
-
-Use make `libg7221_decode.dll`.
-
 ### libg719_decode
 Adds support for ITU-T G.719 (standardization of Polycom Siren 22).
 - Source: https://github.com/kode54/libg719_decode

doc/CMAKE.md

@@ -101,10 +101,10 @@ All of these options are of type BOOL and can be set to either `ON` or `OFF`. Mo
 - **USE_VORBIS**: Chooses if you wish to use libvorbis for support of Vorbis. The default is `ON`.
 - **USE_FFMPEG**: Chooses if you wish to use FFmpeg for support of many codecs. The default is `ON`.
 - **USE_MAIATRAC3PLUS**: Chooses if you wish to use MAIATRAC3+ for support of ATRAC3+. The default is `OFF`. It is not recommended to enable.
+- **USE_G7221**: Chooses if you wish to use G7221 for support of ITU-T G.722.1 annex C. The default is `ON`.
 
 The following options are currently only available for Windows:
 
-- **USE_G7221**: Chooses if you wish to use libg7221_decode for support of ITU-T G.722.1 annex C. The default is `ON`.
 - **USE_G719**: Chooses if you wish to use libg719_decode for support ITU-T G.719. The default is `ON`.
 - **USE_ATRAC9**: Chooses if you wish to use LibAtrac9 for support of ATRAC9. The default is `ON`.
 - **USE_CELT**: Chooses if you wish to use libcelt for support of FSB CELT versions 0.6.1 and 0.11.0. The default is `ON`.

ext_includes/g7221.h

@@ -1,23 +0,0 @@
-/*
-    Interface to reference G.722.1 decoder
-*/
-
-#ifndef G7221_H
-#define G7221_H
-
-/* forward definition for the opaque handle object */
-typedef struct g7221_handle_s g7221_handle;
-
-/* return a handle for decoding on successful init, NULL on failure */
-g7221_handle * g7221_init(int bytes_per_frame, int bandwidth);
-
-/* decode a frame, at code_words, into 16-bit PCM in sample_buffer */
-void g7221_decode_frame(g7221_handle *handle, int16_t *code_words, int16_t *sample_buffer);
-
-/* reset the decoder to its initial state */
-void g7221_reset(g7221_handle *handle);
-
-/* free resources */
-void g7221_free(g7221_handle *handle);
-
-#endif

ext_libs/CMakeLists.txt

@@ -27,16 +27,6 @@ if(MSVC)
 		source_group("Header Files\\vorbis" FILES ${VORBIS_HEADERS})
 	endif()
 
-	if(USE_G7221)
-		add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libg7221_decode.lib ${CMAKE_CURRENT_BINARY_DIR}/libg7221_decode.exp
-			COMMAND lib
-			ARGS /def:${CMAKE_CURRENT_SOURCE_DIR}/libg7221_decode.def /machine:x86 /out:${CMAKE_CURRENT_BINARY_DIR}/libg7221_decode.lib
-			DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libg7221_decode.def)
-		add_custom_target(libg7221_decode
-			DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libg7221_decode.lib
-			SOURCES ${VGM_SOURCE_DIR}/ext_includes/g7221.h)
-	endif()
-
 	if(USE_G719)
 		add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libg719_decode.lib ${CMAKE_CURRENT_BINARY_DIR}/libg719_decode.exp
 			COMMAND lib
@@ -134,15 +124,6 @@ elseif(MINGW)
 			DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libvorbis.lib)
 	endif()
 
-	if(USE_G7221)
-		add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libg7221_decode.lib
-			COMMAND ${DLLTOOL}
-			ARGS -d ${CMAKE_CURRENT_SOURCE_DIR}/libg7221_decode.def -l ${CMAKE_CURRENT_BINARY_DIR}/libg7221_decode.lib
-			DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libg7221_decode.def)
-		add_custom_target(libg7221_decode
-			DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libg7221_decode.lib)
-	endif()
-
 	if(USE_G719)
 		add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libg719_decode.lib
 			COMMAND ${DLLTOOL}

ext_libs/Makefile

@@ -14,9 +14,6 @@ libvorbis.a: libvorbis.def
 libmpg123-0.a: libmpg123-0.def
 	$(DLLTOOL) -d libmpg123-0.def -l libmpg123-0.a
 
-libg7221_decode.a: libg7221_decode.def
-	$(DLLTOOL) -d libg7221_decode.def -l libg7221_decode.a
-
 libg719_decode.a: libg719_decode.def
 	$(DLLTOOL) -d libg719_decode.def -l libg719_decode.a
 
@@ -42,6 +39,6 @@ libcelt-0110.a: libcelt-0110.dll libcelt-0110.def
 	$(DLLTOOL) -D libcelt-0110.dll -d libcelt-0110.def -l libcelt-0110.a
 
 clean:
-	$(RMF) libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libavcodec.a libavformat.a libavutil.a libswresample.a libatrac9.a libcelt-0061.a libcelt-0110.a
+	$(RMF) libvorbis.a libmpg123-0.a libg719_decode.a libavcodec.a libavformat.a libavutil.a libswresample.a libatrac9.a libcelt-0061.a libcelt-0110.a
 
 .PHONY: clean

ext_libs/ext_libs.vcproj

@@ -107,30 +107,6 @@
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath=".\libg7221_decode.def"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building library stub"
-					CommandLine="lib /def:libg7221_decode.def /machine:x86&#x0D;&#x0A;"
-					Outputs="libg7221_decode.lib libg7221_decode.exp"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Building library stub"
-					CommandLine="lib /def:libg7221_decode.def /machine:x86&#x0D;&#x0A;"
-					Outputs="libg7221_decode.lib libg7221_decode.exp"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath=".\libg719_decode.def"
 			>

ext_libs/ext_libs.vcxproj

@@ -63,12 +63,6 @@
 </Command>
       <Outputs>libvorbis.lib;libvorbis.exp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="libg7221_decode.def">
-      <Message>Building library stub</Message>
-      <Command>lib /def:libg7221_decode.def /machine:x86
-</Command>
-      <Outputs>libg7221_decode.lib;libg7221_decode.exp;%(Outputs)</Outputs>
-    </CustomBuild>
     <CustomBuild Include="libg719_decode.def">
       <Message>Building library stub</Message>
       <Command>lib /def:libg719_decode.def /machine:x86

ext_libs/g7221-gen-lic.txt

@@ -1,162 +0,0 @@
-
-   
-              ITU-T SOFTWARE TOOLS' GENERAL PUBLIC LICENSE
-
-
-
-   This "General Public License" is published in the Annex 1 of the
-   ITU-T Recommendation on "SOFTWARE TOOLS FOR HOMOGENITY OF RESULTS
-   IN THE STANDARDIZATION PROCESS OF SPEECH AND AUDIO CODERS",
-   approved in Geneva, 2000.
-
-
-   TERMS AND CONDITIONS
-
-   1. This License Agreement applies to any module or other work
-   related to the ITU-T Software Tool Library, and developed by the
-   User's Group on Software Tools. The "Module", below, refers to any
-   such module or work, and a "work based on the Module" means either
-   the Module or any work containing the Module or a portion of it,
-   either verbatim or with modifications.  Each licensee is addressed
-   as "you".
-
-   2. You may copy and distribute verbatim copies of the Module's
-   source code as you receive it, in any medium, provided that you:
-   -	conspicuously and appropriately publish on each copy an appropriate
-      copyright notice and disclaimer of warranty;
-   -  keep intact all the notices that refer to this General Public
-      License and to the absence of any warranty; and
-   -  give any other recipients of the Module a copy of this General
-      Public License along with the Module.
-   You may charge a fee for the physical act of transferring a copy.
-
-   3. You may modify your copy or copies of the Module or any portion
-   of it, and copy and distribute such modifications under the terms
-   of Paragraph 1 above, provided that you also do the following:
-
-       o  cause the modified files to carry prominent notices stating
-       that you changed the files and the date of any change; and
-
-       o  cause the whole of any work that you distribute or publish,
-       that in whole or in part contains the Module or any part
-       thereof, either with or without modifications, to be licensed
-       at no charge to all third parties under the terms of this
-       General Public License (except that you may choose to grant
-       warranty protection to some or all third parties, at your
-       option).
-
-       o  If the modified module normally reads commands interactively
-       when run, you must cause it, when started running for such
-       interactive use in the simplest and most usual way, to print or
-       display an announcement including an appropriate copyright
-       notice and a notice that there is no warranty (or else, saying
-       that you provide a warranty) and that users may redistribute
-       the module under these conditions, and telling the user how to
-       view a copy of this General Public License.
-
-   You may charge a fee for the physical act of transferring a copy,
-   and you may at your option offer warranty protection in exchange
-   for a fee.
-
-   Mere aggregation of another independent work with the Module (or
-   its derivative) on a volume of a storage or distribution medium
-   does not bring the other work under the scope of these terms.
-
-   4.  You may copy and distribute the Module (or a portion or
-   derivative of it, under Paragraph 2) in object code or executable
-   form under the terms of Paragraphs 1 and 2 above provided that you
-   also do one of the following:
-
-       o  accompany it with the complete corresponding machine-
-       readable source code, which must be distributed under the terms
-       of Paragraphs 1 and 2 above; or,
-
-       o  accompany it with a written offer, valid for at least three
-       years, to give any third party free (except for a nominal
-       charge for the cost of distribution) a complete machine-
-       readable copy of the corresponding source code, to be
-       distributed under the terms of Paragraphs 1 and 2 above; or,
-
-       o  accompany it with the information you received as to where
-       the corresponding source code may be obtained.  (This
-       alternative is allowed only for noncommercial distribution and
-       only if you received the module in object code or executable
-       form alone.) 
-
-   Source code for a work means the preferred form of the work for
-   making modifications to it.  For an executable file, complete
-   source code means all the source code for all modules it contains;
-   but, as a special exception, it need not include source code for
-   modules which are standard libraries that accompany the operating
-   system on which the executable file runs, or for standard header
-   files or definitions files that accompany that operating system.
-
-   5.  You may not copy, modify, sublicense, distribute or transfer
-   the Module except as expressly provided under this General Public
-   License. Any attempt otherwise to copy, modify, sublicense,
-   distribute or transfer the Module is void, and will automatically
-   terminate your rights to use the Module under this License. 
-   However, parties who have received copies, or rights to use copies,
-   from you under this General Public License will not have their
-   licenses terminated so long as such parties remain in full
-   compliance.
-
-   6.  By copying, distributing or modifying the Module (or any work
-   based on the Module) you indicate your acceptance of this license
-   to do so, and all its terms and conditions.
-
-   7.  Each time you redistribute the Module (or any work based on the
-   Module), the recipient automatically receives a license from the
-   original licensor to copy, distribute or modify the Module subject
-   to these terms and conditions.  You may not impose any further
-   restrictions on the recipients' exercise of the rights granted
-   herein.
-
-   8.  The ITU-T may publish revised and/or new versions of this
-   General Public License from time to time.  Such new versions will
-   be similar in spirit to the present version, but may differ in
-   detail to address new problems or concerns.
-
-   Each version is given a distinguishing version number. If the
-   Module specifies a version number of the license which applies to
-   it and "any later version", you have the option of following the
-   terms and conditions either of that version or of any later version
-   published by the ITU-T. If the Module does not specify a version
-   number of the license, you may choose any version ever published by
-   the ITU-T.
-
-   9.  If you wish to incorporate parts of the Module into other free
-   modules whose distribution conditions are different, write to the
-   author to ask for permission.  For software which is copyrighted by
-   the ITU-T, write to the ITU-T Secretariat; exceptions may be made
-   for this. This decision will be guided by the two goals of
-   preserving the free status of all derivatives of this free software
-   and of promoting the sharing and reuse of software generally.
-
-
-   NO WARRANTY
-
-   10. BECAUSE THE MODULE IS LICENSED FREE OF CHARGE, THERE IS NO
-   WARRANTY FOR THE MODULE, TO THE EXTENT PERMITTED BY APPLICABLE LAW. 
-   EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
-   AND/OR OTHER PARTIES PROVIDE THE MODULE "AS IS" WITHOUT WARRANTY OF
-   ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED
-   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-   PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
-   PERFORMANCE OF THE MODULE IS WITH YOU.  SHOULD THE MODULE PROVE
-   DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
-   OR CORRECTION.
-
-   11. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-   WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
-   MODIFY AND/OR REDISTRIBUTE THE MODULE AS PERMITTED ABOVE, BE LIABLE
-   TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-   CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
-   THE MODULE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-   RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR
-   A FAILURE OF THE MODULE TO OPERATE WITH ANY OTHER MODULES), EVEN IF
-   SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-   SUCH DAMAGES.
-
-   END OF TERMS AND CONDITIONS
-

ext_libs/libg7221_decode.def

@@ -1,6 +0,0 @@
-LIBRARY libg7221_decode.dll
-EXPORTS
-    g7221_decode_frame @1
-    g7221_free @2
-    g7221_init @3
-    g7221_reset @4

ext_libs/libg7221_decode.dll.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-wsFcBAABCAAQBQJbvU+ICRCNbJhHn0recQAA0SoQAIrJn0H5ytiOol6A6UuGAWO7
-/T7kwURlaA89ABoirQFJGmkT2g4pUY6mLtCxunDXOJ/zTu7xPvUivPXujc8BREls
-WpZByebEhjNUZ7c1zB/v9QNP1lV2Yy0n3IBdN8IsvjeT4xia0jn+4PV1SOKBh49Z
-kTz6LtWP7XYk5I4KSrCxkERFJQ5DBDiEJoFQkuU3hC896Z2rDTLO25K3bd/6C5yb
-wnB7mS7bjSC3TrZaYKmeMtxCOYtJeJssX+iuXu+0Bn/XulXPU8DuDB8oScPL6h/+
-pzrIZnqk+CqLhReWa7fFOTbjrRiAvik0jqjEo5mV/DZ+GNt/0CnhF5BNJ1p8gFcp
-j1iul7fhs4UqBkQekEQDC3y5Nr+7h8YeraieRHK9pILyMd8vcYbQaudnHXs5gnwZ
-t5ZZET7G4NYf7WSBMb/Lx52CNLZncrx1WiOx3hr9spGcpVKI5W9hBSgCzYT8tjDs
-B4vtT4DTEC9IW1uflu5UEZcLvN3q87i4a0JnEDUrZ+JVDhnp1OEF+IjzoTAKd+vn
-WRuqbB1U8nV28oJbydaghIRVZOEYTXYLoL+NLBovE2DpfJI44QPi8WYPJRUUqUlq
-7jnOHjPZqj2zRUBYVELfi6+c91u5nlDxhX1v2Ac37TpDjio1qS8E8hEmNuJzSQsS
-ipsNU3UDS5Yvd4W3LuiF
-=zoAq
------END PGP SIGNATURE-----

fb2k/foo_input_vgmstream.vcproj

@@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="shared.lib foobar2000_SDKd.lib foobar2000_component_clientd.lib pfcd.lib foobar2000_sdk_helpersd.lib ../ext_libs/libg7221_decode.lib ../ext_libs/libg719_decode.lib ../ext_libs/libvorbis.lib ../ext_libs/libmpg123-0.lib ../ext_libs/avcodec.lib ../ext_libs/avformat.lib ../ext_libs/avutil.lib ../ext_libs/swresample.lib"
+				AdditionalDependencies="shared.lib foobar2000_SDKd.lib foobar2000_component_clientd.lib pfcd.lib foobar2000_sdk_helpersd.lib ../ext_libs/libg719_decode.lib ../ext_libs/libvorbis.lib ../ext_libs/libmpg123-0.lib ../ext_libs/avcodec.lib ../ext_libs/avformat.lib ../ext_libs/avutil.lib ../ext_libs/swresample.lib"
 				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
@@ -138,7 +138,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="shared.lib foobar2000_SDK.lib foobar2000_sdk_helpers.lib foobar2000_component_client.lib pfc.lib ../ext_libs/libvorbis.lib ../ext_libs/libmpg123-0.lib ../ext_libs/libg7221_decode.lib ../ext_libs/libg719_decode.lib ../ext_libs/avcodec.lib ../ext_libs/avformat.lib ../ext_libs/avutil.lib ../ext_libs/swresample.lib"
+				AdditionalDependencies="shared.lib foobar2000_SDK.lib foobar2000_sdk_helpers.lib foobar2000_component_client.lib pfc.lib ../ext_libs/libvorbis.lib ../ext_libs/libmpg123-0.lib ../ext_libs/libg719_decode.lib ../ext_libs/avcodec.lib ../ext_libs/avformat.lib ../ext_libs/avutil.lib ../ext_libs/swresample.lib"
 				OutputFile="$(OutDir)\$(ProjectName).dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""

fb2k/foo_input_vgmstream.vcxproj

@@ -82,7 +82,7 @@
       <AdditionalOptions>/d2notypeopt %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(DependenciesDir)/foobar/foobar2000/shared/shared.lib;../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg7221_decode.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(DependenciesDir)/foobar/foobar2000/shared/shared.lib;../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(DependenciesDir)/foobar/foobar2000/shared/shared.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -108,7 +108,7 @@
       <AdditionalOptions>/d2notypeopt</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(DependenciesDir)/foobar/foobar2000/shared/shared.lib;../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg7221_decode.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(DependenciesDir)/foobar/foobar2000/shared/shared.lib;../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(DependenciesDir)/foobar/foobar2000/shared/shared.lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>

winamp/Makefile

@@ -39,8 +39,6 @@ endif
 VGM_ENABLE_G7221 = 1
 ifeq ($(VGM_ENABLE_G7221),1) 
   CFLAGS  += -DVGM_USE_G7221
-  LDFLAGS += -lg7221_decode
-  TARGET_EXT_LIBS += libg7221_decode.a
 endif
 
 VGM_ENABLE_G719 = 1

winamp/in_vgmstream.vcproj

@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="../ext_libs/libvorbis.lib ../ext_libs/libmpg123-0.lib ../ext_libs/libg7221_decode.lib ../ext_libs/libg719_decode.lib"
+				AdditionalDependencies="../ext_libs/libvorbis.lib ../ext_libs/libmpg123-0.lib ../ext_libs/libg719_decode.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -133,7 +133,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="../ext_libs/libvorbis.lib ../ext_libs/libmpg123-0.lib ../ext_libs/libg7221_decode.lib ../ext_libs/libg719_decode.lib"
+				AdditionalDependencies="../ext_libs/libvorbis.lib ../ext_libs/libmpg123-0.lib ../ext_libs/libg719_decode.lib"
 				LinkIncremental="2"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="true"

winamp/in_vgmstream.vcxproj

@@ -80,7 +80,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg7221_decode.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -107,7 +107,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg7221_decode.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <OptimizeReferences>true</OptimizeReferences>

xmplay/Makefile

@@ -39,8 +39,6 @@ endif
 VGM_ENABLE_G7221 = 1
 ifeq ($(VGM_ENABLE_G7221),1) 
   CFLAGS  += -DVGM_USE_G7221
-  LDFLAGS += -lg7221_decode
-  TARGET_EXT_LIBS += libg7221_decode.a
 endif
 
 VGM_ENABLE_G719 = 1

xmplay/xmp-vgmstream.vcxproj

@@ -69,7 +69,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg7221_decode.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <TargetMachine>MachineX86</TargetMachine>
@@ -96,7 +96,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg7221_decode.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <OptimizeReferences>true</OptimizeReferences>