From 0f9c2dbb12742ea0bfc493156ae6454227878ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 13 Aug 2014 12:38:27 +0300 Subject: [PATCH] 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. --- build/platform-android.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/platform-android.mk b/build/platform-android.mk index 19e853b7..e49ad90e 100644 --- a/build/platform-android.mk +++ b/build/platform-android.mk @@ -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