Merge branch 'develop-linux' into marchcat/slua-linux

# Conflicts:
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llstartup.cpp

2 files changed, 77 insertions, 0 deletions

diff --git a/indra/llprecompiled/CMakeLists.txt b/indra/llprecompiled/CMakeLists.txt
new file mode 100644
index 0000000000..ea230f4a98
--- /dev/null
+++ b/indra/llprecompiled/CMakeLists.txt
@@ -0,0 +1,53 @@
+# -*- cmake -*-
+
+project(llprecompiled)
+
+include(00-Common)
+include(APR)
+include(bugsplat)
+include(Linking)
+include(Boost)
+include(LLSharedLibs)
+include(ZLIBNG)
+include(Tracy)
+include(EXPAT)
+include(SSE2NEON)
+
+set(llprecompiled_SOURCE_FILES
+    cmake_dummy.cpp
+    )
+
+add_library (llprecompiled ${llprecompiled_SOURCE_FILES})
+
+target_include_directories(llprecompiled PRIVATE
+    ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX}llmath
+    )
+
+target_link_libraries(llprecompiled
+        llcommon
+        ll::apr
+        ll::expat
+        ll::zlib-ng
+        ll::boost
+        ll::oslibraries
+        ll::tracy
+        ll::sse2neon
+    )
+
+target_precompile_headers(llprecompiled PRIVATE
+    [["linden_common.h"]]
+    [["llwin32headers.h"]]
+    [["llprofiler.h"]]
+    [["llmath.h"]]
+    <boost/bind.hpp>
+    <boost/fiber/fiber.hpp>
+    <boost/fiber/fss.hpp>
+    <boost/fiber/future/promise.hpp>
+    <boost/fiber/future/future.hpp>
+    <boost/function.hpp>
+    <boost/function_types/function_arity.hpp>
+    <boost/iterator/transform_iterator.hpp>
+    <boost/iterator/indirect_iterator.hpp>
+    <boost/range/iterator_range.hpp>
+    <boost/signals2.hpp>
+    )
diff --git a/indra/llprecompiled/cmake_dummy.cpp b/indra/llprecompiled/cmake_dummy.cpp
new file mode 100644
index 0000000000..21a47a9b14
--- /dev/null
+++ b/indra/llprecompiled/cmake_dummy.cpp
@@ -0,0 +1,24 @@
+/**
+ * @file cmake_dummy.cpp
+ *
+ * $LicenseInfo:firstyear=2008&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */