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

Commit 8a7589e

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

File tree

37 files changed

+97
-94
lines changed

37 files changed

+97
-94
lines changed

building.txt

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

project/.idea/libraries/animated_vector_drawable_25_2_0.xml

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)