MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Version 1.13.0-release

Browse Source
This commit is contained in:
Maksim 2020-10-25 21:29:07 +01:00
parent 2f88030976
commit 4da5cde7e0
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -14,7 +14,7 @@ set(CMAKE_CXX_STANDARD 11)
# Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
set(VERSION_MAJOR 1) set(VERSION_MAJOR 1)
set(VERSION_MINOR 12) set(VERSION_MINOR 13)
set(VERSION_PATCH 0) set(VERSION_PATCH 0)
set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string") set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")

4
build/android/app/build.gradle
View File

@ -8,8 +8,8 @@ android {
minSdkVersion 16 minSdkVersion 16
//noinspection OldTargetApi //noinspection OldTargetApi
targetSdkVersion 29 targetSdkVersion 29
versionCode 100 versionCode 108
versionName "1.12.0" versionName "1.13.0"
multiDexEnabled true multiDexEnabled true
} }

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

@ -1796,7 +1796,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 101; CURRENT_PROJECT_VERSION = 105;
DEVELOPMENT_TEAM = R3RLJ9TW52; DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
@ -1827,7 +1827,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.12.1; MARKETING_VERSION = 1.13.0;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-isystem", "-isystem",
@ -1862,7 +1862,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 101; CURRENT_PROJECT_VERSION = 105;
DEVELOPMENT_TEAM = R3RLJ9TW52; DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
@ -1894,7 +1894,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.12.1; MARKETING_VERSION = 1.13.0;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-isystem", "-isystem",

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

@ -12,7 +12,7 @@ fi
cd gettext-src/gettext-runtime cd gettext-src/gettext-runtime
CFLAGS=$IOS_FLAGS \ CFLAGS="$IOS_FLAGS -Dlocale_charset=intl_locale_charset" \
PKG_CONFIG=/bin/false \ PKG_CONFIG=/bin/false \
./configure --host=arm-apple-darwin --prefix=/ \ ./configure --host=arm-apple-darwin --prefix=/ \
--disable-shared --enable-static --disable-shared --enable-static

2
build/macOS/deps/freetype.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
. sdk.sh . sdk.sh
FREETYPE_VERSION=2.10.3 FREETYPE_VERSION=2.10.4
if [ ! -d freetype-src ]; then if [ ! -d freetype-src ]; then
wget http://download.savannah.gnu.org/releases/freetype/freetype-$FREETYPE_VERSION.tar.gz wget http://download.savannah.gnu.org/releases/freetype/freetype-$FREETYPE_VERSION.tar.gz

2
src/config.h
View File

@ -17,7 +17,7 @@
#define PROJECT_NAME_C "MultiCraft" #define PROJECT_NAME_C "MultiCraft"
#define STATIC_SHAREDIR "" #define STATIC_SHAREDIR ""
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 12 #define VERSION_MINOR 13
#define VERSION_PATCH 0 #define VERSION_PATCH 0
#define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH)
#endif #endif