Conversation
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fix Linux build (atomics, strchrnul, font macros, libm, OpenAL)
Fixes Linux build failures and keeps Windows builds working.
Changes
Added R_Q_strchrnul wrapper to resolve C++ overload ambiguity with glibc’s strchrnul
Wrapper uses Q_strchrnul when HAVE_STRCHRNUL is not defined (e.g. on Windows)
2. inc/shared/atomic.h – C++ atomics
Added C++ path for atomic_int, atomic_load, atomic_store using std::atomic from
Keeps existing MSVC path; C++ branch only used when not MSVC
3. src/client/font.cpp – min/max macro conflict
Define NOMINMAX before including font.h so min/max don’t conflict with std::min/std::max from
4. meson.build – OpenGL renderer and OpenAL
Link OpenGL renderer against libm for math symbols (tanf, sincosf, expf, etc.)
Add -mno-direct-extern-access for client C++ when OpenAL is used on Linux to work around Fedora/binutils “non-canonical reference to canonical protected function” linker errors
Use client_link_args for the client executable
Platforms
Linux: Builds successfully (Fedora tested)
Windows: Unchanged; R_Q_strchrnul uses Q_strchrnul when strchrnul is unavailable