Commit fa5a8814 authored by Martin Höher's avatar Martin Höher

Some changes for Windows build

parent 26d0a81f
......@@ -17,7 +17,9 @@ doc/latex/
app/android/gradle.properties
app/android/local.properties
/build-*
/deploy-*
config.tests/*/Makefile
config.tests/*/*.o
config.tests/qtkeychain/qtkeychain
.qmake.stash
CMakeLists.txt.user*
......@@ -42,7 +42,7 @@ endif()
# Configure the build in qlmdb library:
if(ANDROID OR WIN32)
if(ANDROID)
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")
......
......@@ -394,14 +394,12 @@
<context>
<name>LogViewPage</name>
<message>
<location filename="../Pages/LogViewPage.qml" line="12"/>
<source>Synchronization Log</source>
<translation>Synchronisationsereignisse</translation>
<translation type="vanished">Synchronisationsereignisse</translation>
</message>
<message>
<location filename="../Pages/LogViewPage.qml" line="20"/>
<source>Copy Log</source>
<translation>Protokoll kopieren</translation>
<translation type="vanished">Protokoll kopieren</translation>
</message>
</context>
<context>
......
......@@ -328,19 +328,6 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LogViewPage</name>
<message>
<location filename="../Pages/LogViewPage.qml" line="12"/>
<source>Synchronization Log</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Pages/LogViewPage.qml" line="20"/>
<source>Copy Log</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindow</name>
<message>
......
......@@ -2,9 +2,8 @@
set -e
# Note: Paths need to be corrected on next image rebuild
export PATH=/opt/mxe-x64-shared/usr/bin:$PATH
export PATH=/opt/mxe-x64-shared/usr/i686-w64-mingw32.shared/qt5/bin:$PATH
export PATH=/opt/mxe-i686-shared/usr/bin:$PATH
export PATH=/opt/mxe-i686-shared/usr/i686-w64-mingw32.shared/qt5/bin:$PATH
mkdir -p build-win32
cd build-win32
......@@ -21,10 +20,11 @@ i686-w64-mingw32.shared-cmake --build . --target all -- -j4
cd ..
mkdir -p deploy-win32/bin
cp build-win32/app/OpenTodoList.exe deploy-win32/bin/
cp build-win32/3rdparty/qlmdb/qlmdb/libqlmdb.dll deploy-win32/bin/
wget https://gitlab.com/rpdev/xwindeployqt/raw/master/xwindeployqt
chmod +x xwindeployqt
./xwindeployqt --toolchain-root /opt/mxe-x64-shared/ \
./xwindeployqt --toolchain-root /opt/mxe-i686-shared/ \
--toolchain-arch i686-w64-mingw32.shared \
--qml-dir ./app \
--plugins bearer \
......
......@@ -5,7 +5,7 @@ set -e
export PATH=/opt/mxe-x64-shared/usr/bin:$PATH
export PATH=/opt/mxe-x64-shared/usr/x86_64-w64-mingw32.shared/qt5/bin:$PATH
mkdir build-win64
mkdir -p build-win64
cd build-win64
x86_64-w64-mingw32.shared-cmake \
......@@ -20,6 +20,7 @@ x86_64-w64-mingw32.shared-cmake --build . --target all -- -j4
cd ..
mkdir -p deploy-win64/bin
cp build-win64/app/OpenTodoList.exe deploy-win64/bin/
cp build-win64/3rdparty/qlmdb/qlmdb/libqlmdb.dll deploy-win64/bin/
wget https://gitlab.com/rpdev/xwindeployqt/raw/master/xwindeployqt
chmod +x xwindeployqt
......
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