diff --git a/libs/libblade/libblade.sln b/libs/libblade/libblade.sln index 6734649a7e..9ae853ea8f 100644 --- 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 33a9493001..6cad4886fb 100644 --- a/libs/libblade/libblade.vcxproj +++ b/libs/libblade/libblade.vcxproj @@ -59,6 +59,7 @@ + @@ -66,6 +67,7 @@ + @@ -73,6 +75,7 @@ + @@ -80,6 +83,7 @@ + @@ -193,6 +197,7 @@ + @@ -215,6 +220,7 @@ + @@ -232,9 +238,18 @@ + + {0a11689c-db6a-4bf6-97b2-ad32db863fbd} + + + {8f5e5d77-d269-4665-9e27-1045da6cf0d8} + {70d178d8-1100-4152-86c0-809a91cff832} + + {1faae8b0-c134-436d-9b13-74c16517fc03} + {1a234565-926d-49b2-83e4-d56e0c38c9f2} diff --git a/libs/libblade/libblade.vcxproj.filters b/libs/libblade/libblade.vcxproj.filters index c8d2468fe3..95d31a3192 100644 --- a/libs/libblade/libblade.vcxproj.filters +++ b/libs/libblade/libblade.vcxproj.filters @@ -75,6 +75,9 @@ Source Files + + Source Files + @@ -140,5 +143,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/libs/libblade/src/blade.c b/libs/libblade/src/blade.c index 390a0f8bbb..64d51269f8 100644 --- 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 a3bfecbf40..bc7d96a32e 100644 --- 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 b47ace6153..cbe612868b 100644 --- a/libs/libblade/src/include/blade.h +++ b/libs/libblade/src/include/blade.h @@ -36,6 +36,7 @@ #include #include #include +#include #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 4a8df5c835..01d6e04eeb 100644 --- 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 c806dec27b..ba44e63792 100644 --- 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 a0219cac65..8323480deb 100644 --- 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 63dde1a502..2dff4e2714 100644 --- a/libs/libblade/switchblade/switchblade.vcxproj +++ b/libs/libblade/switchblade/switchblade.vcxproj @@ -61,24 +61,28 @@ + + + + @@ -115,7 +119,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -133,7 +137,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -153,7 +157,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -174,7 +178,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) 4090 true diff --git a/libs/libblade/test/bladec.vcxproj b/libs/libblade/test/bladec.vcxproj index d3b5d1a924..6539eb63b6 100644 --- a/libs/libblade/test/bladec.vcxproj +++ b/libs/libblade/test/bladec.vcxproj @@ -61,24 +61,28 @@ + + + + @@ -115,7 +119,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -133,7 +137,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -153,7 +157,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -174,7 +178,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) 4090 true diff --git a/libs/libblade/test/blades.vcxproj b/libs/libblade/test/blades.vcxproj index a4fdf9020c..b82e67e746 100644 --- a/libs/libblade/test/blades.vcxproj +++ b/libs/libblade/test/blades.vcxproj @@ -61,24 +61,28 @@ + + + + @@ -115,7 +119,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -133,7 +137,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -153,7 +157,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -174,7 +178,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) 4090 true diff --git a/libs/libblade/test/testcli.vcxproj b/libs/libblade/test/testcli.vcxproj index b8cb371645..5d4816df01 100644 --- a/libs/libblade/test/testcli.vcxproj +++ b/libs/libblade/test/testcli.vcxproj @@ -61,24 +61,28 @@ + + + + @@ -115,7 +119,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -133,7 +137,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -153,7 +157,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -174,7 +178,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) 4090 true diff --git a/libs/libblade/test/testcon.vcxproj b/libs/libblade/test/testcon.vcxproj index 8b208c1f57..c93a3b62f0 100644 --- a/libs/libblade/test/testcon.vcxproj +++ b/libs/libblade/test/testcon.vcxproj @@ -61,24 +61,28 @@ + + + + @@ -115,7 +119,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -133,7 +137,7 @@ Disabled _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) 4090 true false @@ -153,7 +157,7 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x86;../src/include;.;%(AdditionalIncludeDirectories) 4090 true @@ -174,7 +178,7 @@ true _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;. + $(SolutionDir)..\win32\openssl\include;$(SolutionDir)..\win32\openssl\include_x64;../src/include;.;%(AdditionalIncludeDirectories) 4090 true diff --git a/libs/win32/Download civetweb.2015.vcxproj b/libs/win32/Download civetweb.2015.vcxproj index 74e7a85688..3b9b293873 100644 --- a/libs/win32/Download civetweb.2015.vcxproj +++ b/libs/win32/Download civetweb.2015.vcxproj @@ -41,8 +41,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\libconfig\$(Configuration)\ - $(PlatformName)\libconfig\$(Configuration)\ + $(PlatformName)\civetweb\$(Configuration)\ + $(PlatformName)\civetweb\$(Configuration)\ diff --git a/libs/win32/Download libsodium.2015.vcxproj b/libs/win32/Download libsodium.2015.vcxproj index dd2cf6265e..6d2567c972 100644 --- a/libs/win32/Download libsodium.2015.vcxproj +++ b/libs/win32/Download libsodium.2015.vcxproj @@ -41,8 +41,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\libconfig\$(Configuration)\ - $(PlatformName)\libconfig\$(Configuration)\ + $(PlatformName)\libsodium\$(Configuration)\ + $(PlatformName)\libsodium\$(Configuration)\ diff --git a/w32/civetweb.props b/w32/civetweb.props index e76d38eb9a..c0f4108924 100644 --- a/w32/civetweb.props +++ b/w32/civetweb.props @@ -9,6 +9,7 @@ $(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) + 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) \ No newline at end of file