diff --git a/libs/libblade/libblade.sln b/libs/libblade/libblade.sln index bcce6559b8..886fab69bd 100644 --- a/libs/libblade/libblade.sln +++ b/libs/libblade/libblade.sln @@ -27,9 +27,15 @@ 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}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "duktape_lib", "..\win32\civetweb\duktape_lib.vcxproj", "{0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}" + ProjectSection(ProjectDependencies) = postProject + {B9B7455D-F109-42BD-AD0A-98489B53FCF3} = {B9B7455D-F109-42BD-AD0A-98489B53FCF3} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua_lib", "..\civetweb-1.9.1\VisualStudio\lua_lib\lua_lib.vcxproj", "{8F5E5D77-D269-4665-9E27-1045DA6CF0D8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua_lib", "..\win32\civetweb\lua_lib.vcxproj", "{8F5E5D77-D269-4665-9E27-1045DA6CF0D8}" + ProjectSection(ProjectDependencies) = postProject + {B9B7455D-F109-42BD-AD0A-98489B53FCF3} = {B9B7455D-F109-42BD-AD0A-98489B53FCF3} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libconfig", "..\win32\Download libconfig.2015.vcxproj", "{4AB0A14F-F65F-4C18-AAEC-AC76E2BE07DA}" EndProject diff --git a/libs/win32/civetweb/civetweb.2015.vcxproj b/libs/win32/civetweb/civetweb.2015.vcxproj index d8a454de55..4dce01ac9a 100644 --- a/libs/win32/civetweb/civetweb.2015.vcxproj +++ b/libs/win32/civetweb/civetweb.2015.vcxproj @@ -140,10 +140,10 @@ - + {0a11689c-db6a-4bf6-97b2-ad32db863fbd} - + {8f5e5d77-d269-4665-9e27-1045da6cf0d8} diff --git a/libs/win32/civetweb/duktape_lib.vcxproj b/libs/win32/civetweb/duktape_lib.vcxproj new file mode 100644 index 0000000000..c5ada61614 --- /dev/null +++ b/libs/win32/civetweb/duktape_lib.vcxproj @@ -0,0 +1,161 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD} + Win32Proj + duktape_lib + 8.1 + + + + StaticLibrary + true + MultiByte + v140 + + + StaticLibrary + true + v140 + MultiByte + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + v140 + true + MultiByte + + + + + + + + + + + + + + + + + + + + $(Configuration)\duktape_lib\$(Platform)\ + $(Configuration)\duktape_lib\$(Platform)\ + + + $(Configuration)\duktape_lib\$(Platform)\ + $(Configuration)\duktape_lib\$(Platform)\ + + + $(Configuration)\duktape_lib\$(Platform)\ + $(Configuration)\duktape_lib\$(Platform)\ + + + $(Configuration)\duktape_lib\$(Platform)\ + $(Configuration)\duktape_lib\$(Platform)\ + + + + + + TurnOffAllWarnings + Disabled + duktape_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(civetwebLibDir)\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) + + + Windows + true + + + + + + + Level3 + Disabled + duktape_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(civetwebLibDir)\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + duktape_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(civetwebLibDir)\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + duktape_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(civetwebLibDir)\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/libs/win32/civetweb/lua_lib.vcxproj b/libs/win32/civetweb/lua_lib.vcxproj new file mode 100644 index 0000000000..35b9f448b8 --- /dev/null +++ b/libs/win32/civetweb/lua_lib.vcxproj @@ -0,0 +1,196 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8F5E5D77-D269-4665-9E27-1045DA6CF0D8} + Win32Proj + lua_lib + 8.1 + + + + StaticLibrary + true + MultiByte + v140 + + + StaticLibrary + true + v140 + MultiByte + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + v140 + true + MultiByte + + + + + + + + + + + + + + + + + + + + $(Configuration)\lua_lib\$(Platform)\ + $(Configuration)\lua_lib\$(Platform)\ + + + $(Configuration)\lua_lib\$(Platform)\ + $(Configuration)\lua_lib\$(Platform)\ + + + $(Configuration)\lua_lib\$(Platform)\ + $(Configuration)\lua_lib\$(Platform)\ + + + $(Configuration)\lua_lib\$(Platform)\ + $(Configuration)\lua_lib\$(Platform)\ + + + + + + TurnOffAllWarnings + Disabled + LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(civetwebLibDir)\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) + + + Windows + true + + + + + + + Level3 + Disabled + LUA_COMPAT_ALL;THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(civetwebLibDir)\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) + + + Windows + true + + + + + Level3 + + + 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;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(civetwebLibDir)\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + + + + Level3 + + + 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) + $(civetwebLibDir)\src\third_party\lua-5.2.4\src;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file