Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-13 22:51:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #457 from Gjacquenot/master

Browse Source 
✨ Switched to gcc10.2 for windows
This commit is contained in:
Matt McCormick 2020-12-22 11:05:32 -05:00 committed by GitHub
commit 0217db3bbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.windows
View File

@ -15,8 +15,8 @@
# ARG MXE_TARGET_LINK=shared # ARG MXE_TARGET_LINK=shared
# #
# mxe master 2019-12-06 # mxe master 2020-12-21
ARG MXE_GIT_TAG=aab04b93b06892a3dc675c97653236a40858c4a3 ARG MXE_GIT_TAG=a7a45e4e51fe70032305b828a001aac848f74fdb
ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake
@ -88,7 +88,7 @@ RUN \
cd /usr/src/mxe && \ cd /usr/src/mxe && \
echo "MXE_TARGETS := ${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}" > settings.mk && \ echo "MXE_TARGETS := ${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}" > settings.mk && \
echo "MXE_USE_CCACHE :=" >> settings.mk && \ echo "MXE_USE_CCACHE :=" >> settings.mk && \
echo "MXE_PLUGIN_DIRS := plugins/gcc9" >> settings.mk && \ echo "MXE_PLUGIN_DIRS := plugins/gcc10" >> settings.mk && \
echo "LOCAL_PKG_LIST := cc cmake" >> settings.mk && \ echo "LOCAL_PKG_LIST := cc cmake" >> settings.mk && \
echo ".DEFAULT local-pkg-list:" >> settings.mk && \ echo ".DEFAULT local-pkg-list:" >> settings.mk && \
echo "local-pkg-list: \$(LOCAL_PKG_LIST)" >> settings.mk && \ echo "local-pkg-list: \$(LOCAL_PKG_LIST)" >> settings.mk && \