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
amantley
6323f49f26
changed the define variable to HIFI_USE_OPTIMIZED_IK
2019-02-21 14:36:05 -08:00
Angus Antley
b6bc467f4b
added HIFI_USE_Q_OS_ANDROID to cmake lists and to MySkeletonModel
2019-02-21 06:42:55 -08:00
amantley
f8a74efdc2
fixed build errors from jenkins
2019-02-20 17:59:45 -08:00
Brad Davis
00ed86d1cf
fixing typo
2019-02-15 14:34:40 -08:00
Brad Davis
4409e59682
Add per-android-app preprocessor macros
2019-02-15 14:11:26 -08:00
Brad Davis
e534270f9a
Merge remote-tracking branch 'upstream/master' into feature/quest_custom_plugins
2019-02-11 15:41:32 -08:00
Sam Gateau
466da1bd05
Merge pull request #14783 from NissimHadar/20816-installOnAndroid
...
Case 20816: install on android (Mac and Windows installers)
2019-02-07 17:02:40 -08:00
Brad Davis
d3301803d3
Support custom display / input plugin lists and small tweaks
2019-02-07 15:15:26 -08:00
NissimHadar
cc3a74b7a0
Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid
2019-02-05 09:01:46 -08:00
Brad Davis
fed9e27a66
Expose current android app name to source code
2019-01-30 16:23:21 -08:00
NissimHadar
a2bae0b329
Fixing merge issues.
2019-01-25 18:15:26 -08:00
Brad Davis
81a7fa17bf
PR feedback
2019-01-25 11:14:40 -08:00
Brad Davis
61ea0de742
Update build files based on move
2019-01-15 15:16:14 -08:00
Brad Davis
2691c39d66
PR feedback
2018-11-08 12:47:53 -08:00
Brad Davis
8c4f0ec774
Vcpkg migration
2018-11-08 12:28:06 -08:00
Bradley Austin Davis
95d160a170
Working on mac GL issues
2018-10-26 11:23:29 -07:00
Anthony Thibault
2bc99d3894
CMP0074 Warning: Proper check for cmake versions 4.x and higher
2018-10-19 15:17:29 -07:00
Anthony Thibault
c19194fed5
Squelch cmake warning CMP0074 without requiring an update to cmake 3.12.
2018-10-15 16:12:28 -07:00
Roxanne Skelly
f8409b3977
dd server-console to client build
2018-10-01 11:29:55 -07:00
Brad Davis
ae8f841912
Shader refactoring for explicit bindings
2018-08-03 14:58:11 -07:00
Brad Davis
e81d2809c1
Fix unit testing setup
2018-05-17 15:05:40 -07:00
Brad Davis
f206456cdd
Restoring manual tests to solution, removing dead tests
2018-05-09 13:20:47 -07:00
Stephen Birarda
b52a877d8d
optionally grab serverless tutorial, on for installers
2018-03-26 14:32:11 -07:00
John Conklin II
283aff71ec
Merge pull request #12612 from jherico/gl_common
...
Break out common GL and GLES code into a single shared library
2018-03-21 11:28:24 -07:00
Stephen Birarda
1405c8fcb3
add a client only option to cmake
2018-03-20 14:20:58 -07:00
Stephen Birarda
283eccd043
remove unneeded ANDROID block, revert removed line in NSIS
2018-03-15 16:21:49 -07:00
Stephen Birarda
f8df90e36d
disable the sixense plugin by default
2018-03-15 13:53:10 -07:00
Brad Davis
6fe75a3ca4
Breaking out common gpu-gl code
2018-03-09 16:39:47 -08:00
Bradley Austin Davis
52af45a355
Create scribe only build mode
2018-02-07 09:47:51 -08:00
Brad Davis
d10d7026c5
Force Qt to use ANGLE when in GLES mode on Windows
2018-01-15 13:42:41 -08:00
Brad Davis
58d4d193f7
Add command line disabling of QML and KTX cache
2018-01-13 12:22:00 -08:00
Brad Davis
22d133c71f
Allow GLES client on desktop builds
2018-01-11 23:31:34 -08:00
Brad Davis
6cff86b0f3
Fix polyvox archive, correct build errors, add additional libraries
2017-12-12 18:29:36 -08:00
Bradley Austin Davis
9df9cf7a47
Adding more libs, ifdefs for android incompatible code
2017-12-11 13:18:23 -08:00
Seth Alves
66191a5419
Merge pull request #11291 from ElderOrb/optional-build-tools
...
make building tools (besides 'scribe') optional
2017-10-08 10:02:28 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
beholder
04305155d0
make building tools (besides 'scribe') optional
2017-09-14 23:16:12 +03:00
Brad Davis
9c03fa0369
Cleanup CMake
2017-09-02 16:15:14 -07:00
beholder
a18410ef07
make building tests optional
2017-08-23 00:40:14 +03:00
Stephen Birarda
c7edc98d5c
remove deprecated CMake policy no longer needed
2017-08-09 18:47:50 -07:00
Brad Davis
3a31805dff
Fix warnings in Qt 59 / VS 2017 build
2017-07-20 11:57:12 -07:00
David Rowe
727ba1320a
Add unpublishedScripts content to the JS project
2017-05-21 11:15:51 +12:00
Brad Davis
a8de6eab8c
Organize the files in the JS and QML projects to appear in a folder hierarchy
2017-04-20 14:39:06 -07:00
Brad Davis
8116de7c14
Force thread linkage
2017-03-23 13:45:13 -07:00
Vladyslav Stelmakhovskyi
2d2b2094fd
Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination
2017-03-07 10:11:09 +01:00
Brad Davis
ecfe56085d
GLM update and GLI integration
2016-09-09 10:18:15 -07:00
Stephen Birarda
a94fe62b37
use shared libc++ to reduce shared lib size
2016-09-01 10:56:49 -07:00
Stephen Birarda
85ba0f36cf
fix controllers/shared compile for android interface port
2016-08-31 16:34:31 -07:00
Stephen Birarda
47f15f6ad8
use libc++ and clang toolchain
2016-08-31 16:16:40 -07:00
Stephen Birarda
fc8fad0753
check SCRIBE_PATH for scribe, add instructions
2016-08-31 13:56:02 -07:00
Stephen Birarda
feef76cbab
add tools, no plugins, add InterfaceActivity
2016-08-31 11:31:07 -07:00
Stephen Birarda
f1ed7a2e78
initial changes needed for android interface cmake
2016-08-31 10:53:29 -07:00
elisa-lj11
2d2cb45c5d
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-22 16:05:16 -07:00
Seth Alves
43c5735baa
don't use -Wsuggest-override on older gcc
2016-08-18 11:05:31 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
elisa-lj11
0e79aa9dbe
Added quazip for unzipping functions
2016-08-04 16:46:56 -07:00
Seth Alves
406b08ffa1
when cmake is told SERVER_ONLY, still build server-side plugins
2016-07-20 11:29:00 -07:00
Stephen Birarda
8b429d5b47
rename console directory to server-console
2016-01-19 16:11:08 -08:00
Stephen Birarda
59b6d8fde8
set CPACK_MODULE_PATH so custom template is used
2016-01-15 15:41:34 -08:00
Stephen Birarda
55886d43f5
add DDE component as downloadable optional
2016-01-15 15:41:34 -08:00
Stephen Birarda
817d651c47
add initial fixup install commands for interface
2016-01-15 15:41:34 -08:00
Stephen Birarda
92064fe507
generate a componentized server/client installer
2016-01-15 15:41:34 -08:00
