From e495bc10e06eaf8279201b24a6ca4256725f4342 Mon Sep 17 00:00:00 2001
From: mathusummut <mathusum.mut@gmail.com>
Date: Fri, 22 Jun 2018 23:34:33 +0200
Subject: [PATCH] Removed libglest warning

---
 mk/windows/vs2015-32/libglest.vcxproj    | 28 ------------------------
 mk/windows/vs2015-32/libstreflop.vcxproj |  1 -
 mk/windows/vs2015-64/libglest.vcxproj    | 14 ------------
 mk/windows/vs2015-64/libstreflop.vcxproj |  1 -
 mk/windows/vs2017-32/libglest.vcxproj    | 28 ------------------------
 mk/windows/vs2017-32/libstreflop.vcxproj |  1 -
 mk/windows/vs2017-64/libglest.vcxproj    | 14 ------------
 mk/windows/vs2017-64/libstreflop.vcxproj |  1 -
 source/glest_game/world/tileset.cpp      |  1 -
 9 files changed, 89 deletions(-)

diff --git a/mk/windows/vs2015-32/libglest.vcxproj b/mk/windows/vs2015-32/libglest.vcxproj
index b4c16ea8e..b20b9a977 100644
--- a/mk/windows/vs2015-32/libglest.vcxproj
+++ b/mk/windows/vs2015-32/libglest.vcxproj
@@ -136,52 +136,24 @@
     <TargetName>libglest</TargetName>
     <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
-    <Linkage-libjpeg>static</Linkage-libjpeg>
-    <Linkage-curl>static</Linkage-curl>
-    <Linkage-libogg>static</Linkage-libogg>
-    <Linkage-openssl>static</Linkage-openssl>
-    <Linkage-freetype>static</Linkage-freetype>
-    <Linkage-libssh2>static</Linkage-libssh2>
-    <Linkage-glew>static</Linkage-glew>
     <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetName>libglest</TargetName>
     <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
-    <Linkage-libjpeg>static</Linkage-libjpeg>
-    <Linkage-curl>static</Linkage-curl>
-    <Linkage-libogg>static</Linkage-libogg>
-    <Linkage-openssl>static</Linkage-openssl>
-    <Linkage-freetype>static</Linkage-freetype>
-    <Linkage-libssh2>static</Linkage-libssh2>
-    <Linkage-glew>static</Linkage-glew>
     <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>libglest</TargetName>
     <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
-    <Linkage-libjpeg>static</Linkage-libjpeg>
-    <Linkage-curl>static</Linkage-curl>
-    <Linkage-libogg>static</Linkage-libogg>
-    <Linkage-openssl>static</Linkage-openssl>
-    <Linkage-freetype>static</Linkage-freetype>
-    <Linkage-libssh2>static</Linkage-libssh2>
-    <Linkage-glew>static</Linkage-glew>
     <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetName>libglest</TargetName>
     <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
-    <Linkage-libjpeg>static</Linkage-libjpeg>
-    <Linkage-curl>static</Linkage-curl>
-    <Linkage-libogg>static</Linkage-libogg>
-    <Linkage-openssl>static</Linkage-openssl>
-    <Linkage-freetype>static</Linkage-freetype>
-    <Linkage-libssh2>static</Linkage-libssh2>
-    <Linkage-glew>static</Linkage-glew>
     <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">
diff --git a/mk/windows/vs2015-32/libstreflop.vcxproj b/mk/windows/vs2015-32/libstreflop.vcxproj
index cd10c867c..fbe16c3de 100644
--- a/mk/windows/vs2015-32/libstreflop.vcxproj
+++ b/mk/windows/vs2015-32/libstreflop.vcxproj
@@ -83,7 +83,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
diff --git a/mk/windows/vs2015-64/libglest.vcxproj b/mk/windows/vs2015-64/libglest.vcxproj
index 87c39ad04..9d9130695 100644
--- a/mk/windows/vs2015-64/libglest.vcxproj
+++ b/mk/windows/vs2015-64/libglest.vcxproj
@@ -115,26 +115,12 @@
     <TargetName>libglest</TargetName>
     <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
-    <Linkage-libjpeg>static</Linkage-libjpeg>
-    <Linkage-curl>static</Linkage-curl>
-    <Linkage-libogg>static</Linkage-libogg>
-    <Linkage-openssl>static</Linkage-openssl>
-    <Linkage-freetype>static</Linkage-freetype>
-    <Linkage-libssh2>static</Linkage-libssh2>
-    <Linkage-glew>static</Linkage-glew>
     <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>libglest</TargetName>
     <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
-    <Linkage-libjpeg>static</Linkage-libjpeg>
-    <Linkage-curl>static</Linkage-curl>
-    <Linkage-libogg>static</Linkage-libogg>
-    <Linkage-openssl>static</Linkage-openssl>
-    <Linkage-freetype>static</Linkage-freetype>
-    <Linkage-libssh2>static</Linkage-libssh2>
-    <Linkage-glew>static</Linkage-glew>
     <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">
