Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 16:02:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46780 commits 71 branches 56 tags 1.2 GiB
Commit graph

388 commits

Author SHA1 Message Date
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
Stephen Birarda
8e3f18b628 require append of @CPACK_PACKAGE_INSTALL_REGISTRY_KEY@ to root 2016-01-15 15:41:34 -08:00
Stephen Birarda
a0647756b5 delete the post-install options info from registry on uninstall 2016-01-15 15:41:34 -08:00
Stephen Birarda
a47cf35b32 write post install option choices to registry 2016-01-15 15:41:34 -08:00
Stephen Birarda
f4817032ec make uninstaller name a cmake/cpack variable 2016-01-15 15:41:34 -08:00
Stephen Birarda
89e8cd16d3 use quotes in nsis template for signtool path 2016-01-15 15:41:34 -08:00
Stephen Birarda
b9ccef6c2c use string replace to escape signtool path 2016-01-15 15:41:34 -08:00
Stephen Birarda
0d2b8f183e use fully escaped path for nsis compatibility 2016-01-15 15:41:34 -08:00
Stephen Birarda
f8ca9e64a9 pass the signtool executable to nsis 2016-01-15 15:41:34 -08:00
Stephen Birarda
cc4f7a9ad8 add message if executable signing enabled 2016-01-15 15:41:34 -08:00
Stephen Birarda
3b12eef79b use full path and not simply name for target 2016-01-15 15:41:34 -08:00
Stephen Birarda
14196ba370 fix for target file name interpolation 2016-01-15 15:41:34 -08:00
Stephen Birarda
44e1cdfe00 make executable signing a post build step 2016-01-15 15:41:34 -08:00
Stephen Birarda
e036531796 attempt to sign executable as a post build step 2016-01-15 15:41:34 -08:00
Stephen Birarda
547d2043e8 fix for execute_process call with signtool command 2016-01-15 15:41:34 -08:00
Stephen Birarda
e50e28468c add a status message for executable signing 2016-01-15 15:41:34 -08:00
Stephen Birarda
798d234d63 remove package bundle copying of ssleay dll 2016-01-15 15:41:34 -08:00
Stephen Birarda
d14c8cf9cc add signing of DS and AC executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
9aa5d017d6 add optional signing of interface executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
3a9ac7d4ac remove macro to consolidate installer components 2016-01-15 15:41:34 -08:00
Stephen Birarda
288b044a0f use nsDialogs for custom post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
c9ecf35d82 rename template file used for post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
58cc86bc5b add a file for NSIS post install options 2016-01-15 15:41:34 -08:00
Stephen Birarda
cfcda488c4 use corect interpolation of display name option 2016-01-15 15:41:34 -08:00
Stephen Birarda
798760f175 change cpack names for generated installer 2016-01-15 15:41:34 -08:00
Stephen Birarda
53eb66418a fix for falsity of build types 2016-01-15 15:41:34 -08:00
Stephen Birarda
a2904cdc7b use a CPackProperties file for custom installer variables 2016-01-15 15:41:34 -08:00
Stephen Birarda
301124ba3c fix reference to rc template and icon prefix 2016-01-15 15:41:34 -08:00
Stephen Birarda
f8f0b99a46 add icon to interface exec, icons in start menu 2016-01-15 15:41:34 -08:00
Stephen Birarda
59b6d8fde8 set CPACK_MODULE_PATH so custom template is used 2016-01-15 15:41:34 -08:00
Stephen Birarda
d2f35adc11 add space back to package name and vendor 2016-01-15 15:41:34 -08:00
Stephen Birarda
63a88815bc add NSIS template for custom installer options 2016-01-15 15:41:34 -08:00
Stephen Birarda
87e55543ce repairs to component group for client/dde 2016-01-15 15:41:34 -08:00
Stephen Birarda
fcd9d9b810 setup optional dde archive for windows 2016-01-15 15:41:34 -08:00
Stephen Birarda
8842c66109 include trailing slash in windows file copy 2016-01-15 15:41:34 -08:00
Stephen Birarda
1faa78fe72 install fixed up DS and AC beside console 2016-01-15 15:41:34 -08:00
Stephen Birarda
1a10d2eb72 switch to a DragNDrop installer for OS X 2016-01-15 15:41:34 -08:00
Stephen Birarda
dedb7e2778 bury components in a shell application inside the server-console 2016-01-15 15:41:34 -08:00
Stephen Birarda
86facc15d1 remove debug message in fixup_interface macro 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
4f00982724 remove extraneous add dependency for FIXUP_LIB 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
3906a4fe38 drop the resources folder for DS beside executable 2016-01-15 15:41:34 -08:00
Stephen Birarda
71307c1280 remove extra debug from shell application copy 2016-01-15 15:41:34 -08:00
Stephen Birarda
b7154cacd2 use shell application to avoid fixup on Electron 2016-01-15 15:41:34 -08:00
Stephen Birarda
cbc0c4e31d rename console packaging target 2016-01-15 15:41:34 -08:00
Stephen Birarda
e3ef18ae6e customize Interface output name for PR/dev/prod 2016-01-15 15:41:34 -08:00
Stephen Birarda
f87d8885f4 rename interface bundle for production and pr build 2016-01-15 15:41:34 -08:00
Stephen Birarda
d491a7f0e5 work around OS X package installer relocation 2016-01-15 15:41:34 -08:00
Stephen Birarda
6eb96c27e5 use standard PlugIns path, fix for makefiles build 2016-01-15 15:41:34 -08:00
Stephen Birarda
e421624e99 put AC and DS binaries beside server-console 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
Stephen Birarda
0463e008cf base cpack configuaration using install commands 2016-01-15 15:41:34 -08:00
Stephen Birarda
5832884b58 handle beta icon usage while packaging console 2016-01-05 10:27:46 -08:00
Stephen Birarda
9c2eebfaeb don't attempt to find nsight multiple times per run 2016-01-04 16:52:39 -08:00
Stephen Birarda
c4fdd86a56 use current source dir for console icon copy 2016-01-04 16:36:30 -08:00
Stephen Birarda
5e762a4b95 specify console folder to copy per-platform 2016-01-04 16:29:00 -08:00
Stephen Birarda
c9c536ff00 remove FIND_NSIGHT_CALLED variable 2016-01-04 16:00:42 -08:00
Stephen Birarda
7892808b28 cleanup TargetNsight, remove extra debug 2016-01-04 15:58:13 -08:00
Stephen Birarda
1e2ae87dee make application version a private include 2016-01-04 15:20:17 -08:00
Stephen Birarda
9e252f0b08 exclude targets from all build, include app version 2016-01-04 15:18:57 -08:00
Stephen Birarda
fcc0c92ff1 put console/build-package in installer folder 2016-01-04 15:13:29 -08:00
Stephen Birarda
bf5f783e67 copy console icon for installer 2016-01-04 13:58:33 -08:00
Stephen Birarda
817bbb09d2 rename console target to High Fidelity Console 2016-01-04 10:54:51 -08:00
Stephen Birarda
90cf69b9b5 add console handling to installer component consolidation 2016-01-04 10:47:25 -08:00
Stephen Birarda
b3e46d1ed8 some macro renaming and cleanup 2016-01-04 10:26:37 -08:00
Stephen Birarda
02069bfcd2 Merge remote-tracking branch 'leo/master' into console 2016-01-04 09:57:55 -08:00
Leonardo Murillo
379cdf1d5d Merge branch 'master' of github.com:highfidelity/hifi 2015-12-31 09:06:44 -06:00
Stephen Birarda
abea65fa84 resolve conflicts on merge with upstream/master 2015-12-29 17:54:45 -08:00
Anthony J. Thibault
c35995b8e3 Build fix for linux? 2015-12-29 08:51:44 -08:00
Leonardo Murillo
ea6850c423 Changes per convo with Philip 2015-12-29 10:16:27 -06:00
Leonardo Murillo
baf095f4af Lots and lots of changes to installer 2015-12-23 14:16:49 -06:00
Anthony J. Thibault
0459479c2b NeuronPlugin: Added external project for Neuron SDK 
Now builds on windows with actual Neuron SDK.
Can to TCP server on localhost, and receive joint data.
Will debug draw joint 6, (left foot?)
 2015-12-21 18:30:15 -08:00
