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 linuxdeploy and compilation #558

Merged
merged 2 commits into from
Nov 10, 2023
Merged

Fix linuxdeploy and compilation #558

merged 2 commits into from
Nov 10, 2023

Conversation

ipochto
Copy link
Member

@ipochto ipochto commented Nov 10, 2023

  1. Renamed UnitAction::None to ::NoAction because of conflict with 'None' macros defined in sdl.h (quick fix for a define on Linux #515)

  2. Also changed ICONDIR for appimage (Broken CI with icon with linuxdeploy #557) to fix linuxdeploy

@ipochto ipochto changed the title Fix linux compilation: Fixed conflict with 'None' macros defined in sdl.h Fix linuxdeploy and compilation Nov 10, 2023
@Jarod42 Jarod42 merged commit 6da5e26 into master Nov 10, 2023
4 checks passed
@Jarod42 Jarod42 deleted the fix-linux-compilation branch November 10, 2023 13:19
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

2 participants