Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #656 from daleglass/fix-build-on-gcc10

Browse source 
Fix build of hifiSdl2 on GCC 10
This commit is contained in:
kasenvr 2020-09-17 18:49:47 -04:00 committed by GitHub
commit 39c36e275f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/hifiSdl2/CMakeLists.txt
View file

@ -8,7 +8,14 @@
if (NOT APPLE)
set(TARGET_NAME hifiSdl2)
if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 10.0)
# GCC 10 and above sets -fno-common by default, and causes a linking problem here:
# multiple definition of `WAYLAND_wl_proxy_marshal'
#
# Work around it per https://medium.com/@clentfort/using-esy-sdl2-with-gcc-10-91b4fa0c5aa9
link_libraries("-Wl,--allow-multiple-definition")
endif()
setup_hifi_plugin(Qml)
link_hifi_libraries(shared controllers ui plugins input-plugins script-engine)
target_sdl2()
endif()
endif()