From 975fbf37027ec574af45022cb6b6d90bb8a7b142 Mon Sep 17 00:00:00 2001 From: def Date: Thu, 3 Sep 2015 11:50:40 +0200 Subject: [PATCH] libwinpthread for new mingw --- bam.lua | 1 + other/opus/windows/lib32/libwinpthread-1.dll | Bin 0 -> 49933 bytes scripts/make_android.sh | 1 + scripts/make_release.py | 2 +- 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100755 other/opus/windows/lib32/libwinpthread-1.dll diff --git a/bam.lua b/bam.lua index c7c57db3b..3b5456ef3 100644 --- a/bam.lua +++ b/bam.lua @@ -156,6 +156,7 @@ if family == "windows" then table.insert(client_depends, CopyToDirectory(".", "other/curl/windows/lib32/ssleay32.dll")) table.insert(client_depends, CopyToDirectory(".", "other/curl/windows/lib32/zlib1.dll")) + table.insert(client_depends, CopyToDirectory(".", "other/opus/windows/lib32/libwinpthread-1.dll")) table.insert(client_depends, CopyToDirectory(".", "other/opus/windows/lib32/libgcc_s_sjlj-1.dll")) table.insert(client_depends, CopyToDirectory(".", "other/opus/windows/lib32/libogg-0.dll")) table.insert(client_depends, CopyToDirectory(".", "other/opus/windows/lib32/libopus-0.dll")) diff --git a/other/opus/windows/lib32/libwinpthread-1.dll b/other/opus/windows/lib32/libwinpthread-1.dll new file mode 100755 index 0000000000000000000000000000000000000000..6b55de1559399e61034becb97da5cd575a2d74e2 GIT binary patch literal 49933 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 CtY-lL literal 0 HcmV?d00001 diff --git a/scripts/make_android.sh b/scripts/make_android.sh index eef2a4dfd..5da957a32 100644 --- a/scripts/make_android.sh +++ b/scripts/make_android.sh @@ -18,6 +18,7 @@ rm -rf AndroidData # Actual compilation, needs a key to sign cd /media/commandergenius +ln -s teeworlds project/jni/application/src ./changeAppSettings.sh -a android update project -p project ./build.sh diff --git a/scripts/make_release.py b/scripts/make_release.py index 8e8eb63f9..fcba319d3 100644 --- a/scripts/make_release.py +++ b/scripts/make_release.py @@ -74,8 +74,8 @@ if include_data and not use_bundle: shutil.copy("libgcc_s_sjlj-1.dll", package_dir) shutil.copy("libidn-11.dll", package_dir) elif platform == "win64": - shutil.copy("libwinpthread-1.dll", package_dir) shutil.copy("libgcc_s_seh-1.dll", package_dir) + shutil.copy("libwinpthread-1.dll", package_dir) shutil.copy("libogg-0.dll", package_dir) shutil.copy("libopus-0.dll", package_dir) shutil.copy("libopusfile-0.dll", package_dir)