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

Openal changes #2026

Merged
merged 2 commits into from Jan 30, 2022
Merged

Openal changes #2026

merged 2 commits into from Jan 30, 2022

Conversation

Copy link
Member

@jriwanek jriwanek commented Jan 30, 2022

Summary

Allows openAL support to be disabled
A couple of consistency improvements to the github actions build

Checklist

References

Provide links to datasheets or other documentation that helped you implement this pull request.

@OBattler OBattler merged commit a0c9009 into 86Box:master Jan 30, 2022
36 checks passed
@jriwanek jriwanek deleted the openal-changes branch Jan 30, 2022
Copy link
Contributor

@dhrdlicka dhrdlicka left a comment

I know this is already merged, but I thought I would leave some notes on this

- name: Generate package
run: cmake --install build --prefix ./build/artifacts ${{ matrix.build.strip }}
- uses: actions/upload-artifact@v2
with:
name: '86Box${{ matrix.build.slug }}-Linux-x86_64-gha${{ github.run_number }}'
path: build/artifacts/**
Copy link
Contributor

@dhrdlicka dhrdlicka Jan 30, 2022

Choose a reason for hiding this comment

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

Nitpick: I would avoid creating any Linux artifacts that are not self-contained and statically linked with all dependencies, otherwise the binary is useless on pretty much anything that is not the host distro.

Copy link
Member Author

@jriwanek jriwanek Jan 30, 2022

Choose a reason for hiding this comment

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

Yeah, I'm just cleaning stuff up, I recall the conversation about static linking and fully agree with you too. But that's for another day, unless you want to beat me to it.

include_directories(${OPENAL_INCLUDE_DIR})
target_link_libraries(86Box ${OPENAL_LIBRARY})
if(OPENAL)
find_package(OpenAL REQUIRED)
Copy link
Contributor

@dhrdlicka dhrdlicka Jan 30, 2022

Choose a reason for hiding this comment

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

Perhaps the find_package call could be not REQUIRED and just have OPENAL be forced off if it's not found?

Copy link
Member Author

@jriwanek jriwanek Jan 30, 2022

Choose a reason for hiding this comment

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

I'm really not all that good with cmake build scripts, so if you wanna, go right ahead, it'd be very welcome. (:

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.

None yet

3 participants