diff --git a/LibCmo/LibCmo.vcxproj b/LibCmo/LibCmo.vcxproj index e9f76d5..748a320 100644 --- a/LibCmo/LibCmo.vcxproj +++ b/LibCmo/LibCmo.vcxproj @@ -100,7 +100,7 @@ true _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(ZLIB_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);$(FFMPEG_WIN32_HEADER_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true @@ -119,7 +119,7 @@ true _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(ZLIB_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);$(FFMPEG_WIN32_HEADER_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true @@ -138,7 +138,7 @@ true _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(ZLIB_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);$(FFMPEG_WIN64_HEADER_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true @@ -159,7 +159,7 @@ true _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(ZLIB_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);$(FFMPEG_WIN64_HEADER_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true diff --git a/LibRef.props b/LibRef.props index 79a7fc2..cfef7a9 100644 --- a/LibRef.props +++ b/LibRef.props @@ -2,23 +2,27 @@ - D:\CppLib\SQLite\sqlite-amalgamation-3400100 - D:\CppLib\SQLite\sqlite-dll-win32-x86-3400100 - D:\CppLib\SQLite\sqlite-dll-win64-x64-3400100 + D:\CppLib\FFmpeg\Win32\include + D:\CppLib\FFmpeg\x64\include + D:\CppLib\FFmpeg\Win32\lib + D:\CppLib\FFmpeg\x64\lib D:\zlib - - $(SQLITE_HEADER_PATH) + + $(FFMPEG_WIN32_HEADER_PATH) - - $(SQLITE_WIN32_LIB_PATH) + + $(FFMPEG_WIN64_HEADER_PATH) - - $(SQLITE_WIN64_LIB_PATH) + + $(FFMPEG_WIN32_LIB_PATH) + + + $(FFMPEG_WIN64_LIB_PATH) diff --git a/README.md b/README.md index 7d9eef4..e6ef73c 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,9 @@ This project require: * The compiler supporting C++20 * Littile-endian architecture system. * zlib +* FFmpeg (In Windows, download dev package in [there](https://github.com/yt-dlp/FFmpeg-Builds).) * iconv (non-Windows system required) It can be compiled on Windows via sln file, or on Linux platform via CMake file. +You should set up `LibRef.props` when using sln file. However CMake may not be updated in time because I develop this project on Windows frequently. diff --git a/Unvirt/Unvirt.vcxproj b/Unvirt/Unvirt.vcxproj index bf7b7dd..f012ae7 100644 --- a/Unvirt/Unvirt.vcxproj +++ b/Unvirt/Unvirt.vcxproj @@ -100,7 +100,7 @@ true _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(ZLIB_PATH);../LibCmo;$(SQLITE_HEADER_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);../LibCmo;$(FFMPEG_WIN32_HEADER_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true @@ -108,8 +108,8 @@ Console true - zlibwapi.lib;sqlite3.lib;LibCmo.lib;%(AdditionalDependencies) - $(ZLIB_PATH)\contrib\vstudio\vc14\x86\ZlibDllReleaseWithoutAsm;$(SolutionDir)out\$(Platform)\$(Configuration)\LibCmo;$(SQLITE_WIN32_LIB_PATH) + zlibwapi.lib;avcodec.lib;avformat.lib;avutil.lib;swscale.lib;avdevice.lib;LibCmo.lib;%(AdditionalDependencies) + $(ZLIB_PATH)\contrib\vstudio\vc14\x86\ZlibDllReleaseWithoutAsm;$(SolutionDir)out\$(Platform)\$(Configuration)\LibCmo;$(FFMPEG_WIN32_LIB_PATH) @@ -120,7 +120,7 @@ true _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(ZLIB_PATH);../LibCmo;$(SQLITE_HEADER_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);../LibCmo;$(FFMPEG_WIN32_HEADER_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true @@ -130,8 +130,8 @@ true true true - zlibwapi.lib;sqlite3.lib;LibCmo.lib;%(AdditionalDependencies) - $(ZLIB_PATH)\contrib\vstudio\vc14\x86\ZlibDllReleaseWithoutAsm;$(SolutionDir)out\$(Platform)\$(Configuration)\LibCmo;$(SQLITE_WIN32_LIB_PATH) + zlibwapi.lib;avcodec.lib;avformat.lib;avutil.lib;swscale.lib;avdevice.lib;LibCmo.lib;%(AdditionalDependencies) + $(ZLIB_PATH)\contrib\vstudio\vc14\x86\ZlibDllReleaseWithoutAsm;$(SolutionDir)out\$(Platform)\$(Configuration)\LibCmo;$(FFMPEG_WIN32_LIB_PATH) @@ -140,7 +140,7 @@ true _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(ZLIB_PATH);../LibCmo;$(SQLITE_HEADER_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);../LibCmo;$(FFMPEG_WIN64_HEADER_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true @@ -148,8 +148,8 @@ Console true - zlibwapi.lib;sqlite3.lib;LibCmo.lib;%(AdditionalDependencies) - $(ZLIB_PATH)\contrib\vstudio\vc14\x64\ZlibDllReleaseWithoutAsm;$(SolutionDir)out\$(Platform)\$(Configuration)\LibCmo;$(SQLITE_WIN64_LIB_PATH) + zlibwapi.lib;avcodec.lib;avformat.lib;avutil.lib;swscale.lib;avdevice.lib;LibCmo.lib;%(AdditionalDependencies) + $(ZLIB_PATH)\contrib\vstudio\vc14\x64\ZlibDllReleaseWithoutAsm;$(SolutionDir)out\$(Platform)\$(Configuration)\LibCmo;$(FFMPEG_WIN64_LIB_PATH) @@ -160,7 +160,7 @@ true _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(ZLIB_PATH);../LibCmo;$(SQLITE_HEADER_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);../LibCmo;$(FFMPEG_WIN64_HEADER_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true @@ -170,8 +170,8 @@ true true true - zlibwapi.lib;sqlite3.lib;LibCmo.lib;%(AdditionalDependencies) - $(ZLIB_PATH)\contrib\vstudio\vc14\x64\ZlibDllReleaseWithoutAsm;$(SolutionDir)out\$(Platform)\$(Configuration)\LibCmo;$(SQLITE_WIN64_LIB_PATH) + zlibwapi.lib;avcodec.lib;avformat.lib;avutil.lib;swscale.lib;avdevice.lib;LibCmo.lib;%(AdditionalDependencies) + $(ZLIB_PATH)\contrib\vstudio\vc14\x64\ZlibDllReleaseWithoutAsm;$(SolutionDir)out\$(Platform)\$(Configuration)\LibCmo;$(FFMPEG_WIN64_LIB_PATH)