Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve Android Makefile to include check_tools.mk only when it's ready

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-01-19 09:25:16 +01:00
parent 67d054f321
commit ca2eb44e26
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -66,15 +66,16 @@ APP_STL=stlport_static
# Checks # Checks
CHECK_MSG=$(shell ./check_tools.sh) CHECK_MSG=$(shell ./check_tools.sh)
ifeq ($(BUILD_OPENH264),1)
ifneq ($(shell echo $(NDK_MAJOR_VERSION)\>=10 | bc),1)
$(error ndk version [$(NDK_MAJOR_VERSION)] not compatible with opensh264.)
endif
endif
include check_tools.mk
ifneq ($(CHECK_MSG),) ifneq ($(CHECK_MSG),)
$(error Some tools are missing.) $(error Some tools are missing.)
else
ifeq ($(BUILD_OPENH264),1)
ifneq ($(shell echo $(NDK_MAJOR_VERSION)\>=10 | bc),1)
$(error ndk version [$(NDK_MAJOR_VERSION)] not compatible with openh264.)
endif
endif
include check_tools.mk
endif endif
OPENSSL_DIR=$(shell openssl version -d | sed "s/OPENSSLDIR: \"\(.*\)\"/\1/") OPENSSL_DIR=$(shell openssl version -d | sed "s/OPENSSLDIR: \"\(.*\)\"/\1/")