diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
index f69634489..b583d4e20 100644
--- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
+++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
@@ -1708,6 +1708,7 @@
"-flto",
"-fvisibility=hidden",
);
+ OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_LDFLAGS = (
"$(inherited)",
"-L${SRCROOT}/../deps/irrlicht",
@@ -1775,6 +1776,7 @@
"-flto",
"-fvisibility=hidden",
);
+ OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_LDFLAGS = (
"$(inherited)",
"-L${SRCROOT}/../deps/irrlicht",
diff --git a/build/iOS/MultiCraft/MultiCraft/Info.plist b/build/iOS/MultiCraft/MultiCraft/Info.plist
index d6d7c1ebd..f47a26889 100644
--- a/build/iOS/MultiCraft/MultiCraft/Info.plist
+++ b/build/iOS/MultiCraft/MultiCraft/Info.plist
@@ -17,9 +17,9 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.0.2
+ 1.0.4
CFBundleVersion
- 6
+ 8
LSRequiresIPhoneOS
NSAppTransportSecurity
diff --git a/build/iOS/Podfile b/build/iOS/Podfile
index f2b796e15..5813c7129 100644
--- a/build/iOS/Podfile
+++ b/build/iOS/Podfile
@@ -5,7 +5,7 @@ target 'MultiCraft' do
pod 'SSZipArchive'
pod 'SDVersion'
- #pod 'Appodeal/Core', '~> 1.1'
- #pod 'Appodeal/Interstitial', '1.3.3'
- #pod 'Appodeal/Video', '1.3.3'
+ pod 'Appodeal/Core'
+ pod 'Appodeal/Interstitial'
+ pod 'Appodeal/Video'
end
diff --git a/build/iOS/assets.sh b/build/iOS/assets.sh
index d879ed446..780bde74d 100755
--- a/build/iOS/assets.sh
+++ b/build/iOS/assets.sh
@@ -37,7 +37,7 @@ echo "Creating assets.zip"
ZIPDEST=$FOLDER/assets.zip
rm -f $ZIPDEST
-cd $DEST; zip -0r $ZIPDEST -- *
+cd $DEST; zip -1r $ZIPDEST -- *
cd $FOLDER; rm -rf $DEST
###########
diff --git a/build/iOS/deps/luajit.sh b/build/iOS/deps/luajit.sh
index 68bf7358c..910ff2194 100755
--- a/build/iOS/deps/luajit.sh
+++ b/build/iOS/deps/luajit.sh
@@ -1,17 +1,22 @@
#!/bin/bash -e
. ../sdk.sh
-LUAJIT_VERSION=2.1.0-beta2
+LUAJIT_VERSION=2.1
if [ ! -d luajit-src ]; then
- wget http://luajit.org/download/LuaJIT-$LUAJIT_VERSION.tar.gz
- tar -xzvf LuaJIT-$LUAJIT_VERSION.tar.gz
+ wget https://github.com/LuaJIT/LuaJIT/archive/v$LUAJIT_VERSION.zip
+ unzip v$LUAJIT_VERSION.zip
mv LuaJIT-$LUAJIT_VERSION luajit-src
- rm LuaJIT-$LUAJIT_VERSION.tar.gz
+ rm v$LUAJIT_VERSION.zip
fi
cd luajit-src
+if [ ! -f .patched ]; then
+patch -p0 <../../patches/luajit.patch
+touch .patched
+fi
+
# 32-bit
make -j$(sysctl -n hw.ncpu) \
HOST_CC="clang -m32 -arch i386" CROSS="$(dirname $IOS_CC)/" \
diff --git a/build/iOS/patches/luajit.patch b/build/iOS/patches/luajit.patch
new file mode 100644
index 000000000..a74dfe3a6
--- /dev/null
+++ b/build/iOS/patches/luajit.patch
@@ -0,0 +1,13 @@
+--- src/Makefile 2016-12-13 22:30:13.000000000 +0200
++++ src/Makefile.new 2016-12-14 03:14:34.000000000 +0200
+@@ -166,6 +166,10 @@
+ HOST_SYS= Windows
+ HOST_MSYS= cygwin
+ endif
++# Use Clang for macOS host.
++ ifeq (Darwin,$(HOST_SYS))
++ DEFAULT_CC= clang
++ endif
+ endif
+
+ ##############################################################################
diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index ba4ab979c..366f4765c 100644
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -127,8 +127,6 @@ end
ui.update()
- core.sound_play("main_menu", false)
-
minetest.set_clouds(false)
mm_texture.set_dirt_bg()
end
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 898f76022..94613596a 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -428,7 +428,7 @@ void set_default_settings(Settings *settings)
if ([SDVersion deviceSize] == Screen4inch) {
settings->setDefault("hud_scaling", "0.5");
settings->setDefault("gui_scaling", "0.9");
- settings->setDefault("mouse_sensitivity", "0.2");
+ settings->setDefault("mouse_sensitivity", "0.23");
};
// 4.7" (iPhone)
if ([SDVersion deviceSize] == Screen4Dot7inch) {