libwinpthread for new mingw

This commit is contained in:
def 2015-09-03 11:50:40 +02:00
parent d4fe267c58
commit 975fbf3702
4 changed files with 3 additions and 1 deletions

View file

@ -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/ssleay32.dll"))
table.insert(client_depends, CopyToDirectory(".", "other/curl/windows/lib32/zlib1.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/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/libogg-0.dll"))
table.insert(client_depends, CopyToDirectory(".", "other/opus/windows/lib32/libopus-0.dll")) table.insert(client_depends, CopyToDirectory(".", "other/opus/windows/lib32/libopus-0.dll"))

Binary file not shown.

View file

@ -18,6 +18,7 @@ rm -rf AndroidData
# Actual compilation, needs a key to sign # Actual compilation, needs a key to sign
cd /media/commandergenius cd /media/commandergenius
ln -s teeworlds project/jni/application/src
./changeAppSettings.sh -a ./changeAppSettings.sh -a
android update project -p project android update project -p project
./build.sh ./build.sh

View file

@ -74,8 +74,8 @@ if include_data and not use_bundle:
shutil.copy("libgcc_s_sjlj-1.dll", package_dir) shutil.copy("libgcc_s_sjlj-1.dll", package_dir)
shutil.copy("libidn-11.dll", package_dir) shutil.copy("libidn-11.dll", package_dir)
elif platform == "win64": elif platform == "win64":
shutil.copy("libwinpthread-1.dll", package_dir)
shutil.copy("libgcc_s_seh-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("libogg-0.dll", package_dir)
shutil.copy("libopus-0.dll", package_dir) shutil.copy("libopus-0.dll", package_dir)
shutil.copy("libopusfile-0.dll", package_dir) shutil.copy("libopusfile-0.dll", package_dir)