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.
This commit is contained in:
Martin Storsjö 2014-08-13 12:38:27 +03:00
parent 681b1da698
commit 0f9c2dbb12

View File

@ -47,8 +47,10 @@ LDFLAGS += --sysroot=$(SYSROOT)
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 = \
-I$(NDKROOT)/sources/cxx-stl/stlport/stlport