diff --git a/VisualStudio/civetweb.sln b/VisualStudio/civetweb.sln index 027d9044..6a9e54e5 100644 --- a/VisualStudio/civetweb.sln +++ b/VisualStudio/civetweb.sln @@ -26,110 +26,72 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ex_embed_cpp", "ex_embed_cp EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Debug|Mixed Platforms.ActiveCfg = Debug CONSOLE|Win32 - {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Debug|Mixed Platforms.Build.0 = Debug CONSOLE|Win32 {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Debug|Win32.ActiveCfg = Debug|Win32 {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Debug|Win32.Build.0 = Debug|Win32 - {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Debug|x64.ActiveCfg = Debug|x64 - {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Debug|x64.Build.0 = Debug|x64 - {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Release|Mixed Platforms.Build.0 = Release|Win32 + {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Debug|x64.ActiveCfg = Release|x64 + {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Debug|x64.Build.0 = Release|x64 {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Release|Win32.ActiveCfg = Release|Win32 {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Release|Win32.Build.0 = Release|Win32 {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Release|x64.ActiveCfg = Release|x64 {9BE9C008-E851-42B1-A034-BD4630AE4CD6}.Release|x64.Build.0 = Release|x64 - {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Debug|Win32.ActiveCfg = Debug|Win32 {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Debug|Win32.Build.0 = Debug|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}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Release|Mixed Platforms.Build.0 = Release|Win32 {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Release|Win32.ActiveCfg = Release|Win32 {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Release|Win32.Build.0 = Release|Win32 {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Release|x64.ActiveCfg = Release|x64 {8F5E5D77-D269-4665-9E27-1045DA6CF0D8}.Release|x64.Build.0 = Release|x64 - {882EC43C-2EEE-434B-A711-C844108D29C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {882EC43C-2EEE-434B-A711-C844108D29C6}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {882EC43C-2EEE-434B-A711-C844108D29C6}.Debug|Win32.ActiveCfg = Debug|Win32 {882EC43C-2EEE-434B-A711-C844108D29C6}.Debug|Win32.Build.0 = Debug|Win32 {882EC43C-2EEE-434B-A711-C844108D29C6}.Debug|x64.ActiveCfg = Debug|x64 - {882EC43C-2EEE-434B-A711-C844108D29C6}.Debug|x64.Build.0 = Debug|x64 - {882EC43C-2EEE-434B-A711-C844108D29C6}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {882EC43C-2EEE-434B-A711-C844108D29C6}.Release|Mixed Platforms.Build.0 = Release|Win32 {882EC43C-2EEE-434B-A711-C844108D29C6}.Release|Win32.ActiveCfg = Release|Win32 {882EC43C-2EEE-434B-A711-C844108D29C6}.Release|Win32.Build.0 = Release|Win32 {882EC43C-2EEE-434B-A711-C844108D29C6}.Release|x64.ActiveCfg = Release|x64 - {882EC43C-2EEE-434B-A711-C844108D29C6}.Release|x64.Build.0 = Release|x64 - {1AC4A7A6-0100-4287-97F4-B95807BE5607}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {1AC4A7A6-0100-4287-97F4-B95807BE5607}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {1AC4A7A6-0100-4287-97F4-B95807BE5607}.Debug|Win32.ActiveCfg = Debug|Win32 {1AC4A7A6-0100-4287-97F4-B95807BE5607}.Debug|Win32.Build.0 = Debug|Win32 {1AC4A7A6-0100-4287-97F4-B95807BE5607}.Debug|x64.ActiveCfg = Debug|Win32 - {1AC4A7A6-0100-4287-97F4-B95807BE5607}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {1AC4A7A6-0100-4287-97F4-B95807BE5607}.Release|Mixed Platforms.Build.0 = Release|Win32 {1AC4A7A6-0100-4287-97F4-B95807BE5607}.Release|Win32.ActiveCfg = Release|Win32 {1AC4A7A6-0100-4287-97F4-B95807BE5607}.Release|Win32.Build.0 = Release|Win32 {1AC4A7A6-0100-4287-97F4-B95807BE5607}.Release|x64.ActiveCfg = Release|Win32 - {58B93E94-7766-435E-93AE-42A2FB5D99B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {58B93E94-7766-435E-93AE-42A2FB5D99B2}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {58B93E94-7766-435E-93AE-42A2FB5D99B2}.Debug|Win32.ActiveCfg = Debug|Win32 {58B93E94-7766-435E-93AE-42A2FB5D99B2}.Debug|Win32.Build.0 = Debug|Win32 - {58B93E94-7766-435E-93AE-42A2FB5D99B2}.Debug|x64.ActiveCfg = Debug|Win32 - {58B93E94-7766-435E-93AE-42A2FB5D99B2}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {58B93E94-7766-435E-93AE-42A2FB5D99B2}.Release|Mixed Platforms.Build.0 = Release|Win32 + {58B93E94-7766-435E-93AE-42A2FB5D99B2}.Debug|x64.ActiveCfg = Debug|x64 {58B93E94-7766-435E-93AE-42A2FB5D99B2}.Release|Win32.ActiveCfg = Release|Win32 {58B93E94-7766-435E-93AE-42A2FB5D99B2}.Release|Win32.Build.0 = Release|Win32 - {58B93E94-7766-435E-93AE-42A2FB5D99B2}.Release|x64.ActiveCfg = Release|Win32 - {882EC43C-2EEE-434B-A711-C845678D29C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {882EC43C-2EEE-434B-A711-C845678D29C6}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {58B93E94-7766-435E-93AE-42A2FB5D99B2}.Release|x64.ActiveCfg = Release|x64 {882EC43C-2EEE-434B-A711-C845678D29C6}.Debug|Win32.ActiveCfg = Debug|Win32 {882EC43C-2EEE-434B-A711-C845678D29C6}.Debug|Win32.Build.0 = Debug|Win32 {882EC43C-2EEE-434B-A711-C845678D29C6}.Debug|x64.ActiveCfg = Debug|Win32 - {882EC43C-2EEE-434B-A711-C845678D29C6}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {882EC43C-2EEE-434B-A711-C845678D29C6}.Release|Mixed Platforms.Build.0 = Release|Win32 {882EC43C-2EEE-434B-A711-C845678D29C6}.Release|Win32.ActiveCfg = Release|Win32 {882EC43C-2EEE-434B-A711-C845678D29C6}.Release|Win32.Build.0 = Release|Win32 {882EC43C-2EEE-434B-A711-C845678D29C6}.Release|x64.ActiveCfg = Release|Win32 - {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Debug|Win32.ActiveCfg = Debug|Win32 {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Debug|Win32.Build.0 = Debug|Win32 - {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Debug|x64.ActiveCfg = Debug|Win32 - {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Release|Mixed Platforms.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}.Release|Win32.ActiveCfg = Release|Win32 {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Release|Win32.Build.0 = Release|Win32 - {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}.Release|x64.ActiveCfg = Release|Win32 - {58B93E94-7766-435E-93AE-42A2FB5D99B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {58B93E94-7766-435E-93AE-42A2FB5D99B1}.Debug|Mixed Platforms.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 {58B93E94-7766-435E-93AE-42A2FB5D99B1}.Debug|Win32.ActiveCfg = Debug|Win32 {58B93E94-7766-435E-93AE-42A2FB5D99B1}.Debug|Win32.Build.0 = Debug|Win32 - {58B93E94-7766-435E-93AE-42A2FB5D99B1}.Debug|x64.ActiveCfg = Debug|Win32 - {58B93E94-7766-435E-93AE-42A2FB5D99B1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {58B93E94-7766-435E-93AE-42A2FB5D99B1}.Release|Mixed Platforms.Build.0 = Release|Win32 + {58B93E94-7766-435E-93AE-42A2FB5D99B1}.Debug|x64.ActiveCfg = Debug|x64 {58B93E94-7766-435E-93AE-42A2FB5D99B1}.Release|Win32.ActiveCfg = Release|Win32 {58B93E94-7766-435E-93AE-42A2FB5D99B1}.Release|Win32.Build.0 = Release|Win32 - {58B93E94-7766-435E-93AE-42A2FB5D99B1}.Release|x64.ActiveCfg = Release|Win32 - {4308C5EE-45E4-45D8-9D73-6C4E2587AD78}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {4308C5EE-45E4-45D8-9D73-6C4E2587AD78}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {58B93E94-7766-435E-93AE-42A2FB5D99B1}.Release|x64.ActiveCfg = Release|x64 {4308C5EE-45E4-45D8-9D73-6C4E2587AD78}.Debug|Win32.ActiveCfg = Debug|Win32 {4308C5EE-45E4-45D8-9D73-6C4E2587AD78}.Debug|Win32.Build.0 = Debug|Win32 - {4308C5EE-45E4-45D8-9D73-6C4E2587AD78}.Debug|x64.ActiveCfg = Debug|Win32 - {4308C5EE-45E4-45D8-9D73-6C4E2587AD78}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {4308C5EE-45E4-45D8-9D73-6C4E2587AD78}.Release|Mixed Platforms.Build.0 = Release|Win32 + {4308C5EE-45E4-45D8-9D73-6C4E2587AD78}.Debug|x64.ActiveCfg = Debug|x64 {4308C5EE-45E4-45D8-9D73-6C4E2587AD78}.Release|Win32.ActiveCfg = Release|Win32 {4308C5EE-45E4-45D8-9D73-6C4E2587AD78}.Release|Win32.Build.0 = Release|Win32 - {4308C5EE-45E4-45D8-9D73-6C4E2587AD78}.Release|x64.ActiveCfg = Release|Win32 + {4308C5EE-45E4-45D8-9D73-6C4E2587AD78}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/VisualStudio/civetweb_lua/civetweb_lua.vcxproj b/VisualStudio/civetweb_lua/civetweb_lua.vcxproj index af805c52..cd83d204 100644 --- a/VisualStudio/civetweb_lua/civetweb_lua.vcxproj +++ b/VisualStudio/civetweb_lua/civetweb_lua.vcxproj @@ -1,10 +1,6 @@  - - Debug CONSOLE - Win32 - Debug Win32 @@ -34,12 +30,6 @@ MultiByte v140 - - Application - true - MultiByte - v140 - Application true @@ -72,9 +62,6 @@ - - - @@ -92,10 +79,6 @@ true $(SolutionDir)\$(Configuration)\$(Platform)\ - - true - $(SolutionDir)\$(Configuration)\$(Platform)\ - true $(SolutionDir)\$(Configuration)\$(Platform)\ @@ -126,28 +109,14 @@ true - - - - - Level3 - Disabled - USE_DUKTAPE;USE_IPV6;LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;CONSOLE;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;$(ProjectDir)..\..\src\third_party\duktape-1.3.0\src;%(AdditionalIncludeDirectories) - - - Console - true - - Level3 Disabled - LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) + USE_DUKTAPE;USE_IPV6;LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;$(ProjectDir)..\..\src\third_party\duktape-1.3.0\src;%(AdditionalIncludeDirectories) Windows @@ -176,7 +145,7 @@ MaxSpeed true true - USE_DUKTAPE;USE_IPV6;LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + USE_DUKTAPE;USE_IPV6;LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;$(ProjectDir)..\..\src\third_party\duktape-1.3.0\src;%(AdditionalIncludeDirectories) @@ -194,8 +163,8 @@ MaxSpeed true true - LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) + USE_DUKTAPE;USE_IPV6;LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;$(ProjectDir)..\..\src\third_party\duktape-1.3.0\src;%(AdditionalIncludeDirectories) Windows diff --git a/VisualStudio/duktape_lib/duktape_lib.vcxproj b/VisualStudio/duktape_lib/duktape_lib.vcxproj index 7810e31d..ffc773d7 100644 --- a/VisualStudio/duktape_lib/duktape_lib.vcxproj +++ b/VisualStudio/duktape_lib/duktape_lib.vcxproj @@ -22,6 +22,7 @@ {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD} Win32Proj duktape_lib + 8.1 @@ -34,7 +35,7 @@ StaticLibrary true v140 - Unicode + MultiByte StaticLibrary @@ -48,7 +49,7 @@ false v140 true - Unicode + MultiByte diff --git a/VisualStudio/ex_embed_cpp/ex_embed_cpp.vcxproj b/VisualStudio/ex_embed_cpp/ex_embed_cpp.vcxproj index 67fe30b3..3941edbf 100644 --- a/VisualStudio/ex_embed_cpp/ex_embed_cpp.vcxproj +++ b/VisualStudio/ex_embed_cpp/ex_embed_cpp.vcxproj @@ -22,6 +22,7 @@ {4308C5EE-45E4-45D8-9D73-6C4E2587AD78} Win32Proj ex_embed_cpp + 8.1 @@ -34,7 +35,7 @@ Application true v140 - Unicode + MultiByte Application @@ -48,7 +49,7 @@ false v140 true - Unicode + MultiByte @@ -102,7 +103,7 @@ Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;%(AdditionalIncludeDirectories) @@ -118,7 +119,7 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;%(AdditionalIncludeDirectories) @@ -136,7 +137,7 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;%(AdditionalIncludeDirectories) diff --git a/VisualStudio/ex_embedded_c/ex_embedded_c.vcxproj b/VisualStudio/ex_embedded_c/ex_embedded_c.vcxproj index 479b9b4d..fb81afff 100644 --- a/VisualStudio/ex_embedded_c/ex_embedded_c.vcxproj +++ b/VisualStudio/ex_embedded_c/ex_embedded_c.vcxproj @@ -29,6 +29,7 @@ {882EC43C-2EEE-434B-A711-C844108D29C6} Win32Proj ex_embedded_c + 8.1 @@ -41,7 +42,7 @@ Application true v140 - Unicode + MultiByte Application @@ -55,7 +56,7 @@ false v140 true - Unicode + MultiByte @@ -110,7 +111,7 @@ Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + USE_IPV6;USE_WEBSOCKET;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;%(AdditionalIncludeDirectories) @@ -126,7 +127,7 @@ MaxSpeed true true - USE_WEBSOCKET;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + USE_IPV6;USE_WEBSOCKET;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;%(AdditionalIncludeDirectories) @@ -144,7 +145,7 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + USE_IPV6;USE_WEBSOCKET;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;%(AdditionalIncludeDirectories) diff --git a/VisualStudio/ex_websocket/ex_websocket.vcxproj b/VisualStudio/ex_websocket/ex_websocket.vcxproj index 23a2b47d..8076f89b 100644 --- a/VisualStudio/ex_websocket/ex_websocket.vcxproj +++ b/VisualStudio/ex_websocket/ex_websocket.vcxproj @@ -22,6 +22,7 @@ {58B93E94-7766-435E-93AE-42A2FB5D99B1} Win32Proj ex_websocket + 8.1 @@ -34,7 +35,7 @@ Application true v140 - Unicode + MultiByte Application @@ -48,7 +49,7 @@ false v140 true - Unicode + MultiByte @@ -102,7 +103,7 @@ Level3 Disabled - USE_WEBSOCKET;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + USE_WEBSOCKET;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;%(AdditionalIncludeDirectories) diff --git a/VisualStudio/ex_websocket_client/ex_websocket_client.vcxproj b/VisualStudio/ex_websocket_client/ex_websocket_client.vcxproj index 48018049..013c887c 100644 --- a/VisualStudio/ex_websocket_client/ex_websocket_client.vcxproj +++ b/VisualStudio/ex_websocket_client/ex_websocket_client.vcxproj @@ -22,6 +22,7 @@ {58B93E94-7766-435E-93AE-42A2FB5D99B2} Win32Proj ex_websocket_client + 8.1 @@ -34,7 +35,7 @@ Application true v140 - Unicode + MultiByte Application @@ -48,7 +49,7 @@ false v140 true - Unicode + MultiByte @@ -102,7 +103,7 @@ Level3 Disabled - USE_WEBSOCKET;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + USE_WEBSOCKET;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;%(AdditionalIncludeDirectories) diff --git a/VisualStudio/lua_lib/lua_lib.vcxproj b/VisualStudio/lua_lib/lua_lib.vcxproj index 85ddc629..33d007fd 100644 --- a/VisualStudio/lua_lib/lua_lib.vcxproj +++ b/VisualStudio/lua_lib/lua_lib.vcxproj @@ -22,6 +22,7 @@ {8F5E5D77-D269-4665-9E27-1045DA6CF0D8} Win32Proj lua_lib + 8.1 @@ -34,7 +35,7 @@ StaticLibrary true v140 - Unicode + MultiByte StaticLibrary @@ -48,7 +49,7 @@ false v140 true - Unicode + MultiByte @@ -98,7 +99,7 @@ Level3 Disabled - LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) @@ -114,7 +115,7 @@ MaxSpeed true true - LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) @@ -132,7 +133,7 @@ MaxSpeed true true - LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) diff --git a/VisualStudio/unit_test/unit_test.vcxproj b/VisualStudio/unit_test/unit_test.vcxproj index 1790196f..76aa9b56 100644 --- a/VisualStudio/unit_test/unit_test.vcxproj +++ b/VisualStudio/unit_test/unit_test.vcxproj @@ -70,8 +70,8 @@ Level3 Disabled - LOCAL_TEST;REPLACE_CHECK_FOR_LOCAL_DEBUGGING;USE_IPV6;USE_WEBSOCKET;MEMORY_DEBUGGING;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(ProjectDir)..\..\src;$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) + LOCAL_TEST;REPLACE_CHECK_FOR_LOCAL_DEBUGGING;USE_IPV6;USE_WEBSOCKET;MEMORY_DEBUGGING;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(ProjectDir)..\..\src;$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;$(ProjectDir)..\..\..\check-0.10.0\;$(ProjectDir)..\..\..\check-0.10.0\src\;%(AdditionalIncludeDirectories) Console @@ -86,8 +86,8 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(ProjectDir)..\..\src;$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(ProjectDir)..\..\src;$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;$(ProjectDir)..\..\..\check-0.10.0\;$(ProjectDir)..\..\..\check-0.10.0\src\;%(AdditionalIncludeDirectories) Console diff --git a/VisualStudio/upload/upload.vcxproj b/VisualStudio/upload/upload.vcxproj index 3cb25ebd..4aec14c4 100644 --- a/VisualStudio/upload/upload.vcxproj +++ b/VisualStudio/upload/upload.vcxproj @@ -29,6 +29,7 @@ {882EC43C-2EEE-434B-A711-C845678D29C6} Win32Proj upload + 8.1 @@ -41,7 +42,7 @@ Application true v140 - Unicode + MultiByte Application @@ -55,7 +56,7 @@ false v140 true - Unicode + MultiByte @@ -95,7 +96,7 @@ Level3 Disabled - NO_FILES;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + NO_FILES;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;%(AdditionalIncludeDirectories) @@ -109,7 +110,7 @@ Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + NO_FILES;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;%(AdditionalIncludeDirectories) @@ -125,7 +126,7 @@ MaxSpeed true true - NO_FILES;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NO_FILES;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;%(AdditionalIncludeDirectories) @@ -143,7 +144,7 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NO_FILES;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..\..\include;%(AdditionalIncludeDirectories) diff --git a/examples/embedded_cpp/embedded_cpp.cpp b/examples/embedded_cpp/embedded_cpp.cpp index 3ea822e1..97900426 100644 --- a/examples/embedded_cpp/embedded_cpp.cpp +++ b/examples/embedded_cpp/embedded_cpp.cpp @@ -171,11 +171,11 @@ class FooHandler : public CivetHandler if (rlen > sizeof(buf)) { rlen = sizeof(buf); } - rlen = mg_read(conn, buf, rlen); + rlen = mg_read(conn, buf, (size_t)rlen); if (rlen <= 0) { break; } - wlen = mg_write(conn, buf, rlen); + wlen = mg_write(conn, buf, (size_t)rlen); if (rlen != rlen) { break; } diff --git a/examples/upload/upload.c b/examples/upload/upload.c index d107a72c..56c4be4f 100644 --- a/examples/upload/upload.c +++ b/examples/upload/upload.c @@ -8,7 +8,9 @@ #ifdef _WIN32 +#ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS +#endif #include #include #define strtoll strtol diff --git a/examples/websocket_client/websocket_client.c b/examples/websocket_client/websocket_client.c index f9756a84..793de404 100644 --- a/examples/websocket_client/websocket_client.c +++ b/examples/websocket_client/websocket_client.c @@ -81,7 +81,7 @@ websocket_server_data(struct mg_connection *conn, void *_ignored) #endif { - printf("Server: Got %u bytes from the client\n", data_len); + printf("Server: Got %lu bytes from the client\n", (unsigned long)data_len); printf("Server received data from client: "); fwrite(data, 1, data_len, stdout); printf("\n"); diff --git a/src/main.c b/src/main.c index 65796579..c57724b3 100644 --- a/src/main.c +++ b/src/main.c @@ -973,7 +973,7 @@ start_civetweb(int argc, char *argv[]) * see https://en.wikipedia.org/wiki/64-bit_computing */ fprintf(stdout, "Data model: i:%u/%u/%u/%u, f:%u/%u/%u, c:%u/%u, " - "p:%u, s:%u, t:%u", + "p:%u, s:%u, t:%u\n", (unsigned)sizeof(short), (unsigned)sizeof(int), (unsigned)sizeof(long), diff --git a/src/mod_lua.inl b/src/mod_lua.inl index 385b81d9..6debefe4 100644 --- a/src/mod_lua.inl +++ b/src/mod_lua.inl @@ -716,7 +716,7 @@ lsp_url_decode(lua_State *L) text = lua_tolstring(L, 1, &text_len); is_form = (num_args == 2) ? lua_isboolean(L, 2) : 0; if (text) { - mg_url_decode(text, text_len, dst, sizeof(dst), is_form); + mg_url_decode(text, text_len, dst, (int)sizeof(dst), is_form); lua_pushstring(L, dst); } else { lua_pushnil(L); @@ -742,7 +742,7 @@ lsp_base64_encode(lua_State *L) if (text) { dst = (char *)mg_malloc(text_len * 8 / 6 + 4); if (dst) { - base64_encode((const unsigned char *)text, text_len, dst); + base64_encode((const unsigned char *)text, (int)text_len, dst); lua_pushstring(L, dst); mg_free(dst); } else { @@ -774,7 +774,7 @@ lsp_base64_decode(lua_State *L) dst = (char *)mg_malloc(text_len); if (dst) { ret = base64_decode((const unsigned char *)text, - text_len, + (int)text_len, dst, &dst_len); if (ret != -1) { diff --git a/test/private.c b/test/private.c index 50e67141..effa0c2b 100644 --- a/test/private.c +++ b/test/private.c @@ -24,7 +24,9 @@ * static functions */ #ifdef _MSC_VER +#ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS +#endif #define CIVETWEB_API static #endif diff --git a/test/private_exe.c b/test/private_exe.c index 3af2246d..5dfd1e1a 100644 --- a/test/private_exe.c +++ b/test/private_exe.c @@ -24,8 +24,10 @@ * static functions. */ #ifdef _MSC_VER +#ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS #endif +#endif #include "private_exe.h" diff --git a/test/public_func.c b/test/public_func.c index bb864c62..75ed9d42 100644 --- a/test/public_func.c +++ b/test/public_func.c @@ -20,7 +20,9 @@ */ #ifdef _MSC_VER -#define _CRT_SECURE_NO_WARNINGS +#ifndef _CRT_SECURE_NO_WARNINGS +#define _CRT_SECURE_NO_WARNINGS +#endif #endif #include diff --git a/test/public_server.c b/test/public_server.c index d02f4876..0c58af67 100644 --- a/test/public_server.c +++ b/test/public_server.c @@ -20,8 +20,10 @@ */ #ifdef _MSC_VER +#ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS #endif +#endif #include #include