zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-23 20:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- upgraded code base to C++17.

Browse source 
Mainly to allow using 'if constexpr'.
Older CI compiler setups like GCC 5 for Linux were removed as a consequence.
Windows 32 bit was also removed because there are no plans to do any more 32 bit releases of GZDoom.
This commit is contained in:
Christoph Oelckers 2020-10-17 11:39:59 +02:00
parent a89afe61f2
commit d6e962c91e
4 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/continuous_integration.yml vendored
View file

@ -22,12 +22,6 @@ jobs:
extra_options: "-A x64",
build_type: "Debug"
}
- {
name: "Visual Studio 32-bit",
os: windows-latest,
extra_options: "-A Win32 -DFORCE_INTERNAL_ZLIB=ON",
build_type: "Release"
}
- {
name: "macOS",
os: macos-latest,
@ -40,14 +34,6 @@ jobs:
os: macos-latest,
build_type: "Debug"
}
- {
name: "Linux GCC 5",
os: ubuntu-latest,
extra_options: "-DCMAKE_C_COMPILER=/usr/bin/gcc-5 -DCMAKE_CXX_COMPILER=/usr/bin/g++-5 \
-DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF",
deps_cmdline: "sudo apt update && sudo apt install g++-5 libsdl2-dev libopenal-dev libfluidsynth-dev libmpg123-dev libsndfile1-dev",
build_type: "MinSizeRel"
}
- {
name: "Linux GCC 7",
os: ubuntu-latest,

7
CMakeLists.txt
View file

@ -1,6 +1,11 @@
cmake_minimum_required( VERSION 2.8.7 )
cmake_minimum_required( VERSION 3.1.0 )
project(GZDoom)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
if( COMMAND cmake_policy )
if( POLICY CMP0011 )
cmake_policy( SET CMP0011 NEW )

2
src/common/engine/sc_man.cpp
View file

@ -1247,7 +1247,7 @@ void FScanner::AddSymbol(const char* name, uint64_t value)
Symbol sym;
sym.tokenType = TK_UIntConst;
sym.Number = value;
sym.Float = value;
sym.Float = (double)value;
symbols.Insert(name, sym);
}

4
src/playsim/fragglescript/t_func.cpp
View file

@ -1879,7 +1879,7 @@ void FParser::SF_FloorTexture(void)
t_return.type = svt_string;
auto tex = TexMan.GetGameTexture(sector->GetTexture(sector_t::floor));
t_return.string = tex? tex->GetName() : "";
t_return.string = tex? tex->GetName() : FString();
}
}
@ -1969,7 +1969,7 @@ void FParser::SF_CeilingTexture(void)
t_return.type = svt_string;
auto tex = TexMan.GetGameTexture(sector->GetTexture(sector_t::ceiling));
t_return.string = tex? tex->GetName() : "";
t_return.string = tex? tex->GetName() : FString();
}
}