iOS: remove redis, minimap and add pause texture. Fix build script

build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj

@@ -35,7 +35,6 @@
 		F8E6C6051DCA3F9900F64426 /* craftdef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C5211DCA3F9900F64426 /* craftdef.cpp */; };
 		F8E6C6061DCA3F9900F64426 /* database-dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C5231DCA3F9900F64426 /* database-dummy.cpp */; };
 		F8E6C6071DCA3F9900F64426 /* database-leveldb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C5251DCA3F9900F64426 /* database-leveldb.cpp */; };
-		F8E6C6081DCA3F9900F64426 /* database-redis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C5271DCA3F9900F64426 /* database-redis.cpp */; };
 		F8E6C6091DCA3F9900F64426 /* database-sqlite3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C5291DCA3F9900F64426 /* database-sqlite3.cpp */; };
 		F8E6C60A1DCA3F9900F64426 /* database.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C52B1DCA3F9900F64426 /* database.cpp */; };
 		F8E6C60B1DCA3F9900F64426 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C52E1DCA3F9900F64426 /* debug.cpp */; };
@@ -270,8 +269,6 @@
 		F8E6C5241DCA3F9900F64426 /* database-dummy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "database-dummy.h"; path = "../../../../src/database-dummy.h"; sourceTree = "<group>"; };
 		F8E6C5251DCA3F9900F64426 /* database-leveldb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "database-leveldb.cpp"; path = "../../../../src/database-leveldb.cpp"; sourceTree = "<group>"; };
 		F8E6C5261DCA3F9900F64426 /* database-leveldb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "database-leveldb.h"; path = "../../../../src/database-leveldb.h"; sourceTree = "<group>"; };
-		F8E6C5271DCA3F9900F64426 /* database-redis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "database-redis.cpp"; path = "../../../../src/database-redis.cpp"; sourceTree = "<group>"; };
-		F8E6C5281DCA3F9900F64426 /* database-redis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "database-redis.h"; path = "../../../../src/database-redis.h"; sourceTree = "<group>"; };
 		F8E6C5291DCA3F9900F64426 /* database-sqlite3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "database-sqlite3.cpp"; path = "../../../../src/database-sqlite3.cpp"; sourceTree = "<group>"; };
 		F8E6C52A1DCA3F9900F64426 /* database-sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "database-sqlite3.h"; path = "../../../../src/database-sqlite3.h"; sourceTree = "<group>"; };
 		F8E6C52B1DCA3F9900F64426 /* database.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = database.cpp; path = ../../../../src/database.cpp; sourceTree = "<group>"; };
@@ -766,8 +763,6 @@
 				F8E6C5241DCA3F9900F64426 /* database-dummy.h */,
 				F8E6C5251DCA3F9900F64426 /* database-leveldb.cpp */,
 				F8E6C5261DCA3F9900F64426 /* database-leveldb.h */,
-				F8E6C5271DCA3F9900F64426 /* database-redis.cpp */,
-				F8E6C5281DCA3F9900F64426 /* database-redis.h */,
 				F8E6C5291DCA3F9900F64426 /* database-sqlite3.cpp */,
 				F8E6C52A1DCA3F9900F64426 /* database-sqlite3.h */,
 				F8E6C52B1DCA3F9900F64426 /* database.cpp */,
@@ -1395,7 +1390,6 @@
 				F8E6C6DF1DCA413A00F64426 /* clientpackethandler.cpp in Sources */,
 				F8E6C6261DCA3F9900F64426 /* itemdef.cpp in Sources */,
 				F8E6C61B1DCA3F9900F64426 /* guiKeyChangeMenu.cpp in Sources */,
-				F8E6C6081DCA3F9900F64426 /* database-redis.cpp in Sources */,
 				F8E6C7671DCA423C00F64426 /* thread.cpp in Sources */,
 				F8E6C6481DCA3F9900F64426 /* pathfinder.cpp in Sources */,
 				F8E6C6531DCA3F9900F64426 /* serverobject.cpp in Sources */,
@@ -1689,6 +1683,17 @@
 				INFOPLIST_FILE = MultiCraft/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				OTHER_CFLAGS = (
+					"$(inherited)",
+					"-isystem",
+					"\"${PODS_ROOT}/Headers/Public\"",
+					"-isystem",
+					"\"${PODS_ROOT}/Headers/Public/SDVersion\"",
+					"-isystem",
+					"\"${PODS_ROOT}/Headers/Public/SSZipArchive\"",
+					"-flto",
+					"-fvisibility=hidden",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-L${SRCROOT}/../deps/irrlicht",
@@ -1745,6 +1750,17 @@
 				INFOPLIST_FILE = MultiCraft/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				OTHER_CFLAGS = (
+					"$(inherited)",
+					"-isystem",
+					"\"${PODS_ROOT}/Headers/Public\"",
+					"-isystem",
+					"\"${PODS_ROOT}/Headers/Public/SDVersion\"",
+					"-isystem",
+					"\"${PODS_ROOT}/Headers/Public/SSZipArchive\"",
+					"-flto",
+					"-fvisibility=hidden",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-L${SRCROOT}/../deps/irrlicht",

build/iOS/MultiCraft/MultiCraft/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>3</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

build/iOS/Start.sh

@@ -13,6 +13,11 @@ echo "Creating Assets:"
 
 ./assets.sh
 
+echo
+echo "Creating App Icon:"
+
+./appicon.sh
+
 echo
 echo "Install CocoaPods:"
 

build/iOS/appicon.sh

@@ -10,3 +10,5 @@ for sz in $SIZES; do
 	echo "Creating ${sz}x${sz} icon"
 	convert -resize ${sz}x${sz} $SRCFILE $DSTDIR/AppIcon-${sz}.png
 done
+
+echo "App Icon create successful"

build/iOS/deps/freetype.sh

@@ -1,6 +1,7 @@
 #!/bin/bash -e
 
 . ../sdk.sh
+IPHONEOS_DEPLOYMENT_TARGET=
 FREETYPE_VERSION=2.7
 
 if [ ! -d freetype-src ]; then

build/iOS/deps/irrlicht.sh

@@ -16,6 +16,7 @@ fi
 
 cd source/Irrlicht
 xcodebuild build \
+	-configuration Release \
 	-project Irrlicht.xcodeproj \
 	-scheme Irrlicht_iOS \
 	-destination generic/platform=iOS

build/iOS/sdk.sh

@@ -4,7 +4,7 @@
 sdk=iphoneos
 
 export IOS_COMPILER=$(xcrun --sdk $sdk --find clang)
+export IPHONEOS_DEPLOYMENT_TARGET=8.0
 export IOS_CC=$IOS_COMPILER
 export IOS_CXX=$IOS_COMPILER
-export IOS_FLAGS="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -arch armv7 -arch arm64"
+export IOS_FLAGS="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -arch armv7 -arch arm64 -Ofast -fvisibility=hidden"
-

builtin/mainmenu/init.lua

@@ -97,8 +97,11 @@ local function init_globals()
 
 	tv_main:set_autosave_tab(true)
 	tv_main:add(tabs.singleplayer)
+	
+if PLATFORM ~= "iOS" then
 	tv_main:add(tabs.multiplayer)
 	tv_main:add(tabs.server)
+end
 
 	if not use_simple_menu then
 		tv_main:add(tabs.settings)
@@ -131,4 +134,3 @@ local function init_globals()
 end
 
 init_globals()
-

src/defaultsettings.cpp

@@ -23,7 +23,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "config.h"
 #include "constants.h"
 #include "porting.h"
+
+#ifdef __IOS__
 #import "SDVersion.h"
+#endif
 
 void set_default_settings(Settings *settings)
 {

src/fontengine.cpp

@@ -345,8 +345,10 @@ void FontEngine::initFont(unsigned int basesize, FontMode mode)
 			m_font_cache[mode][basesize] = font;
 		}
 		else {
+		#ifndef __IOS__
 			errorstream << "FontEngine: failed to load freetype font: "
 					<< font_path << std::endl;
+		#endif
 		}
 	}
 #endif

src/touchscreengui.cpp

@@ -61,6 +61,7 @@ const char* touchgui_button_imagenames[] = {
 	"chat.png",
 //	"camera.png",
 	"rangeview.png",
+	"rangeview_ios.png",
 	"empty.png",
 	"escape.png",
 };
@@ -131,6 +132,9 @@ static irr::EKEY_CODE id2keycode(touch_gui_button_id id)
 		case range_id:
 			key = "rangeselect";
 			break;
+		case range_ios_id:
+			key = "rangeselect";
+			break;
 		case empty_id:
 			key = "forward";
 			break;
@@ -342,36 +346,42 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc)
 			L"fast", false, SLOW_BUTTON_REPEAT);
 #endif*/
 
-/*#ifndef NDEBUG
-	/* init debug button */
-	/*initButton(debug_id,
-			rect<s32>(m_screensize.X - (0.75*button_size), 0.75*button_size,
-					m_screensize.X, 1.5*button_size),
-			L"dbg", false, SLOW_BUTTON_REPEAT);
-#endif*/
-
-	/* init rangeselect button */
-	initButton(range_id,					
-					rect<s32>(m_screensize.X / 2 - (button_size * 1.125), 0,
-					m_screensize.X / 2 - (button_size * 0.375),
-					(button_size * 0.75)),
-			L"far", false, SLOW_BUTTON_REPEAT);
 			
-	/* init minimap button */
-	initButton(minimap_id,
-					rect<s32>(m_screensize.X / 2 - (button_size * 0.375), 0,
-					m_screensize.X / 2 + (button_size * 0.375),
-					(button_size * 0.75)),
-			L"minimap", false, SLOW_BUTTON_REPEAT);
 
-	/* init chat button */
+
 #ifdef __IOS__
+// iOS bar
+	/* init pause button */
 	initButton(escape_id,
-				rect<s32>(m_screensize.X / 2 + (button_size * 0.375), 0,
+				rect<s32>(m_screensize.X / 2 - (button_size * 0.75), 0,
-				m_screensize.X / 2 + (button_size * 1.125),
+				m_screensize.X / 2,
 				(button_size * 0.75)),
 		L"Exit", false, SLOW_BUTTON_REPEAT);
+	
+	/* init rangeselect button */
+	initButton(range_ios_id,
+			   rect<s32>(m_screensize.X / 2, 0,
+						 m_screensize.X / 2 + (button_size * 0.75),
+						 (button_size * 0.75)),
+			   L"far", false, SLOW_BUTTON_REPEAT);
+	
 #else
+// Android and Windows bar
+	/* init rangeselect button */
+	initButton(range_id,
+			   rect<s32>(m_screensize.X / 2 - (button_size * 1.125), 0,
+						 m_screensize.X / 2 - (button_size * 0.375),
+						 (button_size * 0.75)),
+			   L"far", false, SLOW_BUTTON_REPEAT);
+	
+	/* init minimap button */
+	initButton(minimap_id,
+			   rect<s32>(m_screensize.X / 2 - (button_size * 0.375), 0,
+						 m_screensize.X / 2 + (button_size * 0.375),
+						 (button_size * 0.75)),
+			   L"minimap", false, SLOW_BUTTON_REPEAT);
+	
+	/* init chat button */
 	initButton(chat_id,
 					rect<s32>(m_screensize.X / 2 + (button_size * 0.375), 0,
 					m_screensize.X / 2 + (button_size * 1.125),
@@ -379,8 +389,8 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc)
 			L"Chat", false, SLOW_BUTTON_REPEAT);
 #endif
 
-		/* init camera button 
+		/* init camera button */
-	initButton(camera_id,
+	/*initButton(camera_id,
 			rect<s32>(0, 0,
 					0.75*button_size, 0.75*button_size),
 			L"cam", false, SLOW_BUTTON_REPEAT);*/

src/touchscreengui.h

@@ -58,6 +58,7 @@ typedef enum {
 	chat_id,
 //	camera_id,
 	range_id,
+	range_ios_id,
 	empty_id,
 	escape_id,
 	after_last_element_id