Leonardo Murillo
aca60e23c2 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-19 18:44:21 -06:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
Brad Hefta-Gaub
868d10651a Merge pull request #6651 from jherico/webengine 
Migrate QML based web views to Qt WebEngine
 2015-12-18 14:56:35 -08:00
Leonardo Murillo
736977a4c2 Using correct Icons for PR vs Relesae 2015-12-18 08:16:39 -06:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
Leonardo Murillo
bbe444ffc1 Forgot to add file 2015-12-16 16:40:51 -06:00
Leonardo Murillo
66770cc907 Finishing touches 2015-12-16 16:11:35 -06:00
Leonardo Murillo
711d02ba2f Consolidating installer checkpoint 2015-12-16 14:26:24 -06:00
Stephen Birarda
20886748af resolve conflicts on merge with upstream/master 2015-12-16 10:21:24 -08:00
Andrew Meadows
51ff8f096e correct input plugin load path on linux 2015-12-15 08:43:04 -08:00
Andrew Meadows
cb65a6f640 fix cmake to build bullet-2.83 2015-12-11 09:40:15 -08:00
Stephen Birarda
bddb8d5b68 remove Quazip files used by CMake 2015-12-03 14:08:10 -08:00
Leonardo Murillo
c786789c4c Changes for SSL and icons 2015-12-02 12:43:25 -06:00
Leonardo Murillo
ca8cd13c48 Checkpoint 2015-12-01 12:32:31 -06:00
Leonardo Murillo
4e18640922 Some fixes 2015-11-30 10:07:11 -06:00
Leonardo Murillo
5822386702 Checkpoint 2015-11-30 08:56:30 -06:00
Leonardo Murillo
6a53140720 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-30 08:38:13 -06:00
Anthony Thibault
a9e25c51e5 Fix for linker warning LNK4075 on Windows 
Specifcally, this warning:

    LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification

