diff --git a/appveyor.yml b/appveyor.yml index be3209a960..c88dc23eaf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,26 +3,23 @@ image: Visual Studio 2019 environment: nodejs_version: "20" matrix: + - QT: C:\Qt\6.2\msvc2019_64 # As installed by `choco` - - GOROOT: C:\Program Files\Go + GOROOT: C:\Program Files\Go GOPATH: C:\gopath\ GOTOOLCHAIN: local PLATFORM: amd64 - PYTHON: C:\Python312 + COMPILER: msvc install: - ps: Install-Product node $env:nodejs_version - - choco install python --version=3.12.6 - - python -m pip install aqtinstall - - aqt list-qt windows desktop --modules 6.2.4 win64_mingw - - aqt install-qt windows desktop 6.2.4 win64_mingw -m qtpositioning qtserialport qtwebchannel qtwebengine - git submodule update --init --recursive matrix: fast_finish: true before_build: - - set PATH=C:\Qt\Tools\QtCreator\bin\;%GOROOT%\bin;C:\gopath\bin\;C:\Qt\6.2.4\mingw_64\bin\;C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;C:\MinGW\bin;%PATH% + - set PATH=%QT5%\bin;C:\Qt\Tools\QtCreator\bin\;%GOROOT%\bin;C:\gopath\bin\;C:\Qt\6.2\msvc2019_64\bin\;C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;C:\MinGW\bin;%PATH% - set MINGW_BIN=/c/mingw-w64/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/bin build_script: @@ -42,7 +39,7 @@ build_script: # Upload build artifacts but only for commits pushes, no pull requests. after_build: -- if defined APPVEYOR_PULL_REQUEST_NUMBER appveyor exit +#- if defined APPVEYOR_PULL_REQUEST_NUMBER appveyor exit # %APPVEYOR_BUILD_FOLDER% is the path to the git clone. - mkdir %APPVEYOR_BUILD_FOLDER% # Copy build artifacts back to the git clone dir because they can only be diff --git a/frontends/qt/compile_windows.bat b/frontends/qt/compile_windows.bat index 8c0f829125..463052651f 100644 --- a/frontends/qt/compile_windows.bat +++ b/frontends/qt/compile_windows.bat @@ -3,7 +3,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" cd build qmake ..\BitBox.pro -nmake +nmake /d COPY "%VCToolsRedistDir%\x64\Microsoft.VC142.CRT\msvcp140.dll" windows\ COPY "%VCToolsRedistDir%\x64\Microsoft.VC142.CRT\msvcp140_1.dll" windows\ COPY "%VCToolsRedistDir%\x64\Microsoft.VC142.CRT\msvcp140_2.dll" windows\ diff --git a/frontends/qt/main.cpp b/frontends/qt/main.cpp index 07bfcad564..c5236f25ce 100644 --- a/frontends/qt/main.cpp +++ b/frontends/qt/main.cpp @@ -47,6 +47,9 @@ #include #include "filedialog.h" + +#define GO_CGO_EXPORT_PROLOGUE_H +#define GO_CGO_PROLOGUE_H #include "server/libserver.h" #include "webclass.h" diff --git a/frontends/qt/webclass.h b/frontends/qt/webclass.h index 625defe90b..d273eb175f 100644 --- a/frontends/qt/webclass.h +++ b/frontends/qt/webclass.h @@ -14,6 +14,8 @@ #include +#define GO_CGO_EXPORT_PROLOGUE_H +#define GO_CGO_PROLOGUE_H #include "server/libserver.h" class WebClass : public QObject