From 35675555986703e9250d111515d54fbb4c05d36b Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 22 May 2016 01:04:21 -0400
Subject: [PATCH] MSVC: cleanup and enable SDLCheck

---
 SRB2_common.props           |  2 +-
 SRB2_x86.props              | 10 ----------
 libs/SDL2_common.props      |  2 +-
 libs/SDL_mixer_common.props |  2 +-
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/SRB2_common.props b/SRB2_common.props
index 775816bea..d8bbf5ab2 100644
--- a/SRB2_common.props
+++ b/SRB2_common.props
@@ -15,7 +15,7 @@
       <BrowseInformation>true</BrowseInformation>
       <TreatWarningAsError>true</TreatWarningAsError>
       <EnablePREfast>false</EnablePREfast>
-      <SDLCheck>false</SDLCheck>
+      <SDLCheck>true</SDLCheck>
       <DisableSpecificWarnings>4244;4267</DisableSpecificWarnings>
     </ClCompile>
     <Link>
diff --git a/SRB2_x86.props b/SRB2_x86.props
index 34c953745..0ba9d6078 100644
--- a/SRB2_x86.props
+++ b/SRB2_x86.props
@@ -7,16 +7,6 @@
     <ClCompile>
       <PreprocessorDefinitions>USEASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <CustomBuild />
-    <CustomBuild />
-    <CustomBuild />
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <CustomBuildStep />
-    <CustomBuildStep />
-    <CustomBuildStep />
     <Link>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
diff --git a/libs/SDL2_common.props b/libs/SDL2_common.props
index 645c5e358..5234554fc 100644
--- a/libs/SDL2_common.props
+++ b/libs/SDL2_common.props
@@ -4,7 +4,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <IncludePath>$(SolutionDir)libs\SDL2\include;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\libs\SDL2\lib\$(PlatformTarget);$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)libs\SDL2\lib\$(PlatformTarget);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
diff --git a/libs/SDL_mixer_common.props b/libs/SDL_mixer_common.props
index e81233248..0ec482479 100644
--- a/libs/SDL_mixer_common.props
+++ b/libs/SDL_mixer_common.props
@@ -4,7 +4,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <IncludePath>$(SolutionDir)libs\SDL2_mixer\include;$(IncludePath)</IncludePath>
-	<LibraryPath>..\..\libs\SDL2_mixer\lib\$(PlatformTarget);$(LibraryPath)</LibraryPath>
+	<LibraryPath>$(SolutionDir)libs\SDL2_mixer\lib\$(PlatformTarget);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>