-
-
Notifications
You must be signed in to change notification settings - Fork 51
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
SDL build improvements #1270
Merged
Merged
SDL build improvements #1270
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes "/bin/sh: sdl2-config: command not found" when sdl2-config is not in a standard system bin directory.
Fixes "main.cpp:22:10: fatal error: 'SDL2/SDL.h' file not found" when SDL2 is not in a standard system include directory.
Fixes "Undefined symbols for architecture x86_64: '_vDSP_dotpr_s1_15'"
Fixes "ld: library not found for -lGL"
Hacks in AppleII/Video.cpp, AppleII/Video.hpp, and Macintosh/Video.cpp assume that building on macOS means building for Metal unless IGNORE_APPLE is defined. By defining this in the macOS SDL build, Macintosh video is now sized and positioned correctly and Apple II colors are now just as wrong as they are on other OpenGL builds instead of being wrong in a unique way. See TomHarte#872
Adjust phase by 90 degress. Closes TomHarte#872
output_colour_burst expects a uint8_t so may as well make that clear.
In my mild defence, I've never actually intended to support SDL on the Mac — it's purely there for development convenience. This is still an improvement though. |
Oh sure. But hey, now it works! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Here are several improvements to the scons/SDL/OpenGL build, especially for macOS.
Update GitHub workflow: also build SDL UI on macOS
Import PATH into scons environment
Fixes
when sdl2-config is not in a standard system bin directory (e.g. MacPorts).
Use the right include path for SDL.h
Fixes
when SDL2 is not in a standard system include directory (e.g. MacPorts).
Link with Accelerate framework on macOS
Fixes
Silence macOS OpenGL deprecation warnings
Removes warnings like this:
Link with OpenGL framework on macOS
Fixes
Improve Macintosh video & Apple II colors on macOS
Hacks in AppleII/Video.cpp, AppleII/Video.hpp, and Macintosh/Video.cpp assume that building on macOS means building for Metal unless
IGNORE_APPLE
is defined. By defining this in the macOS SDL build, Macintosh video is now sized and positioned correctly and Apple II colors are now just as wrong as they are on other OpenGL builds instead of being wrong in a unique way.See #872
Fix OpenGL Apple II colors
Adjust phase by 90 degress.
Closes #872
Change phase from
int
touint8_t
output_colour_burst
expects auint8_t
so may as well make that clear.