Commit graph

69 commits

Author SHA1 Message Date
Kalila
f1c9614076
Merge pull request #917 from JulianGro/gles
Fix building with GLES 3.2 on Linux
2020-12-17 20:23:26 -05:00
Julian Groß
dcd26c8ad6 Add comment about FILENAME being missing from ANDROID 2020-12-15 21:19:49 +01:00
Julian Groß
4e18382089 Work around android not building with set glad32es.zip filename 2020-12-15 13:53:17 +01:00
Julian Groß
3485efd808 Fix failing builds 2020-12-15 05:00:58 +01:00
Julian Groß
5e17639bed Fix building with GLES 2020-12-15 02:43:39 +01:00
David Rowe
e8a2de86bb Update GitHub links 2020-12-12 20:32:02 +13:00
Dale Glass
8e2245c530 Update hash 2020-11-14 19:00:53 +01:00
Dale Glass
2194a20d34 Upgrade to latest TBB 2020-11-14 18:55:24 +01:00
David Rowe
8dd8ebcbaf Merge branch 'master' into feature/eye-tracking-option
# Conflicts:
#	plugins/openvr/src/ViveControllerManager.cpp
2020-07-11 08:14:13 +12:00
David Rowe
5ce60a9ab7 Include deveoper guidelines doc in Vive PRO Eye's SRanipal package 2020-06-27 07:24:38 +12:00
David Rowe
0f324ee9ae Merge branch 'v2020.2.2-rc' into feature/openvr-linux
# Conflicts:
#	plugins/openvr/CMakeLists.txt
#	plugins/openvr/src/ViveControllerManager.cpp
2020-06-19 16:27:53 +12:00
David Rowe
ec81ac8750 Merge branch 'master' into feature/openvr-linux 2020-06-16 08:30:29 +12:00
David Rowe
4e57d53dde Merge branch 'master' into feature/vive-pro-eye-tracking 2020-06-14 10:51:25 +12:00
Dale Glass
7dd5a2773c Use newer opus to fix illegal instruction in libopusCodec.so
This will build the very latest Opus available (May 30 2020). The absolute
minimum version of Opus is commit 927de8453c502586c03e25c169ec08f2a93ebc02,
released on April 21, 2020.

This incorporates a fix for xiph/opus#154
2020-06-07 12:51:38 +02:00
David Rowe
343c6a4027 Fix Linux targeting 2020-05-23 19:46:26 +12:00
David Rowe
b72d5bf80c Build OpenVR plugin on Linux 2020-05-23 14:53:43 +12:00
David Rowe
7634478aba Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-22 08:52:08 +12:00
kasenvr
a9b56b5f3a
Merge pull request #335 from kasenvr/feature/openvr-update
Update to latest OpenVR SDK
2020-05-20 14:03:05 -04:00
David Rowe
63ba8400f7 Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-16 11:23:38 +12:00
daleglass
8846e0e517
Merge pull request #317 from sethalves/fix-glm-warning
Don't let Linux build of glm with clang-9 fail due to stray semicolon
2020-05-13 22:37:41 +02:00
David Rowe
42036b2746 Merge branch 'master' into feature/openvr-update 2020-05-09 07:25:40 +12:00
David Rowe
5c7e6446d0 Update to build using latest OpenVR SDK package 2020-05-04 21:03:13 +12:00
Seth Alves
da6b59f3f2 Don't let Linux build of glm with clang-9 fail due to stray semicolon 2020-04-26 21:54:05 +00:00
Seth Alves
10830cf68c recover from rebase errors 2020-04-26 14:50:43 -07:00
Seth Alves
2fdbd0ab78 update urls for vive eye and hand tracking libraries, fix cmake for same 2020-04-26 12:27:18 -07:00
Seth Alves
a0031c6f10 eye and hand tracking for htc vive pro 2020-04-26 12:24:45 -07:00
Thijs Wenker
53bb62756f fix more links 2020-04-19 22:50:51 +02:00
Thijs Wenker
466e1a7ce3 - disable osx GHA build for now
- fix tbb issue, the repo moved to another location which changed the hash of the source
2020-04-19 22:50:50 +02:00
Thijs Wenker
3ea3330bea enable tbb for osx 2020-04-19 22:50:49 +02:00
Thijs Wenker
98e79fd698 update zlib port 2020-04-19 22:50:49 +02:00
Thijs Wenker
48ee437c00 cmake -D VCPKG_BUILD_TYPE could be set to either release debug or release in order to build vcpkg in a specific build type, otherwise it will build with debug and release 2020-04-19 22:50:49 +02:00
Thijs Wenker
997eb14ddc release mode proof portfiles 2020-04-19 22:50:48 +02:00
David Rowe
88ee66abad Further work-arounds for "?" in URLs 2020-04-13 11:02:50 +12:00
David Rowe
7ba1ccb8b2 Fix Linux cmake warning
Credit: Dale Glass <dale@daleglass.net>
2020-04-12 13:42:20 +12:00
David Rowe
1a4bb41f22 Fix up quazip configuration 2020-04-10 09:34:00 +12:00
David Rowe
a8b4f22fc6 Update new build URLs 2020-04-09 16:54:14 +12: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
acbc8a889f Fix updated TBB library hash in vcpkg portfile 2020-03-18 19:15:33 -05:00
4e41c0710d Fix VCPKG Opus CONTROL failure on Linux
VCPKG on Linux really, really does not like the "Homepage:" line.
2020-01-09 16:43:11 +01:00
3d8d359c35 Initial work on Opus audio plugin
This commit is made up of changes to VCPKG and CMake to include the Opus libraries, as well as a skeleton project for an Opus audio plugin.
2020-01-09 16:43:11 +01:00
Dale Glass
ec86a1a57f Move to kasenvr repos
The highfidelity github repos will probably be going away on
Jan 15, 2020.
2019-12-30 20:24:15 +01:00
kasenvr
b572b6595e
Merge pull request #19 from daleglass/kasen/core
Change asset URLs to Athena S3 bucket.
2019-12-18 14:34:11 -05:00
Dale Glass
ac5a70fca0 Change asset URLs to Athena S3 bucket.
This uses a variable that can be overriden with an environment variable.
This makes it easy for the community to create alternate asset hosts.

Due to vcpkg using a clean environment, variables can't be easily passed
to cmake scripts run by vcpkg. This was worked around by writing the data
that needs to be passed into temporary files and reading it from the
vcpkg ports.
2019-12-18 17:36:01 +01: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
0240a6e3d9 Update prebuilt dependencies 2019-11-25 11:42:09 -08:00
Anthony Thibault
edfad97b64
Merge pull request #16517 from hyperlogic/feature/facecap-osc-plugin
Input plugin for streaming blendshapes from an iPhone
2019-11-23 11:49:51 -08:00
Anthony J. Thibault
909d292295 Bumped version number on hifi-client-deps/CONTROL file 2019-11-22 14:22:29 -08:00
Simon Walton
a2c5295311 On Linux, remove quazip5 dynamic libs 2019-11-21 16:32:54 -08:00