Commit 26d0a81f authored by Martin Höher's avatar Martin Höher

Prepare Docker Windows updates

parent 84a0a061
Pipeline #41642781 failed with stages
in 15 minutes and 22 seconds
Subproject commit 6c6480bcd1062cab7f25e0b40551db18c4d7f75c
Subproject commit 21daf4cf29c4c869f46a54cb24fd57d69e04b794
......@@ -42,7 +42,7 @@ endif()
# Configure the build in qlmdb library:
if(ANDROID)
if(ANDROID OR WIN32)
set(QLMDB_WITH_STATIC_LIBS ON CACHE BOOL "Build QLMDB as static library")
endif()
set(QLMDB_WITH_BUILTIN_LMDB ON CACHE BOOL "Use built in lmdb library")
......
......@@ -33,7 +33,7 @@ class QmlFileSystemWatcher : public QObject
public:
QmlFileSystemWatcher(const QString baseUrl, QQmlApplicationEngine *engine, QObject *parent = 0) :
QmlFileSystemWatcher(const QString baseUrl, QQmlApplicationEngine *engine, QObject *parent = nullptr) :
QObject(parent),
m_baseUrl(baseUrl),
m_engine(engine),
......
......@@ -11,7 +11,7 @@ RUN \
git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \
libtool-bin libltdl-dev libssl-dev libxml-parser-perl make \
openssl p7zip-full patch perl pkg-config python ruby scons \
sed unzip wget xz-utils nsis && \
sed unzip wget xz-utils nsis python3 && \
\
cd opt && \
mkdir mxe-i686-shared && \
......
FROM debian
# Note: If build fails, check out this issue:
# https://github.com/mxe/mxe/issues/2011
RUN \
\
apt-get update && \
......@@ -8,7 +11,7 @@ RUN \
git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \
libtool-bin libltdl-dev libssl-dev libxml-parser-perl make \
openssl p7zip-full patch perl pkg-config python ruby scons \
sed unzip wget xz-utils nsis && \
sed unzip wget xz-utils nsis python3 && \
\
cd opt && \
mkdir mxe-x64-shared && \
......
......@@ -22,8 +22,6 @@ cd ..
mkdir -p deploy-win32/bin
cp build-win32/app/OpenTodoList.exe deploy-win32/bin/
apt-get update
apt-get install -y wget python3
wget https://gitlab.com/rpdev/xwindeployqt/raw/master/xwindeployqt
chmod +x xwindeployqt
./xwindeployqt --toolchain-root /opt/mxe-x64-shared/ \
......
......@@ -21,8 +21,6 @@ cd ..
mkdir -p deploy-win64/bin
cp build-win64/app/OpenTodoList.exe deploy-win64/bin/
apt-get update
apt-get install -y wget python3
wget https://gitlab.com/rpdev/xwindeployqt/raw/master/xwindeployqt
chmod +x xwindeployqt
./xwindeployqt --toolchain-root /opt/mxe-x64-shared/ \
......
......@@ -100,7 +100,7 @@ find_package(Qt5Xml REQUIRED)
find_package(Qt5Concurrent REQUIRED)
find_package(Qt5Sql REQUIRED)
if(ANDROID)
if(ANDROID OR WIN32)
set(libtype STATIC)
else()
set(libtype SHARED)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment