Browse Source

Upgrade vcxproj + fix path to OpenAL from vcpkg

Daniel Speichert 1 year ago
parent
commit
271790d22e
3 changed files with 24 additions and 8 deletions
  1. 2
    0
      .gitignore
  2. 2
    2
      src/framework/sound/declarations.h
  3. 20
    6
      vc14/otclient.vcxproj

+ 2
- 0
.gitignore View File

@@ -39,6 +39,8 @@ Thumbs.db
39 39
 .directory
40 40
 src/framework/graphics/dx/
41 41
 modules/.project/modules.sublime-workspace
42
+vc14/.vs/
43
+*.dll
42 44
 
43 45
 #################
44 46
 ## Visual Studio

+ 2
- 2
src/framework/sound/declarations.h View File

@@ -27,8 +27,8 @@
27 27
 
28 28
 #define AL_LIBTYPE_STATIC
29 29
 
30
-#include <al.h>
31
-#include <alc.h>
30
+#include <AL/al.h>
31
+#include <AL/alc.h>
32 32
 
33 33
 class SoundManager;
34 34
 class SoundSource;

+ 20
- 6
vc14/otclient.vcxproj View File

@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
   <ItemGroup Label="ProjectConfigurations">
4 4
     <ProjectConfiguration Include="Debug|Win32">
5 5
       <Configuration>Debug</Configuration>
@@ -22,27 +22,28 @@
22 22
     <Keyword>Win32Proj</Keyword>
23 23
     <ProjectGuid>{17A8F78F-1FFB-4128-A3B3-59CC6C19D89A}</ProjectGuid>
24 24
     <RootNamespace>otclient</RootNamespace>
25
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
25 26
   </PropertyGroup>
26 27
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27 28
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
28 29
     <ConfigurationType>Application</ConfigurationType>
29 30
     <UseDebugLibraries>true</UseDebugLibraries>
30
-    <PlatformToolset>v140</PlatformToolset>
31
+    <PlatformToolset>v141</PlatformToolset>
31 32
   </PropertyGroup>
32 33
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 34
     <ConfigurationType>Application</ConfigurationType>
34 35
     <UseDebugLibraries>true</UseDebugLibraries>
35
-    <PlatformToolset>v140</PlatformToolset>
36
+    <PlatformToolset>v141</PlatformToolset>
36 37
   </PropertyGroup>
37 38
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38 39
     <ConfigurationType>Application</ConfigurationType>
39 40
     <UseDebugLibraries>false</UseDebugLibraries>
40
-    <PlatformToolset>v140</PlatformToolset>
41
+    <PlatformToolset>v141</PlatformToolset>
41 42
   </PropertyGroup>
42 43
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
43 44
     <ConfigurationType>Application</ConfigurationType>
44 45
     <UseDebugLibraries>false</UseDebugLibraries>
45
-    <PlatformToolset>v140</PlatformToolset>
46
+    <PlatformToolset>v141</PlatformToolset>
46 47
   </PropertyGroup>
47 48
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
48 49
   <ImportGroup Label="ExtensionSettings">
@@ -74,8 +75,11 @@
74 75
   <PropertyGroup Label="UserMacros" />
75 76
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
76 77
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../src;</IncludePath>
78
+    <SourcePath>$(VC_SourcePath);$(ProjectDir)../src;</SourcePath>
79
+  </PropertyGroup>
80
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
81
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../src;</IncludePath>
77 82
   </PropertyGroup>
78
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
79 83
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
80 84
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../src;</IncludePath>
81 85
   </PropertyGroup>
@@ -87,6 +91,7 @@
87 91
       <PreprocessorDefinitions>$(PREPROCESSOR_DEFS);_SCL_SECURE_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
88 92
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
89 93
       <Optimization>Disabled</Optimization>
94
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
90 95
     </ClCompile>
91 96
     <Link>
92 97
       <TargetMachine>MachineX86</TargetMachine>
@@ -97,6 +102,7 @@
97 102
     <ClCompile>
98 103
       <PreprocessorDefinitions>$(PREPROCESSOR_DEFS);_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
99 104
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
105
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
100 106
     </ClCompile>
101 107
     <Link>
102 108
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -106,6 +112,10 @@
106 112
     <ClCompile>
107 113
       <PreprocessorDefinitions>$(PREPROCESSOR_DEFS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
108 114
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
115
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
116
+      <Optimization>MaxSpeed</Optimization>
117
+      <IntrinsicFunctions>true</IntrinsicFunctions>
118
+      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
109 119
     </ClCompile>
110 120
     <Link>
111 121
       <TargetMachine>MachineX86</TargetMachine>
@@ -120,6 +130,10 @@
120 130
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
121 131
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
122 132
       <WarningLevel>Level4</WarningLevel>
133
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
134
+      <Optimization>MaxSpeed</Optimization>
135
+      <IntrinsicFunctions>true</IntrinsicFunctions>
136
+      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
123 137
     </ClCompile>
124 138
     <Link>
125 139
       <GenerateDebugInformation>true</GenerateDebugInformation>

Loading…
Cancel
Save