Dale Glass
c95de72174
Fix copying jsdoc to interface
...
Take the jsdoc from tools/jsdoc and copy it to interface.
A subtle issue was found: It turns out that for cmake it matters
what gets parsed first, especially if you rely on setting a variable
in one project and reading it in another.
This can result in things like builds that fail the first time, then
work after re-running cmake.
Generation of jsdoc and screenshare were moved above interface,
because they're a dependency of it.
2021-07-11 19:26:51 +02:00
Dale Glass
588528306e
Cmake cleanup
2021-06-20 14:22:28 +02:00
Dale Glass
2a07f5fd5a
Nice colored unsupported distro messages
2021-06-20 14:22:28 +02:00
Dale Glass
506fd9563a
Handle empty environment variables as false
2021-06-20 14:22:28 +02:00
Dale Glass
758ebd7f9d
Fix environment variable cmake syntax
2021-06-20 14:22:28 +02:00
Dale Glass
ca489bd420
Simplify system Qt path
2021-06-20 14:22:28 +02:00
Dale Glass
1e63916940
Disable almost all the code in SetupQt.cmake for system qt
...
We're already using the standard find_package method to setup Qt
for the most part, so none of the manipulations of SetupQt should
be needed for system Qt.
2021-06-20 14:22:28 +02:00
David Rowe
b078518705
Include non-script files in JavaScript IDE directories
2021-05-07 21:36:53 +12:00
David Rowe
c29c1d0200
Include Vircadia Web app files in an IDE directory
2021-05-07 21:36:01 +12:00
Kalila
bb9460f6d9
Merge pull request #1162 from ctrlaltdavid/fix/osx-dmgs
...
Revise OSX DMGs
2021-04-19 17:01:05 -04:00
David Rowe
87bb4654ee
Fix up screenshare conditionals
2021-04-06 15:36:57 +12:00
Julian Groß
69a3f21e5d
Initial partial linux aarch64 support
2021-04-06 03:50:36 +02:00
David Rowe
6b18011a97
Don't include screenshare app in OSX client-only build
2021-04-06 12:34:13 +12:00
David Rowe
1ddbf15f14
Name OSX Interface target as Vircadia
2021-04-06 12:21:19 +12:00
Julian Groß
b416ca1e17
Simplify code according to review
2020-12-16 16:50:54 +01:00
Julian Groß
3485efd808
Fix failing builds
2020-12-15 05:00:58 +01:00
Kalila L
7481925611
Add default timestamp server, remove obsolete comment.
2020-08-24 22:54:16 -04:00
Kasen IO
fda40d56d4
Merge branch 'master' into feature/further-rebranding
2020-06-06 18:43:03 -04:00
Kasen IO
21fd10d154
Revert commit 359248829c using -m 1 to temporarily fix issue 383.
2020-06-03 16:08:18 -04:00
5b6d57eb14
Update CMakeLists.txt
...
Change Visual Studio solution name to `vircadia`
2020-05-17 14:13:38 -05: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
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
b923c3f7f1
Update Primary CMakeLists project name to Athena
...
Having a "hifi.sln" file feels wrong. Let's fix that.
2019-12-18 17:33:35 -06:00
7858b29fbf
Removed trailing whitespace in CMakeLists.txt
2019-12-18 11:16:41 -06: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
Brad Davis
f39088fb0b
Github Actions master builds
2019-12-03 10:56:04 -08:00
Brad Davis
db641d25aa
Force rebuild for mac build issue
2019-11-21 07:52:15 -08:00
Brad Davis
543dcc5e8d
Fix mac build, disable unlable GA job
2019-11-20 16:19:40 -08:00
Brad Davis
0331a8e57d
Attempt to fix mac release builds
2019-11-20 15:24:10 -08:00
Maia Hansen
48cdbcf933
Merge pull request #16401 from jherico/github_actions
...
DEV-2773: GitHub actions initial work
2019-11-19 11:46:52 -08:00
Brad Davis
d4b3a9ba49
Github actions
2019-11-18 15:20:37 -08:00
Sabrina Shanman
518d6a530a
Merge pull request #16507 from highfidelity/master
...
Merge master into instancing
2019-11-18 13:54:33 -08:00
sabrina-shanman
a4c10e2903
Attempt fix for Android build
2019-11-01 10:39:43 -07:00
milad
ea373ac14c
First steps towards a screenshare app
2019-10-30 16:44:42 -07:00
amer cerkic
bae3ebd577
fix android local build
2019-07-24 14:07:58 -07:00
Atlante45
63bd80c65e
Force build with x64 toolchain
2019-07-22 11:29:34 -07:00
Brad Davis
6b34b0971f
Enable KHR_robustness option
2019-06-14 11:09:28 -07:00
Andrew Meadows
528a64c618
hack QT_CMAKE_PREFIX_PATH for Jenkins macos builds
2019-05-18 06:45:25 -07:00
Andrew Meadows
f4d9aa71a4
remove manual symbol stripping
2019-05-16 16:35:49 -07:00
Andrew Meadows
595edb9f6e
more correct QT_VERSION detection
2019-05-16 12:29:37 -07:00
Andrew Meadows
a4d43bbff9
more correct stripping of symbols APPLE and UNIX
2019-05-15 15:54:58 -07:00
Andrew Meadows
abc5a0e7e8
remove symbols for Release build
2019-05-15 14:59:58 -07:00
Andrew Meadows
4cf9673dbb
Merge master into 22007-hifiQtBuildv2
2019-05-15 14:10:30 -07:00
Clement
ad36df0455
Fix build warnings
2019-05-09 13:59:49 -07:00
NissimHadar
bffc0e8a85
Re-ordered commands.
2019-04-22 23:28:43 -07:00
NissimHadar
dd85e224a4
Activate Qt patch.
2019-04-22 20:58:15 -07:00
Clement
e01561185d
Dependencies have correct osx deploy target
2019-04-19 20:19:48 -07:00
NissimHadar
53ea50d1f3
Use set_from_env macro.
2019-04-05 15:45:11 -07:00
NissimHadar
75e1437274
Use optional environment variable for timestamp server URL
2019-04-05 14:55:23 -07:00
amantley
c9db426ce4
Merge remote-tracking branch 'upstream/master' into animSplineIK
2019-02-21 14:36:13 -08:00
