From 8a75eb9f21bf16096f75499f3343e54e7b4da116 Mon Sep 17 00:00:00 2001 From: yyc12345 Date: Wed, 6 Sep 2023 15:17:39 +0800 Subject: [PATCH] use stb as default image codec --- LibCmo/LibCmo.vcxproj | 8 ++++---- LibRef.props | 22 ++++------------------ README.md | 2 +- Unvirt/Unvirt.vcxproj | 16 ++++++++-------- 4 files changed, 17 insertions(+), 31 deletions(-) diff --git a/LibCmo/LibCmo.vcxproj b/LibCmo/LibCmo.vcxproj index 748a320..cc4b588 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);$(FFMPEG_WIN32_HEADER_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);$(STB_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);$(FFMPEG_WIN32_HEADER_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);$(STB_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);$(FFMPEG_WIN64_HEADER_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);$(STB_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);$(FFMPEG_WIN64_HEADER_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);$(STB_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true diff --git a/LibRef.props b/LibRef.props index cfef7a9..43b5e33 100644 --- a/LibRef.props +++ b/LibRef.props @@ -2,31 +2,17 @@ - D:\CppLib\FFmpeg\Win32\include - D:\CppLib\FFmpeg\x64\include - D:\CppLib\FFmpeg\Win32\lib - D:\CppLib\FFmpeg\x64\lib - + D:\CppLib\stb D:\zlib - - $(FFMPEG_WIN32_HEADER_PATH) - - - $(FFMPEG_WIN64_HEADER_PATH) - - - $(FFMPEG_WIN32_LIB_PATH) - - - $(FFMPEG_WIN64_LIB_PATH) - - $(ZLIB_PATH) + + $(STB_PATH) + \ No newline at end of file diff --git a/README.md b/README.md index e6ef73c..201375a 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ 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).) +* [stb](https://github.com/nothings/stb) (For image read / write) * iconv (non-Windows system required) It can be compiled on Windows via sln file, or on Linux platform via CMake file. diff --git a/Unvirt/Unvirt.vcxproj b/Unvirt/Unvirt.vcxproj index f012ae7..70939e8 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;$(FFMPEG_WIN32_HEADER_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);../LibCmo;$(STB_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true @@ -108,7 +108,7 @@ Console true - zlibwapi.lib;avcodec.lib;avformat.lib;avutil.lib;swscale.lib;avdevice.lib;LibCmo.lib;%(AdditionalDependencies) + zlibwapi.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;$(FFMPEG_WIN32_HEADER_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);../LibCmo;$(STB_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true @@ -130,7 +130,7 @@ true true true - zlibwapi.lib;avcodec.lib;avformat.lib;avutil.lib;swscale.lib;avdevice.lib;LibCmo.lib;%(AdditionalDependencies) + zlibwapi.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;$(FFMPEG_WIN64_HEADER_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);../LibCmo;$(STB_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true @@ -148,7 +148,7 @@ Console true - zlibwapi.lib;avcodec.lib;avformat.lib;avutil.lib;swscale.lib;avdevice.lib;LibCmo.lib;%(AdditionalDependencies) + zlibwapi.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;$(FFMPEG_WIN64_HEADER_PATH);%(AdditionalIncludeDirectories) + $(ZLIB_PATH);../LibCmo;$(STB_PATH);%(AdditionalIncludeDirectories) stdcpp20 /utf-8 %(AdditionalOptions) true @@ -170,7 +170,7 @@ true true true - zlibwapi.lib;avcodec.lib;avformat.lib;avutil.lib;swscale.lib;avdevice.lib;LibCmo.lib;%(AdditionalDependencies) + zlibwapi.lib;LibCmo.lib;%(AdditionalDependencies) $(ZLIB_PATH)\contrib\vstudio\vc14\x64\ZlibDllReleaseWithoutAsm;$(SolutionDir)out\$(Platform)\$(Configuration)\LibCmo;$(FFMPEG_WIN64_LIB_PATH)