diff --git a/libs/libblade/libblade.vcxproj b/libs/libblade/libblade.vcxproj index 3420ccef22..5393765671 100644 --- a/libs/libblade/libblade.vcxproj +++ b/libs/libblade/libblade.vcxproj @@ -49,45 +49,27 @@ Unicode + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - @@ -124,7 +106,6 @@ EnableAllWarnings ProgramDatabase Disabled - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;%(AdditionalIncludeDirectories) true true 4711;4574;4100;4127;4668;4255;4706;4710;4820;4090;4702;4456;4242;4457;4459;4244;4324;4204;4388;4245;4267 @@ -145,7 +126,6 @@ MultiThreadedDLL EnableAllWarnings ProgramDatabase - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;%(AdditionalIncludeDirectories) true true 4711;4574;4100;4127;4668;4255;4706;4710;4820;4090;4702;4456;4242;4457;4459;4244;4324;4204;4388;4245;4267 @@ -162,7 +142,6 @@ - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;KS_DECLARE_STATIC;%(PreprocessorDefinitions) EditAndContinue EnableAllWarnings @@ -182,7 +161,6 @@ - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;KS_DECLARE_STATIC;%(PreprocessorDefinitions) EnableAllWarnings true diff --git a/libs/libblade/switchblade/switchblade.vcxproj b/libs/libblade/switchblade/switchblade.vcxproj index 0eb09f50e8..d9ae7772db 100644 --- a/libs/libblade/switchblade/switchblade.vcxproj +++ b/libs/libblade/switchblade/switchblade.vcxproj @@ -52,13 +52,13 @@ Unicode + - @@ -66,7 +66,6 @@ - @@ -74,7 +73,6 @@ - @@ -82,7 +80,6 @@ - @@ -93,26 +90,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) @@ -123,7 +120,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -141,7 +138,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;KS_DECLARE_STATIC;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -163,7 +160,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -184,7 +181,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;KS_DECLARE_STATIC;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -200,6 +197,15 @@ + + {70d178d8-1100-4152-86c0-809a91cff832} + + + {1a234565-926d-49b2-83e4-d56e0c38c9f2} + + + {a185b162-6cb6-4502-b03f-b56f7699a8d9} + {a89d6d18-6203-4149-9051-f8e798e7a3e7} diff --git a/libs/libblade/test/bladec.vcxproj b/libs/libblade/test/bladec.vcxproj index 5bf53cfb87..513b48681e 100644 --- a/libs/libblade/test/bladec.vcxproj +++ b/libs/libblade/test/bladec.vcxproj @@ -52,13 +52,13 @@ Unicode + - @@ -66,7 +66,6 @@ - @@ -74,7 +73,6 @@ - @@ -82,7 +80,6 @@ - @@ -93,26 +90,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) @@ -123,7 +120,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -141,7 +138,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;KS_DECLARE_STATIC;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -163,7 +160,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -184,7 +181,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -209,12 +206,6 @@ {a185b162-6cb6-4502-b03f-b56f7699a8d9} - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {a89d6d18-6203-4149-9051-f8e798e7a3e7} diff --git a/libs/libblade/test/blades.vcxproj b/libs/libblade/test/blades.vcxproj index d98294e8de..7a02675978 100644 --- a/libs/libblade/test/blades.vcxproj +++ b/libs/libblade/test/blades.vcxproj @@ -52,13 +52,13 @@ Unicode + - @@ -66,7 +66,6 @@ - @@ -74,7 +73,6 @@ - @@ -82,7 +80,6 @@ - @@ -93,26 +90,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) @@ -123,7 +120,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -141,7 +138,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;KS_DECLARE_STATIC;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -163,7 +160,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -184,7 +181,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -209,12 +206,6 @@ {a185b162-6cb6-4502-b03f-b56f7699a8d9} - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {a89d6d18-6203-4149-9051-f8e798e7a3e7} diff --git a/libs/libblade/test/testcli.vcxproj b/libs/libblade/test/testcli.vcxproj index a0c687a67e..ef62a6cc8f 100644 --- a/libs/libblade/test/testcli.vcxproj +++ b/libs/libblade/test/testcli.vcxproj @@ -52,13 +52,13 @@ Unicode + - @@ -66,7 +66,6 @@ - @@ -74,7 +73,6 @@ - @@ -82,7 +80,6 @@ - @@ -93,26 +90,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) @@ -123,7 +120,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -141,7 +138,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;KS_DECLARE_STATIC;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -163,7 +160,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -184,7 +181,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;KS_DECLARE_STATIC;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -201,6 +198,15 @@ + + {70d178d8-1100-4152-86c0-809a91cff832} + + + {1a234565-926d-49b2-83e4-d56e0c38c9f2} + + + {a185b162-6cb6-4502-b03f-b56f7699a8d9} + {a89d6d18-6203-4149-9051-f8e798e7a3e7} diff --git a/libs/libblade/test/testcon.vcxproj b/libs/libblade/test/testcon.vcxproj index 513324ec69..8c24d144be 100644 --- a/libs/libblade/test/testcon.vcxproj +++ b/libs/libblade/test/testcon.vcxproj @@ -52,13 +52,13 @@ Unicode + - @@ -66,7 +66,6 @@ - @@ -74,7 +73,6 @@ - @@ -82,7 +80,6 @@ - @@ -93,26 +90,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)..\libks\src\include;$(SolutionDir)..\libsodium-$(SodiumVersion)\src\libsodium\include;$(SolutionDir)..\libconfig-$(ConfigVersion)\lib;$(IncludePath) $(LibraryPath) @@ -123,7 +120,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -141,7 +138,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;KS_DECLARE_STATIC;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -163,7 +160,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -184,7 +181,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;KS_DECLARE_STATIC;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -201,6 +198,15 @@ + + {70d178d8-1100-4152-86c0-809a91cff832} + + + {1a234565-926d-49b2-83e4-d56e0c38c9f2} + + + {a185b162-6cb6-4502-b03f-b56f7699a8d9} + {a89d6d18-6203-4149-9051-f8e798e7a3e7} diff --git a/libs/libks/libks.vcxproj b/libs/libks/libks.vcxproj index 39d3cf7eeb..5a3a3ca7b0 100644 --- a/libs/libks/libks.vcxproj +++ b/libs/libks/libks.vcxproj @@ -49,6 +49,7 @@ Unicode + @@ -56,22 +57,18 @@ - - - - @@ -108,7 +105,6 @@ EnableAllWarnings ProgramDatabase Disabled - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;%(AdditionalIncludeDirectories) true true 4711;4574;4100;4127;4668;4255;4706;4710;4820;4090;4702 @@ -129,7 +125,6 @@ MultiThreadedDLL EnableAllWarnings ProgramDatabase - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;%(AdditionalIncludeDirectories) true true 4711;4574;4100;4127;4668;4255;4706;4710;4820;4090;4702 @@ -146,7 +141,6 @@ - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;KS_DECLARE_STATIC;%(PreprocessorDefinitions) EditAndContinue EnableAllWarnings @@ -170,7 +164,6 @@ - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;KS_DECLARE_STATIC;%(PreprocessorDefinitions) EnableAllWarnings true @@ -251,12 +244,6 @@ - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - diff --git a/libs/libks/test/test_thread_pools.vcxproj b/libs/libks/test/test_thread_pools.vcxproj index 974ab4fc20..cacce87aea 100644 --- a/libs/libks/test/test_thread_pools.vcxproj +++ b/libs/libks/test/test_thread_pools.vcxproj @@ -52,6 +52,7 @@ Unicode + @@ -73,26 +74,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) @@ -103,7 +104,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -122,7 +123,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -143,7 +144,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -165,7 +166,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -178,12 +179,6 @@ - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {70d178d8-1100-4152-86c0-809a91cff832} diff --git a/libs/libks/test/testacl.vcxproj b/libs/libks/test/testacl.vcxproj index ffed964941..ab2ba0ef10 100644 --- a/libs/libks/test/testacl.vcxproj +++ b/libs/libks/test/testacl.vcxproj @@ -52,6 +52,7 @@ Unicode + @@ -73,26 +74,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) @@ -103,7 +104,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -122,7 +123,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -143,8 +144,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. - 4090 + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -165,7 +165,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -178,12 +178,6 @@ - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {70d178d8-1100-4152-86c0-809a91cff832} diff --git a/libs/libks/test/testhash.vcxproj b/libs/libks/test/testhash.vcxproj index 9c4b409f6d..8558960f54 100644 --- a/libs/libks/test/testhash.vcxproj +++ b/libs/libks/test/testhash.vcxproj @@ -52,6 +52,7 @@ Unicode + @@ -73,26 +74,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) @@ -103,7 +104,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -121,8 +122,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. - 4090 + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -141,7 +141,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -162,7 +162,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true diff --git a/libs/libks/test/testpolling.vcxproj b/libs/libks/test/testpolling.vcxproj index c863af6343..ef27a44351 100644 --- a/libs/libks/test/testpolling.vcxproj +++ b/libs/libks/test/testpolling.vcxproj @@ -52,6 +52,7 @@ Unicode + @@ -73,26 +74,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) @@ -103,7 +104,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -122,8 +123,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. - 4090 + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -143,7 +143,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -165,7 +165,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -178,12 +178,6 @@ - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {70d178d8-1100-4152-86c0-809a91cff832} diff --git a/libs/libks/test/testpools.vcxproj b/libs/libks/test/testpools.vcxproj index c1743b4f1d..c448ea3631 100644 --- a/libs/libks/test/testpools.vcxproj +++ b/libs/libks/test/testpools.vcxproj @@ -52,6 +52,7 @@ Unicode + @@ -73,26 +74,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) @@ -103,7 +104,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -121,7 +122,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -141,7 +142,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -162,7 +163,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true diff --git a/libs/libks/test/testq.vcxproj b/libs/libks/test/testq.vcxproj index 45cccc2657..23cd4a8110 100644 --- a/libs/libks/test/testq.vcxproj +++ b/libs/libks/test/testq.vcxproj @@ -52,6 +52,7 @@ Unicode + @@ -73,26 +74,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) @@ -103,7 +104,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -121,7 +122,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -141,7 +142,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -162,7 +163,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true diff --git a/libs/libks/test/testrealloc.vcxproj b/libs/libks/test/testrealloc.vcxproj index a60c5be623..141231c4d3 100644 --- a/libs/libks/test/testrealloc.vcxproj +++ b/libs/libks/test/testrealloc.vcxproj @@ -52,6 +52,7 @@ Unicode + @@ -73,26 +74,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) @@ -103,7 +104,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -122,7 +123,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -143,7 +144,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -165,7 +166,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -178,12 +179,6 @@ - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {70d178d8-1100-4152-86c0-809a91cff832} diff --git a/libs/libks/test/testsock.vcxproj b/libs/libks/test/testsock.vcxproj index 7ab1e57b2c..6190f069c3 100644 --- a/libs/libks/test/testsock.vcxproj +++ b/libs/libks/test/testsock.vcxproj @@ -52,6 +52,7 @@ Unicode + @@ -73,27 +74,27 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(LibraryPath) - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) @@ -103,8 +104,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. - 4090 + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -121,8 +121,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. - 4090 + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -141,8 +140,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. - 4090 + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -162,8 +160,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. - 4090 + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true diff --git a/libs/libks/test/testthreadmutex.vcxproj b/libs/libks/test/testthreadmutex.vcxproj index be33681798..f34d7b7313 100644 --- a/libs/libks/test/testthreadmutex.vcxproj +++ b/libs/libks/test/testthreadmutex.vcxproj @@ -52,6 +52,7 @@ Unicode + @@ -73,26 +74,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) @@ -103,8 +104,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. - 4090 + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -121,8 +121,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. - 4090 + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -141,8 +140,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. - 4090 + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -162,8 +160,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. - 4090 + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true diff --git a/libs/libks/test/testtime.vcxproj b/libs/libks/test/testtime.vcxproj index e1c73e2706..bb9b354189 100644 --- a/libs/libks/test/testtime.vcxproj +++ b/libs/libks/test/testtime.vcxproj @@ -52,6 +52,7 @@ Unicode + @@ -73,26 +74,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) @@ -103,7 +104,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -121,7 +122,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -141,7 +142,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -162,7 +163,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true diff --git a/libs/libks/test/testwebsock.vcxproj b/libs/libks/test/testwebsock.vcxproj index d3bbc3e9f2..9ce6f3031e 100644 --- a/libs/libks/test/testwebsock.vcxproj +++ b/libs/libks/test/testwebsock.vcxproj @@ -52,6 +52,7 @@ Unicode + @@ -73,26 +74,26 @@ true $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) true $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ $(SolutionDir)$(Platform)\$(Configuration)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) false $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath) + $(SolutionDir);$(SolutionDir)\crypt;$(IncludePath) $(LibraryPath) @@ -103,7 +104,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -122,7 +123,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -143,7 +144,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -165,7 +166,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + ../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -178,12 +179,6 @@ - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {70d178d8-1100-4152-86c0-809a91cff832} diff --git a/libs/srtp/libsrtp.2015.vcxproj b/libs/srtp/libsrtp.2015.vcxproj index fcebcea118..e5be6338d2 100644 --- a/libs/srtp/libsrtp.2015.vcxproj +++ b/libs/srtp/libsrtp.2015.vcxproj @@ -86,6 +86,7 @@ v140 + @@ -97,12 +98,10 @@ - - @@ -113,12 +112,10 @@ - - @@ -139,7 +136,7 @@ Disabled - crypto/include;include;..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + crypto/include;include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) true EnableFastChecks @@ -161,7 +158,7 @@ Disabled - crypto/include;include;..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + crypto/include;include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) true EnableFastChecks @@ -178,7 +175,7 @@ copy /Y "$(ProjectDir)config.hw" "$(ProjectDir)crypto\include\config.h" > NUL - crypto/include;include;..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + crypto/include;include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL Default @@ -196,7 +193,7 @@ X64 - crypto/include;include;..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + crypto/include;include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) MultiThreadedDLL Default @@ -416,11 +413,6 @@ - - - {25bd39b1-c8bf-4676-a738-9cabd9c6bc79} - - diff --git a/libs/win32/curl/curllib.2015.vcxproj b/libs/win32/curl/curllib.2015.vcxproj index a6567c8fda..4767430291 100644 --- a/libs/win32/curl/curllib.2015.vcxproj +++ b/libs/win32/curl/curllib.2015.vcxproj @@ -50,7 +50,7 @@ - + @@ -86,7 +86,7 @@ MaxSpeed OnlyExplicitInline - ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -117,7 +117,7 @@ MaxSpeed OnlyExplicitInline - ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -147,7 +147,7 @@ Disabled - ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true EnableFastChecks @@ -177,7 +177,7 @@ Disabled - ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/libs/win32/iksemel/iksemel.2015.vcxproj b/libs/win32/iksemel/iksemel.2015.vcxproj index cb70a26f28..28eb1bbe2a 100644 --- a/libs/win32/iksemel/iksemel.2015.vcxproj +++ b/libs/win32/iksemel/iksemel.2015.vcxproj @@ -48,27 +48,24 @@ v140 + - - - - @@ -77,7 +74,7 @@ Disabled - ..\..\iksemel\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -87,7 +84,7 @@ - ..\..\iksemel\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL TurnOffAllWarnings @@ -99,7 +96,7 @@ Disabled - ..\..\iksemel\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -112,7 +109,7 @@ X64 - ..\..\iksemel\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + ..\..\iksemel\include;.;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;HAVE_SSL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL TurnOffAllWarnings diff --git a/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj b/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj index bf308a894b..d5717772be 100644 --- a/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj +++ b/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj @@ -49,27 +49,24 @@ v140 + - - - - @@ -86,7 +83,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" Disabled - ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\tport\include;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;..\..\..\src\include;%(AdditionalIncludeDirectories) + ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\tport\include;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\..\src\include;%(AdditionalIncludeDirectories) _TIMESPEC_DEFINED;WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -123,7 +120,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" Disabled - ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\tport\include;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;..\..\..\src\include;%(AdditionalIncludeDirectories) + ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\tport\include;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\..\src\include;%(AdditionalIncludeDirectories) _TIMESPEC_DEFINED;_WIN64;WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -158,7 +155,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" MaxSpeed OnlyExplicitInline - ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\tport\include;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;..\..\..\src\include;%(AdditionalIncludeDirectories) + ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\tport\include;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\..\src\include;%(AdditionalIncludeDirectories) _TIMESPEC_DEFINED;WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -196,7 +193,7 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" MaxSpeed OnlyExplicitInline - ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\tport\include;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\openssl-$(OpenSSLVersion)\include;..\..\..\src\include;%(AdditionalIncludeDirectories) + ..\..\sofia-sip\win32;..\..\sofia-sip\libsofia-sip-ua\su;..\..\sofia-sip\libsofia-sip-ua\ipt;..\..\sofia-sip\libsofia-sip-ua\sresolv;..\..\sofia-sip\libsofia-sip-ua\bnf;..\..\sofia-sip\libsofia-sip-ua\url;..\..\sofia-sip\libsofia-sip-ua\msg;..\..\sofia-sip\libsofia-sip-ua\sip;..\..\sofia-sip\libsofia-sip-ua\nta;..\..\sofia-sip\libsofia-sip-ua\nua;..\..\sofia-sip\libsofia-sip-ua\iptsec;..\..\sofia-sip\libsofia-sip-ua\http;..\..\sofia-sip\libsofia-sip-ua\nth;..\..\sofia-sip\libsofia-sip-ua\nea;..\..\sofia-sip\libsofia-sip-ua\sdp;..\..\sofia-sip\libsofia-sip-ua\soa;..\..\sofia-sip\libsofia-sip-ua\stun;..\..\sofia-sip\libsofia-sip-ua\tport;..\..\sofia-sip\libsofia-sip-ua\tport\include;..\..\sofia-sip\libsofia-sip-ua\features;..\..\pthreads-w32-2-9-1;.;..\..\..\src\include;%(AdditionalIncludeDirectories) _TIMESPEC_DEFINED;_WIN64;WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -521,12 +518,6 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" {8b3b4c4c-13c2-446c-beb0-f412cc2cfb9a} false - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {df018947-0fff-4eb3-bdee-441dc81da7a4} false diff --git a/src/mod/applications/mod_curl/mod_curl.2015.vcxproj b/src/mod/applications/mod_curl/mod_curl.2015.vcxproj index 7559a4535e..8665e366a6 100644 --- a/src/mod/applications/mod_curl/mod_curl.2015.vcxproj +++ b/src/mod/applications/mod_curl/mod_curl.2015.vcxproj @@ -47,6 +47,7 @@ + @@ -133,12 +134,6 @@ {87ee9da4-de1e-4448-8324-183c98dca588} false - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false diff --git a/src/mod/applications/mod_http_cache/mod_http_cache.vcxproj b/src/mod/applications/mod_http_cache/mod_http_cache.vcxproj index 9c260e6991..f8e10d063e 100644 --- a/src/mod/applications/mod_http_cache/mod_http_cache.vcxproj +++ b/src/mod/applications/mod_http_cache/mod_http_cache.vcxproj @@ -136,12 +136,6 @@ {87ee9da4-de1e-4448-8324-183c98dca588} - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false diff --git a/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2015.vcxproj b/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2015.vcxproj index 58e0f0884e..f4196aacde 100644 --- a/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2015.vcxproj +++ b/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2015.vcxproj @@ -46,6 +46,7 @@ v140 + @@ -187,12 +188,6 @@ {f6c55d93-b927-4483-bb69-15aef3dd2dff} false - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {df018947-0fff-4eb3-bdee-441dc81da7a4} diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.2015.vcxproj b/src/mod/endpoints/mod_dingaling/mod_dingaling.2015.vcxproj index 7ff672d214..abf3a7424a 100644 --- a/src/mod/endpoints/mod_dingaling/mod_dingaling.2015.vcxproj +++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.2015.vcxproj @@ -46,6 +46,7 @@ v140 + @@ -153,12 +154,6 @@ {e727e8f6-935d-46fe-8b0e-37834748a0e3} false - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false diff --git a/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj b/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj index 0abae49fb9..7aabad1e93 100644 --- a/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj +++ b/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj @@ -46,27 +46,24 @@ v140 + - - - - @@ -92,7 +89,7 @@ - ./libamf/src;../../../../libs/openssl-$(OpenSSLVersion)/include/openssl;../../../../libs/openssl-$(OpenSSLVersion)/include;../../../../libs/win32/;./;%(AdditionalIncludeDirectories) + ./libamf/src;../../../../libs/win32/;./;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) @@ -105,12 +102,12 @@ false - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;../../../../Win32/$(Configuration)/ssleay32.lib;../../../../Win32/$(Configuration)/libeay32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;%(AdditionalDependencies) - ./libamf/src;../../../../libs/openssl-$(OpenSSLVersion)/include/openssl;../../../../libs/openssl-$(OpenSSLVersion)/include;../../../../libs/win32/;./;%(AdditionalIncludeDirectories) + ./libamf/src;../../../../libs/win32/;./;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) @@ -123,12 +120,12 @@ false - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;../../../../x64/Debug/ssleay32.lib;../../../../x64/Debug/libeay32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;%(AdditionalDependencies) - ./libamf/src;../../../../libs/openssl-$(OpenSSLVersion)/include/openssl;../../../../libs/openssl-$(OpenSSLVersion)/include;../../../../libs/win32/;./;%(AdditionalIncludeDirectories) + ./libamf/src;../../../../libs/win32/;./;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) @@ -140,12 +137,12 @@ false - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;../../../../Win32/$(Configuration)/ssleay32.lib;../../../../Win32/$(Configuration)/libeay32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;%(AdditionalDependencies) - ./libamf/src;../../../../libs/openssl-$(OpenSSLVersion)/include/openssl;../../../../libs/openssl-$(OpenSSLVersion)/include;../../../../libs/win32/;./;%(AdditionalIncludeDirectories) + ./libamf/src;../../../../libs/win32/;./;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) @@ -157,7 +154,7 @@ false - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;../../../../x64/Release/ssleay32.lib;../../../../x64/Release/libeay32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;Iphlpapi.lib;Winmm.lib;%(AdditionalDependencies) @@ -177,9 +174,6 @@ - - {d578e676-7ec8-4548-bd8b-845c635f14ad} - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.2015.vcxproj b/src/mod/endpoints/mod_sofia/mod_sofia.2015.vcxproj index 89e702ff7f..afaaafac46 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.2015.vcxproj +++ b/src/mod/endpoints/mod_sofia/mod_sofia.2015.vcxproj @@ -46,6 +46,7 @@ v140 + @@ -178,12 +179,6 @@ {f6c55d93-b927-4483-bb69-15aef3dd2dff} false - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {df018947-0fff-4eb3-bdee-441dc81da7a4} false diff --git a/src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj b/src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj index 55a56c62bc..8a56082a9b 100644 --- a/src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj +++ b/src/mod/endpoints/mod_verto/mod_verto.2015.vcxproj @@ -46,27 +46,24 @@ v140 + - - - - @@ -76,7 +73,7 @@ - $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);..\..\..\..\libs\openssl-$(OpenSSLVersion)\include;$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast _TIMESPEC_DEFINED;_DEBUG;DEBUG;%(PreprocessorDefinitions) 6053;6031;6340;6246;6011;6387;%(DisableSpecificWarnings) @@ -93,7 +90,7 @@ - $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);..\..\..\..\libs\openssl-$(OpenSSLVersion)\include;$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast _TIMESPEC_DEFINED;_DEBUG;DEBUG;%(PreprocessorDefinitions) 6053;6031;6340;6246;6011;6387;%(DisableSpecificWarnings) @@ -108,7 +105,7 @@ - $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);..\..\..\..\libs\openssl-$(OpenSSLVersion)\include;$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast _TIMESPEC_DEFINED;NDEBUG;%(PreprocessorDefinitions) 6053;6031;6340;6246;6011;6387;%(DisableSpecificWarnings) @@ -125,7 +122,7 @@ - $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);..\..\..\..\libs\openssl-$(OpenSSLVersion)\include;$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories);$(ProjectDir)..\..\..\..\libs\pthreads-w32-2-9-1;.\;.\mcast _TIMESPEC_DEFINED;NDEBUG;%(PreprocessorDefinitions) 6053;6031;6340;6246;6011;6387;%(DisableSpecificWarnings) @@ -152,12 +149,6 @@ {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {df018947-0fff-4eb3-bdee-441dc81da7a4} false diff --git a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2015.vcxproj b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2015.vcxproj index ddf405ea06..3ba75a3dbb 100644 --- a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2015.vcxproj +++ b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2015.vcxproj @@ -133,12 +133,6 @@ {f6c55d93-b927-4483-bb69-15aef3dd2dff} false - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false diff --git a/src/mod/formats/mod_shout/mod_shout.2015.vcxproj b/src/mod/formats/mod_shout/mod_shout.2015.vcxproj index 754a72ac23..f4ba0a1c7b 100644 --- a/src/mod/formats/mod_shout/mod_shout.2015.vcxproj +++ b/src/mod/formats/mod_shout/mod_shout.2015.vcxproj @@ -48,6 +48,7 @@ + @@ -184,12 +185,6 @@ {419c8f80-d858-4b48-a25c-af4007608137} false - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {df018947-0fff-4eb3-bdee-441dc81da7a4} false diff --git a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2015.vcxproj b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2015.vcxproj index 81c92a620d..1ea0611f34 100644 --- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2015.vcxproj +++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2015.vcxproj @@ -47,6 +47,7 @@ + @@ -133,12 +134,6 @@ {87ee9da4-de1e-4448-8324-183c98dca588} false - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2015.vcxproj b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2015.vcxproj index b642eed637..ce8e71c011 100644 --- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2015.vcxproj +++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2015.vcxproj @@ -46,27 +46,24 @@ v140 + - - - - @@ -90,7 +87,7 @@ - $(SolutionDir)libs\openssl-$(OpenSSLVersion)\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) ABYSS_WIN32;%(PreprocessorDefinitions) @@ -109,7 +106,7 @@ X64 - $(SolutionDir)libs\openssl-$(OpenSSLVersion)\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) ABYSS_WIN32;%(PreprocessorDefinitions) @@ -126,7 +123,7 @@ - $(SolutionDir)libs\openssl-$(OpenSSLVersion)\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) ABYSS_WIN32;%(PreprocessorDefinitions) @@ -145,7 +142,7 @@ X64 - $(SolutionDir)libs\openssl-$(OpenSSLVersion)\include;$(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\xmlrpc-c\include;$(SolutionDir)libs\xmlrpc-c\lib\abyss\src;$(SolutionDir)libs\xmlrpc-c\lib\util\include;%(AdditionalIncludeDirectories) ABYSS_WIN32;%(PreprocessorDefinitions) @@ -165,12 +162,6 @@ - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {d2396dd7-7d38-473a-abb7-6f96d65ae1b9} diff --git a/w32/Library/FreeSwitchCore.2015.vcxproj b/w32/Library/FreeSwitchCore.2015.vcxproj index 4a35ab70f2..aa3bff3223 100644 --- a/w32/Library/FreeSwitchCore.2015.vcxproj +++ b/w32/Library/FreeSwitchCore.2015.vcxproj @@ -889,12 +889,6 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs {87ee9da4-de1e-4448-8324-183c98dca588} - - {d331904d-a00a-4694-a5a3-fcff64ab5dbe} - - - {b4b62169-5ad4-4559-8707-3d933ac5db39} - {8d04b550-d240-4a44-8a18-35da3f7038d9} false diff --git a/w32/openssl-version.props b/w32/openssl-version.props index 5596b83921..21e8ca66e6 100644 --- a/w32/openssl-version.props +++ b/w32/openssl-version.props @@ -1,10 +1,11 @@  - + 1.0.2k + $(BaseDir)libs\openssl-$(OpenSSLVersion) true diff --git a/w32/openssl.props b/w32/openssl.props index 2ff8c07609..05b75f0fa5 100644 --- a/w32/openssl.props +++ b/w32/openssl.props @@ -1,13 +1,24 @@  + + + true - $(SolutionDir)libs\win32\openssl\include_x86;$(SolutionDir)libs\win32\openssl\include;%(AdditionalIncludeDirectories) - $(SolutionDir)libs\win32\openssl\include_x64;$(SolutionDir)libs\win32\openssl\include;%(AdditionalIncludeDirectories) + $(BaseDir)libs\win32\openssl\include_x86;$(BaseDir)libs\win32\openssl\include;%(AdditionalIncludeDirectories) + $(BaseDir)libs\win32\openssl\include_x64;$(BaseDir)libs\win32\openssl\include;%(AdditionalIncludeDirectories) HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions) + + + {d331904d-a00a-4694-a5a3-fcff64ab5dbe} + + + {b4b62169-5ad4-4559-8707-3d933ac5db39} + + \ No newline at end of file