OpenRCT2

~janisozaur/openrct2/+git/openrct2-janisozaur:function-ptr

  1. Git
  2. lp:~janisozaur/openrct2/+git/openrct2-janisozaur
  3. function-ptr
Last commit made on 2020-04-24
Get this branch:
git clone -b function-ptr https://git.launchpad.net/~janisozaur/openrct2/+git/openrct2-janisozaur

Branch merges

Branch information

Name:
function-ptr
Repository:
lp:~janisozaur/openrct2/+git/openrct2-janisozaur

Recent commits

610409f... by Michael Steenbeek

Add extra ifdefs around warning suppression

Taken from thirdparty/filesystem.hpp

e70099e... by janisozaur

Disable warnings around incompatible function pointer cast

This addresses a compilation issue with newer (8+) mingw.

76c10d1... by Umdlye <email address hidden>

en-GB: Fix capitals after hyphens

Co-authored-by: pizza2004 <email address hidden>

baf6f15... by Michael Steenbeek

Add #11390 to changelog

23d2959... by FlukiestEmperor <email address hidden>

Fix Android filesystem compilation error when using NDK revision 19+

When attemping to build with ndk 19+ I get the following error: error: undefined reference to 'std::__ndk1::__fs::filesystem::path::__extension() const'

Looking at this issue here https://github.com/android/ndk/issues/609 and https://android.googlesource.com/platform/ndk/+/master/docs/Roadmap.md#package-management it's stated that the ndk does not support std::filesystem.

b9671b0... by =?utf-8?q?Micha=C5=82_Janiszewski?= <email address hidden>

Merge pull request #11433 from FlukiestEmperor/android-cleanup

Android cleanup

2fd8e7a... by OpenRCT2 git bot <email address hidden>

Merge Localisation/master into OpenRCT2/develop.

944e61d... by FlukiestEmperor <email address hidden>

Add missing nullable annotations

512d77e... by FlukiestEmperor <email address hidden>

Remove unreachable code

Since the compile sdk is 19, the if check is always true since it's checking 19 >= 17. This also removes the need for the success boolean which would always be true.

44f62a9... by Michael Steenbeek

Move PhotoItem to RTD (#11415)