mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-02 04:22:32 +02:00
Code Issues Projects Releases Wiki Activity

Removed libglest warning

Browse Source
This commit is contained in:
mathusummut
2018-06-22 23:34:33 +02:00
parent b14a23f2d7
commit e495bc10e0
9 changed files with 0 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mk/windows/vs2015-32/libglest.vcxproj
View File

@@ -136,52 +136,24 @@
<TargetName>libglest</TargetName> <TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir> <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> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>libglest</TargetName> <TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir> <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> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>libglest</TargetName> <TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir> <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> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>libglest</TargetName> <TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir> <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> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">

1
mk/windows/vs2015-32/libstreflop.vcxproj
View File

@@ -83,7 +83,6 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" /> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <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" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

14
mk/windows/vs2015-64/libglest.vcxproj
View File

@@ -115,26 +115,12 @@
<TargetName>libglest</TargetName> <TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir> <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> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>libglest</TargetName> <TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir> <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> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">

1
mk/windows/vs2015-64/libstreflop.vcxproj
View File

@@ -66,7 +66,6 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" /> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <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" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

28
mk/windows/vs2017-32/libglest.vcxproj
View File

@@ -136,52 +136,24 @@
<TargetName>libglest</TargetName> <TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir> <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> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>libglest</TargetName> <TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir> <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> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>libglest</TargetName> <TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir> <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> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>libglest</TargetName> <TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir> <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> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">

1
mk/windows/vs2017-32/libstreflop.vcxproj
View File

@@ -83,7 +83,6 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" /> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <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" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

14
mk/windows/vs2017-64/libglest.vcxproj
View File

@@ -115,26 +115,12 @@
<TargetName>libglest</TargetName> <TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir> <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> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>libglest</TargetName> <TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir> <OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir> <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> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">

1
mk/windows/vs2017-64/libstreflop.vcxproj
View File

@@ -66,7 +66,6 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" /> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <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" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

1
source/glest_game/world/tileset.cpp
View File

@@ -29,7 +29,6 @@ using namespace Shared::Graphics;
namespace Glest { namespace Glest {
namespace Game { namespace Game {
const float Tileset::standardAirHeight = 5.0f; const float Tileset::standardAirHeight = 5.0f;
const float Tileset::standardShadowIntensity = 0.2f; const float Tileset::standardShadowIntensity = 0.2f;
// ===================================================== // =====================================================