Browse Source

Update Visual Studio Project

Update Visual Studio to work with PATH system variables in Windows
systems. Credits go to @Radseq for changing the project and to me for
update to Visual Studio 2015

Closes
#795
#746
#718
#724
#713
conde2 3 years ago
parent
commit
664ef6bcad

+ 12
- 0
vc14/arch32.props View File

@@ -0,0 +1,12 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+  <ImportGroup Label="PropertySheets" />
4
+  <PropertyGroup Label="UserMacros" />
5
+  <ItemDefinitionGroup>
6
+    <Link>
7
+      <AdditionalLibraryDirectories>$(OTCLIENT_LIBS)</AdditionalLibraryDirectories>
8
+      <LargeAddressAware>true</LargeAddressAware>
9
+    </Link>
10
+  </ItemDefinitionGroup>
11
+  <ItemGroup />
12
+</Project>

+ 17
- 0
vc14/arch64.props View File

@@ -0,0 +1,17 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+  <ImportGroup Label="PropertySheets" />
4
+  <PropertyGroup Label="UserMacros" />
5
+  <ItemDefinitionGroup>
6
+    <ClCompile>
7
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
8
+      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
9
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
10
+      <FloatingPointModel>Fast</FloatingPointModel>
11
+    </ClCompile>
12
+    <Link>
13
+      <AdditionalLibraryDirectories>$(OTCLIENT_LIBS64)</AdditionalLibraryDirectories>
14
+    </Link>
15
+  </ItemDefinitionGroup>
16
+  <ItemGroup />
17
+</Project>

+ 24
- 0
vc14/debug.props View File

@@ -0,0 +1,24 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+  <ImportGroup Label="PropertySheets" />
4
+  <PropertyGroup Label="UserMacros" />
5
+  <PropertyGroup>
6
+    <OutDir>$(ProjectDir)../</OutDir>
7
+    <LinkIncremental>true</LinkIncremental>
8
+  </PropertyGroup>
9
+  <ItemDefinitionGroup>
10
+    <ClCompile>
11
+      <WholeProgramOptimization>false</WholeProgramOptimization>
12
+      <MinimalRebuild>false</MinimalRebuild>
13
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
14
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
15
+      <ObjectFileName>$(IntDir)\obj_r\%(RelativeDir)</ObjectFileName>
16
+	  <AdditionalOptions>/bigobj%(AdditionalOptions)</AdditionalOptions>
17
+    </ClCompile>
18
+    <Link>
19
+      <AdditionalDependencies>$(OTCLIENT_LIBDEPS_D)</AdditionalDependencies>
20
+    </Link>
21
+  </ItemDefinitionGroup>
22
+  <ItemGroup />
23
+</Project>
24
+

+ 30
- 70
vc14/otclient.vcxproj View File

@@ -19,6 +19,7 @@
19 19
     </ProjectConfiguration>
20 20
   </ItemGroup>
21 21
   <PropertyGroup Label="Globals">
22
+    <Keyword>Win32Proj</Keyword>
22 23
     <ProjectGuid>{17A8F78F-1FFB-4128-A3B3-59CC6C19D89A}</ProjectGuid>
23 24
     <RootNamespace>otclient</RootNamespace>
24 25
   </PropertyGroup>
@@ -27,144 +28,103 @@
27 28
     <ConfigurationType>Application</ConfigurationType>
28 29
     <UseDebugLibraries>true</UseDebugLibraries>
29 30
     <PlatformToolset>v140</PlatformToolset>
30
-    <CharacterSet>MultiByte</CharacterSet>
31 31
   </PropertyGroup>
32 32
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 33
     <ConfigurationType>Application</ConfigurationType>
34 34
     <UseDebugLibraries>true</UseDebugLibraries>
35 35
     <PlatformToolset>v140</PlatformToolset>
36
-    <CharacterSet>MultiByte</CharacterSet>
37 36
   </PropertyGroup>
38 37
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
39 38
     <ConfigurationType>Application</ConfigurationType>
40 39
     <UseDebugLibraries>false</UseDebugLibraries>
41 40
     <PlatformToolset>v140</PlatformToolset>
42
-    <WholeProgramOptimization>true</WholeProgramOptimization>
43
-    <CharacterSet>MultiByte</CharacterSet>
44 41
   </PropertyGroup>
45 42
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
46 43
     <ConfigurationType>Application</ConfigurationType>
47 44
     <UseDebugLibraries>false</UseDebugLibraries>
48 45
     <PlatformToolset>v140</PlatformToolset>
