Skip to content

Commit

Permalink
Merge pull request #33185 from elpaso/mxe-64bit
Browse files Browse the repository at this point in the history
Mxe 64bit
  • Loading branch information
elpaso committed Dec 2, 2019
2 parents 678a877 + 21684cf commit af1c087
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mxe.yml
Expand Up @@ -16,6 +16,6 @@ jobs:
- name: Upload build
uses: actions/upload-artifact@v1
with:
name: Store artifact
name: QGIS for Windows 64bit
path: qgis-mxe-release.zip

5 changes: 2 additions & 3 deletions ms-windows/mxe/build-mxe.sh
Expand Up @@ -44,9 +44,8 @@ RELEASE_DIR=${PWD}/qgis-mxe-release

# End configuration

# Original target (does not support posix threads)
# TARGET=${TARGET}
TARGET=i686-w64-mingw32.shared.posix
# Windows 64 bit with posix threads
TARGET=x86_64-w64-mingw32.shared.posix

# Set base path for all tools
export PATH=${PATH}:/mxe/usr/bin
Expand Down
4 changes: 2 additions & 2 deletions ms-windows/mxe/mxe.Dockerfile
Expand Up @@ -7,7 +7,7 @@ RUN apt-get install -y --no-install-recommends autopoint bison flex gperf libtoo
WORKDIR /mxe

RUN git clone https://github.com/mxe/mxe . || git pull origin master
RUN make MXE_TARGETS=i686-w64-mingw32.shared.posix -j 16 \
RUN make MXE_TARGETS=x86_64-w64-mingw32.shared.posix -j 16 \
qca \
qtlocation \
qscintilla2 \
Expand All @@ -22,5 +22,5 @@ RUN make MXE_TARGETS=i686-w64-mingw32.shared.posix -j 16 \
libspatialindex \
exiv2

RUN chmod -R a+rw /mxe/usr/i686-w64-mingw32.shared.posix
RUN chmod -R a+rw /mxe/usr/x86_64-w64-mingw32.shared.posix

0 comments on commit af1c087

Please sign in to comment.