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

Fix several issues blocking a Solaris compile #1341

Merged
merged 3 commits into from Apr 26, 2017

Conversation

Projects
None yet
2 participants
@chief1983
Member

chief1983 commented Apr 25, 2017

I have actually produced a fully functioning build on OpenIndiana (the fork of OpenSolaris), and have compiled on a Solaris 11.3 VM with these changes. I am open to suggestions for alternative names for the version->gameversion rename, but the rename itself is required because version is a defined enum in math.h in the Solaris system headers, which resulted in a symbol conflict on Solaris distros since this was committed nearly two years ago. The other fixes just enhance the existing platform file to fix library linking, and address a missing line from when a series of IFDEFs were modified without addressing the Solaris case (probably since no one was available to test it on Solaris at the time).

@asarium asarium merged commit 418a944 into scp-fs2open:master Apr 26, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment