Skip to content

Add/Fix clang support #19

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.

Sign up for GitHub

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

Merged
Causeless merged 2 commits into from
Jan 20, 2024
Merged

Add/Fix clang support #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d82375e
add fixes to support clang
HeliumAnt Jan 17, 2024
df6fd60
Merge branch 'development' into clang-support
Causeless Jan 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion external/sources/RakNet/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ deps = []

if cxx.get_argument_syntax() == 'gcc'
cpp_args = ['-w', '-fpermissive']
cpp_options = ['cpp_std=gnu++11']
if host_machine.system() == 'windows'
cpp_args += ['-D_ITERATOR_DEBUG_LEVEL=0','-DWIN32','-D_RAKNET_LIB','-D_CRT_NONSTDC_NO_DEPRECATE','-D_CRT_SECURE_NO_DEPRECATE']
if get_option('debug')
Expand All @@ -32,4 +33,4 @@ else
endif
raknet_dep = declare_dependency(link_with: raknet, dependencies: deps, include_directories: raknet_include)

meson.override_dependency('RakNet', raknet_dep)
meson.override_dependency('RakNet', raknet_dep)
2 changes: 1 addition & 1 deletion external/sources/RakNet/src/ReplicaManager3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ void ReplicaManager3::AutoCreateConnectionList(
{
for (unsigned int index=0; index < participantListIn.Size(); index++)
{
if (GetConnectionByGUID(participantListIn[index], worldId)==false)
if (!GetConnectionByGUID(participantListIn[index], worldId))
{
Connection_RM3 *connection = AllocConnection(rakPeerInterface->GetSystemAddressFromGuid(participantListIn[index]), participantListIn[index]);
if (connection)
Expand Down
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ override_options = []
suffix=''

if compiler.get_id() == 'clang'
error('LLVM clang is not supported due to missing features of the clang standard library. (std::execution)')
warning('LLVM clang is not directly supported due to missing features of the clang standard library. Remember to set cpp_std to gnu++20 or force libstdc++ otherwise (std::execution)')
endif

if host_machine.system() == 'darwin' and get_option('b_lto')
Expand Down