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

Add option to compile against shared Zlib #389

Merged
merged 3 commits into from
Apr 1, 2024

Conversation

runlevel5
Copy link
Contributor

@runlevel5 runlevel5 commented Mar 27, 2024

Issue

#306

Motivation

The Zlib lib has caused lots of pain for many Linux distro which have custom patches. By offering an option to use the system zlib, it would greatly simplify the adoption and maintenance of distro packaging

Changes

  • Add USE_SYSTEM_ZLIB flag

@@ -43,7 +45,7 @@ if (IS_64_BIT)
option(SDL_TEST OFF)

if (CONFIG_LINUX_STEAM_RUNTIME_SUPPORT)
option(INPUT_TSLIB OFF)
option(INPUT_TSLIB OFF)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Replace tab with 4 spaces

@runlevel5
Copy link
Contributor Author

FYI @Connor-GH

CMakeLists.txt Outdated Show resolved Hide resolved
@runlevel5
Copy link
Contributor Author

@res2k I've amended the PR based on your feedback

@apanteleev apanteleev merged commit b611a5e into NVIDIA:master Apr 1, 2024
2 checks passed
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.

3 participants