FS-10690: Fixed some issues in the download projects, added configuration transfer...

diff --git a/libs/libblade/libblade.sln b/libs/libblade/libblade.sln
index 6734649a7e0e25c928dd4c80ef713e5ba7b74499..9ae853ea8f4ad8b27ebea2205670b5c308dad60a 100644 (file)
--- a/libs/libblade/libblade.sln
+++ b/libs/libblade/libblade.sln
@@ -31,6 +31,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openssl", "..\win32\openssl
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "civetweb", "..\win32\civetweb\civetweb.2015.vcxproj", "{1FAAE8B0-C134-436D-9B13-74C16517FC03}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "duktape_lib", "..\civetweb-1.9.1\VisualStudio\duktape_lib\duktape_lib.vcxproj", "{0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua_lib", "..\civetweb-1.9.1\VisualStudio\lua_lib\lua_lib.vcxproj", "{8F5E5D77-D269-4665-9E27-1045DA6CF0D8}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libconfig", "..\win32\Download libconfig.2015.vcxproj", "{4AB0A14F-F65F-4C18-AAEC-AC76E2BE07DA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libsodium", "..\win32\Download libsodium.2015.vcxproj", "{96848DD5-1451-4A88-87FA-FC6B7C7D1E1D}"
@@ -273,6 +277,38 @@ Global
                {1FAAE8B0-C134-436D-9B13-74C16517FC03}.ReleaseDLL|x64.Build.0 = Release|x64
                {1FAAE8B0-C134-436D-9B13-74C16517FC03}.ReleaseDLL|x86.ActiveCfg = Release|Win32
                {1FAAE8B0-C134-436D-9B13-74C16517FC03}.ReleaseDLL|x86.Build.0 = Release|Win32
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Debug|x64.ActiveCfg = Debug|x64
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Debug|x64.Build.0 = Debug|x64
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Debug|x86.ActiveCfg = Debug|Win32
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Debug|x86.Build.0 = Debug|Win32
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.DebugDLL|x64.ActiveCfg = Debug|x64
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.DebugDLL|x64.Build.0 = Debug|x64
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.DebugDLL|x86.ActiveCfg = Debug|Win32
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.DebugDLL|x86.Build.0 = Debug|Win32
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Release|x64.ActiveCfg = Release|x64
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Release|x64.Build.0 = Release|x64
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Release|x86.ActiveCfg = Release|Win32
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Release|x86.Build.0 = Release|Win32
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.ReleaseDLL|x64.ActiveCfg = Release|x64
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.ReleaseDLL|x64.Build.0 = Release|x64
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.ReleaseDLL|x86.ActiveCfg = Release|Win32
+               {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.ReleaseDLL|x86.Build.0 = Release|Win32
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Debug|x64.ActiveCfg = Debug|x64
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Debug|x64.Build.0 = Debug|x64
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Debug|x86.ActiveCfg = Debug|Win32
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Debug|x86.Build.0 = Debug|Win32
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.DebugDLL|x64.ActiveCfg = Debug|x64
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.DebugDLL|x64.Build.0 = Debug|x64
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.DebugDLL|x86.ActiveCfg = Debug|Win32
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.DebugDLL|x86.Build.0 = Debug|Win32
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Release|x64.ActiveCfg = Release|x64
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Release|x64.Build.0 = Release|x64
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Release|x86.ActiveCfg = Release|Win32
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Release|x86.Build.0 = Release|Win32
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.ReleaseDLL|x64.ActiveCfg = Release|x64
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.ReleaseDLL|x64.Build.0 = Release|x64
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.ReleaseDLL|x86.ActiveCfg = Release|Win32
+               {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.ReleaseDLL|x86.Build.0 = Release|Win32
                {4AB0A14F-F65F-4C18-AAEC-AC76E2BE07DA}.Debug|x64.ActiveCfg = Debug|Win32
                {4AB0A14F-F65F-4C18-AAEC-AC76E2BE07DA}.Debug|x64.Build.0 = Debug|Win32
                {4AB0A14F-F65F-4C18-AAEC-AC76E2BE07DA}.Debug|x86.ActiveCfg = Debug|Win32

diff --git a/libs/libblade/libblade.vcxproj b/libs/libblade/libblade.vcxproj
index 33a94930017775e34d36942c34858c865d9fb929..6cad4886fb89aaa057e039e1b654a1582886d9da 100644 (file)
--- a/libs/libblade/libblade.vcxproj
+++ b/libs/libblade/libblade.vcxproj
@@ -59,6 +59,7 @@
     <Import Project="..\..\w32\openssl-version.props" />
     <Import Project="..\..\w32\sodium.props" />
     <Import Project="..\..\w32\config.props" />
+    <Import Project="..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -66,6 +67,7 @@
     <Import Project="..\..\w32\openssl-version.props" />
     <Import Project="..\..\w32\sodium.props" />
     <Import Project="..\..\w32\config.props" />
+    <Import Project="..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -73,6 +75,7 @@
     <Import Project="..\..\w32\openssl-version.props" />
     <Import Project="..\..\w32\sodium.props" />
     <Import Project="..\..\w32\config.props" />
+    <Import Project="..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -80,6 +83,7 @@
     <Import Project="..\..\w32\openssl-version.props" />
     <Import Project="..\..\w32\sodium.props" />
     <Import Project="..\..\w32\config.props" />
+    <Import Project="..\..\w32\civetweb.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -193,6 +197,7 @@
     <ClCompile Include="src\blade_connectionmgr.c" />
     <ClCompile Include="src\blade_identity.c" />
     <ClCompile Include="src\blade_mastermgr.c" />
+    <ClCompile Include="src\blade_restmgr.c" />
     <ClCompile Include="src\blade_routemgr.c" />
     <ClCompile Include="src\blade_rpc.c" />
     <ClCompile Include="src\blade_protocol.c" />
@@ -215,6 +220,7 @@
     <ClInclude Include="src\include\blade_connectionmgr.h" />
     <ClInclude Include="src\include\blade_identity.h" />
     <ClInclude Include="src\include\blade_mastermgr.h" />
+    <ClInclude Include="src\include\blade_restmgr.h" />
     <ClInclude Include="src\include\blade_routemgr.h" />
     <ClInclude Include="src\include\blade_rpc.h" />
     <ClInclude Include="src\include\blade_protocol.h" />
@@ -232,9 +238,18 @@
     <ClInclude Include="src\include\unqlite.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\civetweb-1.9.1\VisualStudio\duktape_lib\duktape_lib.vcxproj">
+      <Project>{0a11689c-db6a-4bf6-97b2-ad32db863fbd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\civetweb-1.9.1\VisualStudio\lua_lib\lua_lib.vcxproj">
+      <Project>{8f5e5d77-d269-4665-9e27-1045da6cf0d8}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\libks\libks.vcxproj">
       <Project>{70d178d8-1100-4152-86c0-809a91cff832}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\win32\civetweb\civetweb.2015.vcxproj">
+      <Project>{1faae8b0-c134-436d-9b13-74c16517fc03}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\win32\libconfig\libconfig.2015.vcxproj">
       <Project>{1a234565-926d-49b2-83e4-d56e0c38c9f2}</Project>
     </ProjectReference>

diff --git a/libs/libblade/libblade.vcxproj.filters b/libs/libblade/libblade.vcxproj.filters
index c8d2468fe34e79236765727a9088a67551759c99..95d31a319248d384b8495fad081a1b5c4324501b 100644 (file)
--- a/libs/libblade/libblade.vcxproj.filters
+++ b/libs/libblade/libblade.vcxproj.filters
@@ -75,6 +75,9 @@
     <ClCompile Include="src\blade_channel.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\blade_restmgr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\include\unqlite.h">
@@ -140,5 +143,8 @@
     <ClInclude Include="src\include\blade_channel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\include\blade_restmgr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/libs/libblade/src/blade.c b/libs/libblade/src/blade.c
index 390a0f8bbbab67b405842df6a12c150def5d9c37..64d51269f8ab58d3f508159143549176dff05005 100644 (file)
--- a/libs/libblade/src/blade.c
+++ b/libs/libblade/src/blade.c
@@ -35,12 +35,17 @@
 
 KS_DECLARE(ks_status_t) blade_init(void)
 {
-       return ks_init();
+       ks_status_t ret = ks_init();
+
+       if (ret == KS_STATUS_SUCCESS && mg_init_library(0xFFu) == 0) ret = KS_STATUS_FAIL;
+
+       return ret;
 }
 
 KS_DECLARE(ks_status_t) blade_shutdown(void)
 {
        ks_status_t ret = ks_shutdown();
+       mg_exit_library();
 #ifdef _WINDOWS_
        _CrtDumpMemoryLeaks();
 #endif

diff --git a/libs/libblade/src/blade_stack.c b/libs/libblade/src/blade_stack.c
index a3bfecbf4076edcc1a7d4f2e28fadf1259b55916..bc7d96a32e054be2b9a1dd63f4115574153c58c5 100644 (file)
--- a/libs/libblade/src/blade_stack.c
+++ b/libs/libblade/src/blade_stack.c
@@ -43,6 +43,7 @@ struct blade_handle_s {
        blade_mastermgr_t *mastermgr;
        blade_connectionmgr_t *connectionmgr;
        blade_sessionmgr_t *sessionmgr;
+       blade_restmgr_t *restmgr;
 };
 
 ks_bool_t blade_rpcroute_request_handler(blade_rpc_request_t *brpcreq, void *data);
@@ -74,6 +75,7 @@ static void blade_handle_cleanup(void *ptr, void *arg, ks_pool_cleanup_action_t
                blade_mastermgr_destroy(&bh->mastermgr);
                blade_connectionmgr_destroy(&bh->connectionmgr);
                blade_sessionmgr_destroy(&bh->sessionmgr);
+               blade_restmgr_destroy(&bh->restmgr);
 
                ks_thread_pool_destroy(&bh->tpool);
                break;
@@ -120,6 +122,8 @@ KS_DECLARE(ks_status_t) blade_handle_create(blade_handle_t **bhP)
        blade_sessionmgr_create(&bh->sessionmgr, bh);
        ks_assert(bh->sessionmgr);
 
+       blade_restmgr_create(&bh->restmgr, bh);
+       ks_assert(bh->restmgr);
 
        ks_pool_set_cleanup(bh, NULL, blade_handle_cleanup);
 
@@ -214,6 +218,8 @@ KS_DECLARE(ks_status_t) blade_handle_startup(blade_handle_t *bh, config_setting_
 
        blade_mastermgr_startup(bh->mastermgr, config);
 
+       blade_restmgr_startup(bh->restmgr, config);
+
        return KS_STATUS_SUCCESS;
 }
 
@@ -229,6 +235,8 @@ KS_DECLARE(ks_status_t) blade_handle_shutdown(blade_handle_t *bh)
 
        blade_sessionmgr_shutdown(bh->sessionmgr);
 
+       blade_restmgr_shutdown(bh->restmgr);
+
        return KS_STATUS_SUCCESS;
 }
 
@@ -280,6 +288,12 @@ KS_DECLARE(blade_sessionmgr_t *) blade_handle_sessionmgr_get(blade_handle_t *bh)
        return bh->sessionmgr;
 }
 
+KS_DECLARE(blade_restmgr_t *) blade_handle_restmgr_get(blade_handle_t *bh)
+{
+       ks_assert(bh);
+       return bh->restmgr;
+}
+
 
 KS_DECLARE(ks_status_t) blade_handle_connect(blade_handle_t *bh, blade_connection_t **bcP, blade_identity_t *target, const char *session_id)
 {

diff --git a/libs/libblade/src/include/blade.h b/libs/libblade/src/include/blade.h
index b47ace61534bc3fd51b0973341d4af9293709946..cbe612868b5d1a47f38a47dd9d821a95950f18f1 100644 (file)
--- a/libs/libblade/src/include/blade.h
+++ b/libs/libblade/src/include/blade.h
@@ -36,6 +36,7 @@
 #include <ks.h>
 #include <sodium.h>
 #include <libconfig.h>
+#include <civetweb.h>
 #include "unqlite.h"
 #include "blade_types.h"
 #include "blade_stack.h"
@@ -56,6 +57,7 @@
 #include "blade_mastermgr.h"
 #include "blade_connectionmgr.h"
 #include "blade_sessionmgr.h"
+#include "blade_restmgr.h"
 
 #include "blade_transport_wss.h"
 

diff --git a/libs/libblade/src/include/blade_stack.h b/libs/libblade/src/include/blade_stack.h
index 4a8df5c835dd26ac6da7493c87d1a4284f60ccc8..01d6e04eebb084ef93e9cf96d5a76331ccfe35a3 100644 (file)
--- a/libs/libblade/src/include/blade_stack.h
+++ b/libs/libblade/src/include/blade_stack.h
@@ -54,6 +54,7 @@ KS_DECLARE(blade_subscriptionmgr_t *) blade_handle_subscriptionmgr_get(blade_han
 KS_DECLARE(blade_mastermgr_t *) blade_handle_mastermgr_get(blade_handle_t *bh);
 KS_DECLARE(blade_connectionmgr_t *) blade_handle_connectionmgr_get(blade_handle_t *bh);
 KS_DECLARE(blade_sessionmgr_t *) blade_handle_sessionmgr_get(blade_handle_t *bh);
+KS_DECLARE(blade_restmgr_t *) blade_handle_restmgr_get(blade_handle_t *bh);
 
 KS_DECLARE(ks_status_t) blade_handle_connect(blade_handle_t *bh, blade_connection_t **bcP, blade_identity_t *target, const char *session_id);
 

diff --git a/libs/libblade/src/include/blade_types.h b/libs/libblade/src/include/blade_types.h
index c806dec27bd44a21081e70392f9393a3ba0dffb9..ba44e63792bdde20e8739feb498a09e142e40c0f 100644 (file)
--- a/libs/libblade/src/include/blade_types.h
+++ b/libs/libblade/src/include/blade_types.h
@@ -62,6 +62,8 @@ typedef struct blade_connectionmgr_s blade_connectionmgr_t;
 typedef struct blade_sessionmgr_s blade_sessionmgr_t;
 typedef struct blade_session_callback_data_s blade_session_callback_data_t;
 
+typedef struct blade_restmgr_s blade_restmgr_t;
+
 typedef ks_bool_t (*blade_rpc_request_callback_t)(blade_rpc_request_t *brpcreq, void *data);
 typedef ks_bool_t (*blade_rpc_response_callback_t)(blade_rpc_response_t *brpcres, void *data);
 

diff --git a/libs/libblade/switchblade/switchblade.cfg b/libs/libblade/switchblade/switchblade.cfg
index a0219cac65a46d4e403d0e5c14670000d2a485d5..8323480deb2386e3dec3b9ff154a1e85ce6b11d1 100644 (file)
--- a/libs/libblade/switchblade/switchblade.cfg
+++ b/libs/libblade/switchblade/switchblade.cfg
@@ -6,6 +6,11 @@ blade:
                nodeid = "00000000-0000-0000-0000-000000000000";
                realms = ( "freeswitch" );
        };
+       rest:
+       {
+               enabled = true;
+               document_root = "./restroot";
+       };
        transport:
        {
                wss:

diff --git a/libs/libblade/switchblade/switchblade.vcxproj b/libs/libblade/switchblade/switchblade.vcxproj
index 63dde1a502a11ab447183559b09443fe7a68afc4..2dff4e2714459ded1844c9942a224de8bd6de53a 100644 (file)
--- a/libs/libblade/switchblade/switchblade.vcxproj
+++ b/libs/libblade/switchblade/switchblade.vcxproj
@@ -61,24 +61,28 @@
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -115,7 +119,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -133,7 +137,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -153,7 +157,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -174,7 +178,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>

diff --git a/libs/libblade/test/bladec.vcxproj b/libs/libblade/test/bladec.vcxproj
index d3b5d1a9248cac605b45bdaf28d224fcf0971ff5..6539eb63b6fe1261025f9e2dc05b5f9d4e00943f 100644 (file)
--- a/libs/libblade/test/bladec.vcxproj
+++ b/libs/libblade/test/bladec.vcxproj
@@ -61,24 +61,28 @@
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -115,7 +119,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -133,7 +137,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -153,7 +157,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -174,7 +178,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>

diff --git a/libs/libblade/test/blades.vcxproj b/libs/libblade/test/blades.vcxproj
index a4fdf9020c59154f51120edc4970c988e0bcbf33..b82e67e746b2c599ac1749f74161f7ca62ba2f47 100644 (file)
--- a/libs/libblade/test/blades.vcxproj
+++ b/libs/libblade/test/blades.vcxproj
@@ -61,24 +61,28 @@
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -115,7 +119,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -133,7 +137,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -153,7 +157,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -174,7 +178,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>

diff --git a/libs/libblade/test/testcli.vcxproj b/libs/libblade/test/testcli.vcxproj
index b8cb3716450ddead8706dd1596f30107479d3506..5d4816df01306546ce11592369c2a0d0fe02d532 100644 (file)
--- a/libs/libblade/test/testcli.vcxproj
+++ b/libs/libblade/test/testcli.vcxproj
@@ -61,24 +61,28 @@
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -115,7 +119,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -133,7 +137,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -153,7 +157,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -174,7 +178,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>

diff --git a/libs/libblade/test/testcon.vcxproj b/libs/libblade/test/testcon.vcxproj
index 8b208c1f5766cd29b5f1bbc19d68239859208d60..c93a3b62f096a2d55ff2029e1496d0c6bfc86f00 100644 (file)
--- a/libs/libblade/test/testcon.vcxproj
+++ b/libs/libblade/test/testcon.vcxproj
@@ -61,24 +61,28 @@
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\w32\openssl-version.props" />
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
+    <Import Project="..\..\..\w32\civetweb.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -115,7 +119,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -133,7 +137,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -153,7 +157,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -174,7 +178,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4090</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>

diff --git a/libs/win32/Download civetweb.2015.vcxproj b/libs/win32/Download civetweb.2015.vcxproj
index 74e7a8568857bc5036f644c4f2b81961b07ad86a..3b9b2938739f0be96e88891a590532b3e05499a7 100644 (file)
--- a/libs/win32/Download civetweb.2015.vcxproj
+++ b/libs/win32/Download civetweb.2015.vcxproj
@@ -41,8 +41,8 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\libconfig\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\libconfig\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\civetweb\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\civetweb\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <BuildLog>

diff --git a/libs/win32/Download libsodium.2015.vcxproj b/libs/win32/Download libsodium.2015.vcxproj
index dd2cf6265e0110a65979ddc3078c8ca3f0df5167..6d2567c97260de4d6e04647ccf922d497524c828 100644 (file)
--- a/libs/win32/Download libsodium.2015.vcxproj
+++ b/libs/win32/Download libsodium.2015.vcxproj
@@ -41,8 +41,8 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\libconfig\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\libconfig\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\libsodium\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\libsodium\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <BuildLog>

diff --git a/w32/civetweb.props b/w32/civetweb.props
index e76d38eb9a970ddf157eebdb6e151bf9927aa672..c0f410892410335ecdb45d6fa151a19e1154fd64 100644 (file)
--- a/w32/civetweb.props
+++ b/w32/civetweb.props
@@ -9,6 +9,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(civetwebLibDir)\src\third_party\lua-5.2.4\src\;$(civetwebLibDir)\src\third_party\duktape-1.5.2\src\;$(civetwebLibDir)\src\third_party;$(civetwebLibDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+         <PreprocessorDefinitions>USE_STACK_SIZE=102400;MAX_REQUEST_SIZE=16384;USE_DUKTAPE;USE_IPV6;LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file