From bea7c0f81033b5f60052c30a0205393b0ccbb064 Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Thu, 17 Sep 2026 19:06:14 +0300 Subject: [PATCH] [Build-System] Windows: Upgrade lame to v3.101_1 and libtiff to v4.7.2_1 and use pre-compiled binaries (#3179) --- .gitignore | 4 + Freeswitch.2017.sln | 28 -- libs/win32/libmp3lame/config.h | 120 ----- libs/win32/libmp3lame/libmp3lame.2017.vcxproj | 473 ------------------ libs/win32/libtiff/libtiff.2017.vcxproj | 207 -------- libs/win32/spandsp/libspandsp.2017.vcxproj | 4 - .../formats/mod_shout/mod_shout.2017.vcxproj | 13 +- w32/download_LAME.props | 40 -- w32/download_tiff.props | 40 -- w32/lame-version.props | 21 + w32/lame.props | 59 +++ w32/tiff-version.props | 8 +- w32/tiff.props | 61 ++- 13 files changed, 152 insertions(+), 926 deletions(-) delete mode 100644 libs/win32/libmp3lame/config.h delete mode 100644 libs/win32/libmp3lame/libmp3lame.2017.vcxproj delete mode 100644 libs/win32/libtiff/libtiff.2017.vcxproj delete mode 100644 w32/download_LAME.props delete mode 100644 w32/download_tiff.props create mode 100644 w32/lame-version.props create mode 100644 w32/lame.props diff --git a/.gitignore b/.gitignore index 9f4e691cb3..34c37949f2 100644 --- a/.gitignore +++ b/.gitignore @@ -281,6 +281,10 @@ libs/lua-*.zip libs/g722_1-*.zip libs/ilbc-*.zip libs/libsilk-*.zip +libs/libtiff-*/ +libs/libtiff-*.zip +libs/lame-*/ +libs/lame-*.zip libs/SharpZipLib.*/ libs/SharpZipLib.*.nupkg libs/nasm-*/ diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln index cee8bb0c20..e2a0fa7597 100644 --- a/Freeswitch.2017.sln +++ b/Freeswitch.2017.sln @@ -278,8 +278,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "32khz", "libs\win32\Sound_F EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_flite", "src\mod\asr_tts\mod_flite\mod_flite.2017.vcxproj", "{66444AEE-554C-11DD-A9F0-8C5D56D89593}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmp3lame", "libs\win32\libmp3lame\libmp3lame.2017.vcxproj", "{E316772F-5D8F-4F2A-8F71-094C3E859D34}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libshout", "libs\win32\libshout\libshout.2017.vcxproj", "{D3D8B329-20BE-475E-9E83-653CEA0E0EF5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_shout", "src\mod\formats\mod_shout\mod_shout.2017.vcxproj", "{38FE0559-9910-43A8-9E45-3E5004C27692}" @@ -311,8 +309,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_easyroute", "src\mod\ap EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_lcr", "src\mod\applications\mod_lcr\mod_lcr.2017.vcxproj", "{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\win32\libtiff\libtiff.2017.vcxproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\win32\spandsp\libspandsp.2017.vcxproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libs\win32\speex\libspeex.2017.vcxproj", "{E972C52F-9E85-4D65-B19C-031E511E9DB4}" @@ -1121,17 +1117,6 @@ Global {66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|Win32.Build.0 = Release|Win32 {66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|x64.ActiveCfg = Release|x64 {66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|x64.Build.0 = Release|x64 - {E316772F-5D8F-4F2A-8F71-094C3E859D34}.All|Win32.ActiveCfg = Debug|x64 - {E316772F-5D8F-4F2A-8F71-094C3E859D34}.All|x64.ActiveCfg = Debug|x64 - {E316772F-5D8F-4F2A-8F71-094C3E859D34}.All|x64.Build.0 = Debug|x64 - {E316772F-5D8F-4F2A-8F71-094C3E859D34}.Debug|Win32.ActiveCfg = Debug|Win32 - {E316772F-5D8F-4F2A-8F71-094C3E859D34}.Debug|Win32.Build.0 = Debug|Win32 - {E316772F-5D8F-4F2A-8F71-094C3E859D34}.Debug|x64.ActiveCfg = Debug|x64 - {E316772F-5D8F-4F2A-8F71-094C3E859D34}.Debug|x64.Build.0 = Debug|x64 - {E316772F-5D8F-4F2A-8F71-094C3E859D34}.Release|Win32.ActiveCfg = Release|Win32 - {E316772F-5D8F-4F2A-8F71-094C3E859D34}.Release|Win32.Build.0 = Release|Win32 - {E316772F-5D8F-4F2A-8F71-094C3E859D34}.Release|x64.ActiveCfg = Release|x64 - {E316772F-5D8F-4F2A-8F71-094C3E859D34}.Release|x64.Build.0 = Release|x64 {D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.All|Win32.ActiveCfg = Debug|x64 {D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.All|x64.ActiveCfg = Debug|x64 {D3D8B329-20BE-475E-9E83-653CEA0E0EF5}.All|x64.Build.0 = Debug|x64 @@ -1285,17 +1270,6 @@ Global {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|Win32.Build.0 = Release|Win32 {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|x64.ActiveCfg = Release|x64 {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}.Release|x64.Build.0 = Release|x64 - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|Win32.ActiveCfg = Release|x64 - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|x64.ActiveCfg = Release|x64 - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|x64.Build.0 = Release|x64 - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32 - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32 - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x64.ActiveCfg = Debug|x64 - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|x64.Build.0 = Debug|x64 - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.ActiveCfg = Release|Win32 - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.Build.0 = Release|Win32 - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64.ActiveCfg = Release|x64 - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|x64.Build.0 = Release|x64 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|Win32.ActiveCfg = Release|x64 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|x64.ActiveCfg = Release|x64 {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.All|x64.Build.0 = Release|x64 @@ -2328,7 +2302,6 @@ Global {7EB71250-F002-4ED8-92CA-CA218114537A} = {4F227C26-768F-46A3-8684-1D08A46FB374} {464AAB78-5489-4916-BE51-BF8D61822311} = {4F227C26-768F-46A3-8684-1D08A46FB374} {66444AEE-554C-11DD-A9F0-8C5D56D89593} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} - {E316772F-5D8F-4F2A-8F71-094C3E859D34} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {D3D8B329-20BE-475E-9E83-653CEA0E0EF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {38FE0559-9910-43A8-9E45-3E5004C27692} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} @@ -2342,7 +2315,6 @@ Global {CF405366-9558-4AE8-90EF-5E21B51CCB4E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {329FD5B0-EF28-4606-86D0-F6EA21CF8E36} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} diff --git a/libs/win32/libmp3lame/config.h b/libs/win32/libmp3lame/config.h deleted file mode 100644 index 67e88fecfa..0000000000 --- a/libs/win32/libmp3lame/config.h +++ /dev/null @@ -1,120 +0,0 @@ -/* The number of bytes in a double. */ -#define SIZEOF_DOUBLE 8 - -/* The number of bytes in a float. */ -#define SIZEOF_FLOAT 4 - -/* The number of bytes in a int. */ -#define SIZEOF_INT 4 - -/* The number of bytes in a long. */ -#define SIZEOF_LONG 4 - -/* The number of bytes in a long double. */ -#define SIZEOF_LONG_DOUBLE 12 - -/* The number of bytes in a short. */ -#define SIZEOF_SHORT 2 - -/* The number of bytes in a unsigned int. */ -#define SIZEOF_UNSIGNED_INT 4 - -/* The number of bytes in a unsigned long. */ -#define SIZEOF_UNSIGNED_LONG 4 - -/* The number of bytes in a unsigned short. */ -#define SIZEOF_UNSIGNED_SHORT 2 - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS - -/* Define if you have the header file. */ -#define HAVE_ERRNO_H - -/* Define if you have the header file. */ -#define HAVE_FCNTL_H - -/* Define if you have the header file. */ -#define HAVE_LIMITS_H - -/* Name of package */ -#define PACKAGE "lame" - -/* Version number of package */ -#define VERSION "3.97" - -/* Define if compiler has function prototypes */ -#define PROTOTYPES 1 - -/* enable VBR bitrate histogram */ -#define BRHIST 1 - -/* IEEE754 compatible machine */ -#define TAKEHIRO_IEEE754_HACK 1 - -/* faster log implementation with less but enough precission */ -#define USE_FAST_LOG 1 - -#define HAVE_STRCHR -#define HAVE_MEMCPY - -#if defined(_MSC_VER) || defined(__BORLANDC__) -#pragma warning( disable : 4305 ) - typedef __int8 int8_t; - typedef __int16 int16_t; - typedef __int32 int32_t; - typedef __int64 int64_t; - - typedef unsigned __int8 uint8_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int32 uint32_t; - typedef unsigned __int64 uint64_t; - - typedef float float32_t; - typedef double float64_t; -#elif defined (__GNUC__) -#define __int8_t_defined -#define uint8_t unsigned char -#define uint16_t unsigned short -#define uint32_t unsigned int -#define uint64_t unsigned long long - -#define int8_t signed char -#define int16_t signed short -#define int32_t signed int -#define int64_t signed long long -#endif - -typedef long double ieee854_float80_t; -typedef double ieee754_float64_t; -typedef float ieee754_float32_t; - -#ifdef HAVE_MPGLIB -# define DECODE_ON_THE_FLY 1 -#endif - -#ifdef LAME_ACM -/* memory hacking for driver purposes */ -#define calloc(x,y) acm_Calloc(x,y) -#define free(x) acm_Free(x) -#define malloc(x) acm_Malloc(x) - -#include -void *acm_Calloc( size_t num, size_t size ); -void *acm_Malloc( size_t size ); -void acm_Free( void * mem); -#endif /* LAME_ACM */ - -#define LAME_LIBRARY_BUILD - - -#ifdef HAVE_NASM - #if (defined(__ICL) && (__ICL >= 450)) - #define HAVE_XMMINTRIN_H - #elif defined(_MSC_VER) - #include - #ifdef _mm_malloc - #define HAVE_XMMINTRIN_H - #endif - #endif -#endif diff --git a/libs/win32/libmp3lame/libmp3lame.2017.vcxproj b/libs/win32/libmp3lame/libmp3lame.2017.vcxproj deleted file mode 100644 index cd039c4797..0000000000 --- a/libs/win32/libmp3lame/libmp3lame.2017.vcxproj +++ /dev/null @@ -1,473 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - libmp3lame - {E316772F-5D8F-4F2A-8F71-094C3E859D34} - libmp3lame - - - - StaticLibrary - false - $(DefaultPlatformToolset) - - - StaticLibrary - false - $(DefaultPlatformToolset) - - - StaticLibrary - false - $(DefaultPlatformToolset) - - - StaticLibrary - false - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - /GAy %(AdditionalOptions) - MaxSpeed - .;..\..\lame-3.98.4;..\..\lame-3.98.4\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - MultiThreaded - true - TurnOffAllWarnings - true - - - 0x0409 - - - $(OutDir)libmp3lame.lib - true - - - - - X64 - - - /GAy %(AdditionalOptions) - MaxSpeed - .;..\..\lame-3.98.4;..\..\lame-3.98.4\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true - MultiThreaded - true - TurnOffAllWarnings - true - - - 0x0409 - - - $(OutDir)libmp3lame.lib - true - - - - - Disabled - .;..\..\lame-3.98.4;..\..\lame-3.98.4\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) - MultiThreadedDebug - TurnOffAllWarnings - true - - - 0x0409 - - - $(OutDir)libmp3lame.lib - true - - - - - X64 - - - Disabled - .;..\..\lame-3.98.4;..\..\lame-3.98.4\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) - MultiThreadedDebug - TurnOffAllWarnings - true - - - 0x0409 - - - $(OutDir)libmp3lame.lib - true - - - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Level1 - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Level1 - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Level1 - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Level1 - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Disabled - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - MaxSpeed - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libs/win32/libtiff/libtiff.2017.vcxproj b/libs/win32/libtiff/libtiff.2017.vcxproj deleted file mode 100644 index b81974e7b5..0000000000 --- a/libs/win32/libtiff/libtiff.2017.vcxproj +++ /dev/null @@ -1,207 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - libtiff - {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} - libtiff - Win32Proj - - - - StaticLibrary - Unicode - true - $(DefaultPlatformToolset) - - - StaticLibrary - Unicode - $(DefaultPlatformToolset) - - - StaticLibrary - Unicode - true - $(DefaultPlatformToolset) - - - StaticLibrary - Unicode - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\libtiff\$(Configuration)\ - $(PlatformName)\libtiff\$(Configuration)\ - $(PlatformName)\libtiff\$(Configuration)\ - $(PlatformName)\libtiff\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - if not exist "$(TiffDir)/tiffconf.h" copy "$(TiffDir)\tiffconf.vc.h" "$(TiffDir)\tiffconf.h" /Y -if not exist "$(TiffDir)/tif_config.h" copy "$(TiffDir)\tif_config.vc.h" "$(TiffDir)\tif_config.h" /Y - - - - .;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - TurnOffAllWarnings - CompileAsC - Disabled - - - - - if not exist "$(TiffDir)/tiffconf.h" copy "$(TiffDir)\tiffconf.vc.h" "$(TiffDir)\tiffconf.h" /Y -if not exist "$(TiffDir)/tif_config.h" copy "$(TiffDir)\tif_config.vc.h" "$(TiffDir)\tif_config.h" /Y - - - - X64 - - - Disabled - .;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - TurnOffAllWarnings - CompileAsC - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - if not exist "$(TiffDir)/tiffconf.h" copy "$(TiffDir)\tiffconf.vc.h" "$(TiffDir)\tiffconf.h" /Y -if not exist "$(TiffDir)/tif_config.h" copy "$(TiffDir)\tif_config.vc.h" "$(TiffDir)\tif_config.h" /Y - - - - .;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO;%(PreprocessorDefinitions) - MultiThreadedDLL - TurnOffAllWarnings - - - - - if not exist "$(TiffDir)/tiffconf.h" copy "$(TiffDir)\tiffconf.vc.h" "$(TiffDir)\tiffconf.h" /Y -if not exist "$(TiffDir)/tif_config.h" copy "$(TiffDir)\tif_config.vc.h" "$(TiffDir)\tif_config.h" /Y - - - - X64 - - - .;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO;%(PreprocessorDefinitions) - MultiThreadedDLL - TurnOffAllWarnings - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libs/win32/spandsp/libspandsp.2017.vcxproj b/libs/win32/spandsp/libspandsp.2017.vcxproj index b97c7fa2a8..2010c70166 100644 --- a/libs/win32/spandsp/libspandsp.2017.vcxproj +++ b/libs/win32/spandsp/libspandsp.2017.vcxproj @@ -459,10 +459,6 @@ true false - - {401a40cd-5db4-4e34-ac68-fa99e9fac014} - false - {dee932ab-5911-4700-9eeb-8c7090a0a330} false diff --git a/src/mod/formats/mod_shout/mod_shout.2017.vcxproj b/src/mod/formats/mod_shout/mod_shout.2017.vcxproj index 66a47191f9..10a06d52ad 100644 --- a/src/mod/formats/mod_shout/mod_shout.2017.vcxproj +++ b/src/mod/formats/mod_shout/mod_shout.2017.vcxproj @@ -47,6 +47,7 @@ $(DefaultPlatformToolset) + @@ -74,7 +75,7 @@ Disabled - ../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories) + ..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories) _TIMESPEC_DEFINED;%(PreprocessorDefinitions) true EnableFastChecks @@ -95,7 +96,7 @@ Disabled - ../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories) + ..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) true EnableFastChecks @@ -114,7 +115,7 @@ MaxSpeed true - ../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories) + ..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories) _TIMESPEC_DEFINED;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -137,7 +138,7 @@ MaxSpeed true - ../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories) + ..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL true @@ -162,10 +163,6 @@ - - {e316772f-5d8f-4f2a-8f71-094c3e859d34} - false - {0feeaec6-4399-4c46-b7db-62ece80d15b4} diff --git a/w32/download_LAME.props b/w32/download_LAME.props deleted file mode 100644 index c3f5177665..0000000000 --- a/w32/download_LAME.props +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - true - - - - - - - - - diff --git a/w32/download_tiff.props b/w32/download_tiff.props deleted file mode 100644 index 5b2e0a09af..0000000000 --- a/w32/download_tiff.props +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - true - - - - - - - - - diff --git a/w32/lame-version.props b/w32/lame-version.props new file mode 100644 index 0000000000..1cddf91019 --- /dev/null +++ b/w32/lame-version.props @@ -0,0 +1,21 @@ + + + + + 3.101 + 1 + + + true + + + + + + $(LameVersion) + + + $(LameBuildNumber) + + + diff --git a/w32/lame.props b/w32/lame.props new file mode 100644 index 0000000000..d32b61f306 --- /dev/null +++ b/w32/lame.props @@ -0,0 +1,59 @@ + + + + + + + + $(BaseDir)libs\lame-$(LameVersion)_$(LameBuildNumber) + + + + + + + + + + + + + + $(LameLibDir)\include;$(LameLibDir)\include\lame;%(AdditionalIncludeDirectories) + + + $(LameLibDir)\binaries\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + libmp3lame.lib;%(AdditionalDependencies) + + + diff --git a/w32/tiff-version.props b/w32/tiff-version.props index 3378831aea..363dd7479c 100644 --- a/w32/tiff-version.props +++ b/w32/tiff-version.props @@ -2,7 +2,8 @@ - 4.0.7 + 4.7.2 + 1 true @@ -13,5 +14,8 @@ $(TiffVersion) + + $(TiffBuildNumber) + - \ No newline at end of file + diff --git a/w32/tiff.props b/w32/tiff.props index 2978d52e42..69aff2b250 100644 --- a/w32/tiff.props +++ b/w32/tiff.props @@ -2,14 +2,67 @@ + - $(SolutionDir)libs\tiff-$(TiffVersion) - $(TiffLibDir)\libtiff + $(BaseDir)libs\libtiff-$(TiffVersion)_$(TiffBuildNumber) + Debug + Release + Release + tiffd + tiff + + + + + + + + + + + - $(TiffDir);%(AdditionalIncludeDirectories) + $(TiffLibDir)\include;%(AdditionalIncludeDirectories) - \ No newline at end of file + + + $(TiffLibDir)\binaries\$(Platform)\$(LibraryConfiguration);%(AdditionalLibraryDirectories) + $(TiffLibraryFileName).lib;%(AdditionalDependencies) + + +