From b002b00b6ce1ff79539b25331287bc089d8d0676 Mon Sep 17 00:00:00 2001
From: Edgar <Edgar@AnotherFoxGuy.com>
Date: Sat, 13 Feb 2021 11:35:55 +0100
Subject: [PATCH] :construction_worker: Fixed qmake build

---
 .github/workflows/build.yml | 11 +++++------
 src/CMakeLists.txt          |  2 +-
 src/common/Credentials.cpp  |  8 +++++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 29ea6cda7..edff86ae4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,20 +52,20 @@ jobs:
         if: startsWith(matrix.os, 'windows')
         uses: actions/cache@v2.1.4
         with:
-          key: ${{ runner.os }}-conan-root-${{ hashFiles('**/conanfile.txt') }}
+          key: ${{ runner.os }}-conan-root-${{ hashFiles('**/conanfile-qmake.txt') }}
           path: ~/.conan
 
       - name: Cache conan packages
         if: startsWith(matrix.os, 'windows')
         uses: actions/cache@v2.1.4
         with:
-          key: ${{ runner.os }}-conan-pkg-${{ hashFiles('**/conanfile.txt') }}
+          key: ${{ runner.os }}-conan-pkg-${{ hashFiles('**/conanfile-qmake.txt') }}
           path: C:/.conan/
 
       - name: Install dependencies (Windows)
         if: startsWith(matrix.os, 'windows')
         run: |
-            choco install conan -y
+            choco install conan jom -y
 
             refreshenv
         shell: cmd
@@ -76,10 +76,9 @@ jobs:
             call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
             mkdir build
             cd build
-            "C:\Program Files\Conan\conan\conan.exe" install ..
+            "C:\Program Files\Conan\conan\conan.exe" install ..\conanfile-qmake.txt
             qmake ..
-            set cl=/MP
-            nmake /S /NOLOGO
+            jom
             windeployqt release/chatterino.exe --release --no-compiler-runtime --no-translations --no-opengl-sw --dir Chatterino2/
             cp release/chatterino.exe Chatterino2/
             echo nightly > Chatterino2/modes
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b2a20d01..73751c249 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -219,7 +219,7 @@ generate_source_groups(${SOURCE_FILES})
 
 add_executable(${PROJECT_NAME} ${SOURCE_FILES})
 
-target_compile_definitions(${PROJECT_NAME} PRIVATE CHATTERINO UNICODE USEWINSDK AB_CUSTOM_THEME AB_CUSTOM_SETTINGS IRC_STATIC IRC_NAMESPACE=Communi)
+target_compile_definitions(${PROJECT_NAME} PRIVATE CMAKE_BUILD CHATTERINO UNICODE USEWINSDK AB_CUSTOM_THEME AB_CUSTOM_SETTINGS IRC_STATIC IRC_NAMESPACE=Communi)
 target_compile_definitions(${PROJECT_NAME} PRIVATE CHATTERINO_GIT_HASH=\"XD\" CHATTERINO_GIT_RELEASE=\"XD\" CHATTERINO_GIT_COMMIT=\"XD\")
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/common/Credentials.cpp b/src/common/Credentials.cpp
index 44ed24141..a7ba22414 100644
--- a/src/common/Credentials.cpp
+++ b/src/common/Credentials.cpp
@@ -1,12 +1,18 @@
 #include "Credentials.hpp"
 
 #include "debug/AssertInGuiThread.hpp"
-#include "qt5keychain/keychain.h"
 #include "singletons/Paths.hpp"
 #include "singletons/Settings.hpp"
 #include "util/CombinePath.hpp"
 #include "util/Overloaded.hpp"
 
+#ifdef CMAKE_BUILD
+#include "qt5keychain/keychain.h"
+#else
+#include "keychain.h"
+#endif
+
+
 #include <QSaveFile>
 #include <boost/variant.hpp>