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 000000000..6b55de155 Binary files /dev/null and b/other/opus/windows/lib32/libwinpthread-1.dll differ 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)