namark
|
ccde9e179c
|
Fixed sdl2 linking errors when built against new wayland.
|
2022-03-20 20:31:17 +01:00 |
|
David Rowe
|
ffeb37e7aa
|
Merge remote-tracking branch 'hifi/master' into merge-hifi-master
# Conflicts:
# CMakeLists.txt
# README.md
# cmake/externals/glad32es/CMakeLists.txt
# cmake/externals/glad41/CMakeLists.txt
# cmake/externals/glad45/CMakeLists.txt
# cmake/externals/polyvox/CMakeLists.txt
# cmake/externals/quazip/CMakeLists.txt
# cmake/externals/vhacd/CMakeLists.txt
# cmake/init.cmake
# cmake/ports/hifi-deps/CONTROL
# cmake/ports/sdl2/CONTROL
# cmake/ports/sdl2/disable-hidapi-for-uwp.patch
# cmake/ports/sdl2/enable-winrt-cmake.patch
# cmake/ports/sdl2/fix-arm64-headers.patch
# cmake/ports/sdl2/fix-x86-windows.patch
# cmake/ports/sdl2/portfile.cmake
# cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
# cmake/ports/tbb/portfile.cmake
# hifi_vcpkg.py
# interface/src/avatar/MyAvatar.h
# libraries/avatars-renderer/src/avatars-renderer/Avatar.h
# libraries/avatars/src/AvatarData.h
# libraries/entities-renderer/src/RenderableEntityItem.h
# libraries/entities/src/EntityItem.cpp
# libraries/entities/src/EntityItem.h
# libraries/fbx/src/GLTFSerializer.cpp
# libraries/graphics-scripting/src/graphics-scripting/Forward.h
# libraries/networking/src/AddressManager.cpp
# libraries/networking/src/DomainHandler.h
# libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
# libraries/render-utils/src/HighlightEffect.cpp
# libraries/render-utils/src/MeshPartPayload.cpp
# libraries/render-utils/src/Model.cpp
# libraries/render-utils/src/RenderShadowTask.cpp
# libraries/script-engine/src/WebSocketClass.cpp
|
2020-04-09 16:46:27 +12:00 |
|
|
|
51332b8437
|
Fix the fix for SDL2
|
2019-12-16 18:22:01 -06:00 |
|
|
|
669c01c5a3
|
Update SDL2 CONTROL file to fix linux build
|
2019-12-16 17:21:16 -06:00 |
|
|
|
12e5712f41
|
Upgrade vcpkg port files for SDL2 from 2.0.8 to 2.0.10. Fixes patch errors.
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
|
2019-12-08 09:46:58 -06:00 |
|
Brad Davis
|
d4b3a9ba49
|
Github actions
|
2019-11-18 15:20:37 -08:00 |
|
Brad Davis
|
8c4f0ec774
|
Vcpkg migration
|
2018-11-08 12:28:06 -08:00 |
|
