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

Disabled streflop

Browse Source
This commit is contained in:
mathusummut
2018-09-25 20:24:38 +02:00
parent 3819da6d0b
commit c04e75e19c
21 changed files with 31 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -40,8 +40,8 @@ OPTION(BUILD_ZETAGLEST_TESTS "Build ZetaGlest Unit Tests" OFF)
OPTION(WANT_STATIC_LIBS "Builds as many static libs as possible." OFF)
OPTION(WANT_USE_OpenSSL "Use libOpenSSL during CURL linking." ON)
OPTION(WANT_USE_FriBiDi "Enable libFriBIDi support." ON)
OPTION(WANT_USE_GoogleBreakpad "Enable GoogleBreakpad support." ON)
OPTION(WANT_USE_STREFLOP "Use the library streflop." ON)
OPTION(WANT_USE_GoogleBreakpad "Enable GoogleBreakpad support." OFF)
OPTION(WANT_USE_STREFLOP "Use the library streflop." OFF)
OPTION(WANT_USE_XercesC "Enable libXercesC support." OFF)
include(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/SpecialMacros.cmake)

8
mk/windows/vs2015-32/ZetaGlest.sln
View File

@@ -7,8 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzetaglest", "libzetagles
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.vcxproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g2xml", "g2xml.vcxproj", "{407355A4-D12A-4E3B-A7EB-A835E573B376}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dviewer", "g3dviewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
@@ -34,12 +32,6 @@ Global
{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|x64.Build.0 = Release|x64
{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|x86.ActiveCfg = Release|Win32
{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|x86.Build.0 = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|Win32.ActiveCfg = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|Win32.Build.0 = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|x64.ActiveCfg = Release|x64
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|x64.Build.0 = Release|x64
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|x86.ActiveCfg = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|x86.Build.0 = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release|Win32.ActiveCfg = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release|Win32.Build.0 = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release|x64.ActiveCfg = Release|x64

11
mk/windows/vs2015-32/libzetaglest.vcxproj
View File

@@ -361,7 +361,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/sources/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\fribidi;..\dependencies\include;..\dependencies\src\fribidi\vs2015-32;..\dependencies\src\fribidi\vs2015-32\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -576,7 +576,7 @@
<ClCompile Include="..\..\..\source\shared_lib\sources\graphics\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\graphics\gl\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\map\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\miniz\*.c" />
<ClCompile Include="..\..\..\source\shared_lib\sources\miniz\*.c" />
<ClCompile Include="..\..\..\source\shared_lib\sources\lua\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\util\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\xml\*.cpp" />
@@ -613,12 +613,7 @@
<ClInclude Include="..\..\..\source\shared_lib\include\platform\sdl\thread.h" />
<ClInclude Include="..\..\..\source\shared_lib\include\platform\sdl\window.h" />
<ClInclude Include="..\..\..\source\shared_lib\include\platform\sdl\window_gl.h" />
<ClInclude Include="..\..\..\source\shared_lib\sources\miniz\*.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libstreflop.vcxproj">
<Project>{cdf4ddb9-945e-4d0d-9f0e-2bbeb5d22141}</Project>
</ProjectReference>
<ClInclude Include="..\..\..\source\shared_lib\sources\miniz\*.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>

2
mk/windows/vs2015-32/zetaglest.vcxproj
View File

@@ -472,7 +472,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

10
mk/windows/vs2015-64/ZetaGlest.sln
View File

@@ -7,8 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzetaglest", "libzetagles
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.vcxproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map_editor", "map_editor.vcxproj", "{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}"
@@ -39,14 +37,6 @@ Global
{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|Win32.Build.0 = Release|Win32
{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|x64.ActiveCfg = Release|x64
{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|x64.Build.0 = Release|x64
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Debug|Win32.ActiveCfg = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Debug|Win32.Build.0 = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Debug|x64.ActiveCfg = Release|x64
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Debug|x64.Build.0 = Release|x64
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|Win32.ActiveCfg = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|Win32.Build.0 = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|x64.ActiveCfg = Release|x64
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|x64.Build.0 = Release|x64
{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Debug|Win32.ActiveCfg = Release|Win32
{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Debug|Win32.Build.0 = Release|Win32
{FE5C7C7C-F109-44F5-8329-25A4E24F162C}.Debug|x64.ActiveCfg = Release|x64

11
mk/windows/vs2015-64/libzetaglest.vcxproj
View File

@@ -288,7 +288,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/sources/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\fribidi;..\dependencies\include;..\dependencies\src\fribidi\vs2015-64;..\dependencies\src\fribidi\vs2015-64\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -425,7 +425,7 @@
<ClCompile Include="..\..\..\source\shared_lib\sources\graphics\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\graphics\gl\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\map\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\miniz\*.c" />
<ClCompile Include="..\..\..\source\shared_lib\sources\miniz\*.c" />
<ClCompile Include="..\..\..\source\shared_lib\sources\lua\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\util\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\xml\*.cpp" />
@@ -462,12 +462,7 @@
<ClInclude Include="..\..\..\source\shared_lib\include\platform\sdl\thread.h" />
<ClInclude Include="..\..\..\source\shared_lib\include\platform\sdl\window.h" />
<ClInclude Include="..\..\..\source\shared_lib\include\platform\sdl\window_gl.h" />
<ClInclude Include="..\..\..\source\shared_lib\sources\miniz\*.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libstreflop.vcxproj">
<Project>{cdf4ddb9-945e-4d0d-9f0e-2bbeb5d22141}</Project>
</ProjectReference>
<ClInclude Include="..\..\..\source\shared_lib\sources\miniz\*.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>

2
mk/windows/vs2015-64/zetaglest.vcxproj
View File

@@ -386,7 +386,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

8
mk/windows/vs2017-32/ZetaGlest.sln
View File

@@ -7,8 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzetaglest", "libzetagles
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.vcxproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g2xml", "g2xml.vcxproj", "{407355A4-D12A-4E3B-A7EB-A835E573B376}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dviewer", "g3dviewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
@@ -34,12 +32,6 @@ Global
{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|x64.Build.0 = Release|x64
{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|x86.ActiveCfg = Release|Win32
{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|x86.Build.0 = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|Win32.ActiveCfg = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|Win32.Build.0 = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|x64.ActiveCfg = Release|x64
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|x64.Build.0 = Release|x64
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|x86.ActiveCfg = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|x86.Build.0 = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release|Win32.ActiveCfg = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release|Win32.Build.0 = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release|x64.ActiveCfg = Release|x64

11
mk/windows/vs2017-32/libzetaglest.vcxproj
View File

@@ -364,7 +364,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/sources/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../dependencies/src/vlc/include;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;../dependencies/src/fribidi/;..\dependencies\src\fribidi\vs2017-32;..\dependencies\src\fribidi\vs2017-32\lib;..\dependencies\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;USE_STREFLOP;WIN32;AL_LIBTYPE_STATIC;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;AL_LIBTYPE_STATIC;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -582,7 +582,7 @@
<ClCompile Include="..\..\..\source\shared_lib\sources\graphics\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\graphics\gl\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\map\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\miniz\*.c" />
<ClCompile Include="..\..\..\source\shared_lib\sources\miniz\*.c" />
<ClCompile Include="..\..\..\source\shared_lib\sources\lua\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\util\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\xml\*.cpp" />
@@ -619,12 +619,7 @@
<ClInclude Include="..\..\..\source\shared_lib\include\platform\sdl\thread.h" />
<ClInclude Include="..\..\..\source\shared_lib\include\platform\sdl\window.h" />
<ClInclude Include="..\..\..\source\shared_lib\include\platform\sdl\window_gl.h" />
<ClInclude Include="..\..\..\source\shared_lib\sources\miniz\*.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libstreflop.vcxproj">
<Project>{cdf4ddb9-945e-4d0d-9f0e-2bbeb5d22141}</Project>
</ProjectReference>
<ClInclude Include="..\..\..\source\shared_lib\sources\miniz\*.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>

2
mk/windows/vs2017-32/zetaglest.vcxproj
View File

@@ -472,7 +472,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>NDEBUG;USE_STREFLOP;WIN32;AL_LIBTYPE_STATIC;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;AL_LIBTYPE_STATIC;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

6
mk/windows/vs2017-64/ZetaGlest.sln
View File

@@ -7,8 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzetaglest", "libzetagles
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.vcxproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g2xml", "g2xml.vcxproj", "{407355A4-D12A-4E3B-A7EB-A835E573B376}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
@@ -29,10 +27,6 @@ Global
{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|Win32.Build.0 = Release|Win32
{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|x64.ActiveCfg = Release|x64
{6B0C65F1-D031-46AF-AC0D-7C38892D2952}.Release|x64.Build.0 = Release|x64
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|Win32.ActiveCfg = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|Win32.Build.0 = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|x64.ActiveCfg = Release|x64
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release|x64.Build.0 = Release|x64
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release|Win32.ActiveCfg = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release|Win32.Build.0 = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release|x64.ActiveCfg = Release|x64

11
mk/windows/vs2017-64/libzetaglest.vcxproj
View File

@@ -288,7 +288,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/sources/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../dependencies/src/vlc/include;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;../dependencies/src/fribidi/;..\dependencies\src\fribidi\vs2017-64;..\dependencies\src\fribidi\vs2017-64\lib;..\dependencies\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;USE_STREFLOP;WIN32;AL_LIBTYPE_STATIC;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;AL_LIBTYPE_STATIC;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -428,7 +428,7 @@
<ClCompile Include="..\..\..\source\shared_lib\sources\graphics\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\graphics\gl\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\map\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\miniz\*.c" />
<ClCompile Include="..\..\..\source\shared_lib\sources\miniz\*.c" />
<ClCompile Include="..\..\..\source\shared_lib\sources\lua\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\util\*.cpp" />
<ClCompile Include="..\..\..\source\shared_lib\sources\xml\*.cpp" />
@@ -465,12 +465,7 @@
<ClInclude Include="..\..\..\source\shared_lib\include\platform\sdl\thread.h" />
<ClInclude Include="..\..\..\source\shared_lib\include\platform\sdl\window.h" />
<ClInclude Include="..\..\..\source\shared_lib\include\platform\sdl\window_gl.h" />
<ClInclude Include="..\..\..\source\shared_lib\sources\miniz\*.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libstreflop.vcxproj">
<Project>{cdf4ddb9-945e-4d0d-9f0e-2bbeb5d22141}</Project>
</ProjectReference>
<ClInclude Include="..\..\..\source\shared_lib\sources\miniz\*.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>

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

@@ -386,7 +386,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>NDEBUG;USE_STREFLOP;WIN32;AL_LIBTYPE_STATIC;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;WIN32;AL_LIBTYPE_STATIC;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

2
source/glest_game/main/program.cpp
View File

@@ -1324,7 +1324,7 @@ namespace Glest {
config.getInt("DepthBits"),
config.getInt("StencilBits"),
config.getBool("HardwareAcceleration", "false"),
config.getBool("FullScreenAntiAliasing", "false"),
config.getBool("FullScreenAntiAliasing", "0"),
config.getFloat("GammaValue", "0.0"));
window->setText(config.getString("WindowTitle", "ZetaGlest"));
if (SystemFlags::

2
source/shared_lib/include/platform/sdl/gl_wrap.h
View File

@@ -64,7 +64,7 @@ namespace Shared {
virtual ~PlatformContextGl();
virtual void init(int colorBits, int depthBits, int stencilBits,
bool hardware_acceleration, bool fullscreen_anti_aliasing,
bool hardware_acceleration, int8 fullscreen_anti_aliasing,
float gammaValue);
virtual void end();

4
source/shared_lib/include/platform/sdl/window.h
View File

@@ -160,7 +160,7 @@ namespace Shared {
static bool isKeyDown() {
return isKeyPressedDown;
}
static void setupGraphicsScreen(int depthBits = -1, int stencilBits = -1, bool hardware_acceleration = false, bool fullscreen_anti_aliasing = false);
static void setupGraphicsScreen(int depthBits = -1, int stencilBits = -1, bool hardware_acceleration = false, int8 fullscreen_anti_aliasing = 0);
static const bool getIsFullScreen() {
return isFullScreen;
}
@@ -184,7 +184,7 @@ namespace Shared {
virtual bool ChangeVideoMode(bool preserveContext, int resWidth, int resHeight,
bool fullscreenWindow, int colorBits, int depthBits, int stencilBits,
bool hardware_acceleration, bool fullscreen_anti_aliasing,
bool hardware_acceleration, int8 fullscreen_anti_aliasing,
float gammaValue) = 0;
//static void setMasterserverMode(bool value) { Window::masterserverMode = value;}
//static bool getMasterserverMode() { return Window::masterserverMode;}

4
source/shared_lib/include/platform/sdl/window_gl.h
View File

@@ -36,7 +36,7 @@ namespace Shared {
virtual ~WindowGl();
void initGl(int colorBits, int depthBits, int stencilBits,
bool hardware_acceleration, bool fullscreen_anti_aliasing,
bool hardware_acceleration, int8 fullscreen_anti_aliasing,
float gammaValue);
void makeCurrentGl();
void swapBuffersGl();
@@ -55,7 +55,7 @@ namespace Shared {
virtual bool ChangeVideoMode(bool preserveContext, int resWidth, int resHeight,
bool fullscreenWindow, int colorBits, int depthBits, int stencilBits,
bool hardware_acceleration, bool fullscreen_anti_aliasing,
bool hardware_acceleration, int8 fullscreen_anti_aliasing,
float gammaValue);
protected:

2
source/shared_lib/sources/graphics/gl/context_gl.cpp
View File

@@ -36,7 +36,7 @@ namespace Shared {
void ContextGl::init() {
pcgl.init(colorBits, depthBits, stencilBits,
(hardware_acceleration != 0), (fullscreen_anti_aliasing != 0),
(hardware_acceleration != 0), fullscreen_anti_aliasing,
gammaValue);
}

2
source/shared_lib/sources/platform/sdl/gl_wrap.cpp
View File

@@ -67,7 +67,7 @@ namespace Shared {
void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,
bool hardware_acceleration,
bool fullscreen_anti_aliasing, float gammaValue) {
int8 fullscreen_anti_aliasing, float gammaValue) {
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__);
if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, "In [%s::%s Line: %d]\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__);

6
source/shared_lib/sources/platform/sdl/window.cpp
View File

@@ -574,7 +574,7 @@ namespace Shared {
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__);
}
void Window::setupGraphicsScreen(int depthBits, int stencilBits, bool hardware_acceleration, bool fullscreen_anti_aliasing) {
void Window::setupGraphicsScreen(int depthBits, int stencilBits, bool hardware_acceleration, int8 fullscreen_anti_aliasing) {
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__);
static int newDepthBits = depthBits;
@@ -589,9 +589,9 @@ namespace Shared {
if (GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false) {
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d]\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__);
if (fullscreen_anti_aliasing == true) {
if (fullscreen_anti_aliasing > 0) {
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 2);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, fullscreen_anti_aliasing == 1 ? 2 : fullscreen_anti_aliasing);
}
if (hardware_acceleration == true) {
SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);

4
source/shared_lib/sources/platform/sdl/window_gl.cpp
View File

@@ -75,7 +75,7 @@ namespace Shared {
}
void WindowGl::initGl(int colorBits, int depthBits, int stencilBits,
bool hardware_acceleration, bool fullscreen_anti_aliasing,
bool hardware_acceleration, int8 fullscreen_anti_aliasing,
float gammaValue) {
context.setColorBits(colorBits);
context.setDepthBits(depthBits);
@@ -131,7 +131,7 @@ namespace Shared {
bool WindowGl::ChangeVideoMode(bool preserveContext, int resWidth, int resHeight,
bool fullscreenWindow,
int colorBits, int depthBits, int stencilBits, bool hardware_acceleration,
bool fullscreen_anti_aliasing, float gammaValue) {
int8 fullscreen_anti_aliasing, float gammaValue) {
if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s %d] preserveContext = %d\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, preserveContext);
#ifdef WIN32