49
-    <WholeProgramOptimization>true</WholeProgramOptimization>
50
-    <CharacterSet>MultiByte</CharacterSet>
51 46
   </PropertyGroup>
52 47
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
53 48
   <ImportGroup Label="ExtensionSettings">
54 49
   </ImportGroup>
55 50
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
56 51
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
52
+    <Import Project="settings.props" />
53
+    <Import Project="arch32.props" />
54
+    <Import Project="debug.props" />
57 55
   </ImportGroup>
58 56
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
59 57
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
58
+    <Import Project="settings.props" />
59
+    <Import Project="arch64.props" />
60
+    <Import Project="debug.props" />
60 61
   </ImportGroup>
61 62
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
62 63
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
64
+    <Import Project="settings.props" />
65
+    <Import Project="arch32.props" />
66
+    <Import Project="release.props" />
63 67
   </ImportGroup>
64 68
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
65 69
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
70
+    <Import Project="settings.props" />
71
+    <Import Project="arch64.props" />
72
+    <Import Project="release.props" />
66 73
   </ImportGroup>
67 74
   <PropertyGroup Label="UserMacros" />
68 75
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
69
-    <IncludePath>D:\otclient-msvc13-libs\libogg-1.3.1\include;D:\otclient-msvc13-libs\libvorbis-1.3.3\include;D:\otclient-msvc13-libs\physfs-2.0.3\include;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\include;D:\otclient-msvc13-libs\zlib-1.2.5\include;D:\otclient-msvc13-libs\OpenAL\include\AL;D:\otclient-msvc13-libs\glew-1.10.0\include;D:\otclient-msvc13-libs\LuaJIT-2.0.2\include;D:\otclient-msvc13-libs\boost_1_55_0\include;D:\otclient\src;..\src;$(IncludePath)</IncludePath>
70
-    <LibraryPath>D:\otclient-msvc13-libs\libogg-1.3.1\lib;D:\otclient-msvc13-libs\libvorbis-1.3.3\lib;D:\otclient-msvc13-libs\physfs-2.0.3\lib;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;D:\otclient-msvc13-libs\zlib-1.2.5\lib;D:\otclient-msvc13-libs\OpenAL\lib;D:\otclient-msvc13-libs\LuaJIT-2.0.2\lib;D:\otclient-msvc13-libs\glew-1.10.0\lib;D:\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</LibraryPath>
71
-  </PropertyGroup>
72
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
73
-    <IncludePath>D:\otclient-msvc13-libs\libogg-1.3.1\include;D:\otclient-msvc13-libs\libvorbis-1.3.3\include;D:\otclient-msvc13-libs\physfs-2.0.3\include;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\include;D:\otclient-msvc13-libs\zlib-1.2.5\include;D:\otclient-msvc13-libs\OpenAL\include\AL;D:\otclient-msvc13-libs\glew-1.10.0\include;D:\otclient-msvc13-libs\LuaJIT-2.0.2\include;D:\otclient-msvc13-libs\boost_1_55_0\include;D:\otclient\src;..\src;$(IncludePath)</IncludePath>
74
-    <LibraryPath>D:\otclient-msvc13-libs\libogg-1.3.1\lib;D:\otclient-msvc13-libs\libvorbis-1.3.3\lib;D:\otclient-msvc13-libs\physfs-2.0.3\lib;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;D:\otclient-msvc13-libs\zlib-1.2.5\lib;D:\otclient-msvc13-libs\OpenAL\lib;D:\otclient-msvc13-libs\LuaJIT-2.0.2\lib;D:\otclient-msvc13-libs\glew-1.10.0\lib;D:\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</LibraryPath>
76
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../src;</IncludePath>
75 77
   </PropertyGroup>
78
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
76 79
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
77
-    <IncludePath>D:\otclient-msvc13-libs\libogg-1.3.1\include;D:\otclient-msvc13-libs\libvorbis-1.3.3\include;D:\otclient-msvc13-libs\physfs-2.0.3\include;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\include;D:\otclient-msvc13-libs\zlib-1.2.5\include;D:\otclient-msvc13-libs\OpenAL\include\AL;D:\otclient-msvc13-libs\glew-1.10.0\include;D:\otclient-msvc13-libs\LuaJIT-2.0.2\include;D:\otclient-msvc13-libs\boost_1_55_0\include;..\src;$(IncludePath)</IncludePath>
78
-    <LibraryPath>D:\otclient-msvc13-libs\libogg-1.3.1\lib;D:\otclient-msvc13-libs\libvorbis-1.3.3\lib;D:\otclient-msvc13-libs\physfs-2.0.3\lib;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;D:\otclient-msvc13-libs\zlib-1.2.5\lib;D:\otclient-msvc13-libs\OpenAL\lib;D:\otclient-msvc13-libs\LuaJIT-2.0.2\lib;D:\otclient-msvc13-libs\glew-1.10.0\lib;D:\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</LibraryPath>
80
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../src;</IncludePath>
79 81
   </PropertyGroup>
