diff --git a/.gitignore b/.gitignore
index d3e40d5d2..24994897b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -39,8 +39,10 @@ tests/monsterdata_java_wire.mon
 tests/monsterdata_go_wire.mon
 CMakeLists.txt.user
 CMakeScripts/**
+CTestTestfile.cmake
 build/Xcode/FlatBuffers.xcodeproj/project.xcworkspace/**
 build/Xcode/FlatBuffers.xcodeproj/xcuserdata/**
+FlatBuffers.xcodeproj/
 java/.idea
 java/*.iml
 java/target
diff --git a/android/jni/include.mk b/android/jni/include.mk
index 3ce49f200..5c16db984 100644
--- a/android/jni/include.mk
+++ b/android/jni/include.mk
@@ -49,15 +49,20 @@ endif
 # The following block generates build rules which result in headers being
 # rebuilt from flatbuffers schemas.
 
+FLATBUFFERS_CMAKELISTS_DIR := \
+  $(realpath $(dir $(lastword $(MAKEFILE_LIST)))/../..)
+
 # Directory that contains the FlatBuffers compiler.
-FLATBUFFERS_FLATC_PATH?=$(CURDIR)/bin
 ifeq (Windows,$(PROJECT_OS))
+FLATBUFFERS_FLATC_PATH?=$(CURDIR)/bin
 FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/Debug/flatc.exe
 endif
 ifeq (Linux,$(PROJECT_OS))
+FLATBUFFERS_FLATC_PATH?=$(CURDIR)/bin
 FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/flatc
 endif
 ifeq (Darwin,$(PROJECT_OS))
+FLATBUFFERS_FLATC_PATH?=$(FLATBUFFERS_CMAKELISTS_DIR)
 FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/Debug/flatc
 endif
 
@@ -80,8 +85,6 @@ CMAKE := cmake
 endif
 
 # Generate a host build rule for the flatbuffers compiler.
-FLATBUFFERS_CMAKELISTS_DIR := \
-  $(realpath $(dir $(lastword $(MAKEFILE_LIST)))/../..)
 ifeq (Windows,$(PROJECT_OS))
 define build_flatc_recipe
 	cd  & jni\build_flatc.bat $(CMAKE)