Commit Graph

390 Commits

Author SHA1 Message Date
Router Gray
e5a6f1e2d9 [CMake Linux] Fix my being too rushed in Copy3rdParty, restore openal 2020-03-16 03:38:55 -05:00
Router Gray
0a6a47a099 [Linux] Use system X11. 2020-03-01 09:42:00 -06:00
Router Gray
9880fe225e [Linux] Use system libraries for dbus-glib, gtk-atk-pango-glib, and ogg-vorbis. 2020-03-01 09:42:00 -06:00
Liru Færs
2afd2c500b Update VLC and Dullahan. Update vcredist deployment. Thanks Alchemy! 2020-02-25 03:21:27 -05:00
Router Gray
c8290b913e [CMake] Change remaining WORD_SIZE references to ADDDRESS_SIZE. 2019-12-27 06:16:59 -06:00
Router Gray
c68e00730e [CMake Linux] Only include pthread and rt in target_link_libraries for ld.gold support (Alchemy sync)
Fixes CMake warnings on Linux
2019-12-25 09:08:48 -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
afbafbe689 Merge branch 'master' of https://github.com/RouterGray/SingularityViewer
# Conflicts:
#	indra/newview/CMakeLists.txt
2019-10-22 01:03:45 -04:00
Router Gray
e3d69b4d8e [Audio] Make Fmod cooperate with the new PCH shiny. Also fixes OpenAL in Windows. 2019-10-21 20:23:55 -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
Router Gray
2ba3ff852c [Linux] Switch to Ninja build system. Use compiler feature detection to accomodate the new PCH module. 2019-10-20 22:15:09 -05:00
Router Gray
76e9d912d6 [Linux] Drop prebuilt freetype and fontconfig, use system libraries. 2019-10-20 22:15:03 -05:00
Router Gray
29e71bec86 [CMake] The COMMENT directive needs quotes on output. 2019-10-20 22:14:57 -05:00
Liru Færs
8a2407ecbb fmt, just not for linux 2019-10-20 05:54:05 -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
Rye Mutt
8561af1f84 Add abseil hashmaps and use in texture list, also fix bugs in texture list insertion 2019-09-28 19:03:49 -04:00
Rye Mutt
886619a099 Add files needed for python venv 2019-09-26 20:11:43 -04:00
Router Gray
dc77a053ea [Alchemy sync] Switch from shipping vc_redist to shipping the dll's from the build host. 2019-07-29 23:04:26 -05:00
Router Gray
9600965bcf Dullahan finally works, thanks Liru, Bitten, Drake. Catch Linux up. 2019-07-22 04:48:34 -05:00
Naiyako
4a6a81b5d4 Make fmod2.0 compiling
Signed-off-by: Lirusaito <inusaito@gmail.com>
Added libraries to autobuild, mac build from Bitten
2019-07-04 10:42:19 -04:00
Router Gray
9bcd3298ba Use dictionaries prebuilt instead of in-tree; adds several languages. 2019-05-05 20:15:04 -04:00
Router Gray
535a01ea30 SLVoice update Windows and Mac 2019-05-05 20:14:53 -04:00
Lirusaito
ed09681479 There's no need to warn or even mention this, thanks Deltek! 2019-04-20 01:35:30 -04:00
Lirusaito
d194dfbc09 Sync with alchemyng for VCRedist update 2019-04-19 23:25:47 -04:00
Lirusaito
564410ac7e Fix some warnings and errors 2019-04-19 17:29:55 -04:00
Lirusaito
f2beb4443a This should fix Linux, thanks Drake. 2019-04-19 16:52:40 -04:00
Lirusaito
01b4339b6f Fix configure
Not sure how Prebuilt.cmake worked in my repo but not others, but okay.
Of course I'd forget to stage the libvlc directory.
And somehow vlc-bin wasn't added to autobuild.xml?!
2019-04-19 13:11:52 -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
7c41dc2e7e It's a syncing ship
Ha... get it?
I'm so lonely...
2019-04-17 18:09:39 -04:00
Lirusaito
41c56f706a It's all Greek to me
Thanks, Router!
2019-04-17 12:43:36 -04:00
Lirusaito
947cf57100 And then I remembered windows is windows. 2019-04-13 02:53:01 -04:00
Lirusaito
278459bdf2 New Fonts to complain about!
Thanks Drake!
Tweaks panels to look good now that font is slightly wider
2019-04-10 15:26:23 -04:00
Lirusaito
3b54658e52 Apparently this wasn't even needed? Why did Visual Studio warn me? 2019-04-10 11:37:37 -04:00
Lirusaito
3ad4770b44 [Support] Show a concise indicator in chat for viewer channel/branch 2019-04-09 04:40:42 -04:00
Lirusaito
2c2d127683 Allow Unicode viewer channels 2019-04-09 04:37:23 -04:00
Lirusaito
6271dba5bf Sync Variables.cmake with future branch 2019-04-09 03:56:59 -04:00
Lirusaito
c848af3960 Merge in Dullahan support from future branch! 2019-04-01 01:26:16 -04:00
Router Gray
940994288b [3:39 PM] CmdrCupcake: there is no /arch:SSE3 2019-03-30 19:11:56 -05:00
Router Gray
3e8fbc8179 Update most Windows 32 prebuilts 2019-03-30 19:11:23 -05:00
Lirusaito
fc488959ea Switch out jsoncpp for nlohmann json
Add llsdjson.* too!
2019-03-07 03:38:27 -05:00