diff --git a/addons/ofxAssimp/addon_config.mk b/addons/ofxAssimp/addon_config.mk index 53c1b7643f3..5958d36f718 100644 --- a/addons/ofxAssimp/addon_config.mk +++ b/addons/ofxAssimp/addon_config.mk @@ -113,4 +113,4 @@ osx: emscripten: ADDON_LIBS= - ADDON_LIBS=../ofxAssimpModelLoader/libs/assimp/lib/emscripten/libassimp.a + ADDON_LIBS=../ofxAssimpModelLoader/libs/assimp/lib/emscripten/%/libassimp.a diff --git a/addons/ofxAssimpModelLoader/addon_config.mk b/addons/ofxAssimpModelLoader/addon_config.mk index caeea3c6c18..eff21858391 100644 --- a/addons/ofxAssimpModelLoader/addon_config.mk +++ b/addons/ofxAssimpModelLoader/addon_config.mk @@ -112,4 +112,4 @@ osx: emscripten: ADDON_LIBS= - ADDON_LIBS=libs/assimp/lib/emscripten/libassimp.a + ADDON_LIBS=libs/assimp/lib/emscripten/%/libassimp.a diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk index e5bc4014b04..12b482e1d81 100644 --- a/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk +++ b/libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk @@ -149,11 +149,14 @@ define parse_addon $(eval TMP_PROJECT_ADDONS_CFLAGS += $(ADDON_CPPFLAGS)) \ $(if $(strip $(ADDON_LIBS)), \ $(foreach addon_lib, $(strip $(ADDON_LIBS)), \ - $(if $(wildcard $(addon)/$(addon_lib)), \ - $(eval TMP_PROJECT_ADDONS_LIBS += $(addon)/$(addon_lib)) \ + $(eval lib_pattern := $(subst %,*,$(addon_lib))) \ + $(eval match := $(wildcard $(addon)/$(lib_pattern))) \ + $(if $(match), \ + $(eval TMP_PROJECT_ADDONS_LIBS += $(match)) \ ) \ - $(if $(wildcard $(addon_lib)), \ - $(eval TMP_PROJECT_ADDONS_LIBS += $(addon_lib)) \ + $(eval match_global := $(wildcard $(lib_pattern))) \ + $(if $(match_global), \ + $(eval TMP_PROJECT_ADDONS_LIBS += $(match_global)) \ ) \ ) \ ) \