Skip to content
This repository was archived by the owner on Mar 5, 2023. It is now read-only.

Commit 8a7589e

Browse files
FaythFayth
committed
Updated/unified sdk versions, compile versions etc;
Minor fixes;
1 parent 11651b5 commit 8a7589e

37 files changed

+97
-94
lines changed

‎building.txt

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ if you want to build SDL, ffmpeg and iconv manually
1212
* place SDL addons sources into folders in ./ext/SDL2 (so that ./ext/SDL2/SDL2-image/code/configure , ./ext/SDL2/SDL2-mixer/code/configure , ./ext/SDL2/SDL2-ttf/code/configure all exist)
1313
* file ./ext/SDL2/SDL2-mixer/build.mk has hardcoded path to "smpeg2-2.0.0", so if there's some newer version, you might need to change it
1414
* try to enter bash and check if "make" and "yasm" work (install them if not (sudo apt-get install or something like that))
15+
* make sure that bash scripts (eg. ./ext/ff/ffmpeg/configure and ./ext/ff/x264/configure) have unix newlines (lf) otherwise building ffmpeg fails with cryptic errors
1516
* run in main folder: python build.py all
1617
* if it eventually finishes without errors, there should be libs in ./ext-output/(ARCH)
1718
* iconv and SDL are build only in configurations declared in vcmiconf.in

‎ext/SDL2/SDL2-image/Application.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APP_MODULES := SDL2_image
22
APP_ABI := armeabi armeabi-v7a arm64-v8a x86 x86_64
33
APP_PLATFORM := android-16
4-
PROJECT_PATH_BASE := Q:/Dev/VCMI/vcmi-android
4+
PROJECT_PATH_BASE := q:/Dev/VCMI/vcmi-android
55
include $(PROJECT_PATH_BASE)/build-hardcoded.mk

‎ext/SDL2/SDL2-mixer/Application.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APP_MODULES := SDL2_mixer
22
APP_ABI := armeabi armeabi-v7a arm64-v8a x86 x86_64
33
APP_PLATFORM := android-16
4-
PROJECT_PATH_BASE := Q:/Dev/VCMI/vcmi-android
4+
PROJECT_PATH_BASE := q:/Dev/VCMI/vcmi-android
55
include $(PROJECT_PATH_BASE)/build-hardcoded.mk

‎ext/SDL2/SDL2-ttf/Application.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APP_MODULES := SDL2_ttf
22
APP_ABI := armeabi armeabi-v7a arm64-v8a x86 x86_64
33
APP_PLATFORM := android-16
4-
PROJECT_PATH_BASE := Q:/Dev/VCMI/vcmi-android
4+
PROJECT_PATH_BASE := q:/Dev/VCMI/vcmi-android
55
include $(PROJECT_PATH_BASE)/build-hardcoded.mk

‎ext/vcmi

