iOS: 1.0.4

This commit is contained in:
Maksim Gamarnik 2016-12-19 23:20:21 +02:00
parent e7ee249303
commit a68186451b
8 changed files with 31 additions and 13 deletions

View File

@ -1708,6 +1708,7 @@
"-flto", "-flto",
"-fvisibility=hidden", "-fvisibility=hidden",
); );
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-L${SRCROOT}/../deps/irrlicht", "-L${SRCROOT}/../deps/irrlicht",
@ -1775,6 +1776,7 @@
"-flto", "-flto",
"-fvisibility=hidden", "-fvisibility=hidden",
); );
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-L${SRCROOT}/../deps/irrlicht", "-L${SRCROOT}/../deps/irrlicht",

View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0.2</string> <string>1.0.4</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>6</string> <string>8</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>NSAppTransportSecurity</key> <key>NSAppTransportSecurity</key>

View File

@ -5,7 +5,7 @@ target 'MultiCraft' do
pod 'SSZipArchive' pod 'SSZipArchive'
pod 'SDVersion' pod 'SDVersion'
#pod 'Appodeal/Core', '~> 1.1' pod 'Appodeal/Core'
#pod 'Appodeal/Interstitial', '1.3.3' pod 'Appodeal/Interstitial'
#pod 'Appodeal/Video', '1.3.3' pod 'Appodeal/Video'
end end

View File

@ -37,7 +37,7 @@ echo "Creating assets.zip"
ZIPDEST=$FOLDER/assets.zip ZIPDEST=$FOLDER/assets.zip
rm -f $ZIPDEST rm -f $ZIPDEST
cd $DEST; zip -0r $ZIPDEST -- * cd $DEST; zip -1r $ZIPDEST -- *
cd $FOLDER; rm -rf $DEST cd $FOLDER; rm -rf $DEST
########### ###########

View File

@ -1,17 +1,22 @@
#!/bin/bash -e #!/bin/bash -e
. ../sdk.sh . ../sdk.sh
LUAJIT_VERSION=2.1.0-beta2 LUAJIT_VERSION=2.1
if [ ! -d luajit-src ]; then if [ ! -d luajit-src ]; then
wget http://luajit.org/download/LuaJIT-$LUAJIT_VERSION.tar.gz wget https://github.com/LuaJIT/LuaJIT/archive/v$LUAJIT_VERSION.zip
tar -xzvf LuaJIT-$LUAJIT_VERSION.tar.gz unzip v$LUAJIT_VERSION.zip
mv LuaJIT-$LUAJIT_VERSION luajit-src mv LuaJIT-$LUAJIT_VERSION luajit-src
rm LuaJIT-$LUAJIT_VERSION.tar.gz rm v$LUAJIT_VERSION.zip
fi fi
cd luajit-src cd luajit-src
if [ ! -f .patched ]; then
patch -p0 <../../patches/luajit.patch
touch .patched
fi
# 32-bit # 32-bit
make -j$(sysctl -n hw.ncpu) \ make -j$(sysctl -n hw.ncpu) \
HOST_CC="clang -m32 -arch i386" CROSS="$(dirname $IOS_CC)/" \ HOST_CC="clang -m32 -arch i386" CROSS="$(dirname $IOS_CC)/" \

View File

@ -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
##############################################################################

View File

@ -127,8 +127,6 @@ end
ui.update() ui.update()
core.sound_play("main_menu", false)
minetest.set_clouds(false) minetest.set_clouds(false)
mm_texture.set_dirt_bg() mm_texture.set_dirt_bg()
end end

View File

@ -428,7 +428,7 @@ void set_default_settings(Settings *settings)
if ([SDVersion deviceSize] == Screen4inch) { if ([SDVersion deviceSize] == Screen4inch) {
settings->setDefault("hud_scaling", "0.5"); settings->setDefault("hud_scaling", "0.5");
settings->setDefault("gui_scaling", "0.9"); settings->setDefault("gui_scaling", "0.9");
settings->setDefault("mouse_sensitivity", "0.2"); settings->setDefault("mouse_sensitivity", "0.23");
}; };
// 4.7" (iPhone) // 4.7" (iPhone)
if ([SDVersion deviceSize] == Screen4Dot7inch) { if ([SDVersion deviceSize] == Screen4Dot7inch) {