Ken Cooke
6838dc0247
Inverted the CMAKE logic, to make the version comparison more clear
2016-10-04 09:01:43 -07:00
Ken Cooke
40393bd8ef
remove Installer debugging code
2016-10-03 22:31:43 -07:00
Ken Cooke
541f7ebb05
Select the correct plugin in the Installer, based on Windows version
2016-10-03 21:46:55 -07:00
Ken Cooke
eb5b03d008
Don't pre-delete qtaudio_windows.dll in Installer
2016-10-03 20:52:24 -07:00
Ken Cooke
372b631448
Post-build command to use qtaudio_windows.dll for Win7, qtaudio_wasapi.dll for Win8/10, or include both for Installer
2016-10-03 19:59:27 -07:00
Ken Cooke
d925a22fd4
Use new filename for the external as a simple form of versioning
2016-09-29 14:09:38 -07:00
Ken Cooke
f42c0dbd7c
Fix cmake checksum, for updated qtaudio_wasapi.zip with release and debug plugins
2016-09-29 13:01:15 -07:00
Ken Cooke
468281f92d
Fix the Debug build of Interface on Windows
2016-09-29 06:58:14 -07:00
Brad Davis
49a91e3a04
Update Oculus SDK
2016-09-22 11:31:50 -07:00
Chris Collins
1c4fcb5112
Merge pull request #8620 from ZappoMan/detectMasterOrStable
...
add basic support for master vs stable builds
2016-09-19 15:08:40 -07:00
Brad Hefta-Gaub
fd474f6319
add basic support for master vs stable builds
2016-09-19 14:14:32 -07:00
Marko Kudjerski
6ccf86e3e9
remove qtaudio_windows.dll on Windows before installing the new version
2016-09-13 11:10:36 -07:00
Brad Davis
ecfe56085d
GLM update and GLI integration
2016-09-09 10:18:15 -07:00
Ken Cooke
9457d49103
Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio
2016-09-06 20:56:20 -07:00
Marko Kudjerski
da5f7912b5
fixed Info.plist setup for Components.app
2016-09-06 17:40:47 -07:00
SamGondelman
62edaf0ec9
commit for marko to look at later
2016-09-06 17:40:46 -07:00
Marko Kudjerski
930afad49c
comment fix
2016-09-06 17:40:45 -07:00
Marko Kudjerski
b8da976123
added Info.plist to Components.app so that macdeployqt from Qt 5.6 doesn't throw a segfault
2016-09-06 17:40:45 -07:00
SamGondelman
7f2476f0f8
put pack macdeployqt call, but still removed qtwebprocess
2016-09-06 17:36:58 -07:00
SamGondelman
2db02fdde1
remove QtWebProcess hack on OSX
2016-09-06 17:36:56 -07:00
Brad Hefta-Gaub
df9ac9fd6e
Merge pull request #8519 from birarda/installer-fixes
...
add removal of resources folder before install
2016-09-02 09:06:20 -07:00
Stephen Birarda
8977f9ed92
fix else condition in hifiAudioCodec
2016-09-01 10:57:30 -07:00
Stephen Birarda
47f15f6ad8
use libc++ and clang toolchain
2016-08-31 16:16:40 -07:00
Stephen Birarda
aea60692de
update to latest android.toolchain.cmake
2016-08-31 15:39:46 -07:00
Stephen Birarda
d113105315
clarify SCRIBE_PATH error message
2016-08-31 14:08:59 -07:00
Stephen Birarda
fc8fad0753
check SCRIBE_PATH for scribe, add instructions
2016-08-31 13:56:02 -07:00
Stephen Birarda
f67f53a4fa
remove the mtc tool that is no longer used
2016-08-31 13:24:21 -07:00
Stephen Birarda
b56a596c29
put android build output in target folder
2016-08-31 13:23:19 -07:00
Stephen Birarda
c9e18e8d90
spacing repairs in autoscribe_shader_lib
2016-08-31 11:59:51 -07:00
Stephen Birarda
62504d457b
put the apk and apk-build folders in root of build
2016-08-31 11:50:39 -07:00
Stephen Birarda
3f1545008d
don't target any plugins for android
2016-08-31 11:19:01 -07:00
Stephen Birarda
7c2fea4598
remove glew/oglplus requirement for android interface
2016-08-31 11:03:53 -07:00
Stephen Birarda
f1ed7a2e78
initial changes needed for android interface cmake
2016-08-31 10:53:29 -07:00
Stephen Birarda
a8272712bb
move forced client selection to apply to all installs
2016-08-29 15:40:45 -07:00
Ken Cooke
678ea3ecbf
PR feedback
2016-08-29 13:22:48 -07:00
Stephen Birarda
20777bd19a
force default selection of client on install
2016-08-29 13:13:35 -07:00
Stephen Birarda
87ecc65dce
set component requirement in cpack add componeent command
2016-08-29 13:13:35 -07:00
Stephen Birarda
fab2568624
always remove the resources dir, make client required
2016-08-29 13:13:35 -07:00
Stephen Birarda
0e4fb51d09
force cleanup section to be first
2016-08-29 13:13:35 -07:00
Stephen Birarda
c4ec02c4bf
add removal of resources folder during install process
2016-08-29 13:13:35 -07:00
Ken Cooke
28a99a7a03
Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio
2016-08-29 12:38:17 -07:00
Ken Cooke
996bf0d763
Replace the Qt multimedia audio back-end on the Windows build.
...
Adds an external project (wasapi) to download a low-latency audio plugin for Qt, as a precompiled DLL.
Adds a post-build command to use this new plugin instead of the default Qt audio plugin.
2016-08-28 20:12:59 -07:00
elisa-lj11
4c434e875e
fixed merge conflicts in Application.cpp
2016-08-19 09:46:22 -07:00
Brad Davis
adcfd55cc0
Batch replay reprojection
2016-08-12 22:28:23 -07:00
elisa-lj11
c009834685
Fixes for linux build of quazip
2016-08-05 17:36:27 -07:00
elisa-lj11
cd7706e80b
Release now has quazip features
2016-08-04 17:01:19 -07:00
elisa-lj11
9833ba1987
No errors upon build
2016-08-04 16:51:14 -07:00
elisa-lj11
212e4f9cca
making quazip work
2016-08-04 16:48:14 -07:00
elisa-lj11
87cbb79d67
fixing up quazip
2016-08-04 16:46:56 -07:00
elisa-lj11
c9c965b1e8
added new files for quazip
2016-08-04 16:46:56 -07:00