ref: 0f9c2dbb12742ea0bfc493156ae6454227878ebb
parent: 681b1da69899535a41b8aee4628811d4e529be8c
author: Martin Storsjö <martin@martin.st>
date: Wed Aug 13 08:38:27 EDT 2014
Check for $(CXX).exe as well when checking for the android toolchain This fixes building for android on windows. Building for android on windows still requires MSYS for running make, but running the ndk-build of the sample projects from within MSYS doesn't seem to work (the OS variable from the OpenH264 makefile interferes with the host system detection in ndk-build), so one still needs to build it in two steps, first make OS=android ... libopenh264.so, then building the sample projects manually.
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -47,7 +47,9 @@
SHLDFLAGS = -Wl,--no-undefined -Wl,-z,relro -Wl,-z,now -Wl,-soname,lib$(PROJECT_NAME).so
ifneq ($(CXX),$(wildcard $(CXX)))
+ifneq ($(CXX).exe,$(wildcard $(CXX).exe))
$(error Compiler not found, bad NDKROOT or ARCH?)
+endif
endif
STL_INCLUDES = \