diff options
author | Aleks Kissinger <aleks0@gmail.com> | 2018-12-20 22:28:41 +0100 |
---|---|---|
committer | Aleks Kissinger <aleks0@gmail.com> | 2018-12-20 22:28:41 +0100 |
commit | 3a981911858553daab4af26af7e46e5b62b0034b (patch) | |
tree | 586ea75973ad170fbe01978b64128652c083c78e | |
parent | 5c44437a879e37dfb311354603756f9436d1bfb8 (diff) |
updated CI scripts
-rw-r--r-- | .appveyor.yml | 7 | ||||
-rwxr-xr-x | deploy-win.bat | 9 | ||||
-rw-r--r-- | tikzit.pro | 6 |
3 files changed, 13 insertions, 9 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index c2f27c4..117c722 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,12 +13,15 @@ configuration: install: - cmd: choco install winflexbison - - cmd: 'C:\Qt\5.11.2\msvc2015_64\bin\qtenv2.bat' - - cmd: call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 + - cmd: 'C:\Qt\5.11.2\mingw53_32\bin\qtenv2.bat' - cmd: cd C:\projects\tikzit - sh: sudo apt-get update - sh: sudo apt-get -y install flex bison qt5-default +before_build: + - ps: (new-object net.webclient).DownloadFile('http://tikzit.github.io/download/win32-deps.zip', 'c:\projects\tikzit\win32-deps.zip') + - cmd: 7z x win32-deps.zip + build_script: - qmake -v - qmake diff --git a/deploy-win.bat b/deploy-win.bat index 1c19f40..20f85f6 100755 --- a/deploy-win.bat +++ b/deploy-win.bat @@ -7,12 +7,11 @@ mkdir icons copy ..\..\tikzfiles.reg .
copy ..\..\release\tikzit.exe .
copy ..\..\images\tikzdoc.ico icons\
-copy C:\Windows\System32\msvcp140.dll .
-copy C:\Windows\System32\vcruntime140.dll .
-copy C:\OpenSSL-Win64\bin\libeay32.dll .
-copy C:\OpenSSL-Win64\bin\ssleay32.dll .
+copy ..\..\win32-dist\*.dll .
+copy C:\OpenSSL-Win32\bin\libeay32.dll .
+copy C:\OpenSSL-Win32\bin\ssleay32.dll .
-windeployqt.exe --no-compiler-runtime --no-webkit2 --no-angle --no-opengl-sw --no-system-d3d-compiler --no-translations --no-quick-import .\tikzit.exe
+windeployqt.exe --no-webkit2 --no-angle --no-opengl-sw --no-system-d3d-compiler --no-translations --no-quick-import .\tikzit.exe
cd ..
7z a -tzip tikzit.zip tikzit
@@ -113,8 +113,10 @@ FORMS += src/gui/mainwindow.ui \ INCLUDEPATH += src src/gui src/data # link to pre-compiled poppler libs on windows -win32:INCLUDEPATH += win32-deps/include -win32:LIBS += -L"$$PWD/win32-deps/bin" +win32 { + INCLUDEPATH += win32-deps/include + LIBS += -L"$$PWD/win32-deps/bin" +} LIBS += -lpoppler-qt5 |