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

Feature/mac os saves directory correct fix #36

Merged

Conversation

apodrugin
Copy link
Contributor

Add correct fix for 'missed saves directory' error (I have to add platform dependent code to get 'Documents' directory, unfortunately there is no generic way to do that). Remove unnecessary scripts. Update README.md.

…tform dependent code to get 'Documents' directory, unfortunately there is no generic way to do that). Remove unnecessary scripts. Update README.md.
CMakeLists.txt Outdated
@@ -69,6 +73,10 @@ else()
add_definitions(-Wno-reorder -pedantic-errors -Ofast -fno-fast-math)
endif()

if(MAC_OS)
Copy link
Contributor

Choose a reason for hiding this comment

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

For now this is okay, but in the future we want to move away from piling onto a sourcelist.
Perhaps you could add a CMake target instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am not familiar with CMake. Will investigate how to do that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

By the way, can you recommend some CMake tutorial?

Copy link
Contributor

Choose a reason for hiding this comment

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

Checkout CppCon talks on CMake.
I can also recommend this: https://cliutils.gitlab.io/modern-cmake/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks a lot

…on Mac OS using cmake (properly handle frameworks).
@apodrugin
Copy link
Contributor Author

Fixed conflicts and build on Mac OS. Please, take a look.

CMakeLists.txt Outdated

# MacOSUtils
if(MAC_OS)
add_library(MacOSUtils macOS/src/PathUtils.m)
Copy link
Contributor

Choose a reason for hiding this comment

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

The directory is called macos in lowercase, so this line breaks the build on Linux

@apodrugin
Copy link
Contributor Author

Now it works as intended. Sorry for the mess with commits.

@gynt gynt merged commit 28ac0e6 into sourcehold:master Feb 10, 2021
@apodrugin apodrugin deleted the feature/mac-os-saves-directory-correct-fix branch February 10, 2021 19:12
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

4 participants