wip

benma · Oct 24, 2024 · 12ac4cd · 12ac4cd
1 parent 16b5894
commit 12ac4cd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git 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:

diff --git 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
@@ -47,6 +47,9 @@
 #include <string.h>
 
 #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
@@ -14,6 +14,8 @@
 
 #include <QApplication>
 
+#define GO_CGO_EXPORT_PROLOGUE_H
+#define GO_CGO_PROLOGUE_H
 #include "server/libserver.h"
 
 class WebClass : public QObject