80 82
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
81
-    <IncludePath>D:\otclient-msvc13-libs\libogg-1.3.1\include;D:\otclient-msvc13-libs\libvorbis-1.3.3\include;D:\otclient-msvc13-libs\physfs-2.0.3\include;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\include;D:\otclient-msvc13-libs\zlib-1.2.5\include;D:\otclient-msvc13-libs\OpenAL\include\AL;D:\otclient-msvc13-libs\glew-1.10.0\include;D:\otclient-msvc13-libs\LuaJIT-2.0.2\include;D:\otclient-msvc13-libs\boost_1_55_0\include;D:\otclient\src;..\src;$(IncludePath)</IncludePath>
82
-    <LibraryPath>D:\otclient-msvc13-libs\libogg-1.3.1\lib;D:\otclient-msvc13-libs\libvorbis-1.3.3\lib;D:\otclient-msvc13-libs\physfs-2.0.3\lib;D:\otclient-msvc13-libs\OpenSSL-1.0.1e\lib\VC;D:\otclient-msvc13-libs\zlib-1.2.5\lib;D:\otclient-msvc13-libs\OpenAL\lib;D:\otclient-msvc13-libs\LuaJIT-2.0.2\lib;D:\otclient-msvc13-libs\glew-1.10.0\lib;D:\otclient-msvc13-libs\boost_1_55_0\lib;$(LibraryPath)</LibraryPath>
83
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../src;</IncludePath>
83 84
   </PropertyGroup>
84 85
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
85 86
     <ClCompile>
86
-      <WarningLevel>Level3</WarningLevel>
87
+      <PreprocessorDefinitions>$(PREPROCESSOR_DEFS);_SCL_SECURE_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
88
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
87 89
       <Optimization>Disabled</Optimization>
88
-      <SDLCheck>true</SDLCheck>
89
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;BOT_PROTECTION;CLIENT;CRASH_HANDLER;FW_GRAPHICS;FW_NET;FW_SOUND;FW_XML;BUILD_TYPE="RelWithDebInfo";BUILD_COMMIT="devel";BUILD_REVISION="0";VERSION="0.6.3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
90
-      <ObjectFileName>$(IntDir)\$(Platform)\src\%(RelativeDir)\</ObjectFileName>
91
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
92 90
     </ClCompile>
93 91
     <Link>
92
+      <TargetMachine>MachineX86</TargetMachine>
94 93
       <GenerateDebugInformation>true</GenerateDebugInformation>
95
-      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
96
-      <AdditionalDependencies>glew32.lib;zlib1.lib;libeay32MD.lib;physfs.lib;openal32.lib;luajit.lib;libogg_static.lib;libvorbisfile_static.lib;libvorbis_static.lib;opengl32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
97
-      <LargeAddressAware>true</LargeAddressAware>
98
-      <SubSystem>Windows</SubSystem>
99
-      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
100
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
101 94
     </Link>
102 95
   </ItemDefinitionGroup>
103 96
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
104 97
     <ClCompile>
105
-      <WarningLevel>Level3</WarningLevel>
106
-      <Optimization>Disabled</Optimization>
107
-      <SDLCheck>true</SDLCheck>
108
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WIN32_WINNT=0x0501;BOT_PROTECTION;CLIENT;CRASH_HANDLER;FW_GRAPHICS;FW_NET;FW_SOUND;FW_XML;BUILD_TYPE="RelWithDebInfo";BUILD_COMMIT="devel";BUILD_REVISION="0";VERSION="0.6.3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
109
-      <ObjectFileName>$(IntDir)\$(Platform)\src\%(RelativeDir)\</ObjectFileName>
110
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
111
-      <FloatingPointModel>Fast</FloatingPointModel>
98
+      <PreprocessorDefinitions>$(PREPROCESSOR_DEFS);_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
99
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
112 100
     </ClCompile>
113 101
     <Link>
114 102
       <GenerateDebugInformation>true</GenerateDebugInformation>
115
-      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
116
-      <AdditionalDependencies>glew32.lib;zlib1.lib;libeay32MD.lib;physfs.lib;openal32.lib;luajit.lib;libogg_static.lib;libvorbisfile_static.lib;libvorbis_static.lib;opengl32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
117
-      <LargeAddressAware>true</LargeAddressAware>
118
-      <SubSystem>Windows</SubSystem>
119
-      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
120 103
     </Link>