diff --git a/mk/windows/vs2015-64/libstreflop.vcxproj b/mk/windows/vs2015-64/libstreflop.vcxproj
index 1add142b5..aaacceded 100644
--- a/mk/windows/vs2015-64/libstreflop.vcxproj
+++ b/mk/windows/vs2015-64/libstreflop.vcxproj
@@ -66,7 +66,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
diff --git a/mk/windows/vs2017-32/libglest.vcxproj b/mk/windows/vs2017-32/libglest.vcxproj
index 3dcf923fa..b563ca686 100644
--- a/mk/windows/vs2017-32/libglest.vcxproj
+++ b/mk/windows/vs2017-32/libglest.vcxproj
@@ -136,52 +136,24 @@
     <TargetName>libglest</TargetName>
     <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
-    <Linkage-libjpeg>static</Linkage-libjpeg>
-    <Linkage-curl>static</Linkage-curl>
-    <Linkage-libogg>static</Linkage-libogg>
-    <Linkage-openssl>static</Linkage-openssl>
-    <Linkage-freetype>static</Linkage-freetype>
-    <Linkage-libssh2>static</Linkage-libssh2>
-    <Linkage-glew>static</Linkage-glew>
     <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetName>libglest</TargetName>
     <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
-    <Linkage-libjpeg>static</Linkage-libjpeg>
-    <Linkage-curl>static</Linkage-curl>
-    <Linkage-libogg>static</Linkage-libogg>
-    <Linkage-openssl>static</Linkage-openssl>
-    <Linkage-freetype>static</Linkage-freetype>
-    <Linkage-libssh2>static</Linkage-libssh2>
-    <Linkage-glew>static</Linkage-glew>
     <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>libglest</TargetName>
     <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
-    <Linkage-libjpeg>static</Linkage-libjpeg>
-    <Linkage-curl>static</Linkage-curl>
-    <Linkage-libogg>static</Linkage-libogg>
-    <Linkage-openssl>static</Linkage-openssl>
-    <Linkage-freetype>static</Linkage-freetype>
-    <Linkage-libssh2>static</Linkage-libssh2>
-    <Linkage-glew>static</Linkage-glew>
     <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetName>libglest</TargetName>
     <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
-    <Linkage-libjpeg>static</Linkage-libjpeg>
-    <Linkage-curl>static</Linkage-curl>
-    <Linkage-libogg>static</Linkage-libogg>
-    <Linkage-openssl>static</Linkage-openssl>
-    <Linkage-freetype>static</Linkage-freetype>
-    <Linkage-libssh2>static</Linkage-libssh2>
-    <Linkage-glew>static</Linkage-glew>
     <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">
diff --git a/mk/windows/vs2017-32/libstreflop.vcxproj b/mk/windows/vs2017-32/libstreflop.vcxproj
index afec8386c..fff2ba98e 100644
--- a/mk/windows/vs2017-32/libstreflop.vcxproj
+++ b/mk/windows/vs2017-32/libstreflop.vcxproj
@@ -83,7 +83,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
diff --git a/mk/windows/vs2017-64/libglest.vcxproj b/mk/windows/vs2017-64/libglest.vcxproj
index 0f2ae1ec1..f283edd31 100644
--- a/mk/windows/vs2017-64/libglest.vcxproj
+++ b/mk/windows/vs2017-64/libglest.vcxproj
@@ -115,26 +115,12 @@
     <TargetName>libglest</TargetName>
     <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
-    <Linkage-libjpeg>static</Linkage-libjpeg>
-    <Linkage-curl>static</Linkage-curl>
-    <Linkage-libogg>static</Linkage-libogg>
-    <Linkage-openssl>static</Linkage-openssl>
-    <Linkage-freetype>static</Linkage-freetype>
-    <Linkage-libssh2>static</Linkage-libssh2>
-    <Linkage-glew>static</Linkage-glew>
     <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>libglest</TargetName>
     <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
-    <Linkage-libjpeg>static</Linkage-libjpeg>
-    <Linkage-curl>static</Linkage-curl>
-    <Linkage-libogg>static</Linkage-libogg>
-    <Linkage-openssl>static</Linkage-openssl>
-    <Linkage-freetype>static</Linkage-freetype>
-    <Linkage-libssh2>static</Linkage-libssh2>
-    <Linkage-glew>static</Linkage-glew>
     <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">
diff --git a/mk/windows/vs2017-64/libstreflop.vcxproj b/mk/windows/vs2017-64/libstreflop.vcxproj
index a077b2321..7ad80879b 100644
--- a/mk/windows/vs2017-64/libstreflop.vcxproj
+++ b/mk/windows/vs2017-64/libstreflop.vcxproj
@@ -66,7 +66,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
diff --git a/source/glest_game/world/tileset.cpp b/source/glest_game/world/tileset.cpp
index d87f13390..2f816d8e3 100644
--- a/source/glest_game/world/tileset.cpp
+++ b/source/glest_game/world/tileset.cpp
@@ -29,7 +29,6 @@ using namespace Shared::Graphics;
 
 namespace Glest {
 	namespace Game {
-
 		const float Tileset::standardAirHeight = 5.0f;
 		const float Tileset::standardShadowIntensity = 0.2f;
 		// =====================================================