The fix is to set /OPT:NOREF and /OPT:NOICF on debug builds.
 2015-11-27 20:56:57 -08:00
Leonardo Murillo
b7cdca75b7 Checkpoint towards integrated delivery 2015-11-24 16:12:04 -06:00
Leonardo Murillo
d58b11f0a2 Ubuntu fix - case sensitivity¨ 2015-11-23 18:13:41 -06:00
Leonardo Murillo
66803ce356 Ubuntu fix - case sensitivity¨ 2015-11-23 18:04:36 -06:00
Leonardo Murillo
fee50a56e5 Ubuntu fix - case sensitivity 2015-11-23 18:02:20 -06:00
Leonardo Murillo
8b573cebfb Successfull windows build given any build type checkpoint 2015-11-23 15:16:48 -06:00
Leonardo Murillo
e17d0b2af3 Bundling and consolidating deployment package 2015-11-20 15:10:56 -06:00
Leonardo Murillo
6105191a3f OS X Bundling 2015-11-20 14:45:25 -06:00
Leonardo Murillo
c56a3b6d22 Checkpoint - turning quazip into external 2015-11-20 09:56:10 -06:00
Brad Davis
0c60538952 Ensure that dependencies of runtime plugins are included in the DLL copy 2015-11-06 16:57:30 -08:00
Brad Hefta-Gaub
9c23f2551d Merge pull request #6207 from jherico/pluginSupport 
Support for runtime plugins (DLLs)
 2015-11-01 14:57:13 -08:00
