diff --git a/prepare.py b/prepare.py index 6af46c5e8..588431628 100755 --- a/prepare.py +++ b/prepare.py @@ -185,6 +185,7 @@ class IOSPreparator(prepare.Preparator): if find_executable("nasm"): nasm_output = Popen("nasm -f elf32".split(" "), stderr=PIPE, stdout=PIPE).stderr.read() if "fatal: unrecognised output format" in nasm_output: + error("Invalid version of nasm detected. Please make sure that you are NOT using Apple's binary here") self.missing_dependencies["nasm"] = "nasm" reterr = 1 diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 285750137..75de608ed 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 285750137ea9d102b2d2923dfec0ba93fd4c3aea +Subproject commit 75de608edffd637af7a5911f067f005f380fcf47 diff --git a/submodules/belle-sip b/submodules/belle-sip index 0d11b6ece..e74398bf2 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 0d11b6ece11181112f55443623326ad16f4a2e00 +Subproject commit e74398bf24c85f94c779d2868ee061299831a6da diff --git a/submodules/bzrtp b/submodules/bzrtp index b8033c8dc..88104f538 160000 --- a/submodules/bzrtp +++ b/submodules/bzrtp @@ -1 +1 @@ -Subproject commit b8033c8dc960b8fd446e3e68d37749828cf7f808 +Subproject commit 88104f538b2d786c6e7808e05a4fb7aba8afca42 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index a4fbcbee4..0ffa3259f 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit a4fbcbee40e7c9b9ef3ec3f7b0e95e3440906d89 +Subproject commit 0ffa3259fd2848f57ee70cfac941e26dbc38b0ec diff --git a/submodules/linphone b/submodules/linphone index af2ecd8cb..747209c61 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit af2ecd8cb67845e904d803d008ced2703e45423e +Subproject commit 747209c6138b1188e4653f524f54176ebf3a4a5d