Skip to content

Commit e3caaac

Browse files
slavidodoslavidodo
committed
Use vcpkg & drop OTClient SDK for windows
additionaly, the project has been updated to Visual Studio 2019!
1 parent 714c6b8 commit e3caaac

File tree

5 files changed

+14
-109
lines changed

5 files changed

+14
-109
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ config.otml
3333
!.gitignore
3434
otclient.map
3535
otclient.layout
36+
otclient.exp
37+
otclient.lib
3638
LOCALTODO
3739
tags
3840
Thumbs.db

‎vc14/arch32.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<PropertyGroup Label="UserMacros" />
55
<ItemDefinitionGroup>
66
<Link>
7-
<AdditionalLibraryDirectories>$(OTCLIENT_LIBS)</AdditionalLibraryDirectories>
87
<LargeAddressAware>true</LargeAddressAware>
98
</Link>
109
</ItemDefinitionGroup>

‎vc14/arch64.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
1010
<FloatingPointModel>Fast</FloatingPointModel>
1111
</ClCompile>
12-
<Link>
13-
<AdditionalLibraryDirectories>$(OTCLIENT_LIBS64)</AdditionalLibraryDirectories>
14-
</Link>
1512
</ItemDefinitionGroup>
1613
<ItemGroup />
1714
</Project>

‎vc14/otclient.vcxproj‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,53 +22,50 @@
2222
<Keyword>Win32Proj</Keyword>
2323
<ProjectGuid>{17A8F78F-1FFB-4128-A3B3-59CC6C19D89A}</ProjectGuid>
2424
<RootNamespace>otclient</RootNamespace>
25-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>Application</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v141</PlatformToolset>
31+
<PlatformToolset>v142</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<UseDebugLibraries>true</UseDebugLibraries>
36-
<PlatformToolset>v141</PlatformToolset>
36+
<PlatformToolset>v142</PlatformToolset>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3939
<ConfigurationType>Application</ConfigurationType>
4040
<UseDebugLibraries>false</UseDebugLibraries>
41-
<PlatformToolset>v141</PlatformToolset>
41+
<PlatformToolset>v142</PlatformToolset>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
4545
<UseDebugLibraries>false</UseDebugLibraries>
46-
<PlatformToolset>v141</PlatformToolset>
46+
<PlatformToolset>v142</PlatformToolset>
4747
</PropertyGroup>
4848
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4949
<ImportGroup Label="ExtensionSettings">
5050
</ImportGroup>
51+
<Import Project="settings.props" />
5152
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5253
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
53-
<Import Project="settings.props" />
5454
<Import Project="arch32.props" />
5555
<Import Project="debug.props" />
5656
</ImportGroup>
5757
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
5858
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
59-
<Import Project="settings.props" />
6059
<Import Project="arch64.props" />
6160
<Import Project="debug.props" />
6261
</ImportGroup>
6362
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6463
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
65-
<Import Project="settings.props" />
6664
<Import Project="arch32.props" />
6765
<Import Project="release.props" />
6866
</ImportGroup>
6967
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
7068
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
71-
<Import Project="settings.props" />
7269
<Import Project="arch64.props" />
7370
<Import Project="release.props" />
7471
</ImportGroup>
@@ -92,6 +89,7 @@
9289
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
9390
<Optimization>Disabled</Optimization>
9491
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
92+
<AdditionalIncludeDirectories>$(VcpkgRoot)include\luajit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9593
</ClCompile>
9694
<Link>
9795
<TargetMachine>MachineX86</TargetMachine>
@@ -103,6 +101,7 @@
103101
<PreprocessorDefinitions>$(PREPROCESSOR_DEFS);_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
104102
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
105103
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
104+
<AdditionalIncludeDirectories>$(VcpkgRoot)include\luajit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
106105
</ClCompile>
107106
<Link>
108107
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -116,6 +115,7 @@
116115
<Optimization>MaxSpeed</Optimization>
117116
<IntrinsicFunctions>true</IntrinsicFunctions>
118117
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
118+
<AdditionalIncludeDirectories>$(VcpkgRoot)include\luajit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119119
</ClCompile>
120120
<Link>
121121
<TargetMachine>MachineX86</TargetMachine>
@@ -134,6 +134,7 @@
134134
<Optimization>MaxSpeed</Optimization>
135135
<IntrinsicFunctions>true</IntrinsicFunctions>
136136
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
137+
<AdditionalIncludeDirectories>$(VcpkgRoot)include\luajit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
137138
</ClCompile>
138139
<Link>
139140
<GenerateDebugInformation>true</GenerateDebugInformation>

