diff options
| author | Rye <rye@lindenlab.com> | 2024-10-11 06:35:10 -0700 |
|---|---|---|
| committer | Rye <rye@lindenlab.com> | 2024-10-11 14:59:04 -0700 |
| commit | a6a3a1771b81e551e2d7fcd68e9df0cec092b27b (patch) | |
| tree | cc66d36873ee157429668cbaef6bfd5f47848dd1 /indra | |
| parent | bed3b57c52574ec593293c7397dd0da18e801fb4 (diff) | |
Rework GHA matrix config to fix linux build
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/UI.cmake | 1 | ||||
| -rw-r--r-- | indra/newview/rlvhelper.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index 23bd8018dd..595f394af4 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -6,7 +6,6 @@ include(GLIB) add_library( ll::uilibraries INTERFACE IMPORTED ) if (LINUX) - use_prebuilt_binary(fltk) target_compile_definitions(ll::uilibraries INTERFACE LL_X11=1 ) if( USE_CONAN ) diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp index 7cb1473c8c..1dac297bf1 100644 --- a/indra/newview/rlvhelper.cpp +++ b/indra/newview/rlvhelper.cpp @@ -95,12 +95,12 @@ void BehaviourDictionary::addEntry(const BehaviourInfo* entry_p) } // Sanity check for duplicate entries -#ifndef LL_RELEASE_FOR_DOWNLOAD +#if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG std::for_each(mBhvrInfoList.begin(), mBhvrInfoList.end(), [&entry_p](const BehaviourInfo* bhvr_info_p) { RLV_ASSERT_DBG((bhvr_info_p->getBehaviour() != entry_p->getBehaviour()) || ((bhvr_info_p->getParamTypeMask() & entry_p->getParamTypeMask()) == 0)); }); -#endif // LL_RELEASE_FOR_DOWNLOAD +#endif // LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG mBhvrInfoList.push_back(entry_p); } |