RPI - Linux aarch64 minor fixes (#7527)

#changelog #linuxarm
openframeworks · Apr 26, 2023 · 29c99ed · 29c99ed
1 parent 84c0cd0
commit 29c99ed
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/addons/ofxAssimpModelLoader/addon_config.mk b/addons/ofxAssimpModelLoader/addon_config.mk
@@ -70,6 +70,11 @@ linuxarmv7l:
 	ADDON_LIBS_EXCLUDE = libs/assimp
 	ADDON_INCLUDES_EXCLUDE = libs/assimp/%
 
+linuxaarch64:
+	ADDON_PKG_CONFIG_LIBRARIES = assimp
+	ADDON_LIBS_EXCLUDE = libs/assimp
+	ADDON_INCLUDES_EXCLUDE = libs/assimp/%
+
 linux:
 	ADDON_PKG_CONFIG_LIBRARIES = assimp
 	ADDON_LIBS_EXCLUDE = libs/assimp

diff --git a/addons/ofxOpenCv/addon_config.mk b/addons/ofxOpenCv/addon_config.mk
@@ -84,6 +84,12 @@ linuxarmv7l:
 	ADDON_INCLUDES_EXCLUDE = libs/opencv
 	ADDON_INCLUDES_EXCLUDE += libs/opencv/%
 
+linuxaarch64:
+	ADDON_PKG_CONFIG_LIBRARIES = opencv4
+	ADDON_LIBS_EXCLUDE = libs/opencv/%
+	ADDON_INCLUDES_EXCLUDE = libs/opencv
+	ADDON_INCLUDES_EXCLUDE += libs/opencv/%
+
 msys2:
 	ADDON_PKG_CONFIG_LIBRARIES = opencv4
 	ADDON_LIBS_EXCLUDE = libs/opencv/%

diff --git a/apps/projectGenerator b/apps/projectGenerator
diff --git a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk
@@ -39,7 +39,8 @@ include $(OF_SHARED_MAKEFILES_PATH)/config.linux.common.mk
 ################################################################################
 
 PLATFORM_LDFLAGS += -lstdc++fs
-
+PLATFORM_LDFLAGS += -no-pie
+# PLATFORM_LDFLAGS += -nostartfiles
 
 PLATFORM_CFLAGS += -march=armv8-a
 PLATFORM_CFLAGS += -mcpu=cortex-a72