‎vc14/settings.props‎

Lines changed: 2 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportGroup Label="PropertySheets" />
44
<PropertyGroup Label="UserMacros">
5-
<LUA_DIR>$(OTCLIENTSDKDir)\LuaJIT-2.1.0\</LUA_DIR>
6-
<GLEW_DIR>$(OTCLIENTSDKDir)\glew-2.0.0\</GLEW_DIR>
7-
<LIBOGG_DIR>$(OTCLIENTSDKDir)\libogg-1.3.2\</LIBOGG_DIR>
8-
<LIBVORBIS_DIR>$(OTCLIENTSDKDir)\libvorbis-1.3.5\</LIBVORBIS_DIR>
9-
<OPEN_AL_DIR>$(OTCLIENTSDKDir)\OpenAL-1.15.1\</OPEN_AL_DIR>
10-
<OPEN_SSL_DIR>$(OTCLIENTSDKDir)\OpenSSL-1.0.2j\</OPEN_SSL_DIR>
11-
<PHYSFS_DIR>$(OTCLIENTSDKDir)\physfs-2.0.3.1\</PHYSFS_DIR>
12-
<ZLIB_DIR>$(OTCLIENTSDKDir)\zlib-1.2.8.8\</ZLIB_DIR>
13-
145
<PREPROCESSOR_DEFS>
156
WIN32;
167
_CRT_SECURE_NO_WARNINGS;
@@ -28,47 +19,10 @@
2819
VERSION="0.6.6";
2920
AB
3021
</PREPROCESSOR_DEFS>
31-
32-
<OTCLIENT_INCLUDES>
33-
$(BOOST_ROOT_OTCLIENT);
34-
$(LUA_DIR)\include;
35-
$(GLEW_DIR)\include;
36-
$(LIBOGG_DIR)\include;
37-
$(LIBVORBIS_DIR)\include;
38-
$(OPEN_AL_DIR)\include;
39-
$(OPEN_SSL_DIR)\include;
40-
$(PHYSFS_DIR)\include;
41-
$(ZLIB_DIR)\include
42-
</OTCLIENT_INCLUDES>
43-
44-
<OTCLIENT_LIBS>
45-
$(BOOST_ROOT_OTCLIENT)\lib32-msvc-14.0;
46-
$(LUA_DIR)\lib;
47-
$(GLEW_DIR)\lib;
48-
$(LIBOGG_DIR)\lib;
49-
$(LIBVORBIS_DIR)\lib;
50-
$(OPEN_AL_DIR)\lib;
51-
$(OPEN_SSL_DIR)\lib;
52-
$(PHYSFS_DIR)\lib;
53-
$(ZLIB_DIR)\lib
54-
</OTCLIENT_LIBS>
55-
56-
<OTCLIENT_LIBS64>
57-
$(BOOST_ROOT_OTCLIENT)\lib64-msvc-14.0;
58-
$(LUA_DIR)\lib64;
59-
$(GLEW_DIR)\lib64;
60-
$(LIBOGG_DIR)\lib64;
61-
$(LIBVORBIS_DIR)\lib64;
62-
$(OPEN_AL_DIR)\lib64;
63-
$(OPEN_SSL_DIR)\lib64;
64-
$(PHYSFS_DIR)\lib64;
65-
$(ZLIB_DIR)\lib64
66-
</OTCLIENT_LIBS64>
67-
22+
6823
<OTCLIENT_LIBDEPS>
6924
glew32.lib;
7025
zlib.lib;
71-
libeay32.lib;
7226
physfs.lib;
7327
openal32.lib;
7428
lua51.lib;
@@ -87,7 +41,7 @@
8741
<OTCLIENT_LIBDEPS_D>
8842
glew32d.lib;
8943
zlibd.lib;
90-
libeay32.lib;
44+
zstdd.lib;
9145
physfs.lib;
9246
openal32.lib;
9347
lua51.lib;
@@ -102,14 +56,12 @@
10256
gdi32.lib;
10357
advapi32.lib;
10458
</OTCLIENT_LIBDEPS_D>
105-
10659
</PropertyGroup>
10760
<PropertyGroup>
10861
<LinkIncremental>false</LinkIncremental>
10962
</PropertyGroup>
11063
<ItemDefinitionGroup>
11164
<ClCompile>
112-
<AdditionalIncludeDirectories>$(OTCLIENT_INCLUDES)</AdditionalIncludeDirectories>
11365
<WarningLevel>Level3</WarningLevel>
11466
<MultiProcessorCompilation>true</MultiProcessorCompilation>
11567
<WholeProgramOptimization>true</WholeProgramOptimization>
@@ -118,7 +70,6 @@
11870
<Link>
11971
<AdditionalDependencies>$(OTCLIENT_LIBDEPS)</AdditionalDependencies>
12072
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
121-
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
12273
<LargeAddressAware>true</LargeAddressAware>
12374
<SubSystem>Windows</SubSystem>
12475
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
@@ -128,55 +79,10 @@
12879
</ResourceCompile> -->
12980
</ItemDefinitionGroup>
13081
<ItemGroup>
131-
<BuildMacro Include="LUA_DIR">
132-
<Value>$(LUA_DIR)</Value>
133-
<EnvironmentVariable>true</EnvironmentVariable>
134-
</BuildMacro>
135-
<BuildMacro Include="GLEW_DIR">
136-
<Value>$(GLEW_DIR)</Value>
137-
<EnvironmentVariable>true</EnvironmentVariable>
138-
</BuildMacro>
139-
<BuildMacro Include="LIBOGG_DIR">
140-
<Value>$(LIBOGG_DIR)</Value>
141-
<EnvironmentVariable>true</EnvironmentVariable>
142-
</BuildMacro>
143-
<BuildMacro Include="LIBVORBIS_DIR">
144-
<Value>$(LIBVORBIS_DIR)</Value>
145-
<EnvironmentVariable>true</EnvironmentVariable>
146-
</BuildMacro>
147-
<BuildMacro Include="OPEN_AL_DIR">
148-
<Value>$(OPEN_AL_DIR)</Value>
149-
<EnvironmentVariable>true</EnvironmentVariable>
150-
</BuildMacro>
151-
<BuildMacro Include="OPEN_SSL_DIR">
152-
<Value>$(OPEN_SSL_DIR)</Value>
153-
<EnvironmentVariable>true</EnvironmentVariable>
154-
</BuildMacro>
155-
<BuildMacro Include="PHYSFS_DIR">
156-
<Value>$(PHYSFS_DIR)</Value>
157-
<EnvironmentVariable>true</EnvironmentVariable>
158-
</BuildMacro>
159-
<BuildMacro Include="ZLIB_DIR">
160-
<Value>$(ZLIB_DIR)</Value>
161-
<EnvironmentVariable>true</EnvironmentVariable>
162-
</BuildMacro>
163-
16482
<BuildMacro Include="PREPROCESSOR_DEFS">
16583
<Value>$(PREPROCESSOR_DEFS)</Value>
16684
<EnvironmentVariable>true</EnvironmentVariable>
16785
</BuildMacro>
168-
<BuildMacro Include="OTCLIENT_INCLUDES">
169-
<Value>$(OTCLIENT_INCLUDES)</Value>
170-
<EnvironmentVariable>true</EnvironmentVariable>
171-
</BuildMacro>
172-
<BuildMacro Include="OTCLIENT_LIBS">
173-
<Value>$(OTCLIENT_LIBS)</Value>
174-
<EnvironmentVariable>true</EnvironmentVariable>
175-
</BuildMacro>
176-
<BuildMacro Include="OTCLIENT_LIBS64">
177-
<Value>$(OTCLIENT_LIBS64)</Value>
178-
<EnvironmentVariable>true</EnvironmentVariable>
179-
</BuildMacro>
18086
<BuildMacro Include="OTCLIENT_LIBDEPS">
18187
<Value>$(OTCLIENT_LIBDEPS)</Value>
18288
<EnvironmentVariable>true</EnvironmentVariable>

0 commit comments

Comments
 (0)