noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

👷 Fixed qmake build

Browse source
This commit is contained in:
Edgar 2021-02-13 11:35:55 +01:00 committed by Rasmus Karlsson
parent 082b5e8b90
commit b002b00b6c
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.github/workflows/build.yml vendored
View file

@ -52,20 +52,20 @@ jobs:
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
uses: actions/cache@v2.1.4 uses: actions/cache@v2.1.4
with: with:
key: ${{ runner.os }}-conan-root-${{ hashFiles('**/conanfile.txt') }} key: ${{ runner.os }}-conan-root-${{ hashFiles('**/conanfile-qmake.txt') }}
path: ~/.conan path: ~/.conan
- name: Cache conan packages - name: Cache conan packages
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
uses: actions/cache@v2.1.4 uses: actions/cache@v2.1.4
with: with:
key: ${{ runner.os }}-conan-pkg-${{ hashFiles('**/conanfile.txt') }} key: ${{ runner.os }}-conan-pkg-${{ hashFiles('**/conanfile-qmake.txt') }}
path: C:/.conan/ path: C:/.conan/
- name: Install dependencies (Windows) - name: Install dependencies (Windows)
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
run: | run: |
choco install conan -y choco install conan jom -y
refreshenv refreshenv
shell: cmd shell: cmd
@ -76,10 +76,9 @@ jobs:
call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
mkdir build mkdir build
cd build cd build
"C:\Program Files\Conan\conan\conan.exe" install .. "C:\Program Files\Conan\conan\conan.exe" install ..\conanfile-qmake.txt
qmake .. qmake ..
set cl=/MP jom
nmake /S /NOLOGO
windeployqt release/chatterino.exe --release --no-compiler-runtime --no-translations --no-opengl-sw --dir Chatterino2/ windeployqt release/chatterino.exe --release --no-compiler-runtime --no-translations --no-opengl-sw --dir Chatterino2/
cp release/chatterino.exe Chatterino2/ cp release/chatterino.exe Chatterino2/
echo nightly > Chatterino2/modes echo nightly > Chatterino2/modes

2
src/CMakeLists.txt
View file

@ -219,7 +219,7 @@ generate_source_groups(${SOURCE_FILES})
add_executable(${PROJECT_NAME} ${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_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}) target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

8
src/common/Credentials.cpp
View file

@ -1,12 +1,18 @@
#include "Credentials.hpp" #include "Credentials.hpp"
#include "debug/AssertInGuiThread.hpp" #include "debug/AssertInGuiThread.hpp"
#include "qt5keychain/keychain.h"
#include "singletons/Paths.hpp" #include "singletons/Paths.hpp"
#include "singletons/Settings.hpp" #include "singletons/Settings.hpp"
#include "util/CombinePath.hpp" #include "util/CombinePath.hpp"
#include "util/Overloaded.hpp" #include "util/Overloaded.hpp"
#ifdef CMAKE_BUILD
#include "qt5keychain/keychain.h"
#else
#include "keychain.h"
#endif
#include <QSaveFile> #include <QSaveFile>
#include <boost/variant.hpp> #include <boost/variant.hpp>