From dd8df8bf784f50a885f92790f9dc846b108b48b0 Mon Sep 17 00:00:00 2001 From: Quentin Bazin Date: Wed, 29 Jul 2020 16:36:05 +0200 Subject: [PATCH] [external/gamekit] Updated. Probably fixed #166. --- .gitignore | 1 + external/gamekit | 2 +- misc/deploy.sh | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2fdb1d55..5c2630fc 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ build build_win32 build_win64 build_msvc +build_mingw deploy openminer openminer_server diff --git a/external/gamekit b/external/gamekit index c031d48f..ca131a8a 160000 --- a/external/gamekit +++ b/external/gamekit @@ -1 +1 @@ -Subproject commit c031d48f690d2fe27293c83bde3d3261e91d646b +Subproject commit ca131a8af626b9def9d0335f2a00f395a27b65b2 diff --git a/misc/deploy.sh b/misc/deploy.sh index aaae9d05..a94da971 100755 --- a/misc/deploy.sh +++ b/misc/deploy.sh @@ -31,7 +31,6 @@ cp /usr/i686-w64-mingw32/bin/libssp-0.dll deploy/win32/bin/openminer && \ cp /usr/i686-w64-mingw32/bin/zlib1.dll deploy/win32/bin/openminer && \ cp /usr/i686-w64-mingw32/bin/libgcc_s_dw2-1.dll deploy/win32/bin/openminer && \ cp deploy/win32/libjpeg.dll deploy/win32/bin/openminer && \ -cp deploy/win32/libpng16.dll deploy/win32/bin/openminer && \ mkdir -p deploy/win32/bin/openminer/docs/markdown && \ cp docs/*.md deploy/win32/bin/openminer/docs/markdown/ && \ cp -r deploy/html_docs deploy/win32/bin/openminer/docs/html && \ @@ -52,7 +51,6 @@ cp /usr/x86_64-w64-mingw32/bin/libssp-0.dll deploy/win64/bin/openminer && \ cp /usr/x86_64-w64-mingw32/bin/zlib1.dll deploy/win64/bin/openminer && \ cp /usr/x86_64-w64-mingw32/bin/libgcc_s_seh-1.dll deploy/win64/bin/openminer && \ cp deploy/win64/libjpeg.dll deploy/win64/bin/openminer && \ -cp deploy/win64/libpng16.dll deploy/win64/bin/openminer && \ mkdir -p deploy/win64/bin/openminer/docs/markdown && \ cp docs/*.md deploy/win64/bin/openminer/docs/markdown/ && \ cp -r deploy/html_docs deploy/win64/bin/openminer/docs/html && \