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.

Sign up for GitHub

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

Jump to bottom

fix out of tree build #14

Merged
merged 2 commits into from
May 19, 2023
Merged

fix out of tree build #14

merged 2 commits into from
May 19, 2023

Conversation

wjt
Copy link
Contributor

@wjt wjt commented May 19, 2023

  • Fix out-of-tree build
  • Quit game when window is closed

wjt added 2 commits May 19, 2023 07:52
@wjt
Fix out-of-tree build
bc1fef6 
When building out-of-tree, in the src/sdl subdir, the
current working directory is $(builddir)/src/sdl so '..' refers to
$(builddir)/src, whereas the sw.h header that files in this directory
include are in $(srcdir)/src.

Correctly pass the source directory as the additional include directory.
@wjt
Quit game when window is closed
e7a91df 
Fixes fragglet#5
@fragglet fragglet merged commit 825ac14 into fragglet:trunk May 19, 2023
@wjt wjt deleted the fix-out-of-tree-build branch May 19, 2023 07:46
@wjt
Copy link
Contributor Author

wjt commented May 19, 2023

Argh, I screwed up when splitting my branch in two, so I guess the repo now has two copies of the same commit:

5d37795
e7a91df

Sorry!

@fragglet
Copy link
Owner

fragglet commented May 19, 2023 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@wjt @fragglet