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

Fix compilation on Linux and add the new setting to the UI #6

Merged
merged 14 commits into from
Mar 13, 2018

Conversation

loathingKernel
Copy link

@loathingKernel loathingKernel commented Jul 18, 2017

Most of the changes in this PR probably don't touch anything outside of the linux build. The ones that do are:

  • Update on cdriso.c: Needed because compilation would fail with latest ffmpeg and ccdda enabled. Still produces deprecation warnings.

  • Moving pixmaps: I don't know if Windows or OSX builds use those but it was needed to move them to easily generate the resource files for GTK.

@iCatButler iCatButler merged commit 7683324 into iCatButler:master Mar 13, 2018
@loathingKernel loathingKernel deleted the fix-linux-build branch March 19, 2018 09:42
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.

2 participants