diff --git a/.gitignore b/.gitignore index 5b6d4431..a633534b 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,8 @@ Thumbs.db .directory src/framework/graphics/dx/ modules/.project/modules.sublime-workspace +vc14/.vs/ +*.dll ################# ## Visual Studio diff --git a/src/framework/net/connection.h b/src/framework/net/connection.h index b9e56181..93a701ee 100644 --- a/src/framework/net/connection.h +++ b/src/framework/net/connection.h @@ -33,9 +33,10 @@ class Connection : public LuaObject typedef std::function ErrorCallback; typedef std::function RecvCallback; + static constexpr int32_t READ_TIMEOUT = 30; + static constexpr int32_t WRITE_TIMEOUT = 30; + enum { - READ_TIMEOUT = 30, - WRITE_TIMEOUT = 30, SEND_BUFFER_SIZE = 65536, RECV_BUFFER_SIZE = 65536 }; diff --git a/src/framework/sound/declarations.h b/src/framework/sound/declarations.h index 445643ba..ea99c3c2 100644 --- a/src/framework/sound/declarations.h +++ b/src/framework/sound/declarations.h @@ -27,8 +27,8 @@ #define AL_LIBTYPE_STATIC -#include -#include +#include +#include class SoundManager; class SoundSource; diff --git a/vc14/otclient.vcxproj b/vc14/otclient.vcxproj index 037f5073..37297092 100644 --- a/vc14/otclient.vcxproj +++ b/vc14/otclient.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,27 +22,28 @@ Win32Proj {17A8F78F-1FFB-4128-A3B3-59CC6C19D89A} otclient + 10.0.17134.0 Application true - v140 + v141 Application true - v140 + v141 Application false - v140 + v141 Application false - v140 + v141 @@ -74,8 +75,11 @@ $(VC_IncludePath);$(WindowsSDK_IncludePath);../src; + $(VC_SourcePath);$(ProjectDir)../src; + + + $(VC_IncludePath);$(WindowsSDK_IncludePath);../src; - $(VC_IncludePath);$(WindowsSDK_IncludePath);../src; @@ -87,6 +91,7 @@ $(PREPROCESSOR_DEFS);_SCL_SECURE_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions) ProgramDatabase Disabled + AdvancedVectorExtensions MachineX86 @@ -97,6 +102,7 @@ $(PREPROCESSOR_DEFS);_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ProgramDatabase + AdvancedVectorExtensions true @@ -106,6 +112,10 @@ $(PREPROCESSOR_DEFS);%(PreprocessorDefinitions) MultiThreaded + AdvancedVectorExtensions + MaxSpeed + true + true MachineX86 @@ -120,6 +130,10 @@ MultiThreadedDLL ProgramDatabase Level4 + AdvancedVectorExtensions + MaxSpeed + true + true true