121 104
   </ItemDefinitionGroup>
122 105
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
123 106
     <ClCompile>
124
-      <WarningLevel>Level3</WarningLevel>
125
-      <Optimization>MaxSpeed</Optimization>
126
-      <FunctionLevelLinking>true</FunctionLevelLinking>
127
-      <IntrinsicFunctions>true</IntrinsicFunctions>
128
-      <SDLCheck>true</SDLCheck>
129
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;BOT_PROTECTION;CLIENT;CRASH_HANDLER;FW_GRAPHICS;FW_NET;FW_SOUND;FW_XML;BUILD_TYPE="RelWithDebInfo";BUILD_COMMIT="devel";BUILD_REVISION="0";VERSION="0.6.3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
130
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
131
-      <ObjectFileName>$(IntDir)\$(Platform)\src\%(RelativeDir)\</ObjectFileName>
107
+      <PreprocessorDefinitions>$(PREPROCESSOR_DEFS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
108
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
132 109
     </ClCompile>
133 110
     <Link>
111
+      <TargetMachine>MachineX86</TargetMachine>
134 112
       <GenerateDebugInformation>true</GenerateDebugInformation>
135 113
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
136 114
       <OptimizeReferences>true</OptimizeReferences>
137
-      <AdditionalDependencies>glew32.lib;zlib1.lib;libeay32MD.lib;physfs.lib;openal32.lib;luajit.lib;libogg_static.lib;libvorbisfile_static.lib;libvorbis_static.lib;opengl32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
138
-      <SubSystem>Windows</SubSystem>
139
-      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
140
-      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
141
-      <LargeAddressAware>true</LargeAddressAware>
142 115
     </Link>
143 116
   </ItemDefinitionGroup>
144 117
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
145 118
     <ClCompile>
146
-      <WarningLevel>Level3</WarningLevel>
147
-      <Optimization>MaxSpeed</Optimization>
148
-      <FunctionLevelLinking>true</FunctionLevelLinking>
149
-      <IntrinsicFunctions>true</IntrinsicFunctions>
150
-      <SDLCheck>true</SDLCheck>
151
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WIN32_WINNT=0x0501;BOT_PROTECTION;CLIENT;CRASH_HANDLER;FW_GRAPHICS;FW_NET;FW_SOUND;FW_XML;BUILD_TYPE="RelWithDebInfo";BUILD_COMMIT="devel";BUILD_REVISION="0";VERSION="0.6.3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
152
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
153
-      <ObjectFileName>$(IntDir)\$(Platform)\src\%(RelativeDir)\</ObjectFileName>
154
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
155
-      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
156
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
157
-      <FloatingPointModel>Fast</FloatingPointModel>
119
+      <PreprocessorDefinitions>$(PREPROCESSOR_DEFS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
120
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
121
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
122
+      <WarningLevel>Level4</WarningLevel>
158 123
     </ClCompile>
159 124
     <Link>
160 125
       <GenerateDebugInformation>true</GenerateDebugInformation>
161 126
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
162 127
       <OptimizeReferences>true</OptimizeReferences>
163
-      <AdditionalDependencies>glew32.lib;zlib1.lib;libeay32MD.lib;physfs.lib;openal32.lib;luajit.lib;libogg_static.lib;libvorbisfile_static.lib;libvorbis_static.lib;opengl32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
164
-      <SubSystem>Windows</SubSystem>
165
-      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
166
-      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
167
-      <LargeAddressAware>true</LargeAddressAware>
168 128
     </Link>
169 129
   </ItemDefinitionGroup>
170 130
   <ItemGroup>
@@ -499,4 +459,4 @@
499 459
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
500 460
   <ImportGroup Label="ExtensionTargets">
501 461
   </ImportGroup>
502
-</Project>
462
+</Project>

+ 1
- 0
vc14/register_otclient_boost_env.bat View File

@@ -0,0 +1 @@
1
+setx BOOST_ROOT_OTCLIENT %CD%

+ 1
- 0
vc14/register_otclient_sdk_env.bat View File

@@ -0,0 +1 @@
1
+setx OTCLIENTSDKDir %CD%

+ 20
- 0
vc14/release.props View File

@@ -0,0 +1,20 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+  <ImportGroup Label="PropertySheets" />
4
+  <PropertyGroup Label="UserMacros" />
5
+  <PropertyGroup>
6
+    <OutDir>$(ProjectDir)../</OutDir>
7
+    <LinkIncremental>false</LinkIncremental>
8
+  </PropertyGroup>
9
+  <ItemDefinitionGroup>
10
+    <ClCompile>
11
+      <Optimization>Full</Optimization>
12
+      <ObjectFileName>$(IntDir)\obj_r\%(RelativeDir)</ObjectFileName>
13
+    </ClCompile>
14
+    <Link>
15
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
16
+    </Link>
17
+  </ItemDefinitionGroup>
18
+  <ItemGroup />
19
+</Project>
20
+

+ 188
- 0
vc14/settings.props View File

@@ -0,0 +1,188 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
+  <ImportGroup Label="PropertySheets" />
4
+  <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
+
14
+    <PREPROCESSOR_DEFS>
15
+        WIN32;
16
+        _CRT_SECURE_NO_WARNINGS;
17
+        _WIN32_WINNT=0x0501;
18
+        BOT_PROTECTION;
19
+        OTCLIENT;
20
+        CRASH_HANDLER;
21
+        FW_GRAPHICS;
22
+        FW_NET;
23
+        FW_SOUND;
24
+        FW_XML;
25
+        BUILD_TYPE="RelWithDebInfo";
26
+        BUILD_COMMIT="devel";
27
+        BUILD_REVISION="0";
28
+        VERSION="0.6.3";
29
+        AB
30
+    </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
+    
68
+    <OTCLIENT_LIBDEPS>
69
+        glew32.lib;
70
+        zlib.lib;
71
+        libeay32.lib;
72
+        physfs.lib;
73
+        openal32.lib;
74
+        lua51.lib;
75
+        ogg.lib;
76
+        vorbisfile.lib;
77
+        vorbis.lib;
78
+        opengl32.lib;
79
+        dbghelp.lib;
80
+        kernel32.lib;
81
+        user32.lib;
82
+        shell32.lib;
83
+        gdi32.lib;
84
+        advapi32.lib;
85
+    </OTCLIENT_LIBDEPS>
86
+    
87
+    <OTCLIENT_LIBDEPS_D>
88
+        glew32.lib;
89
+        zlib.lib;
90
+        libeay32.lib;
91
+        physfs.lib;
92
+        openal32.lib;
93
+        lua51.lib;
94
+        ogg.lib;
95
+        vorbisfile.lib;
96
+        vorbis.lib;
97
+        opengl32.lib;
98
+        dbghelp.lib;
99
+        kernel32.lib;
100
+        user32.lib;
101
+        shell32.lib;
102
+        gdi32.lib;
103
+        advapi32.lib;
104
+	</OTCLIENT_LIBDEPS_D>
105
+    
106
+  </PropertyGroup>
107
+  <PropertyGroup>
108
+    <LinkIncremental>false</LinkIncremental>
109
+  </PropertyGroup>
110
+  <ItemDefinitionGroup>
111
+    <ClCompile>
112
+      <AdditionalIncludeDirectories>$(OTCLIENT_INCLUDES)</AdditionalIncludeDirectories>
113
+      <WarningLevel>Level3</WarningLevel>
114
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
115
+      <WholeProgramOptimization>true</WholeProgramOptimization>
116
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
117
+    </ClCompile>
118
+    <Link>
119
+      <AdditionalDependencies>$(OTCLIENT_LIBDEPS)</AdditionalDependencies>
120
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
121
+      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
122
+      <LargeAddressAware>true</LargeAddressAware>
123
+      <SubSystem>Windows</SubSystem>
124
+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
125
+    </Link>
126
+    <!-- <ResourceCompile>
127
+      <PreprocessorDefinitions>$(PREPROCESSOR_DEFS)</PreprocessorDefinitions>
128
+    </ResourceCompile> -->
129
+  </ItemDefinitionGroup>
130
+  <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
+    
164
+    <BuildMacro Include="PREPROCESSOR_DEFS">
165
+      <Value>$(PREPROCESSOR_DEFS)</Value>
166
+      <EnvironmentVariable>true</EnvironmentVariable>
167
+    </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>
180
+    <BuildMacro Include="OTCLIENT_LIBDEPS">
181
+      <Value>$(OTCLIENT_LIBDEPS)</Value>
182
+      <EnvironmentVariable>true</EnvironmentVariable>
183
+    </BuildMacro>
184
+    <BuildMacro Include="OTCLIENT_LIBDEPS_D">
185
+      <Value>$(OTCLIENT_LIBDEPS_D)</Value>
186
+    </BuildMacro>
187
+  </ItemGroup>
188
+</Project>

Loading…
Cancel
Save