Try to parallelize xcode builds further and add more headers to PCH to reduce build time

4 files changed, 45 insertions, 7 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 95740c0cc1..b599358aa3 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1456,6 +1456,7 @@ if (DARWIN)
   set_source_files_properties(
     llappdelegate-objc.mm
     PROPERTIES
+    SKIP_PRECOMPILE_HEADERS TRUE
     COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}"
     # BugsplatMac is a module, imported with @import. That language feature
     # demands these -f switches.
diff --git a/indra/newview/gltf/common.h b/indra/newview/gltf/common.h
index 742daff715..8cf3f1dff7 100644
--- a/indra/newview/gltf/common.h
+++ b/indra/newview/gltf/common.h
@@ -26,8 +26,6 @@
  * $/LicenseInfo$
  */
 
-#define GLM_ENABLE_EXPERIMENTAL 1
-
 #include "glm/vec2.hpp"
 #include "glm/vec3.hpp"
 #include "glm/vec4.hpp"
diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp
index 9e936eee5b..2e0669fc38 100644
--- a/indra/newview/llinventoryitemslist.cpp
+++ b/indra/newview/llinventoryitemslist.cpp
@@ -99,7 +99,7 @@ void LLInventoryItemsList::updateSelection()
 
     for(std::vector<LLSD>::const_iterator cur_id_it = cur.begin(); cur_id_it != cur.end() && !mSelectTheseIDs.empty(); ++cur_id_it)
     {
-        uuid_vec_t::iterator select_ids_it = std::find(mSelectTheseIDs.begin(), mSelectTheseIDs.end(), *cur_id_it);
+        uuid_vec_t::iterator select_ids_it = std::find(mSelectTheseIDs.begin(), mSelectTheseIDs.end(), cur_id_it->asUUID());
         if(select_ids_it != mSelectTheseIDs.end())
         {
             selectItemByUUID(*select_ids_it);
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index a857887247..5700d8b278 100644
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@@ -29,22 +29,28 @@
 #ifndef LL_LLVIEWERPRECOMPILEDHEADERS_H
 #define LL_LLVIEWERPRECOMPILEDHEADERS_H
 
-#include "llwin32headers.h"
-
 // This file MUST be the first one included by each .cpp file
 // in viewer.
 // It is used to precompile headers for improved build speed.
 
 #include "linden_common.h"
 
+#include "llwin32headers.h"
+
 #include <algorithm>
 #include <deque>
 #include <functional>
+#include <list>
 #include <map>
 #include <set>
 #include <vector>
+#include <string_view>
+#include <unordered_map>
+#include <unordered_set>
 
 // Library headers from llcommon project:
+#include "apply.h"
+#include "function_types.h"
 #include "indra_constants.h"
 #include "llinitparam.h"
 #include "llapp.h"
@@ -54,8 +60,10 @@
 #include "llerror.h"
 #include "llfasttimer.h"
 #include "llframetimer.h"
+#include "llinstancetracker.h"
 #include "llpointer.h"
 #include "llprocessor.h"
+#include "llrand.h"
 #include "llrefcount.h"
 #include "llsafehandle.h"
 #include "llsd.h"
@@ -65,11 +73,13 @@
 #include "llstring.h"
 #include "llsys.h"
 #include "lltimer.h"
+#include "lluuid.h"
 #include "stdtypes.h"
 #include "u64.h"
 
 // Library includes from llmath project
 #include "llmath.h"
+#include "llbbox.h"
 #include "llbboxlocal.h"
 #include "llcamera.h"
 #include "llcoord.h"
@@ -77,9 +87,7 @@
 #include "llcrc.h"
 #include "llplane.h"
 #include "llquantize.h"
-#include "llrand.h"
 #include "llrect.h"
-#include "lluuid.h"
 #include "m3math.h"
 #include "m4math.h"
 #include "llquaternion.h"
@@ -91,11 +99,42 @@
 #include "v4coloru.h"
 #include "v4math.h"
 #include "xform.h"
+#include "llvector4a.h"
+#include "llmatrix4a.h"
+#include "lloctree.h"
+#include "llvolume.h"
 
+// Library includes from llfilesystem project
 #include "lldir.h"
 
 // Library includes from llmessage project
+#include "llassetstorage.h"
+#include "llavatarnamecache.h"
 #include "llcachename.h"
+#include "llcorehttputil.h"
+
+// Library includes from llrender project
+#include "llgl.h"
+#include "llrender.h"
+
+// Library includes from llrender project
+#include "llcharacter.h"
+
+// Library includes from llui project
+#include "llnotifications.h"
+#include "llpanel.h"
+#include "llfloater.h"
+
+#include <boost/function.hpp>
+#include <boost/signals2.hpp>
+#include <boost/unordered_set.hpp>
+#include <boost/unordered_map.hpp>
+#include <boost/json.hpp>
 
+#include "glm/glm.hpp"
+#include "glm/gtc/type_ptr.hpp"
+#include "glm/ext/quaternion_float.hpp"
+#include "glm/gtx/quaternion.hpp"
+#include "glm/gtx/matrix_decompose.hpp"
 
 #endif