Merge pull request #3905 from delroth/analytics

Analytics reporting support

CMakeLists.txt

@@ -16,6 +16,19 @@ option(ENABLE_LTO "Enables Link Time Optimization" OFF)
 option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
 option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)
 
+# Maintainers: if you consider blanket disabling this for your users, please
+# consider the following points:
+#  * No data is being sent without explicit user approval (pop up box at first
+#    launch).
+#  * The Dolphin team relies on the data in order to understand the behavior
+#    of our software in the wild.
+option(ENABLE_ANALYTICS "Enables opt-in Analytics collection" ON)
+
+# Name of the Dolphin distributor. If you redistribute Dolphin builds (forks,
+# unofficial builds) please consider identifying your distribution with a
+# unique name here.
+set(DISTRIBUTOR "None" CACHE STRING "Name of the distributor.")
+
 # Enable SDL for default on operating systems that aren't OSX, Android, Linux or Windows.
 if(NOT APPLE AND NOT ANDROID AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT MSVC)
 	option(ENABLE_SDL "Enables SDL as a generic controller backend" ON)
@@ -587,6 +600,11 @@ if(UNIX)
 	add_definitions(-DUSE_MEMORYWATCHER=1)
 endif()
 
+if(ENABLE_ANALYTICS)
+	message("Enabling analytics collection (subject to end-user opt-in)")
+	add_definitions(-DUSE_ANALYTICS=1)
+endif()
+
 ########################################
 # Setup include directories (and make sure they are preferred over the Externals)
 #
@@ -765,6 +783,17 @@ else()
 	include_directories(Externals/mbedtls/include)
 endif()
 
+include(FindCURL OPTIONAL)
+if(CURL_FOUND)
+	message("Using shared libcurl")
+	include_directories(${CURL_INCLUDE_DIRS})
+else()
+	message("Using static libcurl from Externals")
+	add_subdirectory(Externals/curl)
+	set(CURL_LIBRARIES curl)
+	include_directories(BEFORE Externals/curl/include)
+endif()
+
 if(NOT APPLE)
 	check_lib(SOIL "(no .pc for SOIL)" SOIL SOIL/SOIL.h QUIET)
 endif()
@@ -911,6 +940,7 @@ file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/scmrev.h
 	"#define SCM_DESC_STR \"" ${DOLPHIN_WC_DESCRIBE} "\"\n"
 	"#define SCM_BRANCH_STR \"" ${DOLPHIN_WC_BRANCH} "\"\n"
 	"#define SCM_IS_MASTER " ${DOLPHIN_WC_IS_STABLE} "\n"
+	"#define SCM_DISTRIBUTOR_STR \"" ${DISTRIBUTOR} "\"\n"
 	)
 include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common")
 

Externals/curl/CMakeLists.txt

@@ -0,0 +1,2 @@
+include_directories(include/)
+add_subdirectory(lib)

Externals/curl/COPYING

@@ -0,0 +1,22 @@
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1996 - 2016, Daniel Stenberg, <daniel@haxx.se>, and many
+contributors, see the THANKS file.
+
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.