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
kasenvr
a9b56b5f3a
Merge pull request #335 from kasenvr/feature/openvr-update
...
Update to latest OpenVR SDK
2020-05-20 14:03:05 -04:00
Thijs Wenker
eb1bf12494
Fix linux PR builds
2020-05-18 14:07:38 +02: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
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
1254557814
Fix Linux cmake problem
...
Credit: Dale Glass <dale@daleglass.net>
2020-04-12 13:24:35 +12:00
David Rowe
b92bd1773a
Fix copying PolyVox libraries to cmake binary directory
2020-04-11 20:24:10 +12:00
David Rowe
d99dad3fcb
Fix files not removed in master merge
2020-04-11 15:40:11 +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
Dale Glass
39f23b52c3
Force dynamic build on Linux, fixes #151
2020-02-05 23:30:04 +01:00
Thijs Wenker
dcb575a178
Merge pull request #86 from MarcusLlewellyn/opus-plugin
...
Add support for the Opus audio plugin.
2020-01-31 01:04:47 +01:00
a0fd53ae24
Change installer name from Beta to Alpha
2020-01-17 14:58:40 -06:00
Thijs Wenker
26bebba8dd
fix opus library linking in cmake
...
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2020-01-13 12:27:24 -06:00
d030d82355
Cosmetic change for TargetOpus.cmake
2020-01-10 12:17:22 -06: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
77e49421bc
Fix installer failing when signing certifcate is not available.
...
This commit comments out the code signing portion of the installer for now. Also a few minor cosmetic changes
2020-01-05 18:44:17 -06:00
97a5149b89
Merge remote-tracking branch 'upstream/kasen/core' into Winstall-brand
2019-12-30 15:58:03 -06: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
986cb05f7b
Fix typo
...
Tomato, Tohmahto, Athena, Athenay
2019-12-29 17:40:51 -06:00
12633e8ee0
Change how analytics was disable
...
Rather than comment out the body od the GoogleAnalytics macro, it now has each invokation of the macro commented our.
2019-12-26 17:21:43 -06:00
f614f6f290
Stuff I forgot in last commit for NSIS
2019-12-22 15:44:25 -06:00
b512eec6f8
Make changes to NSIS installer
...
Changes names to Project Athena.
Disables downloading of compaign packages.
Disables slideshow during install.
2019-12-22 15:44:02 -06:00
a547f4c771
Change installer images
2019-12-22 14:42:59 -06:00
9b542736f7
Remove Google Analytics from installer
2019-12-22 14:23:28 -06: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
Simon Walton
16b6c6305b
Fix formatting issues in cmake file
2019-12-10 09:46:35 -08: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
Simon Walton
82ed358323
Merge remote-tracking branch 'upstream/master' into linux-actions-builds
...
Also merge in Linux PR build
2019-12-05 16:19:12 -08:00
Brad Davis
f39088fb0b
Github Actions master builds
2019-12-03 10:56:04 -08:00
Kasen IO
0b46c53df1
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-01 19:59:59 -05: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
