mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-23 00:12:49 +02:00
Code Issues Projects Releases Wiki Activity

Fixed issue with VS2017-32

Browse Source
This commit is contained in:
mathusummut
2018-03-16 01:17:19 +01:00
parent 4d74c52baa
commit 90b0872f3a
9 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mk/windows/README.md
View File

@@ -15,18 +15,14 @@ Configuration in Visual Studio must be left as "Release", otherwise it won't com
Debug: Debug:
Optimization=Disabled
Inline Function Expansion: Disabled Inline Function Expansion: Disabled
Enable Intrinsic Functions: No Enable Intrinsic Functions: No
Favor Size Or Speed: Neither Favor Size Or Speed: Neither
Preprocessor: DEBUG instead of NDEBUG Preprocessor: DEBUG instead of NDEBUG
Code Generation->Basic Runtime Checks: Both
Release: Release:
Optimization=Full
Inline Function Expansion: Any Suitable Inline Function Expansion: Any Suitable
Enable Intrinsic Functions: Yes Enable Intrinsic Functions: Yes
Favor Size Or Speed: Favor fast code Favor Size Or Speed: Favor fast code
Preprocessor: NDEBUG instead of DEBUG Preprocessor: NDEBUG instead of DEBUG
Code Generation->Basic Runtime Checks: Default

4
mk/windows/vs2015-32/glest_game.vcxproj
View File

@@ -464,7 +464,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion> <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions> <IntrinsicFunctions>false</IntrinsicFunctions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
@@ -486,7 +486,7 @@
<DisableSpecificWarnings>4996;4018;4244;4250;4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4018;4244;4250;4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;turbojpeg-static.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;turbojpeg-static.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

@@ -389,7 +389,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion> <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions> <IntrinsicFunctions>false</IntrinsicFunctions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
@@ -410,7 +410,7 @@
<DisableSpecificWarnings>4996;4250;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4250;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile> </ClCompile>
<Lib> <Lib>
<AdditionalDependencies>libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
mk/windows/vs2015-64/glest_game.vcxproj
View File

@@ -378,7 +378,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion> <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions> <IntrinsicFunctions>false</IntrinsicFunctions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
@@ -400,7 +400,7 @@
<DisableSpecificWarnings>4996;4018;4244;4250;4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4018;4244;4250;4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;turbojpeg-static.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;turbojpeg-static.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

@@ -299,7 +299,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion> <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions> <IntrinsicFunctions>false</IntrinsicFunctions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
@@ -320,7 +320,7 @@
<DisableSpecificWarnings>4996;4250;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4250;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile> </ClCompile>
<Lib> <Lib>
<AdditionalDependencies>libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
mk/windows/vs2017-32/glest_game.vcxproj
View File

@@ -464,7 +464,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion> <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions> <IntrinsicFunctions>false</IntrinsicFunctions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
@@ -486,7 +486,7 @@
<DisableSpecificWarnings>4996;4018;4244;4250;4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4018;4244;4250;4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;turbojpeg-static.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;turbojpeg-static.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

@@ -392,7 +392,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion> <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions> <IntrinsicFunctions>false</IntrinsicFunctions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
@@ -413,7 +413,7 @@
<DisableSpecificWarnings>4996;4250;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4250;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile> </ClCompile>
<Lib> <Lib>
<AdditionalDependencies>libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies)</AdditionalDependencies>

4
mk/windows/vs2017-64/glest_game.vcxproj
View File

@@ -378,7 +378,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion> <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions> <IntrinsicFunctions>false</IntrinsicFunctions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
@@ -400,7 +400,7 @@
<DisableSpecificWarnings>4996;4018;4244;4250;4503;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4996;4018;4244;4250;4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;turbojpeg-static.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;turbojpeg-static.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

@@ -299,7 +299,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion> <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions> <IntrinsicFunctions>false</IntrinsicFunctions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>