‎project/.idea/libraries/animated_vector_drawable_25_2_0.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/.idea/libraries/appcompat_v7_25_2_0.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/.idea/libraries/design_25_2_0.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/.idea/libraries/recyclerview_v7_25_2_0.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/.idea/libraries/support_compat_25_2_0.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/.idea/libraries/support_core_ui_25_2_0.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/.idea/libraries/support_core_utils_25_2_0.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/.idea/libraries/support_fragment_25_2_0.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/.idea/libraries/support_media_compat_25_2_0.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/.idea/libraries/support_v4_25_2_0.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/.idea/libraries/support_vector_drawable_25_2_0.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/.idea/libraries/transition_25_2_0.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎project/boost-datetime/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'com.android.model.native'
33
model {
44
android {
55
compileSdkVersion VCMI_COMPILE_SDK
6-
buildToolsVersion "25.0.1"
6+
buildToolsVersion "25.0.2"
77

88
defaultConfig {
9-
minSdkVersion.apiLevel 16
10-
targetSdkVersion.apiLevel 24
9+
minSdkVersion.apiLevel VCMI_PLATFORM
10+
targetSdkVersion.apiLevel 25
1111
}
1212
}
1313

‎project/boost-filesystem/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'com.android.model.native'
33
model {
44
android {
55
compileSdkVersion VCMI_COMPILE_SDK
6-
buildToolsVersion "25.0.1"
6+
buildToolsVersion "25.0.2"
77

88
defaultConfig {
9-
minSdkVersion.apiLevel 16
10-
targetSdkVersion.apiLevel 24
9+
minSdkVersion.apiLevel VCMI_PLATFORM
10+
targetSdkVersion.apiLevel 25
1111
}
1212
}
1313

‎project/boost-locale/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ model {
2020

2121
android {
2222
compileSdkVersion VCMI_COMPILE_SDK
23-
buildToolsVersion "25.0.1"
23+
buildToolsVersion "25.0.2"
2424

2525
defaultConfig {
26-
minSdkVersion.apiLevel 16
27-
targetSdkVersion.apiLevel 24
26+
minSdkVersion.apiLevel VCMI_PLATFORM
27+
targetSdkVersion.apiLevel 25
2828
}
2929
}
3030

‎project/boost-program-options/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'com.android.model.native'
33
model {
44
android {
55
compileSdkVersion VCMI_COMPILE_SDK
6-
buildToolsVersion "25.0.1"
6+
buildToolsVersion "25.0.2"
77

88
defaultConfig {
9-
minSdkVersion.apiLevel 16
10-
targetSdkVersion.apiLevel 24
9+
minSdkVersion.apiLevel VCMI_PLATFORM
10+
targetSdkVersion.apiLevel 25
1111
}
1212
}
1313

‎project/boost-smartptr/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'com.android.model.native'
33
model {
44
android {
55
compileSdkVersion VCMI_COMPILE_SDK
6-
buildToolsVersion "25.0.1"
6+
buildToolsVersion "25.0.2"
77

88
defaultConfig {
9-
minSdkVersion.apiLevel 16
10-
targetSdkVersion.apiLevel 24
9+
minSdkVersion.apiLevel VCMI_PLATFORM
10+
targetSdkVersion.apiLevel 25
1111
}
1212
}
1313

‎project/boost-system/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'com.android.model.native'
33
model {
44
android {
55
compileSdkVersion VCMI_COMPILE_SDK
6-
buildToolsVersion "25.0.1"
6+
buildToolsVersion "25.0.2"
77

88
defaultConfig {
9-
minSdkVersion.apiLevel 16
10-
targetSdkVersion.apiLevel 24
9+
minSdkVersion.apiLevel VCMI_PLATFORM
10+
targetSdkVersion.apiLevel 25
1111
}
1212
}
1313

‎project/boost-thread/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'com.android.model.native'
33
model {
44
android {
55
compileSdkVersion VCMI_COMPILE_SDK
6-
buildToolsVersion "25.0.1"
6+
buildToolsVersion "25.0.2"
77

88
defaultConfig {
9-
minSdkVersion.apiLevel 16
10-
targetSdkVersion.apiLevel 24
9+
minSdkVersion.apiLevel VCMI_PLATFORM
10+
targetSdkVersion.apiLevel 25
1111
}
1212
}
1313

‎project/fuzzylite/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'com.android.model.native'
33
model {
44
android {
55
compileSdkVersion VCMI_COMPILE_SDK
6-
buildToolsVersion "25.0.1"
6+
buildToolsVersion "25.0.2"
77

88
defaultConfig {
9-
minSdkVersion.apiLevel 16
10-
targetSdkVersion.apiLevel 24
9+
minSdkVersion.apiLevel VCMI_PLATFORM
10+
targetSdkVersion.apiLevel 25
1111
}
1212
}
1313

‎project/minizip/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'com.android.model.native'
33
model {
44
android {
55
compileSdkVersion VCMI_COMPILE_SDK
6-
buildToolsVersion "25.0.1"
6+
buildToolsVersion "25.0.2"
77

88
defaultConfig {
9-
minSdkVersion.apiLevel 16
10-
targetSdkVersion.apiLevel 24
9+
minSdkVersion.apiLevel VCMI_PLATFORM
10+
targetSdkVersion.apiLevel 25
1111
}
1212
}
1313

‎project/vcmi-ai-battle/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ model {
44

55
android {
66
compileSdkVersion VCMI_COMPILE_SDK
7-
buildToolsVersion "25.0.1"
7+
buildToolsVersion "25.0.2"
88

99
defaultConfig {
10-
minSdkVersion.apiLevel 16
11-
targetSdkVersion.apiLevel 24
10+
minSdkVersion.apiLevel VCMI_PLATFORM
11+
targetSdkVersion.apiLevel 25
1212
}
1313
}
1414

‎project/vcmi-ai-stupid/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'com.android.model.native'
33
model {
44
android {
55
compileSdkVersion VCMI_COMPILE_SDK
6-
buildToolsVersion "25.0.1"
6+
buildToolsVersion "25.0.2"
77

88
defaultConfig {
9-
minSdkVersion.apiLevel 16
10-
targetSdkVersion.apiLevel 24
9+
minSdkVersion.apiLevel VCMI_PLATFORM
10+
targetSdkVersion.apiLevel 25
1111
}
1212
}
1313

‎project/vcmi-ai-vcai/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ model {
2121

2222
android {
2323
compileSdkVersion VCMI_COMPILE_SDK
24-
buildToolsVersion "25.0.1"
24+
buildToolsVersion "25.0.2"
2525

2626
defaultConfig {
27-
minSdkVersion.apiLevel 16
28-
targetSdkVersion.apiLevel 24
27+
minSdkVersion.apiLevel VCMI_PLATFORM
28+
targetSdkVersion.apiLevel 25
2929
}
3030
}
3131

‎project/vcmi-app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.model.application'
22
model {
33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.1"
4+
compileSdkVersion VCMI_COMPILE_SDK
5+
buildToolsVersion "25.0.2"
66

77
defaultConfig {
88
applicationId "eu.vcmi.vcmi"

‎project/vcmi-app/src/main/java/eu/vcmi/vcmi/ActivityLauncher.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ private InitResult handleDataFoldersInitialization()
317317
if (!testH3Data.exists())
318318
{
319319
return new InitResult(false,
320-
getString(R.string.launcher_error_h3_data_missing, testH3Data.getAbsolutePath(), vcmiDir.getAbsolutePath() + "/Mp3"));
320+
getString(R.string.launcher_error_h3_data_missing, testH3Data.getAbsolutePath(), Const.VCMI_DATA_ROOT_FOLDER_NAME));
321321
}
322322

323323
final File testVcmiData = new File(vcmiInternalDir, "Mods/vcmi/mod.json");

0 commit comments

Comments
 (0)