From fd94d65a3dbe8410ff0f5d36ccd7b3e3900d384c Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Sun, 1 Dec 2019 11:31:09 +0100
Subject: [PATCH] Cleanup third party libs into common folder

Remove old OpenSSL which now get bundled with Qt installer
---
 .gitignore                                          |  3 +--
 .gitmodules                                         | 11 ++++-------
 {ScreenPlay/ThirdParty => Common}/stomt-qt-sdk      |  0
 ScreenPlay.pro                                      |  2 +-
 ScreenPlay/ThirdParty/OpenSSL/libcrypto-1_1-x64.dll |  3 ---
 ScreenPlay/ThirdParty/OpenSSL/libssl-1_1-x64.dll    |  3 ---
 6 files changed, 6 insertions(+), 16 deletions(-)
 rename {ScreenPlay/ThirdParty => Common}/stomt-qt-sdk (100%)
 delete mode 100644 ScreenPlay/ThirdParty/OpenSSL/libcrypto-1_1-x64.dll
 delete mode 100644 ScreenPlay/ThirdParty/OpenSSL/libssl-1_1-x64.dll

diff --git a/.gitignore b/.gitignore
index 4f0a731a..63c65a9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,9 +68,8 @@ Thumbs.db
 
 *.lnk
 
-!ScreenPlay/ThirdParty/**
+Common/vcpkg/**
 !ScreenPlay/translations/**
 /build-*/**
 *_qmlcache.qrc
-ScreenPlay/ThirdParty/.DS_Store
 *.DS_Store
diff --git a/.gitmodules b/.gitmodules
index 769867ac..6c7d7dac 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
-[submodule "ScreenPlay/ThirdParty/qt-google-analytics"]
-	path = ScreenPlay/ThirdParty/qt-google-analytics
+[submodule "Common/qt-google-analytics"]
+	path = Common/qt-google-analytics
 	url = https://github.com/HSAnet/qt-google-analytics.git
-[submodule "ScreenPlay/ThirdParty/stomt-qt-sdk"]
-	path = ScreenPlay/ThirdParty/stomt-qt-sdk
+[submodule "Common/stomt-qt-sdk"]
+	path = Common/stomt-qt-sdk
 	url = https://github.com/Aimber/stomt-qt-sdk.git
-[submodule "Common/vcpkg"]
-	path = Common/vcpkg
-	url = https://github.com/Microsoft/vcpkg.git
diff --git a/ScreenPlay/ThirdParty/stomt-qt-sdk b/Common/stomt-qt-sdk
similarity index 100%
rename from ScreenPlay/ThirdParty/stomt-qt-sdk
rename to Common/stomt-qt-sdk
diff --git a/ScreenPlay.pro b/ScreenPlay.pro
index a13e1867..4f901ae8 100644
--- a/ScreenPlay.pro
+++ b/ScreenPlay.pro
@@ -4,7 +4,7 @@ SUBDIRS +=   \
     ScreenPlaySDK/ScreenPlaySDK.pro \
     ScreenPlayWallpaper/ScreenPlayWallpaper.pro \
     ScreenPlayWidget/ScreenPlayWidget.pro \
-    ScreenPlay/ThirdParty/stomt-qt-sdk/sdk/stomt-qt-sdk.pro \
+    Common/stomt-qt-sdk/sdk/stomt-qt-sdk.pro \
 
 ScreenPlayWallpaper.depends = ScreenPlaySDK
 ScreenPlayWidget.depends = ScreenPlaySDK
diff --git a/ScreenPlay/ThirdParty/OpenSSL/libcrypto-1_1-x64.dll b/ScreenPlay/ThirdParty/OpenSSL/libcrypto-1_1-x64.dll
deleted file mode 100644
index 90c9eb0a..00000000
--- a/ScreenPlay/ThirdParty/OpenSSL/libcrypto-1_1-x64.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d9286a9a225746890acf1325dbe24301536cbbe370c28467bb63918da07beb1
-size 3407360
diff --git a/ScreenPlay/ThirdParty/OpenSSL/libssl-1_1-x64.dll b/ScreenPlay/ThirdParty/OpenSSL/libssl-1_1-x64.dll
deleted file mode 100644
index e535fe38..00000000
--- a/ScreenPlay/ThirdParty/OpenSSL/libssl-1_1-x64.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c1917eb05675a807fe05cc89c0cab05911474dbc8883faa16cd1cb34086c3944
-size 681472