Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix iOS build

This commit is contained in:
Maksim Gamarnik 2017-04-19 22:47:56 +03:00
parent 64b23b2675
commit 80466662be
18 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
View File

@ -499,7 +499,7 @@
F8E6C6721DCA405000F64426 /* mini-gmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "mini-gmp.c"; path = "../../../../src/gmp/mini-gmp.c"; sourceTree = "<group>"; };
F8E6C6731DCA405000F64426 /* mini-gmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "mini-gmp.h"; path = "../../../../src/gmp/mini-gmp.h"; sourceTree = "<group>"; };
F8E6C6761DCA407400F64426 /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json.h; path = ../../../../src/jsoncpp/json/json.h; sourceTree = "<group>"; };
F8E6C6771DCA407400F64426 /* jsoncpp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jsoncpp.cpp; path = ../../../../src/jsoncpp/json/jsoncpp.cpp; sourceTree = "<group>"; };
F8E6C6771DCA407400F64426 /* jsoncpp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jsoncpp.cpp; path = ../../../../src/jsoncpp/jsoncpp.cpp; sourceTree = "<group>"; };
F8E6C6D31DCA413A00F64426 /* clientopcodes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = clientopcodes.cpp; path = ../../../../src/network/clientopcodes.cpp; sourceTree = "<group>"; };
F8E6C6D41DCA413A00F64426 /* clientopcodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = clientopcodes.h; path = ../../../../src/network/clientopcodes.h; sourceTree = "<group>"; };
F8E6C6D51DCA413A00F64426 /* clientpackethandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = clientpackethandler.cpp; path = ../../../../src/network/clientpackethandler.cpp; sourceTree = "<group>"; };
@ -1694,6 +1694,7 @@
baseConfigurationReference = 32528F14AAB9EA0E9CAB8526 /* Pods-MultiCraft.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
DEVELOPMENT_TEAM = R3RLJ9TW52;
ENABLE_BITCODE = NO;
@ -1761,6 +1762,7 @@
baseConfigurationReference = 1E76DCA01B51A98F0CA4C480 /* Pods-MultiCraft.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
DEVELOPMENT_TEAM = R3RLJ9TW52;
ENABLE_BITCODE = NO;

BIN
build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-120.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-152.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

BIN
build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-167.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

BIN
build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-180.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

BIN
build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-76.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

4
build/iOS/MultiCraft/MultiCraft/Info.plist
View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.9</string>
<string>1.0.10</string>
<key>CFBundleVersion</key>
<string>14</string>
<string>15</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>

2
build/iOS/Start.sh
View File

@ -6,7 +6,9 @@ echo "Starting build MultiCraft for iOS..."
echo
echo "Build Libraries:"
cd deps
./libraries.sh
cd ..
echo
echo "Creating Assets:"

2
build/iOS/deps/intl.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash -e
. ../sdk.sh
. sdk.sh
if [ ! -d intl-src ]; then
wget https://github.com/j-jorge/libintl-lite/archive/master.tar.gz

4
build/iOS/deps/irrlicht.sh
View File

@ -1,9 +1,9 @@
#!/bin/bash -e
. ../sdk.sh
. sdk.sh
[ ! -d irrlicht-src ] && \
svn co svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es irrlicht-src
svn co -r 5415 svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es irrlicht-src
cd irrlicht-src/

2
build/iOS/deps/leveldb.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash -e
. ../sdk.sh
. sdk.sh
LEVELDB_VERSION=1.20
if [ ! -d leveldb-src ]; then

2
build/iOS/deps/libcurl.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash -e
. ../sdk.sh
. sdk.sh
CURL_VERSION=7.53.1
if [ ! -d libcurl-src ]; then

2
build/iOS/deps/libogg.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash -e
. ../sdk.sh
. sdk.sh
OGG_VERSION=1.3.2
if [ ! -d libogg-src ]; then

4
build/iOS/libraries.sh → build/iOS/deps/libraries.sh Executable file → Normal file
View File

@ -1,10 +1,8 @@
#!/bin/bash -e
cd deps
./irrlicht.sh
./libogg.sh
./libvorbis.sh # depends on libogg
./libvorbis.sh
./leveldb.sh
./freetype.sh
./luajit.sh

2
build/iOS/deps/libvorbis.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash -e
. ../sdk.sh
. sdk.sh
VORBIS_VERSION=1.3.5
if [ ! -d libvorbis-src ]; then

2
build/iOS/deps/luajit.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash -e
. ../sdk.sh
. sdk.sh
LUAJIT_VERSION=2.1
if [ ! -d luajit-src ]; then

2
build/iOS/sdk.sh → build/iOS/deps/sdk.sh Executable file → Normal file
View File

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

3
src/touchscreengui.cpp
View File

@ -671,7 +671,6 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
}
else {
assert(event.TouchInput.Event == ETIE_MOVED);
size_t move_idx = event.TouchInput.ID;
if (loadPointerPos(event.TouchInput.ID) ==
v2s32(event.TouchInput.X, event.TouchInput.Y)) {
@ -701,8 +700,6 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
/* adapt to similar behaviour as pc screen */
double d = g_settings->getFloat("mouse_sensitivity");
double old_yaw = m_camera_yaw_change;
double old_pitch = m_camera_pitch;
m_camera_yaw_change -= dx * d;
m_camera_pitch = MYMIN(MYMAX(m_camera_pitch + (dy * d), -180), 180);