kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 08:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FS-10167: Basic building of libks under VS2015, tests compile but most do not run successfully yet.

Browse Source
This commit is contained in:
Shane Bryldt 2017-03-23 11:36:45 -06:00
parent 856c87b4cb
commit 17f3daa7c3
15 changed files with 203 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
libs/libks/libks.vcxproj
View File

@ -74,6 +74,8 @@
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\</IntDir> <IntDir>$(Platform)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental> <LinkIncremental>
@ -81,21 +83,27 @@
<IntDir>$(Platform)\$(Configuration)\</IntDir> <IntDir>$(Platform)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib64;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBKS_EXPORTS;CJSON_EXPORT_SYMBOLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>EnableAllWarnings</WarningLevel> <WarningLevel>EnableAllWarnings</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>false</TreatWarningAsError>
<DisableSpecificWarnings>4711;4574;4100;4127;4668;4255;4706;4710;4820;4090</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<AdditionalDependencies>Rpcrt4.lib;Crypt32.lib;libsslMT.lib;libcryptoMT.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -119,15 +127,17 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBKS_EXPORTS;CJSON_EXPORT_SYMBOLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<WarningLevel>EnableAllWarnings</WarningLevel> <WarningLevel>EnableAllWarnings</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>false</TreatWarningAsError>
<DisableSpecificWarnings>4711;4574;4100;4127;4668;4255;4706;4710;4820;4090</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>Debug</GenerateDebugInformation> <GenerateDebugInformation>Debug</GenerateDebugInformation>
<AdditionalDependencies>Rpcrt4.lib;Crypt32.lib;libsslMT.lib;libcryptoMT.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -143,7 +153,18 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="crypt\aescrypt.c" />
<ClCompile Include="crypt\aeskey.c" />
<ClCompile Include="crypt\aestab.c" />
<ClCompile Include="crypt\aes_modes.c" />
<ClCompile Include="crypt\sha2.c" />
<ClCompile Include="crypt\twofish.c" />
<ClCompile Include="crypt\twofish_cfb.c" />
<ClCompile Include="src\cJSON.c" />
<ClCompile Include="src\cJSON_Utils.c" />
<ClCompile Include="src\ks.c" /> <ClCompile Include="src\ks.c" />
<ClCompile Include="src\ks_acl.c" />
<ClCompile Include="src\ks_base64.c" />
<ClCompile Include="src\ks_buffer.c" /> <ClCompile Include="src\ks_buffer.c" />
<ClCompile Include="src\ks_config.c" /> <ClCompile Include="src\ks_config.c" />
<ClCompile Include="src\ks_dso.c" /> <ClCompile Include="src\ks_dso.c" />
@ -155,27 +176,52 @@
<ClCompile Include="src\ks_q.c" /> <ClCompile Include="src\ks_q.c" />
<ClCompile Include="src\ks_rng.c" /> <ClCompile Include="src\ks_rng.c" />
<ClCompile Include="src\ks_socket.c" /> <ClCompile Include="src\ks_socket.c" />
<ClCompile Include="src\ks_ssl.c" />
<ClCompile Include="src\ks_string.c" /> <ClCompile Include="src\ks_string.c" />
<ClCompile Include="src\ks_thread.c" /> <ClCompile Include="src\ks_thread.c" />
<ClCompile Include="src\ks_mutex.c" /> <ClCompile Include="src\ks_mutex.c" />
<ClCompile Include="src\ks_thread_pool.c" />
<ClCompile Include="src\ks_time.c" /> <ClCompile Include="src\ks_time.c" />
<ClCompile Include="src\kws.c" />
<ClCompile Include="src\simclist.c" /> <ClCompile Include="src\simclist.c" />
<ClCompile Include="src\win\mman.c" /> <ClCompile Include="src\win\mman.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="crypt\aes.h" />
<ClInclude Include="crypt\aescpp.h" />
<ClInclude Include="crypt\aesopt.h" />
<ClInclude Include="crypt\aestab.h" />
<ClInclude Include="crypt\brg_endian.h" />
<ClInclude Include="crypt\brg_types.h" />
<ClInclude Include="crypt\sha2.h" />
<ClInclude Include="crypt\twofish.h" />
<ClInclude Include="src\include\ks.h" /> <ClInclude Include="src\include\ks.h" />
<ClInclude Include="src\include\ks_acl.h" />
<ClInclude Include="src\include\ks_base64.h" />
<ClInclude Include="src\include\ks_buffer.h" /> <ClInclude Include="src\include\ks_buffer.h" />
<ClInclude Include="src\include\ks_cJSON.h" />
<ClInclude Include="src\include\ks_cJSON_Utils.h" />
<ClInclude Include="src\include\ks_config.h" /> <ClInclude Include="src\include\ks_config.h" />
<ClInclude Include="src\include\ks_dso.h" />
<ClInclude Include="src\include\ks_hash.h" />
<ClInclude Include="src\include\ks_json.h" /> <ClInclude Include="src\include\ks_json.h" />
<ClInclude Include="src\include\ks_platform.h" /> <ClInclude Include="src\include\ks_platform.h" />
<ClInclude Include="src\include\ks_printf.h" />
<ClInclude Include="src\include\ks_q.h" />
<ClInclude Include="src\include\ks_socket.h" />
<ClInclude Include="src\include\ks_ssl.h" />
<ClInclude Include="src\include\ks_threadmutex.h" /> <ClInclude Include="src\include\ks_threadmutex.h" />
<ClInclude Include="src\include\ks_thread_pool.h" />
<ClInclude Include="src\include\ks_time.h" />
<ClInclude Include="src\include\ks_types.h" /> <ClInclude Include="src\include\ks_types.h" />
<ClInclude Include="src\include\ks_pool.h" /> <ClInclude Include="src\include\ks_pool.h" />
<ClInclude Include="src\include\ks_rng.h" /> <ClInclude Include="src\include\ks_rng.h" />
<ClInclude Include="src\include\kws.h" />
<ClInclude Include="src\include\simclist.h" /> <ClInclude Include="src\include\simclist.h" />
<ClInclude Include="src\win\mman.h" /> <ClInclude Include="src\win\mman.h" />
<ClInclude Include="src\win\sys\mman.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

