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

Mac OS #370

Merged
merged 19 commits into from
Aug 13, 2023
Merged

Mac OS #370

merged 19 commits into from
Aug 13, 2023

Conversation

sharonsolomon
Copy link
Contributor

Description

These are the changes that I made that allowed me to get MK404 working on my Mac.

Some of this has to do with paths, so I assume there may be a way to do this during the CMake interaction. Having never used CMake or C, this is the way I got it to work. If these changes aren't desirable because there is a better way to do this, that is fine-- hopefully someone else will still find this conversation helpful.

Changes

Added Paths for Mac Homebrew Dependencies

-Added additional path options to 'Find' files in make folder that refer to dependencies installed in Homebrew on Mac

Update from SDL > SDL2

-Updated CMakeLists.txt to refer to SDL2 instead of SDL1
-Created FindSDL2.cmake based on https://github.com/trenki2/SDL2Test; This was designed for Linux and Windows, and I've tested it on Mac.

Have you tested the changes?

Yes, I have tested that the program now works on a OS X arm64 computer.

Despite updating the SDL dependency, the beeping function still works.

Other

The wiki will also need to be updated with the latest version of the Homebrew dependency names.

@vintagepc
Copy link
Owner

vintagepc commented Apr 21, 2023

Thanks for your contribution!

I've approved the automated CI jobs - once those complete without issue I don't have any objection to merging. The changes look reasonable to me.

The build scripts may require some adjustment to account for the change from SDL to SDL2

@sharonsolomon
Copy link
Contributor Author

My apologies for all the confusion above- I have now reverted this back to your last commit (5aa3d42).

You can check my work by looking at my new branch restore_mac_changes which I created based off of the master state as of the aforementioned commit, and comparing it to the current master.

@vintagepc
Copy link
Owner

Thanks - there's still some weirdness I need to sort out, apparently the build runners we were using for the tests were deprecated at some point since the last build and software rendering has issues. I'll need to find some time to fix that, but I'll do it separately so as not to pollute the changes here with those.

@codecov
Copy link

codecov bot commented Aug 13, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (0f0620a) 90.77% compared to head (d2f7d10) 90.77%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #370   +/-   ##
=======================================
  Coverage   90.77%   90.77%           
=======================================
  Files         153      153           
  Lines        7851     7851           
=======================================
  Hits         7127     7127           
  Misses        724      724           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@vintagepc vintagepc merged commit 8f947a7 into vintagepc:master Aug 13, 2023
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