Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

53d4e69c

Unverified Commit 53d4e69c authored 2 years ago by Signal Linden Committed by GitHub 2 years ago

Downloads
- Plain Diff

Merge pull request #159 from secondlife/marchcat/main-contrib-merge

merge main into contribute

parents 4042ed97 ff0edab6

No related branches found

No related tags found

No related merge requests found

Changes 386

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 5 deletions

.gitignore
autobuild.xml 140 additions, 40 deletions

autobuild.xml
doc/contributions.txt 12 additions, 0 deletions

doc/contributions.txt
indra/CMakeLists.txt 36 additions, 14 deletions

indra/CMakeLists.txt
indra/cmake/00-Common.cmake 72 additions, 117 deletions

indra/cmake/00-Common.cmake
indra/cmake/APR.cmake 39 additions, 48 deletions

indra/cmake/APR.cmake
indra/cmake/Atmosphere.cmake 0 additions, 5 deletions

indra/cmake/Atmosphere.cmake
indra/cmake/Audio.cmake 11 additions, 37 deletions

indra/cmake/Audio.cmake
indra/cmake/Boost.cmake 40 additions, 95 deletions

indra/cmake/Boost.cmake
indra/cmake/BuildPackagesInfo.cmake 1 addition, 1 deletion

indra/cmake/BuildPackagesInfo.cmake
indra/cmake/BuildVersion.cmake 17 additions, 27 deletions

indra/cmake/BuildVersion.cmake
indra/cmake/CEFPlugin.cmake 7 additions, 11 deletions

indra/cmake/CEFPlugin.cmake
indra/cmake/CMakeLists.txt 67 additions, 98 deletions

indra/cmake/CMakeLists.txt
indra/cmake/CURL.cmake 10 additions, 15 deletions

indra/cmake/CURL.cmake
indra/cmake/Copy3rdPartyLibs.cmake 66 additions, 54 deletions

indra/cmake/Copy3rdPartyLibs.cmake
indra/cmake/DBusGlib.cmake 8 additions, 23 deletions

indra/cmake/DBusGlib.cmake
indra/cmake/DragDrop.cmake 6 additions, 10 deletions

indra/cmake/DragDrop.cmake
indra/cmake/EXPAT.cmake 16 additions, 19 deletions

indra/cmake/EXPAT.cmake
indra/cmake/ExamplePlugin.cmake 1 addition, 11 deletions

indra/cmake/ExamplePlugin.cmake
indra/cmake/FMODSTUDIO.cmake 25 additions, 15 deletions

indra/cmake/FMODSTUDIO.cmake

with 576 additions and 645 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment