From be7a8371ba31564179dc569bd5fe263eaf1284a7 Mon Sep 17 00:00:00 2001 From: Lukas Cone Date: Sat, 17 Jul 2021 17:01:10 +0200 Subject: [PATCH 1/3] ffmpeg includes from system for unix --- cli/Makefile | 2 +- cli/vgmstream_cli.vcxproj | 6 +++--- cmake/vgmstream.cmake | 1 + .../{ => ffmpeg}/libavcodec/ac3_parser.h | 0 .../{ => ffmpeg}/libavcodec/adts_parser.h | 0 ext_includes/{ => ffmpeg}/libavcodec/avcodec.h | 0 ext_includes/{ => ffmpeg}/libavcodec/avdct.h | 0 ext_includes/{ => ffmpeg}/libavcodec/avfft.h | 0 ext_includes/{ => ffmpeg}/libavcodec/d3d11va.h | 0 ext_includes/{ => ffmpeg}/libavcodec/dirac.h | 0 .../{ => ffmpeg}/libavcodec/dv_profile.h | 0 ext_includes/{ => ffmpeg}/libavcodec/dxva2.h | 0 ext_includes/{ => ffmpeg}/libavcodec/jni.h | 0 .../{ => ffmpeg}/libavcodec/mediacodec.h | 0 ext_includes/{ => ffmpeg}/libavcodec/qsv.h | 0 ext_includes/{ => ffmpeg}/libavcodec/vaapi.h | 0 ext_includes/{ => ffmpeg}/libavcodec/vdpau.h | 0 ext_includes/{ => ffmpeg}/libavcodec/version.h | 0 .../{ => ffmpeg}/libavcodec/videotoolbox.h | 0 .../{ => ffmpeg}/libavcodec/vorbis_parser.h | 0 ext_includes/{ => ffmpeg}/libavcodec/xvmc.h | 0 ext_includes/{ => ffmpeg}/libavformat/avformat.h | 0 ext_includes/{ => ffmpeg}/libavformat/avio.h | 0 ext_includes/{ => ffmpeg}/libavformat/version.h | 0 ext_includes/{ => ffmpeg}/libavutil/adler32.h | 0 ext_includes/{ => ffmpeg}/libavutil/aes.h | 0 ext_includes/{ => ffmpeg}/libavutil/aes_ctr.h | 0 ext_includes/{ => ffmpeg}/libavutil/attributes.h | 0 ext_includes/{ => ffmpeg}/libavutil/audio_fifo.h | 0 ext_includes/{ => ffmpeg}/libavutil/avassert.h | 0 ext_includes/{ => ffmpeg}/libavutil/avconfig.h | 0 ext_includes/{ => ffmpeg}/libavutil/avstring.h | 0 ext_includes/{ => ffmpeg}/libavutil/avutil.h | 0 ext_includes/{ => ffmpeg}/libavutil/base64.h | 0 ext_includes/{ => ffmpeg}/libavutil/blowfish.h | 0 ext_includes/{ => ffmpeg}/libavutil/bprint.h | 0 ext_includes/{ => ffmpeg}/libavutil/bswap.h | 0 ext_includes/{ => ffmpeg}/libavutil/buffer.h | 0 ext_includes/{ => ffmpeg}/libavutil/camellia.h | 0 ext_includes/{ => ffmpeg}/libavutil/cast5.h | 0 .../{ => ffmpeg}/libavutil/channel_layout.h | 0 ext_includes/{ => ffmpeg}/libavutil/common.h | 0 ext_includes/{ => ffmpeg}/libavutil/cpu.h | 0 ext_includes/{ => ffmpeg}/libavutil/crc.h | 0 ext_includes/{ => ffmpeg}/libavutil/des.h | 0 ext_includes/{ => ffmpeg}/libavutil/dict.h | 0 ext_includes/{ => ffmpeg}/libavutil/display.h | 0 .../{ => ffmpeg}/libavutil/downmix_info.h | 0 .../{ => ffmpeg}/libavutil/encryption_info.h | 0 ext_includes/{ => ffmpeg}/libavutil/error.h | 0 ext_includes/{ => ffmpeg}/libavutil/eval.h | 0 ext_includes/{ => ffmpeg}/libavutil/ffversion.h | 0 ext_includes/{ => ffmpeg}/libavutil/fifo.h | 0 ext_includes/{ => ffmpeg}/libavutil/file.h | 0 ext_includes/{ => ffmpeg}/libavutil/frame.h | 0 ext_includes/{ => ffmpeg}/libavutil/hash.h | 0 .../libavutil/hdr_dynamic_metadata.h | 0 ext_includes/{ => ffmpeg}/libavutil/hmac.h | 0 ext_includes/{ => ffmpeg}/libavutil/hwcontext.h | 0 .../{ => ffmpeg}/libavutil/hwcontext_cuda.h | 0 .../{ => ffmpeg}/libavutil/hwcontext_d3d11va.h | 0 .../{ => ffmpeg}/libavutil/hwcontext_drm.h | 0 .../{ => ffmpeg}/libavutil/hwcontext_dxva2.h | 0 .../libavutil/hwcontext_mediacodec.h | 0 .../{ => ffmpeg}/libavutil/hwcontext_qsv.h | 0 .../{ => ffmpeg}/libavutil/hwcontext_vaapi.h | 0 .../{ => ffmpeg}/libavutil/hwcontext_vdpau.h | 0 .../libavutil/hwcontext_videotoolbox.h | 0 ext_includes/{ => ffmpeg}/libavutil/imgutils.h | 0 ext_includes/{ => ffmpeg}/libavutil/intfloat.h | 0 .../{ => ffmpeg}/libavutil/intreadwrite.h | 0 ext_includes/{ => ffmpeg}/libavutil/lfg.h | 0 ext_includes/{ => ffmpeg}/libavutil/log.h | 0 ext_includes/{ => ffmpeg}/libavutil/macros.h | 0 .../libavutil/mastering_display_metadata.h | 0 .../{ => ffmpeg}/libavutil/mathematics.h | 0 ext_includes/{ => ffmpeg}/libavutil/md5.h | 0 ext_includes/{ => ffmpeg}/libavutil/mem.h | 0 .../{ => ffmpeg}/libavutil/motion_vector.h | 0 ext_includes/{ => ffmpeg}/libavutil/murmur3.h | 0 ext_includes/{ => ffmpeg}/libavutil/opt.h | 0 ext_includes/{ => ffmpeg}/libavutil/parseutils.h | 0 ext_includes/{ => ffmpeg}/libavutil/pixdesc.h | 0 ext_includes/{ => ffmpeg}/libavutil/pixelutils.h | 0 ext_includes/{ => ffmpeg}/libavutil/pixfmt.h | 0 .../{ => ffmpeg}/libavutil/random_seed.h | 0 ext_includes/{ => ffmpeg}/libavutil/rational.h | 0 ext_includes/{ => ffmpeg}/libavutil/rc4.h | 0 ext_includes/{ => ffmpeg}/libavutil/replaygain.h | 0 ext_includes/{ => ffmpeg}/libavutil/ripemd.h | 0 ext_includes/{ => ffmpeg}/libavutil/samplefmt.h | 0 ext_includes/{ => ffmpeg}/libavutil/sha.h | 0 ext_includes/{ => ffmpeg}/libavutil/sha512.h | 0 ext_includes/{ => ffmpeg}/libavutil/spherical.h | 0 ext_includes/{ => ffmpeg}/libavutil/stereo3d.h | 0 ext_includes/{ => ffmpeg}/libavutil/tea.h | 0 .../{ => ffmpeg}/libavutil/threadmessage.h | 0 ext_includes/{ => ffmpeg}/libavutil/time.h | 0 ext_includes/{ => ffmpeg}/libavutil/timecode.h | 0 ext_includes/{ => ffmpeg}/libavutil/timestamp.h | 0 ext_includes/{ => ffmpeg}/libavutil/tree.h | 0 ext_includes/{ => ffmpeg}/libavutil/twofish.h | 0 ext_includes/{ => ffmpeg}/libavutil/version.h | 0 ext_includes/{ => ffmpeg}/libavutil/xtea.h | 0 .../{ => ffmpeg}/libswresample/swresample.h | 0 .../{ => ffmpeg}/libswresample/version.h | 0 ext_libs/CMakeLists.txt | 16 ++++++++-------- fb2k/foo_input_vgmstream.vcproj | 4 ++-- fb2k/foo_input_vgmstream.vcxproj | 6 +++--- src/libvgmstream.vcproj | 4 ++-- src/libvgmstream.vcxproj | 6 +++--- winamp/in_vgmstream.vcxproj | 6 +++--- xmplay/xmp-vgmstream.vcxproj | 6 +++--- 113 files changed, 29 insertions(+), 28 deletions(-) rename ext_includes/{ => ffmpeg}/libavcodec/ac3_parser.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/adts_parser.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/avcodec.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/avdct.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/avfft.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/d3d11va.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/dirac.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/dv_profile.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/dxva2.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/jni.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/mediacodec.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/qsv.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/vaapi.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/vdpau.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/version.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/videotoolbox.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/vorbis_parser.h (100%) rename ext_includes/{ => ffmpeg}/libavcodec/xvmc.h (100%) rename ext_includes/{ => ffmpeg}/libavformat/avformat.h (100%) rename ext_includes/{ => ffmpeg}/libavformat/avio.h (100%) rename ext_includes/{ => ffmpeg}/libavformat/version.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/adler32.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/aes.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/aes_ctr.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/attributes.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/audio_fifo.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/avassert.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/avconfig.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/avstring.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/avutil.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/base64.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/blowfish.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/bprint.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/bswap.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/buffer.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/camellia.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/cast5.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/channel_layout.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/common.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/cpu.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/crc.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/des.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/dict.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/display.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/downmix_info.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/encryption_info.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/error.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/eval.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/ffversion.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/fifo.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/file.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/frame.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hash.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hdr_dynamic_metadata.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hmac.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hwcontext.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hwcontext_cuda.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hwcontext_d3d11va.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hwcontext_drm.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hwcontext_dxva2.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hwcontext_mediacodec.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hwcontext_qsv.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hwcontext_vaapi.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hwcontext_vdpau.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/hwcontext_videotoolbox.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/imgutils.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/intfloat.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/intreadwrite.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/lfg.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/log.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/macros.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/mastering_display_metadata.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/mathematics.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/md5.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/mem.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/motion_vector.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/murmur3.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/opt.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/parseutils.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/pixdesc.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/pixelutils.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/pixfmt.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/random_seed.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/rational.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/rc4.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/replaygain.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/ripemd.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/samplefmt.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/sha.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/sha512.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/spherical.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/stereo3d.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/tea.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/threadmessage.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/time.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/timecode.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/timestamp.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/tree.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/twofish.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/version.h (100%) rename ext_includes/{ => ffmpeg}/libavutil/xtea.h (100%) rename ext_includes/{ => ffmpeg}/libswresample/swresample.h (100%) rename ext_includes/{ => ffmpeg}/libswresample/version.h (100%) diff --git a/cli/Makefile b/cli/Makefile index b2019e44..5d4acf3f 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -15,7 +15,7 @@ endif # -DUSE_ALLOCA ifeq ($(TARGET_OS),Windows_NT) - CFLAGS += -DWIN32 + CFLAGS += -DWIN32 -I../ext_includes/ffmpeg endif CFLAGS += $(DEF_CFLAGS) -DVAR_ARRAYS -I../ext_includes $(EXTRA_CFLAGS) diff --git a/cli/vgmstream_cli.vcxproj b/cli/vgmstream_cli.vcxproj index 7b8b9e6f..8fada8fd 100644 --- a/cli/vgmstream_cli.vcxproj +++ b/cli/vgmstream_cli.vcxproj @@ -71,7 +71,7 @@ Disabled - ..;../ext_libs/Getopt;../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) + ..;../ext_libs/Getopt;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;HAVE_JSON;_DEBUG;_WINDOWS;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -96,7 +96,7 @@ - ..;../ext_libs/Getopt;../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) + ..;../ext_libs/Getopt;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;HAVE_JSON;NDEBUG;_WINDOWS;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded @@ -145,4 +145,4 @@ - \ No newline at end of file + diff --git a/cmake/vgmstream.cmake b/cmake/vgmstream.cmake index 17bfefb0..5aae4704 100644 --- a/cmake/vgmstream.cmake +++ b/cmake/vgmstream.cmake @@ -57,6 +57,7 @@ macro(setup_target TARGET) if(USE_FFMPEG) target_compile_definitions(${TARGET} PRIVATE VGM_USE_FFMPEG) if(WIN32) + target_include_directories(${TARGET} PRIVATE ${VGM_SOURCE_DIR}/ext_includes/ffmpeg) if(LINK) add_dependencies(${TARGET} ffmpeg) target_link_libraries(${TARGET} diff --git a/ext_includes/libavcodec/ac3_parser.h b/ext_includes/ffmpeg/libavcodec/ac3_parser.h similarity index 100% rename from ext_includes/libavcodec/ac3_parser.h rename to ext_includes/ffmpeg/libavcodec/ac3_parser.h diff --git a/ext_includes/libavcodec/adts_parser.h b/ext_includes/ffmpeg/libavcodec/adts_parser.h similarity index 100% rename from ext_includes/libavcodec/adts_parser.h rename to ext_includes/ffmpeg/libavcodec/adts_parser.h diff --git a/ext_includes/libavcodec/avcodec.h b/ext_includes/ffmpeg/libavcodec/avcodec.h similarity index 100% rename from ext_includes/libavcodec/avcodec.h rename to ext_includes/ffmpeg/libavcodec/avcodec.h diff --git a/ext_includes/libavcodec/avdct.h b/ext_includes/ffmpeg/libavcodec/avdct.h similarity index 100% rename from ext_includes/libavcodec/avdct.h rename to ext_includes/ffmpeg/libavcodec/avdct.h diff --git a/ext_includes/libavcodec/avfft.h b/ext_includes/ffmpeg/libavcodec/avfft.h similarity index 100% rename from ext_includes/libavcodec/avfft.h rename to ext_includes/ffmpeg/libavcodec/avfft.h diff --git a/ext_includes/libavcodec/d3d11va.h b/ext_includes/ffmpeg/libavcodec/d3d11va.h similarity index 100% rename from ext_includes/libavcodec/d3d11va.h rename to ext_includes/ffmpeg/libavcodec/d3d11va.h diff --git a/ext_includes/libavcodec/dirac.h b/ext_includes/ffmpeg/libavcodec/dirac.h similarity index 100% rename from ext_includes/libavcodec/dirac.h rename to ext_includes/ffmpeg/libavcodec/dirac.h diff --git a/ext_includes/libavcodec/dv_profile.h b/ext_includes/ffmpeg/libavcodec/dv_profile.h similarity index 100% rename from ext_includes/libavcodec/dv_profile.h rename to ext_includes/ffmpeg/libavcodec/dv_profile.h diff --git a/ext_includes/libavcodec/dxva2.h b/ext_includes/ffmpeg/libavcodec/dxva2.h similarity index 100% rename from ext_includes/libavcodec/dxva2.h rename to ext_includes/ffmpeg/libavcodec/dxva2.h diff --git a/ext_includes/libavcodec/jni.h b/ext_includes/ffmpeg/libavcodec/jni.h similarity index 100% rename from ext_includes/libavcodec/jni.h rename to ext_includes/ffmpeg/libavcodec/jni.h diff --git a/ext_includes/libavcodec/mediacodec.h b/ext_includes/ffmpeg/libavcodec/mediacodec.h similarity index 100% rename from ext_includes/libavcodec/mediacodec.h rename to ext_includes/ffmpeg/libavcodec/mediacodec.h diff --git a/ext_includes/libavcodec/qsv.h b/ext_includes/ffmpeg/libavcodec/qsv.h similarity index 100% rename from ext_includes/libavcodec/qsv.h rename to ext_includes/ffmpeg/libavcodec/qsv.h diff --git a/ext_includes/libavcodec/vaapi.h b/ext_includes/ffmpeg/libavcodec/vaapi.h similarity index 100% rename from ext_includes/libavcodec/vaapi.h rename to ext_includes/ffmpeg/libavcodec/vaapi.h diff --git a/ext_includes/libavcodec/vdpau.h b/ext_includes/ffmpeg/libavcodec/vdpau.h similarity index 100% rename from ext_includes/libavcodec/vdpau.h rename to ext_includes/ffmpeg/libavcodec/vdpau.h diff --git a/ext_includes/libavcodec/version.h b/ext_includes/ffmpeg/libavcodec/version.h similarity index 100% rename from ext_includes/libavcodec/version.h rename to ext_includes/ffmpeg/libavcodec/version.h diff --git a/ext_includes/libavcodec/videotoolbox.h b/ext_includes/ffmpeg/libavcodec/videotoolbox.h similarity index 100% rename from ext_includes/libavcodec/videotoolbox.h rename to ext_includes/ffmpeg/libavcodec/videotoolbox.h diff --git a/ext_includes/libavcodec/vorbis_parser.h b/ext_includes/ffmpeg/libavcodec/vorbis_parser.h similarity index 100% rename from ext_includes/libavcodec/vorbis_parser.h rename to ext_includes/ffmpeg/libavcodec/vorbis_parser.h diff --git a/ext_includes/libavcodec/xvmc.h b/ext_includes/ffmpeg/libavcodec/xvmc.h similarity index 100% rename from ext_includes/libavcodec/xvmc.h rename to ext_includes/ffmpeg/libavcodec/xvmc.h diff --git a/ext_includes/libavformat/avformat.h b/ext_includes/ffmpeg/libavformat/avformat.h similarity index 100% rename from ext_includes/libavformat/avformat.h rename to ext_includes/ffmpeg/libavformat/avformat.h diff --git a/ext_includes/libavformat/avio.h b/ext_includes/ffmpeg/libavformat/avio.h similarity index 100% rename from ext_includes/libavformat/avio.h rename to ext_includes/ffmpeg/libavformat/avio.h diff --git a/ext_includes/libavformat/version.h b/ext_includes/ffmpeg/libavformat/version.h similarity index 100% rename from ext_includes/libavformat/version.h rename to ext_includes/ffmpeg/libavformat/version.h diff --git a/ext_includes/libavutil/adler32.h b/ext_includes/ffmpeg/libavutil/adler32.h similarity index 100% rename from ext_includes/libavutil/adler32.h rename to ext_includes/ffmpeg/libavutil/adler32.h diff --git a/ext_includes/libavutil/aes.h b/ext_includes/ffmpeg/libavutil/aes.h similarity index 100% rename from ext_includes/libavutil/aes.h rename to ext_includes/ffmpeg/libavutil/aes.h diff --git a/ext_includes/libavutil/aes_ctr.h b/ext_includes/ffmpeg/libavutil/aes_ctr.h similarity index 100% rename from ext_includes/libavutil/aes_ctr.h rename to ext_includes/ffmpeg/libavutil/aes_ctr.h diff --git a/ext_includes/libavutil/attributes.h b/ext_includes/ffmpeg/libavutil/attributes.h similarity index 100% rename from ext_includes/libavutil/attributes.h rename to ext_includes/ffmpeg/libavutil/attributes.h diff --git a/ext_includes/libavutil/audio_fifo.h b/ext_includes/ffmpeg/libavutil/audio_fifo.h similarity index 100% rename from ext_includes/libavutil/audio_fifo.h rename to ext_includes/ffmpeg/libavutil/audio_fifo.h diff --git a/ext_includes/libavutil/avassert.h b/ext_includes/ffmpeg/libavutil/avassert.h similarity index 100% rename from ext_includes/libavutil/avassert.h rename to ext_includes/ffmpeg/libavutil/avassert.h diff --git a/ext_includes/libavutil/avconfig.h b/ext_includes/ffmpeg/libavutil/avconfig.h similarity index 100% rename from ext_includes/libavutil/avconfig.h rename to ext_includes/ffmpeg/libavutil/avconfig.h diff --git a/ext_includes/libavutil/avstring.h b/ext_includes/ffmpeg/libavutil/avstring.h similarity index 100% rename from ext_includes/libavutil/avstring.h rename to ext_includes/ffmpeg/libavutil/avstring.h diff --git a/ext_includes/libavutil/avutil.h b/ext_includes/ffmpeg/libavutil/avutil.h similarity index 100% rename from ext_includes/libavutil/avutil.h rename to ext_includes/ffmpeg/libavutil/avutil.h diff --git a/ext_includes/libavutil/base64.h b/ext_includes/ffmpeg/libavutil/base64.h similarity index 100% rename from ext_includes/libavutil/base64.h rename to ext_includes/ffmpeg/libavutil/base64.h diff --git a/ext_includes/libavutil/blowfish.h b/ext_includes/ffmpeg/libavutil/blowfish.h similarity index 100% rename from ext_includes/libavutil/blowfish.h rename to ext_includes/ffmpeg/libavutil/blowfish.h diff --git a/ext_includes/libavutil/bprint.h b/ext_includes/ffmpeg/libavutil/bprint.h similarity index 100% rename from ext_includes/libavutil/bprint.h rename to ext_includes/ffmpeg/libavutil/bprint.h diff --git a/ext_includes/libavutil/bswap.h b/ext_includes/ffmpeg/libavutil/bswap.h similarity index 100% rename from ext_includes/libavutil/bswap.h rename to ext_includes/ffmpeg/libavutil/bswap.h diff --git a/ext_includes/libavutil/buffer.h b/ext_includes/ffmpeg/libavutil/buffer.h similarity index 100% rename from ext_includes/libavutil/buffer.h rename to ext_includes/ffmpeg/libavutil/buffer.h diff --git a/ext_includes/libavutil/camellia.h b/ext_includes/ffmpeg/libavutil/camellia.h similarity index 100% rename from ext_includes/libavutil/camellia.h rename to ext_includes/ffmpeg/libavutil/camellia.h diff --git a/ext_includes/libavutil/cast5.h b/ext_includes/ffmpeg/libavutil/cast5.h similarity index 100% rename from ext_includes/libavutil/cast5.h rename to ext_includes/ffmpeg/libavutil/cast5.h diff --git a/ext_includes/libavutil/channel_layout.h b/ext_includes/ffmpeg/libavutil/channel_layout.h similarity index 100% rename from ext_includes/libavutil/channel_layout.h rename to ext_includes/ffmpeg/libavutil/channel_layout.h diff --git a/ext_includes/libavutil/common.h b/ext_includes/ffmpeg/libavutil/common.h similarity index 100% rename from ext_includes/libavutil/common.h rename to ext_includes/ffmpeg/libavutil/common.h diff --git a/ext_includes/libavutil/cpu.h b/ext_includes/ffmpeg/libavutil/cpu.h similarity index 100% rename from ext_includes/libavutil/cpu.h rename to ext_includes/ffmpeg/libavutil/cpu.h diff --git a/ext_includes/libavutil/crc.h b/ext_includes/ffmpeg/libavutil/crc.h similarity index 100% rename from ext_includes/libavutil/crc.h rename to ext_includes/ffmpeg/libavutil/crc.h diff --git a/ext_includes/libavutil/des.h b/ext_includes/ffmpeg/libavutil/des.h similarity index 100% rename from ext_includes/libavutil/des.h rename to ext_includes/ffmpeg/libavutil/des.h diff --git a/ext_includes/libavutil/dict.h b/ext_includes/ffmpeg/libavutil/dict.h similarity index 100% rename from ext_includes/libavutil/dict.h rename to ext_includes/ffmpeg/libavutil/dict.h diff --git a/ext_includes/libavutil/display.h b/ext_includes/ffmpeg/libavutil/display.h similarity index 100% rename from ext_includes/libavutil/display.h rename to ext_includes/ffmpeg/libavutil/display.h diff --git a/ext_includes/libavutil/downmix_info.h b/ext_includes/ffmpeg/libavutil/downmix_info.h similarity index 100% rename from ext_includes/libavutil/downmix_info.h rename to ext_includes/ffmpeg/libavutil/downmix_info.h diff --git a/ext_includes/libavutil/encryption_info.h b/ext_includes/ffmpeg/libavutil/encryption_info.h similarity index 100% rename from ext_includes/libavutil/encryption_info.h rename to ext_includes/ffmpeg/libavutil/encryption_info.h diff --git a/ext_includes/libavutil/error.h b/ext_includes/ffmpeg/libavutil/error.h similarity index 100% rename from ext_includes/libavutil/error.h rename to ext_includes/ffmpeg/libavutil/error.h diff --git a/ext_includes/libavutil/eval.h b/ext_includes/ffmpeg/libavutil/eval.h similarity index 100% rename from ext_includes/libavutil/eval.h rename to ext_includes/ffmpeg/libavutil/eval.h diff --git a/ext_includes/libavutil/ffversion.h b/ext_includes/ffmpeg/libavutil/ffversion.h similarity index 100% rename from ext_includes/libavutil/ffversion.h rename to ext_includes/ffmpeg/libavutil/ffversion.h diff --git a/ext_includes/libavutil/fifo.h b/ext_includes/ffmpeg/libavutil/fifo.h similarity index 100% rename from ext_includes/libavutil/fifo.h rename to ext_includes/ffmpeg/libavutil/fifo.h diff --git a/ext_includes/libavutil/file.h b/ext_includes/ffmpeg/libavutil/file.h similarity index 100% rename from ext_includes/libavutil/file.h rename to ext_includes/ffmpeg/libavutil/file.h diff --git a/ext_includes/libavutil/frame.h b/ext_includes/ffmpeg/libavutil/frame.h similarity index 100% rename from ext_includes/libavutil/frame.h rename to ext_includes/ffmpeg/libavutil/frame.h diff --git a/ext_includes/libavutil/hash.h b/ext_includes/ffmpeg/libavutil/hash.h similarity index 100% rename from ext_includes/libavutil/hash.h rename to ext_includes/ffmpeg/libavutil/hash.h diff --git a/ext_includes/libavutil/hdr_dynamic_metadata.h b/ext_includes/ffmpeg/libavutil/hdr_dynamic_metadata.h similarity index 100% rename from ext_includes/libavutil/hdr_dynamic_metadata.h rename to ext_includes/ffmpeg/libavutil/hdr_dynamic_metadata.h diff --git a/ext_includes/libavutil/hmac.h b/ext_includes/ffmpeg/libavutil/hmac.h similarity index 100% rename from ext_includes/libavutil/hmac.h rename to ext_includes/ffmpeg/libavutil/hmac.h diff --git a/ext_includes/libavutil/hwcontext.h b/ext_includes/ffmpeg/libavutil/hwcontext.h similarity index 100% rename from ext_includes/libavutil/hwcontext.h rename to ext_includes/ffmpeg/libavutil/hwcontext.h diff --git a/ext_includes/libavutil/hwcontext_cuda.h b/ext_includes/ffmpeg/libavutil/hwcontext_cuda.h similarity index 100% rename from ext_includes/libavutil/hwcontext_cuda.h rename to ext_includes/ffmpeg/libavutil/hwcontext_cuda.h diff --git a/ext_includes/libavutil/hwcontext_d3d11va.h b/ext_includes/ffmpeg/libavutil/hwcontext_d3d11va.h similarity index 100% rename from ext_includes/libavutil/hwcontext_d3d11va.h rename to ext_includes/ffmpeg/libavutil/hwcontext_d3d11va.h diff --git a/ext_includes/libavutil/hwcontext_drm.h b/ext_includes/ffmpeg/libavutil/hwcontext_drm.h similarity index 100% rename from ext_includes/libavutil/hwcontext_drm.h rename to ext_includes/ffmpeg/libavutil/hwcontext_drm.h diff --git a/ext_includes/libavutil/hwcontext_dxva2.h b/ext_includes/ffmpeg/libavutil/hwcontext_dxva2.h similarity index 100% rename from ext_includes/libavutil/hwcontext_dxva2.h rename to ext_includes/ffmpeg/libavutil/hwcontext_dxva2.h diff --git a/ext_includes/libavutil/hwcontext_mediacodec.h b/ext_includes/ffmpeg/libavutil/hwcontext_mediacodec.h similarity index 100% rename from ext_includes/libavutil/hwcontext_mediacodec.h rename to ext_includes/ffmpeg/libavutil/hwcontext_mediacodec.h diff --git a/ext_includes/libavutil/hwcontext_qsv.h b/ext_includes/ffmpeg/libavutil/hwcontext_qsv.h similarity index 100% rename from ext_includes/libavutil/hwcontext_qsv.h rename to ext_includes/ffmpeg/libavutil/hwcontext_qsv.h diff --git a/ext_includes/libavutil/hwcontext_vaapi.h b/ext_includes/ffmpeg/libavutil/hwcontext_vaapi.h similarity index 100% rename from ext_includes/libavutil/hwcontext_vaapi.h rename to ext_includes/ffmpeg/libavutil/hwcontext_vaapi.h diff --git a/ext_includes/libavutil/hwcontext_vdpau.h b/ext_includes/ffmpeg/libavutil/hwcontext_vdpau.h similarity index 100% rename from ext_includes/libavutil/hwcontext_vdpau.h rename to ext_includes/ffmpeg/libavutil/hwcontext_vdpau.h diff --git a/ext_includes/libavutil/hwcontext_videotoolbox.h b/ext_includes/ffmpeg/libavutil/hwcontext_videotoolbox.h similarity index 100% rename from ext_includes/libavutil/hwcontext_videotoolbox.h rename to ext_includes/ffmpeg/libavutil/hwcontext_videotoolbox.h diff --git a/ext_includes/libavutil/imgutils.h b/ext_includes/ffmpeg/libavutil/imgutils.h similarity index 100% rename from ext_includes/libavutil/imgutils.h rename to ext_includes/ffmpeg/libavutil/imgutils.h diff --git a/ext_includes/libavutil/intfloat.h b/ext_includes/ffmpeg/libavutil/intfloat.h similarity index 100% rename from ext_includes/libavutil/intfloat.h rename to ext_includes/ffmpeg/libavutil/intfloat.h diff --git a/ext_includes/libavutil/intreadwrite.h b/ext_includes/ffmpeg/libavutil/intreadwrite.h similarity index 100% rename from ext_includes/libavutil/intreadwrite.h rename to ext_includes/ffmpeg/libavutil/intreadwrite.h diff --git a/ext_includes/libavutil/lfg.h b/ext_includes/ffmpeg/libavutil/lfg.h similarity index 100% rename from ext_includes/libavutil/lfg.h rename to ext_includes/ffmpeg/libavutil/lfg.h diff --git a/ext_includes/libavutil/log.h b/ext_includes/ffmpeg/libavutil/log.h similarity index 100% rename from ext_includes/libavutil/log.h rename to ext_includes/ffmpeg/libavutil/log.h diff --git a/ext_includes/libavutil/macros.h b/ext_includes/ffmpeg/libavutil/macros.h similarity index 100% rename from ext_includes/libavutil/macros.h rename to ext_includes/ffmpeg/libavutil/macros.h diff --git a/ext_includes/libavutil/mastering_display_metadata.h b/ext_includes/ffmpeg/libavutil/mastering_display_metadata.h similarity index 100% rename from ext_includes/libavutil/mastering_display_metadata.h rename to ext_includes/ffmpeg/libavutil/mastering_display_metadata.h diff --git a/ext_includes/libavutil/mathematics.h b/ext_includes/ffmpeg/libavutil/mathematics.h similarity index 100% rename from ext_includes/libavutil/mathematics.h rename to ext_includes/ffmpeg/libavutil/mathematics.h diff --git a/ext_includes/libavutil/md5.h b/ext_includes/ffmpeg/libavutil/md5.h similarity index 100% rename from ext_includes/libavutil/md5.h rename to ext_includes/ffmpeg/libavutil/md5.h diff --git a/ext_includes/libavutil/mem.h b/ext_includes/ffmpeg/libavutil/mem.h similarity index 100% rename from ext_includes/libavutil/mem.h rename to ext_includes/ffmpeg/libavutil/mem.h diff --git a/ext_includes/libavutil/motion_vector.h b/ext_includes/ffmpeg/libavutil/motion_vector.h similarity index 100% rename from ext_includes/libavutil/motion_vector.h rename to ext_includes/ffmpeg/libavutil/motion_vector.h diff --git a/ext_includes/libavutil/murmur3.h b/ext_includes/ffmpeg/libavutil/murmur3.h similarity index 100% rename from ext_includes/libavutil/murmur3.h rename to ext_includes/ffmpeg/libavutil/murmur3.h diff --git a/ext_includes/libavutil/opt.h b/ext_includes/ffmpeg/libavutil/opt.h similarity index 100% rename from ext_includes/libavutil/opt.h rename to ext_includes/ffmpeg/libavutil/opt.h diff --git a/ext_includes/libavutil/parseutils.h b/ext_includes/ffmpeg/libavutil/parseutils.h similarity index 100% rename from ext_includes/libavutil/parseutils.h rename to ext_includes/ffmpeg/libavutil/parseutils.h diff --git a/ext_includes/libavutil/pixdesc.h b/ext_includes/ffmpeg/libavutil/pixdesc.h similarity index 100% rename from ext_includes/libavutil/pixdesc.h rename to ext_includes/ffmpeg/libavutil/pixdesc.h diff --git a/ext_includes/libavutil/pixelutils.h b/ext_includes/ffmpeg/libavutil/pixelutils.h similarity index 100% rename from ext_includes/libavutil/pixelutils.h rename to ext_includes/ffmpeg/libavutil/pixelutils.h diff --git a/ext_includes/libavutil/pixfmt.h b/ext_includes/ffmpeg/libavutil/pixfmt.h similarity index 100% rename from ext_includes/libavutil/pixfmt.h rename to ext_includes/ffmpeg/libavutil/pixfmt.h diff --git a/ext_includes/libavutil/random_seed.h b/ext_includes/ffmpeg/libavutil/random_seed.h similarity index 100% rename from ext_includes/libavutil/random_seed.h rename to ext_includes/ffmpeg/libavutil/random_seed.h diff --git a/ext_includes/libavutil/rational.h b/ext_includes/ffmpeg/libavutil/rational.h similarity index 100% rename from ext_includes/libavutil/rational.h rename to ext_includes/ffmpeg/libavutil/rational.h diff --git a/ext_includes/libavutil/rc4.h b/ext_includes/ffmpeg/libavutil/rc4.h similarity index 100% rename from ext_includes/libavutil/rc4.h rename to ext_includes/ffmpeg/libavutil/rc4.h diff --git a/ext_includes/libavutil/replaygain.h b/ext_includes/ffmpeg/libavutil/replaygain.h similarity index 100% rename from ext_includes/libavutil/replaygain.h rename to ext_includes/ffmpeg/libavutil/replaygain.h diff --git a/ext_includes/libavutil/ripemd.h b/ext_includes/ffmpeg/libavutil/ripemd.h similarity index 100% rename from ext_includes/libavutil/ripemd.h rename to ext_includes/ffmpeg/libavutil/ripemd.h diff --git a/ext_includes/libavutil/samplefmt.h b/ext_includes/ffmpeg/libavutil/samplefmt.h similarity index 100% rename from ext_includes/libavutil/samplefmt.h rename to ext_includes/ffmpeg/libavutil/samplefmt.h diff --git a/ext_includes/libavutil/sha.h b/ext_includes/ffmpeg/libavutil/sha.h similarity index 100% rename from ext_includes/libavutil/sha.h rename to ext_includes/ffmpeg/libavutil/sha.h diff --git a/ext_includes/libavutil/sha512.h b/ext_includes/ffmpeg/libavutil/sha512.h similarity index 100% rename from ext_includes/libavutil/sha512.h rename to ext_includes/ffmpeg/libavutil/sha512.h diff --git a/ext_includes/libavutil/spherical.h b/ext_includes/ffmpeg/libavutil/spherical.h similarity index 100% rename from ext_includes/libavutil/spherical.h rename to ext_includes/ffmpeg/libavutil/spherical.h diff --git a/ext_includes/libavutil/stereo3d.h b/ext_includes/ffmpeg/libavutil/stereo3d.h similarity index 100% rename from ext_includes/libavutil/stereo3d.h rename to ext_includes/ffmpeg/libavutil/stereo3d.h diff --git a/ext_includes/libavutil/tea.h b/ext_includes/ffmpeg/libavutil/tea.h similarity index 100% rename from ext_includes/libavutil/tea.h rename to ext_includes/ffmpeg/libavutil/tea.h diff --git a/ext_includes/libavutil/threadmessage.h b/ext_includes/ffmpeg/libavutil/threadmessage.h similarity index 100% rename from ext_includes/libavutil/threadmessage.h rename to ext_includes/ffmpeg/libavutil/threadmessage.h diff --git a/ext_includes/libavutil/time.h b/ext_includes/ffmpeg/libavutil/time.h similarity index 100% rename from ext_includes/libavutil/time.h rename to ext_includes/ffmpeg/libavutil/time.h diff --git a/ext_includes/libavutil/timecode.h b/ext_includes/ffmpeg/libavutil/timecode.h similarity index 100% rename from ext_includes/libavutil/timecode.h rename to ext_includes/ffmpeg/libavutil/timecode.h diff --git a/ext_includes/libavutil/timestamp.h b/ext_includes/ffmpeg/libavutil/timestamp.h similarity index 100% rename from ext_includes/libavutil/timestamp.h rename to ext_includes/ffmpeg/libavutil/timestamp.h diff --git a/ext_includes/libavutil/tree.h b/ext_includes/ffmpeg/libavutil/tree.h similarity index 100% rename from ext_includes/libavutil/tree.h rename to ext_includes/ffmpeg/libavutil/tree.h diff --git a/ext_includes/libavutil/twofish.h b/ext_includes/ffmpeg/libavutil/twofish.h similarity index 100% rename from ext_includes/libavutil/twofish.h rename to ext_includes/ffmpeg/libavutil/twofish.h diff --git a/ext_includes/libavutil/version.h b/ext_includes/ffmpeg/libavutil/version.h similarity index 100% rename from ext_includes/libavutil/version.h rename to ext_includes/ffmpeg/libavutil/version.h diff --git a/ext_includes/libavutil/xtea.h b/ext_includes/ffmpeg/libavutil/xtea.h similarity index 100% rename from ext_includes/libavutil/xtea.h rename to ext_includes/ffmpeg/libavutil/xtea.h diff --git a/ext_includes/libswresample/swresample.h b/ext_includes/ffmpeg/libswresample/swresample.h similarity index 100% rename from ext_includes/libswresample/swresample.h rename to ext_includes/ffmpeg/libswresample/swresample.h diff --git a/ext_includes/libswresample/version.h b/ext_includes/ffmpeg/libswresample/version.h similarity index 100% rename from ext_includes/libswresample/version.h rename to ext_includes/ffmpeg/libswresample/version.h diff --git a/ext_libs/CMakeLists.txt b/ext_libs/CMakeLists.txt index bceb0af0..61d6c892 100644 --- a/ext_libs/CMakeLists.txt +++ b/ext_libs/CMakeLists.txt @@ -54,10 +54,10 @@ if(MSVC) COMMAND lib ARGS /def:${CMAKE_CURRENT_SOURCE_DIR}/swresample-vgmstream-3.def /machine:x86 /out:${CMAKE_CURRENT_BINARY_DIR}/swresample.lib DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/swresample-vgmstream-3.def) - file(GLOB AVCODEC_HEADERS "${VGM_SOURCE_DIR}/ext_includes/libavcodec/*.h") - file(GLOB AVFORMAT_HEADERS "${VGM_SOURCE_DIR}/ext_includes/libavformat/*.h") - file(GLOB AVUTIL_HEADERS "${VGM_SOURCE_DIR}/ext_includes/libavutil/*.h") - file(GLOB SWRESAMPLE_HEADERS "${VGM_SOURCE_DIR}/ext_includes/libswresample/*.h") + file(GLOB AVCODEC_HEADERS "${VGM_SOURCE_DIR}/ext_includes/ffmpeg/libavcodec/*.h") + file(GLOB AVFORMAT_HEADERS "${VGM_SOURCE_DIR}/ext_includes/ffmpeg/libavformat/*.h") + file(GLOB AVUTIL_HEADERS "${VGM_SOURCE_DIR}/ext_includes/ffmpeg/libavutil/*.h") + file(GLOB SWRESAMPLE_HEADERS "${VGM_SOURCE_DIR}/ext_includes/ffmpeg/libswresample/*.h") add_custom_target(ffmpeg DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/avcodec.lib @@ -69,10 +69,10 @@ if(MSVC) ${AVFORMAT_HEADERS} ${AVUTIL_HEADERS} ${SWRESAMPLE_HEADERS}) - source_group("Header Files\\libavcodec" FILES ${AVCODEC_HEADERS}) - source_group("Header Files\\libavformat" FILES ${AVFORMAT_HEADERS}) - source_group("Header Files\\libavutil" FILES ${AVUTIL_HEADERS}) - source_group("Header Files\\libswresample" FILES ${SWRESAMPLE_HEADERS}) + source_group("Header Files\\ffmpeg\\libavcodec" FILES ${AVCODEC_HEADERS}) + source_group("Header Files\\ffmpeg\\libavformat" FILES ${AVFORMAT_HEADERS}) + source_group("Header Files\\ffmpeg\\libavutil" FILES ${AVUTIL_HEADERS}) + source_group("Header Files\\ffmpeg\\libswresample" FILES ${SWRESAMPLE_HEADERS}) endif() if(USE_ATRAC9) diff --git a/fb2k/foo_input_vgmstream.vcproj b/fb2k/foo_input_vgmstream.vcproj index 99d419d9..7342db99 100644 --- a/fb2k/foo_input_vgmstream.vcproj +++ b/fb2k/foo_input_vgmstream.vcproj @@ -41,7 +41,7 @@ Disabled - ..;../ext_includes;$(DependenciesDir)/WTL/Include;$(DependenciesDir)/foobar/foobar2000/SDK;$(DependenciesDir)/foobar/foobar2000/shared;$(DependenciesDir)/foobar/foobar2000;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) + ..;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/WTL/Include;$(DependenciesDir)/foobar/foobar2000/SDK;$(DependenciesDir)/foobar/foobar2000/shared;$(DependenciesDir)/foobar/foobar2000;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;_DEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -96,7 +96,7 @@ - ..;../ext_includes;$(DependenciesDir)/WTL/Include;$(DependenciesDir)/foobar/foobar2000/SDK;$(DependenciesDir)/foobar/foobar2000/shared;$(DependenciesDir)/foobar/foobar2000;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) + ..;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/WTL/Include;$(DependenciesDir)/foobar/foobar2000/SDK;$(DependenciesDir)/foobar/foobar2000/shared;$(DependenciesDir)/foobar/foobar2000;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions) MultiThreaded @@ -175,4 +175,4 @@ - \ No newline at end of file + diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj index d17b0c44..a4f4b582 100644 --- a/src/libvgmstream.vcproj +++ b/src/libvgmstream.vcproj @@ -40,7 +40,7 @@ Disabled - ../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) + ../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_G719;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;USE_ALLOCA;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -71,7 +71,7 @@ - ../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) + ../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) _WIN32_WINNT=0x501;WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_G719;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;USE_ALLOCA;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded @@ -704,4 +704,4 @@ - \ No newline at end of file + diff --git a/winamp/in_vgmstream.vcxproj b/winamp/in_vgmstream.vcxproj index b823ebbd..358dd99b 100644 --- a/winamp/in_vgmstream.vcxproj +++ b/winamp/in_vgmstream.vcxproj @@ -70,7 +70,7 @@ Disabled - ..;../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) + ..;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;_DEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;VGM_WINAMP_UNICODE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -97,7 +97,7 @@ - ..;../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) + ..;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;VGM_WINAMP_UNICODE;%(PreprocessorDefinitions) MultiThreaded @@ -154,4 +154,4 @@ - \ No newline at end of file + diff --git a/xmplay/xmp-vgmstream.vcxproj b/xmplay/xmp-vgmstream.vcxproj index 19d1dc99..53fe161a 100644 --- a/xmplay/xmp-vgmstream.vcxproj +++ b/xmplay/xmp-vgmstream.vcxproj @@ -61,7 +61,7 @@ Disabled - ..;../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) + ..;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;_DEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -85,7 +85,7 @@ - ..;../ext_includes;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) + ..;../ext_includes;../ext_includes/ffmpeg;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) _WIN32_WINNT=0x501;WIN32;VGM_USE_VORBIS;VGM_USE_MPEG;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_ATRAC9;VGM_USE_CELT;VGM_USE_SPEEX;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions) MultiThreaded Level3 @@ -140,4 +140,4 @@ - \ No newline at end of file + From 4681aecadac37dc00fbf2afe382d7969a6c4294c Mon Sep 17 00:00:00 2001 From: Lukas Cone Date: Sat, 17 Jul 2021 17:01:40 +0200 Subject: [PATCH 2/3] fixed pkgconfig include error for cmake --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3825225..d3bc63b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,6 +117,8 @@ else() endif() endif() + find_package(PkgConfig REQUIRED) + # Only build JSON dumping capabilities on Linux pkg_check_modules(JANSSON jansson>=2.3) if (JANSSON_FOUND) @@ -130,7 +132,6 @@ else() # If building Audacious, we need to make sure we can find its pkg-config module as well as GTK's if(BUILD_AUDACIOUS) - include(FindPkgConfig) pkg_search_module(AUDACIOUS REQUIRED audacious>=3.6) pkg_get_variable(AUDACIOUS_PLUGIN_DIR audacious plugin_dir) pkg_search_module(GTK REQUIRED gtk+-3.0 gtk+-2.0) From aa196055c22cc3de89168929df54add73f9bad9d Mon Sep 17 00:00:00 2001 From: Lukas Cone Date: Sat, 17 Jul 2021 18:37:49 +0200 Subject: [PATCH 3/3] Allow use of external ffmpeg SDK --- CMakeLists.txt | 35 ++++++++++++++++++----------------- cmake/FindFFmpeg.cmake | 10 +++++++++- cmake/vgmstream.cmake | 2 +- doc/CMAKE.md | 2 +- ext_libs/CMakeLists.txt | 4 ++-- 5 files changed, 31 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d3bc63b6..98dba069 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,24 @@ else() option(BUILD_AUDACIOUS "Build Audacious plugin" ON) endif() +if(USE_FFMPEG) + find_package(FFmpeg) + if(NOT FFMPEG_LIBRARIES) + set(USE_FFMPEG OFF) + else() + if(${AVCODEC_VERSION} VERSION_LESS 57) + set(USE_FFMPEG OFF) + message("libavcodec version mismatch ${AVCODEC_VERSION} expected >=57") + elseif(${AVUTIL_VERSION} VERSION_LESS 55) + set(USE_FFMPEG OFF) + message("libavutil version mismatch ${AVUTIL_VERSION} expected >=55") + elseif(${SWRESAMPLE_VERSION} VERSION_LESS 2) + set(USE_FFMPEG OFF) + message("libswresample version mismatch ${SWRESAMPLE_VERSION} expected >=2") + endif() + endif() +endif() + if(WIN32) # Enable support for the resource compiler when using MinGW if(MINGW) @@ -91,23 +109,6 @@ else() set(USE_VORBIS OFF) endif() endif() - if(USE_FFMPEG) - find_package(FFmpeg) - if(NOT FFMPEG_LIBRARIES) - set(USE_FFMPEG OFF) - else() - if(${AVCODEC_VERSION} VERSION_LESS 57) - set(USE_FFMPEG OFF) - message("libavcodec version mismatch ${AVCODEC_VERSION} expected >=57") - elseif(${AVUTIL_VERSION} VERSION_LESS 55) - set(USE_FFMPEG OFF) - message("libavutil version mismatch ${AVUTIL_VERSION} expected >=55") - elseif(${SWRESAMPLE_VERSION} VERSION_LESS 2) - set(USE_FFMPEG OFF) - message("libswresample version mismatch ${SWRESAMPLE_VERSION} expected >=2") - endif() - endif() - endif() # If building the CLI, we need to include AO as well if(BUILD_CLI) diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake index c424e2a7..cd581ea2 100644 --- a/cmake/FindFFmpeg.cmake +++ b/cmake/FindFFmpeg.cmake @@ -72,16 +72,24 @@ macro(find_component _component _pkgconfig _library _header) HINTS ${PC_LIB${_component}_INCLUDEDIR} ${PC_LIB${_component}_INCLUDE_DIRS} + ${FFMPEG_PATH}/include PATH_SUFFIXES ffmpeg) find_library(${_component}_LIBRARIES NAMES ${_library} HINTS ${PC_LIB${_component}_LIBDIR} - ${PC_LIB${_component}_LIBRARY_DIRS}) + ${PC_LIB${_component}_LIBRARY_DIRS} + ${FFMPEG_PATH}/lib) set(${_component}_DEFINITIONS ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.") set(${_component}_VERSION ${PC_${_component}_VERSION} CACHE STRING "The ${_component} version number.") + if(WIN32 AND NOT ${_component}_VERSION) + file(GLOB FOUND_DLL_ ${FFMPEG_PATH}/bin/${_library}*.dll) + string(REGEX MATCH ".*${_library}-(.+).dll" FOUND_DLL_ ${FOUND_DLL_}) + set(${_component}_VERSION ${CMAKE_MATCH_1} CACHE STRING "The ${_component} version number." FORCE) + endif() + set_component_found(${_component}) mark_as_advanced( diff --git a/cmake/vgmstream.cmake b/cmake/vgmstream.cmake index 5aae4704..8c89abf0 100644 --- a/cmake/vgmstream.cmake +++ b/cmake/vgmstream.cmake @@ -56,7 +56,7 @@ macro(setup_target TARGET) if(USE_FFMPEG) target_compile_definitions(${TARGET} PRIVATE VGM_USE_FFMPEG) - if(WIN32) + if(WIN32 AND NOT FFMPEG_LIBRARIES) target_include_directories(${TARGET} PRIVATE ${VGM_SOURCE_DIR}/ext_includes/ffmpeg) if(LINK) add_dependencies(${TARGET} ffmpeg) diff --git a/doc/CMAKE.md b/doc/CMAKE.md index 00730617..2cd7e8b2 100644 --- a/doc/CMAKE.md +++ b/doc/CMAKE.md @@ -95,7 +95,7 @@ All of these options are of type BOOL and can be set to either `ON` or `OFF`. Mo - **USE_FDKAAC**: Chooses if you wish to use FDK-AAC/QAAC for support of MP4 AAC. Note that this requires `QAAC_PATH` and `FDK_AAC_PATH` to also be given if the option is `ON`. The default for is `ON`. See the foobar2000 plugin section of [BUILD.md](BUILD.md) for more information on this. - **USE_MPEG**: Chooses if you wish to use libmpg123 for support of MP1/MP2/MP3. The default is `ON`. - **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_FFMPEG**: Chooses if you wish to use FFmpeg for support of many codecs. The default is `ON`. `FFMPEG_PATH` can also be given, so it can use official/external SDK instead of the one used in vgmstream project. - **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`. diff --git a/ext_libs/CMakeLists.txt b/ext_libs/CMakeLists.txt index 61d6c892..8e6fad52 100644 --- a/ext_libs/CMakeLists.txt +++ b/ext_libs/CMakeLists.txt @@ -37,7 +37,7 @@ if(MSVC) SOURCES ${VGM_SOURCE_DIR}/ext_includes/g719.h) endif() - if(USE_FFMPEG) + if(USE_FFMPEG AND NOT FFMPEG_LIBRARIES) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/avcodec.lib ${CMAKE_CURRENT_BINARY_DIR}/avcodec.exp COMMAND lib ARGS /def:${CMAKE_CURRENT_SOURCE_DIR}/avcodec-vgmstream-58.def /machine:x86 /out:${CMAKE_CURRENT_BINARY_DIR}/avcodec.lib @@ -144,7 +144,7 @@ elseif(MINGW) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libg719_decode.lib) endif() - if(USE_FFMPEG) + if(USE_FFMPEG AND NOT FFMPEG_LIBRARIES) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/avcodec.lib COMMAND ${DLLTOOL} ARGS -d ${CMAKE_CURRENT_SOURCE_DIR}/avcodec-vgmstream-58.def -l ${CMAKE_CURRENT_BINARY_DIR}/avcodec.lib -D avcodec-vgmstream-58.dll