116
libs/libks/libks.vcxproj.filters
View File

@ -69,6 +69,48 @@
<ClCompile Include="src\ks_time.c"> <ClCompile Include="src\ks_time.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="crypt\aescrypt.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="crypt\aeskey.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="crypt\aestab.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="crypt\aes_modes.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="crypt\sha2.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="crypt\twofish.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="crypt\twofish_cfb.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ks_ssl.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\kws.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ks_base64.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ks_acl.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\cJSON_Utils.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\cJSON.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\ks_thread_pool.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\include\ks.h"> <ClInclude Include="src\include\ks.h">
@ -95,12 +137,6 @@
<ClInclude Include="src\include\simclist.h"> <ClInclude Include="src\include\simclist.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\include\table.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\table_loc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\win\mman.h"> <ClInclude Include="src\win\mman.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -110,5 +146,71 @@
<ClInclude Include="src\include\ks_platform.h"> <ClInclude Include="src\include\ks_platform.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="crypt\aes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crypt\aescpp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crypt\aesopt.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crypt\aestab.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crypt\brg_endian.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crypt\brg_types.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crypt\sha2.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="crypt\twofish.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\win\sys\mman.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ks_acl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ks_base64.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ks_cJSON.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ks_cJSON_Utils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ks_dso.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ks_hash.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ks_printf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ks_q.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ks_socket.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ks_ssl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ks_thread_pool.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\ks_time.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\include\kws.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
libs/libks/src/include/ks_cJSON.h
View File

