VS 2015 setup.

extra-a · Jan 14, 2016 · e5fdd23 · e5fdd23
1 parent 8fd2242
commit e5fdd23
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,6 @@ vcpp/sauerbraten.vcxproj.user
 vcpp/Debug/
 vcpp/Release/
 vcpp/ipch
-vcpp/sauerbraten.v12.suo
+vcpp/*.suo
+vcpp/.vs
+vcpp/*.opendb
diff --git a/engine/main.cpp b/engine/main.cpp
@@ -532,7 +532,7 @@ void clearcontrollerids() {
     selectedpad = -1;
 }
 
-void initgamecontrollers(bool enable) {
+void initgamecontrollers(int enable) {
     resetpaddata();
     clearcontrollerids();
     if(ngamecontrollers && gamecontrollers) {
@@ -698,7 +698,7 @@ void rumblehaptics(int mode, int power, int duration) {
     }
 }
 
-void inithaptics(bool enable) {
+void inithaptics(int enable) {
     if(nhaptics && haptics) {
         hapticsnames.deletearrays();
         loopi(nhaptics) {
@@ -2340,7 +2340,7 @@ int gameloop (void* p)
     inputgrab(grabinput = true);
     ignoremousemotion();
 
-    conoutf("\f0Sauerbraten SDL2 Client\f1 Version 2.2.2");
+    conoutf("\f0Sauerbraten SDL2 Client\f1 Version 2.3.0");
 
     ullong prevcycletime = 0;
     for(;;)

diff --git a/vcpp/sauerbraten.vcxproj b/vcpp/sauerbraten.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="https://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -38,26 +38,27 @@
     <ProjectName>sauerbraten</ProjectName>
     <ProjectGuid>{06594C6D-6DA9-49DC-9A91-8F47221DDCFD}</ProjectGuid>
     <RootNamespace>sauerbraten</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>	
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -71,21 +72,21 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>	
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Template|x64'">
     <PlatformToolset>Windows7.1SDK</PlatformToolset>
-  </PropertyGroup>  
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -1220,4 +1221,4 @@
       <UserProperties DevPartner_IsInstrumented="0" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
diff --git a/vcpp/sauerbraten.vcxproj.filters b/vcpp/sauerbraten.vcxproj.filters
@@ -255,6 +255,9 @@
     <ClInclude Include="..\engine\sdl2_keymap_extrakeys.h">
       <Filter>engine</Filter>
     </ClInclude>
+    <ClInclude Include="..\engine\controllerdb.h">
+      <Filter>engine</Filter>
+    </ClInclude>
     <ClInclude Include="..\engine\skelmodel.h">
       <Filter>engine</Filter>
     </ClInclude>
@@ -313,4 +316,3 @@
     </Filter>
   </ItemGroup>
 </Project>
-