diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-15 06:48:40 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-15 06:48:40 +0800 |
| commit | 1f11febb44760758c1eff52a3acc76db2fb32299 (patch) | |
| tree | 9fd4e3509a85497e95430e0095407cffb19489aa | |
| parent | adcb9165ff6dced01f74076233568e13b149dcf7 (diff) | |
| parent | ddd92b44c4248f90d6f1eca653fa9763ec766b80 (diff) | |
Merge branch 'main' into webrtc-voice
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | indra/cmake/FMODSTUDIO.cmake | 1 | ||||
| -rw-r--r-- | indra/cmake/LLCoreHttp.cmake | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -29,8 +29,8 @@ As a third party maintained fork, which includes Apple Silicon native builds, Me ``` $ git clone git://megapahit.org/viewer.git $ cd viewer -$ mkdir build-`uname -s|tr [:upper:] [:lower:]`-`uname -m` -$ cd build-`uname -s|tr [:upper:] [:lower:]`-`uname -m` +$ mkdir build-`uname -s|tr '[:upper:]' '[:lower:]'`-`uname -m` +$ cd build-`uname -s|tr '[:upper:]' '[:lower:]'`-`uname -m` ``` ### macOS diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake index a8bf087ece..313ee2cde7 100644 --- a/indra/cmake/FMODSTUDIO.cmake +++ b/indra/cmake/FMODSTUDIO.cmake @@ -31,6 +31,7 @@ if (USE_FMODSTUDIO) # as accessing the private LL location will fail if you don't have the credential include(Prebuilt) if (USESYSTEMLIBS AND (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/fmodstudio_installed OR NOT ${fmodstudio_installed} EQUAL 0)) + file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release) if (DARWIN) execute_process( COMMAND hdiutil attach -noverify fmodstudioapi20223mac-installer.dmg diff --git a/indra/cmake/LLCoreHttp.cmake b/indra/cmake/LLCoreHttp.cmake index 22ed5fef9c..5464e4d327 100644 --- a/indra/cmake/LLCoreHttp.cmake +++ b/indra/cmake/LLCoreHttp.cmake @@ -1,5 +1,5 @@ # -*- cmake -*- -include(CURL) include(OpenSSL) +include(CURL) include(NGHTTP2) |