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

Initial Haiku support #6568

Merged
merged 6 commits into from
Oct 30, 2017
Merged

Initial Haiku support #6568

merged 6 commits into from
Oct 30, 2017

Conversation

extrowerk
Copy link
Contributor

No description provided.

@rubenwardy rubenwardy added @ Build CMake, build scripts, official builds, compiler and linker errors Feature ✨ PRs that add or enhance a feature One approval ✅ ◻️ labels Oct 29, 2017
@sfan5
Copy link
Member

sfan5 commented Oct 29, 2017

@Megaf

@@ -329,9 +337,11 @@ else()
endif(APPLE)

# This way Xxf86vm is found on OpenBSD too
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this comment should be moved inside the if() too

if(NOT HAIKU)
# This way Xxf86vm is found on OpenBSD too
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now you just need to indent it ;)

@@ -34,7 +34,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "inputhandler.h"
#include "gettext.h"

#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && !defined(SERVER) && !defined(__HAIKU__)
#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) \
&& !defined(SERVER) && !defined(__HAIKU__)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the tab in the middle should be a space

@nerzhul
Copy link
Member

nerzhul commented Oct 29, 2017

should we support a such OS ?

@AntonBoch1244
Copy link
Contributor

AntonBoch1244 commented Oct 29, 2017

@nerzhul should not, but why not to try.
Haiku is a BeOS but more open than BeOS.

@sfan5
Copy link
Member

sfan5 commented Oct 29, 2017

the linter still has a complaint about your syntax: https://travis-ci.org/minetest/minetest/jobs/294459402#L504

@rubenwardy
Copy link
Member

should we support a such OS ?

Not officially support, ie: no builds or ci tests maintained by us, but this pr is fine

@@ -34,8 +34,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "inputhandler.h"
#include "gettext.h"

#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) \
&& !defined(SERVER) && !defined(__HAIKU__)
#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) &&
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still need the \ on this line

@nerzhul nerzhul merged commit a95e0d1 into minetest:master Oct 30, 2017
t0ny2 pushed a commit to t0ny2/minetest that referenced this pull request Jan 23, 2018
osjc pushed a commit to osjc/minetest that referenced this pull request Jan 11, 2019
osjc pushed a commit to osjc/minetest that referenced this pull request Jan 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
@ Build CMake, build scripts, official builds, compiler and linker errors Feature ✨ PRs that add or enhance a feature >= Two approvals ✅ ✅
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants