mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 05:23:04 +01:00
Code Issues Releases Wiki Activity

Start Simplifying CMake code (#24177)

Browse Source 
* Use generator expressions

* Update cmake minimum

* Move options and remove project name

* Use further generator expressions

* Try upgrading to CMake 3.25 on Ubuntu 22.04 CI

Install software-properties-common

* Standardise with DISABLE_TTF for disable defines

* Set X64 var differently due to unknown reasons

---------

Co-authored-by: Michael Steenbeek <1478678+Gymnasiast@users.noreply.github.com>
This commit is contained in:
Duncan
2025-04-11 16:09:52 +01:00
committed by GitHub
parent 87765d662d
commit d5de6c2b49
26 changed files with 177 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/interface/InteractiveConsole.cpp
View File

@@ -78,7 +78,7 @@
#include <thread>
#include <vector>
#ifndef NO_TTF
#ifndef DISABLE_TTF
#include "../drawing/TTF.h"
#endif
@@ -722,7 +722,7 @@ static void ConsoleCommandGet(InteractiveConsole& console, const arguments_t& ar
{
console.WriteFormatLine("host_timescale %.02f", OpenRCT2::GetContext()->GetTimeScale());
}
#ifndef NO_TTF
#ifndef DISABLE_TTF
else if (argv[0] == "enable_hinting")
{
console.WriteFormatLine("enable_hinting %d", Config::Get().fonts.EnableHinting);
@@ -1003,7 +1003,7 @@ static void ConsoleCommandSet(InteractiveConsole& console, const arguments_t& ar
console.Execute("get host_timescale");
}
#ifndef NO_TTF
#ifndef DISABLE_TTF
else if (varName == "enable_hinting" && InvalidArguments(&invalidArgs, int_valid[0]))
{
Config::Get().fonts.EnableHinting = (int_val[0] != 0);