mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 01:22:25 +01:00
Code Issues Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Ethan O'Brien
2025-01-10 12:16:03 -06:00
parent 284aa05d89 95f977334d
commit 8dfe1f91a9
1297 changed files with 6626 additions and 5210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/Version.h
View File

@@ -1,5 +1,5 @@
/*****************************************************************************
* Copyright (c) 2014-2024 OpenRCT2 developers
* Copyright (c) 2014-2025 OpenRCT2 developers
*
* For a complete list of all authors, please refer to contributors.md
* Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
@@ -12,7 +12,7 @@
#include <string>
#define OPENRCT2_NAME "OpenRCT2"
#define OPENRCT2_VERSION "0.4.17"
#define OPENRCT2_VERSION "0.4.18"
#if defined(__amd64__) || defined(_M_AMD64)
#define OPENRCT2_ARCHITECTURE "x86-64"
@@ -34,6 +34,8 @@
#define OPENRCT2_ARCHITECTURE "mips"
#elif defined(__riscv)
#define OPENRCT2_ARCHITECTURE "RISC-V"
#elif defined(__loongarch__)
#define OPENRCT2_ARCHITECTURE "LoongArch"
#endif
#ifdef __wasm32__
#define OPENRCT2_ARCHITECTURE "wasm32"