8000 General platform-logic refactoring & Haiku support. by waddlesplash · Pull Request #1827 · LMMS/lmms · GitHub
[go: up one dir, main page]

Skip to content

General platform-logic refactoring & Haiku support. #1827

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

Merged
merged 7 commits into from
Mar 7, 2015
Merged

General platform-logic refactoring & Haiku support. #1827

merged 7 commits into from
Mar 7, 2015

Conversation

waddlesplash
Copy link
Contributor

Fixes #1820.

@tresf
Copy link
Member
tresf commented Mar 5, 2015

This looks pretty good, but something has broken our win32 builds per:
https://travis-ci.org/LMMS/lmms/jobs/53227720#L1252

-Tres

@waddlesplash
Copy link
Contributor Author

There, that should fix shared memory on Windows.

@tresf
Copy link
Member
tresf commented Mar 5, 2015

👍

Since this adds a new LMMS_BUILD_HAIKU, I'd like @lukas-w's input before merging. Tremendous. Thanks!

@diizy
Copy link
Contributor
diizy commented Mar 6, 2015

In lb302, it'd be better to just remove that MIN macro completely and replace it with qMin() to be consistent with rest of our codebase.

@waddlesplash
Copy link
Contributor Author

Done.

@@ -34,7 +34,7 @@
#include <cmath>
using namespace std;

#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE)
#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU)
Copy link
Member

Choose a reason for hiding this comment

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

As I wrote in #1822, I think this #if condition can just be removed and its body enabled on all platforms.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Except some OSes may not have these as #defines, so you'll be overriding the OS version.

Copy link
Member

Choose a reason for hiding this comment

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

That is a very valid argument.

@tresf
Copy link
Member
tresf commented Mar 7, 2015

@waddlesplash thanks as this cleans things up quite a bit. We'll tag this commit if we have any fallout from a VST perspective. Merging.

tresf added a commit that referenced this pull request Mar 7, 2015
General platform-logic refactoring & Haiku support.
@tresf tresf merged commit 07e422c into LMMS:master Mar 7, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants
0