diff --git a/.gitignore b/.gitignore
index a633534b3..dd9b2ab02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,8 @@ config.otml
!.gitignore
otclient.map
otclient.layout
+otclient.exp
+otclient.lib
LOCALTODO
tags
Thumbs.db
diff --git a/vc14/arch32.props b/vc14/arch32.props
index b3f250b94..16828e066 100644
--- a/vc14/arch32.props
+++ b/vc14/arch32.props
@@ -4,7 +4,6 @@
- $(OTCLIENT_LIBS)
true
diff --git a/vc14/arch64.props b/vc14/arch64.props
index 9d3daebc6..bc5d4d96b 100644
--- a/vc14/arch64.props
+++ b/vc14/arch64.props
@@ -9,9 +9,6 @@
StreamingSIMDExtensions2
Fast
-
- $(OTCLIENT_LIBS64)
-
\ No newline at end of file
diff --git a/vc14/otclient.vcxproj b/vc14/otclient.vcxproj
index 5d1136b13..095b26bfe 100644
--- a/vc14/otclient.vcxproj
+++ b/vc14/otclient.vcxproj
@@ -22,53 +22,50 @@
Win32Proj
{17A8F78F-1FFB-4128-A3B3-59CC6C19D89A}
otclient
- 10.0.17134.0
+ 10.0
Application
true
- v141
+ v142
Application
true
- v141
+ v142
Application
false
- v141
+ v142
Application
false
- v141
+ v142
+
-
-
-
-
@@ -92,6 +89,7 @@
ProgramDatabase
Disabled
StreamingSIMDExtensions2
+ $(VcpkgRoot)include\luajit;%(AdditionalIncludeDirectories)
MachineX86
@@ -103,6 +101,7 @@
$(PREPROCESSOR_DEFS);_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
ProgramDatabase
AdvancedVectorExtensions
+ $(VcpkgRoot)include\luajit;%(AdditionalIncludeDirectories)
true
@@ -116,6 +115,7 @@
MaxSpeed
true
true
+ $(VcpkgRoot)include\luajit;%(AdditionalIncludeDirectories)
MachineX86
@@ -134,6 +134,7 @@
MaxSpeed
true
true
+ $(VcpkgRoot)include\luajit;%(AdditionalIncludeDirectories)
true
diff --git a/vc14/settings.props b/vc14/settings.props
index 45160ebc7..4c1b9fc9c 100644
--- a/vc14/settings.props
+++ b/vc14/settings.props
@@ -2,15 +2,6 @@
- $(OTCLIENTSDKDir)\LuaJIT-2.1.0\
- $(OTCLIENTSDKDir)\glew-2.0.0\
- $(OTCLIENTSDKDir)\libogg-1.3.2\
- $(OTCLIENTSDKDir)\libvorbis-1.3.5\
- $(OTCLIENTSDKDir)\OpenAL-1.15.1\
- $(OTCLIENTSDKDir)\OpenSSL-1.0.2j\
- $(OTCLIENTSDKDir)\physfs-2.0.3.1\
- $(OTCLIENTSDKDir)\zlib-1.2.8.8\
-
WIN32;
_CRT_SECURE_NO_WARNINGS;
@@ -28,47 +19,10 @@
VERSION="0.6.6";
AB
-
-
- $(BOOST_ROOT_OTCLIENT);
- $(LUA_DIR)\include;
- $(GLEW_DIR)\include;
- $(LIBOGG_DIR)\include;
- $(LIBVORBIS_DIR)\include;
- $(OPEN_AL_DIR)\include;
- $(OPEN_SSL_DIR)\include;
- $(PHYSFS_DIR)\include;
- $(ZLIB_DIR)\include
-
-
-
- $(BOOST_ROOT_OTCLIENT)\lib32-msvc-14.0;
- $(LUA_DIR)\lib;
- $(GLEW_DIR)\lib;
- $(LIBOGG_DIR)\lib;
- $(LIBVORBIS_DIR)\lib;
- $(OPEN_AL_DIR)\lib;
- $(OPEN_SSL_DIR)\lib;
- $(PHYSFS_DIR)\lib;
- $(ZLIB_DIR)\lib
-
-
-
- $(BOOST_ROOT_OTCLIENT)\lib64-msvc-14.0;
- $(LUA_DIR)\lib64;
- $(GLEW_DIR)\lib64;
- $(LIBOGG_DIR)\lib64;
- $(LIBVORBIS_DIR)\lib64;
- $(OPEN_AL_DIR)\lib64;
- $(OPEN_SSL_DIR)\lib64;
- $(PHYSFS_DIR)\lib64;
- $(ZLIB_DIR)\lib64
-
-
+
glew32.lib;
zlib.lib;
- libeay32.lib;
physfs.lib;
openal32.lib;
lua51.lib;
@@ -87,7 +41,7 @@
glew32d.lib;
zlibd.lib;
- libeay32.lib;
+ zstdd.lib;
physfs.lib;
openal32.lib;
lua51.lib;
@@ -102,14 +56,12 @@
gdi32.lib;
advapi32.lib;
-
false
- $(OTCLIENT_INCLUDES)
Level3
true
true
@@ -118,7 +70,6 @@
$(OTCLIENT_LIBDEPS)
Default
- libcmt.lib
true
Windows
mainCRTStartup
@@ -128,55 +79,10 @@
-->
-
- $(LUA_DIR)
- true
-
-
- $(GLEW_DIR)
- true
-
-
- $(LIBOGG_DIR)
- true
-
-
- $(LIBVORBIS_DIR)
- true
-
-
- $(OPEN_AL_DIR)
- true
-
-
- $(OPEN_SSL_DIR)
- true
-
-
- $(PHYSFS_DIR)
- true
-
-
- $(ZLIB_DIR)
- true
-
-
$(PREPROCESSOR_DEFS)
true
-
- $(OTCLIENT_INCLUDES)
- true
-
-
- $(OTCLIENT_LIBS)
- true
-
-
- $(OTCLIENT_LIBS64)
- true
-
$(OTCLIENT_LIBDEPS)
true