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

Install non-dev SDL packages by default #3655

Merged
merged 4 commits into from
Jun 17, 2021
Merged

Conversation

qarkai
Copy link
Contributor

@qarkai qarkai commented Jun 9, 2021

Add separate scripts to install development packages.
Also don't remove other version of SDL before installation.
Fixes #2599.

Add -d flag to install development packages.
@oleg-derevenetz oleg-derevenetz added improvement New feature, request or improvement script Things related to various scripts (utility scripts, CI scripts, etc) labels Jun 9, 2021
@oleg-derevenetz oleg-derevenetz added this to the 0.9.5 milestone Jun 9, 2021
Copy link
Owner

@ihhub ihhub left a comment

Choose a reason for hiding this comment

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

Hi @qarkai , I left one comment. Could you please reply to it?

script/linux/install_sdl_1.sh Show resolved Hide resolved
Also fix macOS spelling in README
Copy link
Collaborator

@oleg-derevenetz oleg-derevenetz left a comment

Choose a reason for hiding this comment

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

Hi @qarkai I just left one question, please take a look when it will be convenient for you.

script/linux/install_sdl_1.sh Show resolved Hide resolved
@ihhub
Copy link
Owner

ihhub commented Jun 10, 2021

Hi @qarkai and @oleg-derevenetz , I remember there was a reason why we had to remove SDL 1 if we install SDL 2. I'll check it soon.

@oleg-derevenetz
Copy link
Collaborator

@ihhub I'm not sure about Ubuntu, but on macOS I have both SDL1 and SDL2 libs installed (from MacPorts) without any issues, so I can switch between SDL1 and SDL2 just by adding/removing FHEROES2_SDL1="ON" argument for make.

@ihhub ihhub merged commit 9fc4458 into ihhub:master Jun 17, 2021
@ihhub
Copy link
Owner

ihhub commented Jun 17, 2021

@qarkai , a bunch of thanks for improving the project!

@qarkai qarkai deleted the install-sdl branch June 17, 2021 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement New feature, request or improvement script Things related to various scripts (utility scripts, CI scripts, etc)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ubuntu packages should be packed with non-dev SDL scripts
3 participants