Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AROS port #1492

Merged
merged 1 commit into from Nov 9, 2018

Conversation

Projects
None yet
3 participants
@BSzili
Copy link
Contributor

BSzili commented Nov 8, 2018

Added some fixes to built it for AROS. This time used autotools, not the custom Makefile.

@@ -210,7 +210,7 @@ namespace picojson {
if (
#ifdef _MSC_VER
! _finite(n)
#elif __cplusplus>=201103L || !(defined(isnan) && defined(isinf))
#elif (__cplusplus>=201103L && !defined(__AROS__)) || !(defined(isnan) && defined(isinf))
std::isnan(n) || std::isinf(n)

This comment has been minimized.

@Ghabry

Ghabry Nov 8, 2018

Member

this one makes we wonder why non-emscripten builds even have picojson included

This comment has been minimized.

@carstene1ns

carstene1ns Nov 8, 2018

Member

...because CreateRequestMapping is not guarded and generally the async stuff is so ugly nobody wants to touch it ;)

This comment has been minimized.

@Ghabry

Ghabry Nov 8, 2018

Member

okay, I will touch it later and then undo that one-line change ;)

@Ghabry Ghabry added the Building label Nov 8, 2018

@carstene1ns
Copy link
Member

carstene1ns left a comment

Looks good to me. The removed newline and merge commit can be addressed when merging.
The picojson change will be removed when updating the header.

@carstene1ns carstene1ns force-pushed the BSzili:master branch from 3345659 to fa3354c Nov 8, 2018

@carstene1ns carstene1ns merged commit 8377aa6 into EasyRPG:master Nov 9, 2018

7 checks passed

Android (armeabi-v7a) Build finished.
Details
GNU/Linux Build finished.
Details
OSX Build finished.
Details
Wii (SDL1) Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.