@ -141,7 +141,7 @@ CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int item); CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int item);
/* Get item "string" from object. Case insensitive. */ /* Get item "string" from object. Case insensitive. */
CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON *object, const char *string); CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON *object, const char *string);
CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON *object, const char *string); CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
CJSON_PUBLIC(int) cJSON_HasObjectItem(const cJSON *object, const char *string); CJSON_PUBLIC(int) cJSON_HasObjectItem(const cJSON *object, const char *string);
/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */ /* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void); CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);

5
libs/libks/src/include/ks_types.h
View File

@ -73,6 +73,11 @@ KS_BEGIN_EXTERN_C
KS_POLL_ERROR = (1 << 2) KS_POLL_ERROR = (1 << 2)
} ks_poll_t; } ks_poll_t;
#if defined(_MSC_VER)
#include <BaseTsd.h>
typedef SSIZE_T ssize_t;
#endif
typedef uint16_t ks_port_t; typedef uint16_t ks_port_t;
typedef size_t ks_size_t; typedef size_t ks_size_t;
typedef unsigned char ks_byte_t; typedef unsigned char ks_byte_t;

8
libs/libks/src/ks_rng.c
View File

@ -57,7 +57,7 @@ KS_DECLARE(char *) ks_uuid_str(ks_pool_t *pool, uuid_t *uuid)
#ifdef __WINDOWS__ #ifdef __WINDOWS__
unsigned char * str; unsigned char * str;
UuidToStringA ( uuid, &str ); UuidToStringA ( uuid, &str );
uuidstr = ks_pstrdup(pool, str); uuidstr = ks_pstrdup(pool, (const char *)str);
RpcStringFreeA ( &str ); RpcStringFreeA ( &str );
#else #else
char str[37] = { 0 }; char str[37] = { 0 };
@ -129,7 +129,7 @@ KS_DECLARE(size_t) ks_rng_seed_data(uint8_t *seed, size_t length)
} }
#ifdef __WINDOWS__ #ifdef __WINDOWS__
if (crypt_provider) { if (crypt_provider) {
if(!CryptGenRandom(crypt_provider, length, seed)) { if(!CryptGenRandom(crypt_provider, (DWORD)length, seed)) {
return 0; return 0;
} }
bytes = length; bytes = length;
@ -156,11 +156,11 @@ KS_DECLARE(size_t) ks_rng_add_entropy(const uint8_t *buffer, size_t length)
} }
if (buffer && length) { if (buffer && length) {
sha512_hash(buffer, length, &global_sha512); sha512_hash(buffer, (unsigned long)length, &global_sha512);
} }
if (len > 0) { if (len > 0) {
sha512_hash(seed, len, &global_sha512); sha512_hash(seed, (unsigned long)len, &global_sha512);
length += len; length += len;
} }

4
libs/libks/src/ks_socket.c
View File

@ -123,8 +123,8 @@ KS_DECLARE(ks_status_t) ks_socket_option(ks_socket_t socket, int option_name, ks
break; break;
case IPV6_V6ONLY: case IPV6_V6ONLY:
#ifdef WIN32 #ifdef WIN32
#warning make sure windows works like linux for IPV6 to IPV4 automapping stuff //#warning make sure windows works like linux for IPV6 to IPV4 automapping stuff
result = setsockopt(socket, SOL_IPV6, IPV6_V6ONLY, (char *)&opt, sizeof(opt)); result = setsockopt(socket, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&opt, sizeof(opt));
#else #else
result = setsockopt(socket, SOL_IPV6, IPV6_V6ONLY, &opt, sizeof(opt)); result = setsockopt(socket, SOL_IPV6, IPV6_V6ONLY, &opt, sizeof(opt));
#endif #endif

2
libs/libks/src/ks_thread.c
View File

@ -43,7 +43,7 @@ KS_DECLARE(ks_pid_t) ks_thread_self_id(void)
{ {
#ifdef WIN32 #ifdef WIN32
return GetCurrentThreadId(); return GetCurrentThreadId();
#elseif gettid #elif gettid
return gettid(); return gettid();
#else #else
return syscall(SYS_gettid); return syscall(SYS_gettid);

3
libs/libks/src/simclist.c
View File

@ -20,6 +20,7 @@
*/ */
/* SimCList implementation, version 1.6 */ /* SimCList implementation, version 1.6 */
#include <ks.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -30,7 +31,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdint.h> #include <stdint.h>
#else #else
#include <Windows.h> //#include <Windows.h>
#endif #endif
#ifndef SIMCLIST_NO_DUMPRESTORE #ifndef SIMCLIST_NO_DUMPRESTORE
/* includes for dump/restore */ /* includes for dump/restore */

4
libs/libks/test/testhash.c
View File

@ -68,7 +68,7 @@ static void *test2_thread(ks_thread_t *thread, void *data)
int test2(void) int test2(void)
{ {
ks_thread_t *threads[MAX]; ks_thread_t *threads[MAX];
int ttl = 5; int ttl = 1;
int runs = 5; int runs = 5;
ks_pool_t *pool; ks_pool_t *pool;
ks_hash_t *hash; ks_hash_t *hash;
@ -120,7 +120,7 @@ int test2(void)
return 1; return 1;
} }
#include "sodium.h" //#include "sodium.h"
#define TEST3_SIZE 20 #define TEST3_SIZE 20
int test3(void) int test3(void)
{ {

6
libs/libks/test/testhash.vcxproj
View File

@ -73,10 +73,14 @@
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib64;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
@ -96,6 +100,7 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>../src/include;.</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../src/include;.</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4090</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -111,6 +116,7 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>../src/include;.</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../src/include;.</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4090</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>

4
libs/libks/test/testpools.vcxproj
View File

@ -73,10 +73,14 @@
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib64;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>

4
libs/libks/test/testq.vcxproj
View File

@ -73,10 +73,14 @@
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib64;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>

4
libs/libks/test/testsock.vcxproj
View File

@ -73,10 +73,14 @@
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib64;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>

4
libs/libks/test/testthreadmutex.vcxproj
View File

@ -73,10 +73,14 @@
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib64;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>

4
libs/libks/test/testtime.vcxproj
View File

@ -73,10 +73,14 @@
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
<IncludePath>$(SolutionDir);$(SolutionDir)\crypt;$(SolutionDir)\openssl\include64;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\openssl\lib64;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>