From b7303414f210c393b9e62a7f0ea43b32b5eb2ca2 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 26 Jan 2018 11:57:30 -0800
Subject: [PATCH] unmangle merges

---
 .../macros/PackageCrashpadForDeployment.cmake  |  5 +++++
 cmake/modules/FindCrashpad.cmake               |  2 +-
 interface/src/Application.cpp                  | 18 ------------------
 interface/src/main.cpp                         |  2 --
 libraries/shared/CMakeLists.txt                |  2 --
 5 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/cmake/macros/PackageCrashpadForDeployment.cmake b/cmake/macros/PackageCrashpadForDeployment.cmake
index 1808ddc3d1..024d1624fb 100644
--- a/cmake/macros/PackageCrashpadForDeployment.cmake
+++ b/cmake/macros/PackageCrashpadForDeployment.cmake
@@ -13,6 +13,11 @@ macro(PACKAGE_CRASHPAD_FOR_DEPLOYMENT)
     get_property(HAS_CRASHPAD GLOBAL PROPERTY HAS_CRASHPAD)
 
     if (HAS_CRASHPAD)
+
+        if (WIN32)
+            set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS "/ignore:4099")
+        endif()
+
         add_custom_command(
             TARGET ${TARGET_NAME}
             POST_BUILD
diff --git a/cmake/modules/FindCrashpad.cmake b/cmake/modules/FindCrashpad.cmake
index 5095a0b0c9..283058336d 100644
--- a/cmake/modules/FindCrashpad.cmake
+++ b/cmake/modules/FindCrashpad.cmake
@@ -5,7 +5,7 @@
 #  Once done this will define
 #
 #  CRASHPAD_FOUND
-#  DRACO_INCLUDE_DIRS
+#  CRASHPAD_INCLUDE_DIRS
 #  CRASHPAD_LIBRARY
 #  CRASHPAD_BASE_LIBRARY
 #  CRASHPAD_UTIL_LIBRARY
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 6aead4aa62..6c7093ff4d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -601,24 +601,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
         qApp->setProperty(hifi::properties::APP_LOCAL_DATA_PATH, cacheDir);
     }
 
-    // FIXME fix the OSX installer to install the resources.rcc binary instead of resource files and remove
-    // this conditional exclusion
-#if !defined(Q_OS_OSX)
-    {
-#if defined(Q_OS_ANDROID)
-        const QString resourcesBinaryFile = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/resources.rcc";
-#else
-        const QString resourcesBinaryFile = QCoreApplication::applicationDirPath() + "/resources.rcc";
-#endif
-        if (!QFile::exists(resourcesBinaryFile)) {
-            throw std::runtime_error("Unable to find primary resources");
-        }
-        if (!QResource::registerResource(resourcesBinaryFile)) {
-            throw std::runtime_error("Unable to load primary resources");
-        }
-    }
-#endif
-
     // Tell the plugin manager about our statically linked plugins
     auto pluginManager = PluginManager::getInstance();
     pluginManager->setInputPluginProvider([] { return getInputPlugins(); });
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 2b89c13ae7..94ac8b8008 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -46,8 +46,6 @@ int main(int argc, const char* argv[]) {
 
     disableQtBearerPoll(); // Fixes wifi ping spikes
 
-    startCrashHandler();
-
     QElapsedTimer startupTime;
     startupTime.start();
 
diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt
index 379c15c999..a8fe14e23e 100644
--- a/libraries/shared/CMakeLists.txt
+++ b/libraries/shared/CMakeLists.txt
@@ -5,8 +5,6 @@ setup_hifi_library(Gui Network Script Widgets)
 
 if (WIN32)
     target_link_libraries(${TARGET_NAME} Wbemuuid.lib)
-
-    add_crashpad()
 endif()
 
 if (ANDROID)