Commit Graph

58 Commits

Author SHA1 Message Date
Router Gray
c8290b913e [CMake] Change remaining WORD_SIZE references to ADDDRESS_SIZE. 2019-12-27 06:16:59 -06:00
Liru Færs
067bd3cbd7 Sync with alchemy
Minor installer fix
Fix MSVC update breaking crashAndLoop
Move Variables to their corresponding places
Sync parts of deps/CMakeLists.txt
Update Abseil and fmt
2019-12-19 21:04:01 -05:00
Liru Færs
6e716fe3c5 Sentry and CI improvements from Rye. 2019-12-19 20:35:33 -05:00
Liru Færs
831c7f53b2 Fix bad spacing in Variables.cmake 2019-12-18 19:54:03 -05:00
Liru Færs
1c5a829e82 More of Rye's gitlab CI changes <3 2019-12-18 19:51:29 -05:00
Liru Færs
4751949628 Cleanup and further sync with upstream 2019-12-18 16:27:17 -05:00
Liru Færs
10140d143c Wooops, branding ID separation is necessary, revert that change
Set up VIEWER_BINARY_NAME based on VIEWER_BRANDING_ID, make spaces dashes.
Fix VIEWER_EXE_GLOBS being wrong on Linux, thanks Router!
2019-12-17 23:49:37 -05:00
Liru Færs
f3609b06d7 Further CI/CD & building sync with alchemy
Reorder Variables.cmake for mergeability
Renames CMake Variables:
FMODSTUDIO->USE_FMODSTUDIO, NVAPI->USE_NVAPI,
VIEWER_CHANNEL_BASE->VIEWER_CHANNEL_TYPE
VIEWER_BRANDING_ID->VIEWER_BINARY_NAME,
VIEWER_PRODUCT_NAME->VIEWER_CHANNEL_BASE

Remove unused variables:
VIEWER_PACKAGE_ID, VIEWER_EXE_STRING, VIEWER_SHORTCUT_STRING, VERSION_BUILD

PACKAGE now defaults to on, USE_FMODSTUDIO now defaults to off

Use list append instead of set in some more places

