BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-26 03:42:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Mac ndk-build error on motive, pie_noon, pindrop.

Browse Source 
We were looking for 'flatc' in motive/bin/Debug/flatc,
on Mac. It's actually built to flatbuffers/Debug/flatc.

Tested: OS X Yosemite, ndk-r10d. Also tested on Linux.
Change-Id: I9f1ecfe00c5f42fd9b6808b5a5da1c920487a4c2
This commit is contained in:
Jason Sanmiya
2015-03-26 10:35:52 -07:00
parent ca5c9e7496
commit e8598950fc
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -39,8 +39,10 @@ tests/monsterdata_java_wire.mon
tests/monsterdata_go_wire.mon tests/monsterdata_go_wire.mon
CMakeLists.txt.user CMakeLists.txt.user
CMakeScripts/** CMakeScripts/**
CTestTestfile.cmake
build/Xcode/FlatBuffers.xcodeproj/project.xcworkspace/** build/Xcode/FlatBuffers.xcodeproj/project.xcworkspace/**
build/Xcode/FlatBuffers.xcodeproj/xcuserdata/** build/Xcode/FlatBuffers.xcodeproj/xcuserdata/**
FlatBuffers.xcodeproj/
java/.idea java/.idea
java/*.iml java/*.iml
java/target java/target

9
android/jni/include.mk
View File

@@ -49,15 +49,20 @@ endif
# The following block generates build rules which result in headers being # The following block generates build rules which result in headers being
# rebuilt from flatbuffers schemas. # rebuilt from flatbuffers schemas.
FLATBUFFERS_CMAKELISTS_DIR := \
$(realpath $(dir $(lastword $(MAKEFILE_LIST)))/../..)
# Directory that contains the FlatBuffers compiler. # Directory that contains the FlatBuffers compiler.
FLATBUFFERS_FLATC_PATH?=$(CURDIR)/bin
ifeq (Windows,$(PROJECT_OS)) ifeq (Windows,$(PROJECT_OS))
FLATBUFFERS_FLATC_PATH?=$(CURDIR)/bin
FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/Debug/flatc.exe FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/Debug/flatc.exe
endif endif
ifeq (Linux,$(PROJECT_OS)) ifeq (Linux,$(PROJECT_OS))
FLATBUFFERS_FLATC_PATH?=$(CURDIR)/bin
FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/flatc FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/flatc
endif endif
ifeq (Darwin,$(PROJECT_OS)) ifeq (Darwin,$(PROJECT_OS))
FLATBUFFERS_FLATC_PATH?=$(FLATBUFFERS_CMAKELISTS_DIR)
FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/Debug/flatc FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/Debug/flatc
endif endif
@@ -80,8 +85,6 @@ CMAKE := cmake
endif endif
# Generate a host build rule for the flatbuffers compiler. # Generate a host build rule for the flatbuffers compiler.
FLATBUFFERS_CMAKELISTS_DIR := \
$(realpath $(dir $(lastword $(MAKEFILE_LIST)))/../..)
ifeq (Windows,$(PROJECT_OS)) ifeq (Windows,$(PROJECT_OS))
define build_flatc_recipe define build_flatc_recipe
cd & jni\build_flatc.bat $(CMAKE) cd & jni\build_flatc.bat $(CMAKE)