diff --git a/prepare.py b/prepare.py
index 1c8a890a4..204c325ae 100755
--- a/prepare.py
+++ b/prepare.py
@@ -84,10 +84,15 @@ ios_targets = {
     'arm64': IOSarm64Target()
 }
 
+ios_virtual_targets = {
+    'devices': ['armv7', 'arm64'],
+    'simulators': ['i386', 'x86_64']
+}
+
 class IOSPreparator(prepare.Preparator):
 
-    def __init__(self, targets=ios_targets):
-        prepare.Preparator.__init__(self, targets)
+    def __init__(self, targets=ios_targets, virtual_targets=ios_virtual_targets):
+        prepare.Preparator.__init__(self, targets, virtual_targets=virtual_targets)
         self.veryclean = True
         self.show_gpl_disclaimer = True
         self.argparser.add_argument('-ac', '--all-codecs', help="Enable all codecs, including the non-free ones. Final application must comply with their respective license (see README.md).", action='store_true')
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 852b8d37f..3645c90a2 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 852b8d37ff836e70313afb5b721ebd90977b82fe
+Subproject commit 3645c90a20ce865cfaca62b88a981c1cd1c27a87