Adds support for Project channels.
2019-12-17 19:31:08 -05:00
Liru Færs
cf5586037e Move to gitlab for CI (Rye's work but ported)
d3ddcdae: Update various urls from bitbucket to new alchemy gitlab
c24b176d: Standardize on one vc directory name for ease of build automation
Also add .gitlab-ci.yml

Thanks for the help, Rye!
2019-12-14 23:01:07 -05:00
Liru Færs
432bf03f0a Port Crashpad support from alchemy, with some small tweaks
Moved initCrashReporting into LLAppViewer, everything we use there is
crossplatform enough that duplicating code is silly

Removes unused gCrashSettings
Adds MBFatalError, that's right, Crash Loop is now translatable!
Adds consent notification prompt to first login... enjoy that, everyone.
2019-10-21 16:25:29 -04:00
Liru Færs
7b3c3b9fab Burst Commit for building with ninja and more, thanks Alchemy!
GeneratePrecompiledHeader - Cinder and Rye
Ninja Support - Rye
Fetch Content instead of prebuilds - Rye
Visual Studio Native CMake Support - Rye
2019-10-17 21:15:30 -04:00
Rye Mutt
e1757d68a5 Enable cmake IDE folder generation 2019-10-07 11:56:46 -04:00
Lirusaito
f26425f17a VLC instead of QuickTime
I dunno if it's actually in there yet... meh
2019-04-19 00:05:49 -04:00
Lirusaito
b28313559d Update to VS2019, you now need autobuild-1.1 on windows 2019-04-18 23:49:47 -04:00
Lirusaito
07569d008d Fix compile issues, thanks Router! 2019-04-18 09:19:20 -04:00
Lirusaito
41c56f706a It's all Greek to me
Thanks, Router!
2019-04-17 12:43:36 -04:00
Lirusaito
3ad4770b44 [Support] Show a concise indicator in chat for viewer channel/branch 2019-04-09 04:40:42 -04:00
Lirusaito
6271dba5bf Sync Variables.cmake with future branch 2019-04-09 03:56:59 -04:00
Liru
f838fa5d45 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Release 2017-10-02 14:12:18 -04:00
Inusaito Sayori
2922f78c20 Merge pull request #30 from nikolas/patch-2
Variables.cmake: typo fix - BOOl -> BOOL
2017-10-02 13:29:24 -04:00
Nik Nyby
5e3e46847e Variables.cmake: fix typo - Unkown -> Unknown 2017-09-30 23:48:25 -04:00
Nik Nyby
c68b7ff4a8 Variables.cmake: typo fix - BOOl -> BOOL 2017-09-30 14:12:58 -04:00
Lirusaito
c92ccf8a44 Branding shtuffs for the Singularity 2017-04-04 20:40:08 -04:00
Lirusaito
ac593a694e Fix the cmake issue with VIEWER_CHANNEL_NOSPACES
Thanks for helping, Friti!
2016-06-15 23:25:21 -04:00
Lirusaito
b4f0ea4c78 More merge? More merge. 2016-05-03 00:08:32 -04:00
Shyotl
9e354801d8 Fix up generated artifact naming to include full unspaced channel name as well as arch. 2016-05-01 23:05:34 -05:00
Drake Arconis
01bf430b1a Get linux64 somewhat working 2016-01-19 10:07:27 -08:00
Drake Arconis
8a6bb4c00a Add options for LTO and Incremental Linking for windows 2016-01-17 08:19:17 -05:00
Drake Arconis
e9f4b917d1 Fix up icon copying and make manifest actually start to kinda work again 2016-01-16 11:18:40 -05:00
Drake Arconis
13666ac62a Change out versioning code for less hacky versioning code 2016-01-16 10:06:07 -05:00
Drake Arconis
2f2e1fbe8f Major breaking changes 2016-01-16 08:05:47 -05:00
Shyotl
958031dbaf Moved build dirs out of indra directory. installed.xml and prebuilts are now per-build-target. Added support for v3 prebuilt package layout. 2014-12-03 22:36:42 -06:00
Latif Khalifa
42ca1a8994 [clang] Force build with SDK 10.6 2014-04-16 10:55:36 +02:00
Latif Khalifa
41eafa4ede [xcode5] WIP: build system changes 2014-04-14 21:14:42 +02:00
Latif Khalifa
c99f54367d Use viewer channel as the basis for installer file names 2013-11-19 00:50:06 +01:00
Drake Arconis
e1356b7aaf Fix slight breakage in the osx cmake 2013-11-03 23:00:56 -05:00
Latif Khalifa
32bed5660a WIP win64 support 2013-10-19 23:05:53 +02:00
Siana Gearz
54983bcc89 Fixing some syntactic and build system stupidity 2013-05-11 23:40:26 +02:00
Drake Arconis
e9330f8a87 This should fix OSX blah blah 2013-04-09 08:12:13 -04:00
Latif Khalifa
cfa3766bc7 Quick fix for the Mac build.
TODO: Make this version dependant so it works with newer Xcode too
2013-03-24 17:11:03 +01:00
Drake Arconis
91b3cdde39 Unbreak non-debian derived and standalone linux 2013-03-21 16:55:25 -04:00
Drake Arconis
0e3a9b28bd CMake cleanup and organization 2013-03-05 12:24:51 -05:00
Drake Arconis
43c0c4ce91 Some CMake Cleanup
Clean up leftover SERVER and VIEWER from when they were a single tree
Fixed debian multiarch cmake
Small bits of OSX cleanup
2013-03-04 03:31:24 -05:00
Shyotl
7533b475be TCMalloc can now be manually disabled via develop.py -DDISABLE_TCMALLOC:BOOL=ON 2012-10-16 17:15:23 -05:00
Drake Arconis
ccb914ea83 General cleanup of OSX support - not done
Updated with new cursors from LL
Corrected mispackaged OSX Libs
Corrected mouse flicker on menus

Signed-off-by: Drake Arconis <lightdrake@gmail.com>
2012-07-15 17:45:50 -04:00
Lirusaito
23e6c9c9e8 Revert "One more DARWIN fix."
This reverts commit 6581cb2929.
2012-07-09 18:49:27 -04:00
Lirusaito
6581cb2929 One more DARWIN fix.
Credit to LightDrake and Apelsin
2012-07-08 17:57:06 -04:00
Siana Gearz
23b97efb69 Prebuilt fetch now honors CMake-specified plattform 2011-12-25 05:21:37 +01:00
Drake Arconis
a35ef93d19 Right Click Mouse Scroll Zoom and Xcode fix 2011-10-31 15:43:05 -04:00
Drake Arconis
e5f75d1e48 XCode fixes 2011-10-31 13:24:31 -04:00