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
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
c9e18e8d90
spacing repairs in autoscribe_shader_lib
2016-08-31 11:59:51 -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
elisa-lj11
87cbb79d67
fixing up quazip
2016-08-04 16:46:56 -07:00
SamGondelman
676f4bdfcf
misc fixes from particles branch
2016-07-29 15:36:32 -07:00
Seth Alves
5485b3ee13
when cmake is told SERVER_ONLY, still build server-side plugins
2016-07-20 11:34:44 -07:00
Leonardo Murillo
ce67d57279
Removing Debugs
2016-07-15 13:03:40 -06:00
Leonardo Murillo
53d524eb2f
Checkpoint
2016-07-15 12:04:45 -06:00
Leonardo Murillo
f0db7b9d39
Checkpoint
2016-07-15 11:42:30 -06:00
Brad Hefta-Gaub
c2fd055f0f
more hacking
2016-07-14 08:20:07 -07:00
Brad Hefta-Gaub
b6ffabf500
attempt to get mac sandbox plugins to work
2016-07-13 14:58:27 -07:00
Brad Hefta-Gaub
2b719e12f7
attempt to make mac server plugins work
2016-07-12 10:54:45 -07:00
Brad Hefta-Gaub
f3f72f3c93
Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins
2016-07-11 13:15:27 -07:00
Brad Davis
790f74da1d
Support geometry shaders
2016-07-07 13:36:47 -07:00
Brad Hefta-Gaub
38f0cd218b
make client server plugins properly copy into plugins directory
2016-07-07 10:31:12 -07:00
Marko Kudjerski
17ce80ed69
sign executables with SHA256
2016-06-24 19:28:31 -07:00
SamGondelman
645ae3c21e
remove tabs
2016-06-22 17:02:02 -07:00
SamGondelman
a9ed0b1c83
completely destroyed sixense on macs
2016-06-22 16:56:50 -07:00
Atlante45
1a8d6ea614
Make steamworks an external dependency
2016-06-14 16:29:50 -07:00
Atlante45
96258a795a
Initial Steamworks integration
2016-06-14 16:29:50 -07:00
Ken Cooke
b60b9bb312
compiler fixes for GCC/clang
2016-06-06 14:54:15 -07:00
Brad Davis
3cc08cdcfc
Breaking up GL agnostic code from 4.1 specific code
2016-05-18 14:35:53 -07:00
Stephen Birarda
9fe9100cac
change produced installer names to beta
2016-04-27 15:57:32 -07:00
Stephen Birarda
bc706191df
add_definitions from cmake for each release type
2016-04-21 17:28:11 -07:00
Stephen Birarda
7e02b30227
rename .app on OS X to Interface
2016-04-14 13:01:47 -07:00
Stephen Birarda
7d042fc47d
keep server-console as sandbox folder in Program Files
2016-03-30 13:54:55 -07:00
Stephen Birarda
02d93e2a11
cleanup fixes for old shortcuts in NSIS script
2016-03-30 13:09:36 -07:00
Stephen Birarda
724c95fbd6
leave executable name for server-console
2016-03-30 12:05:17 -07:00
Stephen Birarda
6bdedeb5ce
change packaging parameters for Sandbox/Interface
2016-03-30 11:59:49 -07:00
Stephen Birarda
a9dd88d834
Merge pull request #7320 from zzmp/feat/shader-includes
...
Compile shaders into separate dir for inclusion
2016-03-10 21:07:49 -08:00
Zach Pomerantz
243fbf8299
Specify and create shaders folder
2016-03-10 20:49:33 -08:00
Zach Pomerantz
11867aa71d
Compile shaders to their own folders
2016-03-10 20:10:54 -08:00
Stephen Birarda
3750d5d780
manually install OpenSSL DLLs for Qt
2016-03-03 17:57:34 -08:00
Stephen Birarda
248aa58d23
force statically linked OpenSSL on windows
2016-03-01 13:04:37 -08:00
Ryan Huffman
71b72aceb8
Fix CHECKED_FOR_BUGSPLAT_ONCE
2016-02-11 09:46:12 -08:00
Ryan Huffman
813d5e5ba0
Add headers and proper bugsplat checking to cmake files
2016-02-11 08:17:05 -08:00
Ryan Huffman
20cf7c0099
Clean up BugSplat cmake
2016-02-09 11:45:32 -08:00
Ryan Huffman
b1684eba9c
Add BugSplat cmake files
2016-02-09 10:48:16 -08:00
Ken Cooke
04798a45fc
Remove redundant patterns from CMake GLOB
2016-02-08 14:47:43 -08:00
Ken Cooke
08e299f724
CMAKE changes to support AVX instructions. Source files in src/avx are compiled with AVX enabled (VEX encoding) and require runtime dispatch to avoid crashing a machine without AVX hardware.
2016-02-06 10:53:56 -08:00
Brad Hefta-Gaub
5ea4cb6900
Merge pull request #6949 from birarda/installer-sixense
...
pull missing Sixense DLLs from external project
2016-01-27 12:17:59 -08:00
Stephen Birarda
8ba0e3bc6e
give dev shortcuts a specific name too
2016-01-26 16:21:18 -08:00
Stephen Birarda
e6a8fd192c
use the VS2011 DLLs bundled with sixense for installer
2016-01-26 15:54:08 -08:00
Stephen Birarda
068de5203c
use specific shortcut names for PR builds
2016-01-26 11:40:50 -08:00
Stephen Birarda
78609ed634
fix reference to components install path on OS X
2016-01-22 17:07:05 -08:00
Stephen Birarda
801cbf3fac
make sure CONSOLE_INSTALL_APP_PATH is defined before use
2016-01-22 15:59:39 -08:00
Stephen Birarda
da1902ac72
use CMake InstallRequiredSystemLibraries for MSVC
2016-01-22 15:55:58 -08:00
Stephen Birarda
53eee27086
use incredibly dumb win path to 64-bit dlls
2016-01-22 15:55:58 -08:00
Stephen Birarda
47a630f0ad
manually install msvc DLLs with Interface/DS/AC
2016-01-22 15:55:58 -08:00
Stephen Birarda
5743c8046c
install the server-console in a subdir on win32
2016-01-22 15:55:58 -08:00
Stephen Birarda
b099376193
fix a typo in message for macdeployqt
2016-01-22 14:47:25 -08:00
Stephen Birarda
e00481ddfb
use macdeployqt for fixup of components
2016-01-21 17:17:28 -08:00
Stephen Birarda
5f21b1f35c
cpack properties file must be setup after variables
2016-01-20 12:10:37 -08:00
Stephen Birarda
391313532a
remove hash from PR org name
2016-01-20 10:46:54 -08:00
Stephen Birarda
57639672cf
repairs to path finding and naming on OS X
2016-01-20 10:46:54 -08:00
Stephen Birarda
d1421137e5
add a folder with icon for DMG installer
2016-01-20 10:46:54 -08:00
Stephen Birarda
974a899328
clean unused vars and spacing
2016-01-19 16:04:42 -08:00
Stephen Birarda
4feb79cff4
fix message for no code signing on production
2016-01-19 16:04:42 -08:00
Stephen Birarda
8c400f1c5f
shorten up GenerateInstallers macro
2016-01-19 16:04:42 -08:00
Stephen Birarda
4fb5a142f7
check during uninstall for running applications
2016-01-18 15:50:44 -08:00
Stephen Birarda
b7998935b0
install a json file with build info beside console
2016-01-18 14:56:06 -08:00
Stephen Birarda
88604a0110
make sure ADD_REMOVE_ICON_NAME set for nsis
2016-01-18 10:57:45 -08:00
Stephen Birarda
7d4a7983ed
update the installer icon and header
2016-01-18 10:38:38 -08:00
Stephen Birarda
ba6c4d90df
install the ssleay32 dll, not lib
2016-01-18 10:34:42 -08:00
Stephen Birarda
d4597f9e8b
Revert "comment out manual ssleay copying"
...
This reverts commit 0355e816b0
.
2016-01-18 10:11:36 -08:00
Stephen Birarda
0355e816b0
comment out manual ssleay copying
2016-01-15 16:02:24 -08:00
Stephen Birarda
0876da7a7d
call manual install of ssleay from console install
2016-01-15 15:41:34 -08:00
Stephen Birarda
cf5b6198fd
use install command to manually place ssleay library
2016-01-15 15:41:34 -08:00
Stephen Birarda
59b4c2545f
remove DDE as component of installer
2016-01-15 15:41:34 -08:00
Stephen Birarda
0533438b8f
use backslashes in add remove icon path
2016-01-15 15:41:34 -08:00
Stephen Birarda
95acd2cfc3
drop in add remove icon during core install
2016-01-15 15:41:34 -08:00
Stephen Birarda
d57bd887b1
install the add/remove icon
2016-01-15 15:41:34 -08:00
Stephen Birarda
fc65053eb5
add an icon for item in add/remove
2016-01-15 15:41:34 -08:00
Stephen Birarda
9ce0f6a0b1
add a header image for uninstaller
2016-01-15 15:41:34 -08:00
Stephen Birarda
92c221620c
use backslashes for header image path on win
2016-01-15 15:41:34 -08:00
Stephen Birarda
d34c3bdc1c
add custom header image for installer
2016-01-15 15:41:34 -08:00
Stephen Birarda
537f8deeec
update to new license in root and installer
2016-01-15 15:41:34 -08:00
Stephen Birarda
81493f9b4e
only sign production build executables
2016-01-15 15:41:34 -08:00
Stephen Birarda
99ad79d833
add an icon for nsis installer
2016-01-15 15:41:34 -08:00
Stephen Birarda
c0c627a226
explicitly set install directory to match display name
2016-01-15 15:41:34 -08:00
Stephen Birarda
aa9319001e
use BUILD_ORGANIZATION for installer display name
2016-01-15 15:41:34 -08:00
Stephen Birarda
7d2684f01e
use alpha for packaged installer name
2016-01-15 15:41:34 -08:00
Stephen Birarda
0a15f0400c
fix env variable referencing in SetPackagingParameters
2016-01-15 15:41:34 -08:00
Stephen Birarda
ffd79a5df4
pretty up the packaged installer name
2016-01-15 15:41:34 -08:00
Stephen Birarda
926b75782f
use build version for cpack package version
2016-01-15 15:41:34 -08:00
Stephen Birarda
3e9f124209
update packaging parameters for suggested jenkins setup
2016-01-15 15:41:34 -08:00
Stephen Birarda
0b118a8e98
replace ApplicationVersion with BuildInfo
2016-01-15 15:41:34 -08:00
Stephen Birarda
e9ce0318a2
add the custom installer license
2016-01-15 15:41:34 -08:00
Stephen Birarda
a1a92cf3a9
change registry location for post install options
2016-01-15 15:41:34 -08:00