mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2026-01-23 23:04:36 +01:00
Start Simplifying CMake code (#24177)
* 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:
@@ -28,9 +28,9 @@
|
||||
// for PATH_MAX
|
||||
#include <linux/limits.h>
|
||||
#endif // __linux__
|
||||
#ifndef NO_TTF
|
||||
#ifndef DISABLE_TTF
|
||||
#include <fontconfig/fontconfig.h>
|
||||
#endif // NO_TTF
|
||||
#endif // DISABLE_TTF
|
||||
|
||||
#include "../Date.h"
|
||||
#include "../OpenRCT2.h"
|
||||
@@ -387,7 +387,7 @@ namespace OpenRCT2::Platform
|
||||
};
|
||||
}
|
||||
|
||||
#ifndef NO_TTF
|
||||
#ifndef DISABLE_TTF
|
||||
std::string GetFontPath(const TTFFontDescriptor& font)
|
||||
{
|
||||
// set LANG to portable C.UTF-8 so font face names from fontconfig
|
||||
@@ -448,7 +448,7 @@ namespace OpenRCT2::Platform
|
||||
FcFini();
|
||||
return path;
|
||||
}
|
||||
#endif // NO_TTF
|
||||
#endif // DISABLE_TTF
|
||||
} // namespace OpenRCT2::Platform
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user