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

Server platform works on OS X too #23279

Merged
merged 1 commit into from
Oct 29, 2018
Merged

Conversation

marcelofg55
Copy link
Contributor

No description provided.

@LikeLakers2
Copy link
Contributor

LikeLakers2 commented Oct 25, 2018

I remember some talk about removing the server platform, and just replacing it with a server=yes option when compiling... #11389

That said, I don't have a problem with this PR, despite that talk.

@akien-mga
Copy link
Member

Maybe we should make the binary name more explicit to show whether it was compiled for Linux/*BSD ("X11", even though it's not using X11) or OSX? Maybe godot_server.x11.* and godot_server.osx.*?

(This will all be further refined when we split OS and Display and rename the X11 platform to Freedesktop, so it's not too bad if we abuse the "x11" identifier now IMO).

@marcelofg55
Copy link
Contributor Author

Maybe we should make the binary name more explicit to show whether it was compiled for Linux/BSD ("X11", even though it's not using X11) or OSX? Maybe godot_server.x11. and godot_server.osx.*?

(This will all be further refined when we split OS and Display and rename the X11 platform to Freedesktop, so it's not too bad if we abuse the "x11" identifier now IMO).

Sounds good to me, I'll add that change.

@marcelofg55
Copy link
Contributor Author

@akien-mga Done

SConstruct Show resolved Hide resolved
@akien-mga akien-mga merged commit 4d9b8a9 into godotengine:master Oct 29, 2018
@akien-mga
Copy link
Member

Thanks!

@marcelofg55 marcelofg55 deleted the osx_server branch October 29, 2018 20:41
Calinou added a commit to Calinou/godot-builds-ci that referenced this pull request Oct 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants