Skip to content

Commit 4305c34

Browse files
committed
linux makefile update arm64 / jetson / rpi
1 parent 1ddf619 commit 4305c34

File tree

1 file changed

+30
-19
lines changed

1 file changed

+30
-19
lines changed

libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ else
4040
FIND=find
4141
endif
4242

43+
RPI_DETECTED := $(shell grep -qi 'Raspberry' /proc/device-tree/model && echo yes || echo no)
44+
JETSON_DETECTED := $(shell grep -qi -e 'Jetson' -e 'Tegra' /proc/device-tree/model && echo yes || echo no)
45+
4346
#check for Raspbian as armv7l needs to use armv6l architecture
4447
ifeq ($(wildcard $(RPI_ROOT)/etc/*-release), /etc/os-release)
4548
ifeq ($(shell grep ID=raspbian $(RPI_ROOT)/etc/*-release),ID=raspbian)
@@ -77,33 +80,41 @@ ifdef MAKEFILE_DEBUG
7780
$(info CROSS_COMPILING=$(CROSS_COMPILING))
7881
$(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
7982
$(info IS_RASPBIAN=$(IS_RASPBIAN))
83+
$(info IS_RASPBIAN=$(IS_RASPBIAN))
8084
endif
8185

8286
# if not defined, construct the default PLATFORM_LIB_SUBPATH
8387
ifndef PLATFORM_LIB_SUBPATH
8488
# determine from the arch
8589
ifeq ($(PLATFORM_OS),Linux)
86-
ifeq ($(PLATFORM_ARCH),x86_64)
87-
PLATFORM_LIB_SUBPATH=linux/64
88-
else ifeq ($(PLATFORM_ARCH),64)
89-
PLATFORM_LIB_SUBPATH=linux/64
90-
else ifeq ($(PLATFORM_ARCH),armv6l)
91-
PLATFORM_LIB_SUBPATH=linux/armv6l
92-
else ifeq ($(PLATFORM_ARCH),armv7l)
93-
PLATFORM_LIB_SUBPATH=linux/armv7l
94-
else ifeq ($(PLATFORM_ARCH),armv8l)
95-
PLATFORM_LIB_SUBPATH=linux/armv8l
96-
else ifeq ($(PLATFORM_ARCH),arm64)
97-
PLATFORM_LIB_SUBPATH=linux/arm64
98-
else ifeq ($(PLATFORM_ARCH),aarch64)
99-
PLATFORM_LIB_SUBPATH=linux/aarch64
100-
else ifeq ($(PLATFORM_ARCH),jetson)
90+
ifeq ($(RPI_DETECTED),yes)
91+
else ifeq ($(PLATFORM_ARCH),armv6l)
92+
PLATFORM_LIB_SUBPATH=linux/armv6l
93+
else ifeq ($(PLATFORM_ARCH),armv7l)
94+
PLATFORM_LIB_SUBPATH=linux/armv7l
95+
else ifeq ($(PLATFORM_ARCH),armv8l)
96+
PLATFORM_LIB_SUBPATH=linux/armv8l
97+
else ifeq ($(PLATFORM_ARCH),arm64)
98+
PLATFORM_LIB_SUBPATH=linux/arm64
99+
else ifeq ($(PLATFORM_ARCH),aarch64)
100+
PLATFORM_LIB_SUBPATH=linux/aarch64
101+
else ifeq ($(JETSON_DETECTED),yes)
101102
PLATFORM_LIB_SUBPATH=linux/jetson
102-
else ifeq ($(PLATFORM_ARCH),i386)
103-
PLATFORM_LIB_SUBPATH=linux
104103
else
105-
PLATFORM_LIB_SUBPATH=linux
106-
$(error This makefile does not support your architecture $(PLATFORM_ARCH))
104+
ifeq ($(PLATFORM_ARCH),x86_64)
105+
PLATFORM_LIB_SUBPATH=linux/64
106+
else ifeq ($(PLATFORM_ARCH),64)
107+
PLATFORM_LIB_SUBPATH=linux/64
108+
else ifeq ($(PLATFORM_ARCH),arm64)
109+
PLATFORM_LIB_SUBPATH=linux/arm64
110+
else ifeq ($(PLATFORM_ARCH),aarch64)
111+
PLATFORM_LIB_SUBPATH=linux/arm64
112+
else ifeq ($(PLATFORM_ARCH),i386)
113+
PLATFORM_LIB_SUBPATH=linux/i386
114+
else
115+
PLATFORM_LIB_SUBPATH=linux
116+
$(error This makefile does not support your architecture $(PLATFORM_ARCH))
117+
endif
107118
endif
108119
SHARED_LIB_EXTENSION=so
109120
else ifneq (,$(findstring MINGW32_NT,$(PLATFORM_OS)))

0 commit comments

Comments
 (0)