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

Preliminary Haiku support #94

Merged
merged 11 commits into from May 1, 2019
Merged

Preliminary Haiku support #94

merged 11 commits into from May 1, 2019

Conversation

@extrowerk
Copy link
Contributor

extrowerk commented Apr 29, 2019

With these patches it builds and works on Haiku (tested only on 64 bit with GCC7):

zcNr

@extrowerk

This comment has been minimized.

Copy link
Contributor Author

extrowerk commented Apr 30, 2019

zcQs

@AJenbo

This comment has been minimized.

Copy link
Member

AJenbo commented Apr 30, 2019

Nice Icon, but would it be possible to put it in a folder so that the name and intend is clear? Probably not many are familiar with .rdef.in files and as we start to support more platforms this could clutter the root.

@extrowerk

This comment has been minimized.

Copy link
Contributor Author

extrowerk commented Apr 30, 2019

Yeah, we can do that.
What do you think about a “platform/$osname” structure?
Or “resources/$osname”?

@AJenbo

This comment has been minimized.

Copy link
Member

AJenbo commented Apr 30, 2019

I was thinking resources/$osname

@@ -21,6 +21,14 @@
#ifdef _MSC_VER
#pragma comment(lib, "wininet.lib") // Internet functions for HTTP stream
#pragma warning(disable: 4800) // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
#endif

#ifdef __HAIKU__

This comment has been minimized.

Copy link
@AJenbo

AJenbo Apr 30, 2019

Member

It looks like stormlib solved the same issue for FreeBSD by settings this in CMake:
https://github.com/ladislav-zezula/StormLib/blob/master/CMakeLists.txt#L303

I think we should go for the same solution here instead of modifying the stormlib source localy.

This comment has been minimized.

Copy link
@AJenbo

AJenbo Apr 30, 2019

Member

O_LARGEFILE should be disabled in StormPort.h
https://github.com/ladislav-zezula/StormLib/blob/4ad0bff21da0163917e1552960e6a43679586b89/src/StormPort.h#L202

It looks like this is also the place to define *64 functions, not sure why they ended up putting it in CMake for FreeBSD :/

extrowerk added 3 commits May 1, 2019
This reverts commit 1416b79.
@extrowerk extrowerk mentioned this pull request May 1, 2019
@AJenbo

This comment has been minimized.

Copy link
Member

AJenbo commented May 1, 2019

Nice work upstreaming the storm changes. Should the aiso changes also be upstreamed?

@AJenbo AJenbo merged commit 106ffa5 into diasurgical:master May 1, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@extrowerk

This comment has been minimized.

Copy link
Contributor Author

extrowerk commented May 1, 2019

@AJenbo : i tried to upstream the asio patches, but i had to see it is already done and merged. The devilution in-tree version is just too old.

@AJenbo

This comment has been minimized.

Copy link
Member

AJenbo commented May 1, 2019

Good to know

Again thanks for the PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.