Brad Davis
e0ac48fe27 PR comments 2015-11-01 12:19:19 -08:00
Brad Davis
cfb2fd1523 Support for runtime plugins (DLLs) 2015-11-01 11:12:12 -08:00
Brad Davis
99d8554cc8 Make zlib a true external on windows (linux and OSX should rely on system libraries) 2015-11-01 01:36:59 -07:00
Brad Hefta-Gaub
fb3bf16391 improvement to cmake to explicitly use local external dependency 2015-10-30 09:01:42 -07:00
Brad Davis
fcfab0fc51 Moving SDL2, Sixense and Faceshift to external projects 2015-10-30 00:57:51 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Ken Cooke
de8848f7bc Fix to only pass --release to windeployqt on release builds 2015-09-30 08:11:16 -07:00
Ken Cooke
4dc2c9a58f Create symbol files on Windows release builds. Added --release to windeployqt.exe, otherwise it gets confused and copies debug DLLs instead of release. 2015-09-29 18:42:52 -07:00
Stephen Birarda
255f896f7b remove extra cmake debug 2015-09-08 15:21:34 -07:00
Brad Davis
5f1affaff9 Procedural skybox work 2015-09-08 14:31:16 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Seiji Emery
d29a368688 removed debug 2015-08-25 16:50:09 -07:00
Seiji Emery
140edd0589 try removing quotes... 2015-08-25 16:21:38 -07:00
Seiji Emery
248d0729a6 test 2015-08-25 15:29:36 -07:00
Seiji Emery
62dc83fa32 test 2015-08-25 15:00:21 -07:00
Seiji Emery
3d59f8d7e8 changed setup_project to only use the generated shader source files 2015-08-25 14:40:52 -07:00
Seiji Emery
316ddd68ef force cmake autoscribe to use full paths 2015-08-25 13:46:50 -07:00
Seiji Emery
4d9f45475e Merge branch 'master' of https://github.com/highfidelity/hifi into gputest 2015-08-24 14:38:26 -07:00
Seiji Emery
bd18951be8 fixed AUTOSCRIBE_SHADER_LIB to work for targets outside of libraries/ 2015-08-24 13:13:24 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Leonardo Murillo
cda5b29fd3 Another take at versioning details exchange - checkpoint 2015-08-13 14:19:13 -06:00
Bradley Austin Davis
53ccbfc4fa Merge branch 'core' into plugins 2015-08-03 22:25:50 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
Brad Davis
2a1776303d Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-07-03 06:17:35 -07:00
Seiji Emery
16e7af1848 Reverted macro naming convention 2015-07-02 17:41:38 -07:00
Seiji Emery
a48adf5ce5 Cleanup + formatting 2015-06-30 14:12:58 -07:00
Seiji Emery
e81b0a3c3a Fixed tests for ALL_BUILD 
Fixed physics tests, disabled out-of-date octree tests, and renamed /
added QTestExtensions to the tests folder (IDE view).

ALL_BUILD will now succeed.
 2015-06-26 13:31:31 -07:00
Seiji Emery
0ee0c92f2f Re-added stuff 2015-06-24 14:54:54 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Brad Davis
7955eeda28 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2015-06-12 15:49:35 -07:00
Brad Davis
1846ead27c Merge branch 'master' into vs2015 2015-06-10 10:11:58 -07:00
Brad Davis
f614268667 Moving windows to SDK 0.6 
Working on SDK 0.6 for windows

Working on SDK 0.6 for windows
 2015-06-07 01:40:44 -07:00
Brad Davis
a483dd27ba Trying to get widgets / windows working 2015-06-01 17:31:18 -07:00
Brad Davis
912c003d58 Making (most) plugins into a library 2015-05-29 16:49:11 -07:00
Stephen Birarda
b28e7cc765 handle case where a symlink replaces copy 2015-05-04 17:46:03 -07:00
Stephen Birarda
a24789b721 remove extra space from SetupHifiProject 2015-05-01 16:32:05 -07:00
Stephen Birarda
b50545f414 use symlink for DS resources, add AM bandwidth 2015-04-30 13:53:44 -07:00
Stephen Birarda
e8ee9e4b3a try performing copy in PRE_BUILD for VS 2015-04-30 13:42:30 -07:00
Stephen Birarda
3c7f1cc565 add the symlink or copy directory macro 2015-04-30 13:37:15 -07:00
Stephen Birarda
42c40a7164 attempt add of resources to executable sources 2015-04-30 13:32:25 -07:00
Stephen Birarda
f9ac918ff0 add macro to copy directory beside target 2015-04-30 13:10:59 -07:00
Stephen Birarda
38ae3afc82 add a macro for directory copying 2015-04-30 13:06:00 -07:00
Brad Davis
a83616a7dc Don't prevent building on Visual Studio 2015 2015-04-30 10:32:19 -07:00
Stephen Birarda
ec2f54b90a add a macro to recursively correctly handle resources 2015-04-27 16:02:52 -07:00
Stephen Birarda
08b155146a move externals from build-ext inside the build folder 2015-04-15 12:12:21 -07:00
Brad Davis
54f2774d2e Organize projects into folders for IDEs that support it 2015-03-19 15:45:11 -07:00
Stephen Birarda
76f3378223 don't pass no-libraries option to windeployqt 2015-03-10 18:05:10 -07:00