Fixes for Raspberry Pi compilation (#2701)

* Added linker options to armv7 in iOS makefile

* Updated Eigen version in Xcode iOS examples

* Updated iOS link flags

* Added support for Raspberry Pi
This commit is contained in:
Pete Warden 2016-06-06 23:51:58 -07:00
parent 6567e44999
commit ede4b4c111
2 changed files with 9 additions and 2 deletions

View File

@ -129,8 +129,8 @@ ifeq ($(TARGET),LINUX)
endif
# If we're cross-compiling for the Raspberry Pi, use the right gcc.
ifeq ($(TARGET),PI)
CXX := arm-linux-gnueabihf-g++
LDFLAGS := -L$(GENDIR)protobuf_pi/lib/ -Wl,--no-whole-archive
CXXFLAGS += -D__ANDROID_TYPES_SLIM__
LDFLAGS := -Wl,--no-whole-archive
LIBS += -ldl
LIBFLAGS += -Wl,--allow-multiple-definition -Wl,--whole-archive
endif

View File

@ -37,6 +37,13 @@ limitations under the License.
#define IS_MOBILE_PLATFORM
#endif
#elif defined(__arm__)
#define PLATFORM_POSIX
// Since there's no macro for the Raspberry Pi, assume we're on a mobile
// platform if we're compiling for the ARM CPU.
#define IS_MOBILE_PLATFORM
#else
// If no platform specified, use:
#define PLATFORM_POSIX