diff --git a/addons/ofxAssimpModelLoader/addon_config.mk b/addons/ofxAssimpModelLoader/addon_config.mk index 01c88e61778..8c3db92edc6 100644 --- 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 index f58108371a4..420fdaf90f9 100644 --- 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 index e43e7fed62f..a63241bce78 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit e43e7fed62f9924b24052851cb6f77815009bcee +Subproject commit a63241bce783304c2e3669c4df133cf6e6a0c18b diff --git a/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk b/libs/openFrameworksCompiled/project/linuxaarch64/config.linuxaarch64.default.mk index ea5d809ee10..f17204e6324 100644 --- 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