Skip to content

Commit 74993cc

Browse files
authored
Bugfix assimp addons (#8288)
* add wildcard support to libs paths in addons_config.mk fix emscripten libs paths for assimp addons closes #8273 * fix for wildcard support
1 parent a736809 commit 74993cc

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

addons/ofxAssimp/addon_config.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,4 @@ osx:
113113

114114
emscripten:
115115
ADDON_LIBS=
116-
ADDON_LIBS=../ofxAssimpModelLoader/libs/assimp/lib/emscripten/libassimp.a
116+
ADDON_LIBS=../ofxAssimpModelLoader/libs/assimp/lib/emscripten/%/libassimp.a

addons/ofxAssimpModelLoader/addon_config.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,4 @@ osx:
112112

113113
emscripten:
114114
ADDON_LIBS=
115-
ADDON_LIBS=libs/assimp/lib/emscripten/libassimp.a
115+
ADDON_LIBS=libs/assimp/lib/emscripten/%/libassimp.a

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

+7-4
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,14 @@ define parse_addon
149149
$(eval TMP_PROJECT_ADDONS_CFLAGS += $(ADDON_CPPFLAGS)) \
150150
$(if $(strip $(ADDON_LIBS)), \
151151
$(foreach addon_lib, $(strip $(ADDON_LIBS)), \
152-
$(if $(wildcard $(addon)/$(addon_lib)), \
153-
$(eval TMP_PROJECT_ADDONS_LIBS += $(addon)/$(addon_lib)) \
152+
$(eval lib_pattern := $(subst %,*,$(addon_lib))) \
153+
$(eval match := $(wildcard $(addon)/$(lib_pattern))) \
154+
$(if $(match), \
155+
$(eval TMP_PROJECT_ADDONS_LIBS += $(match)) \
154156
) \
155-
$(if $(wildcard $(addon_lib)), \
156-
$(eval TMP_PROJECT_ADDONS_LIBS += $(addon_lib)) \
157+
$(eval match_global := $(wildcard $(lib_pattern))) \
158+
$(if $(match_global), \
159+
$(eval TMP_PROJECT_ADDONS_LIBS += $(match_global)) \
157160
) \
158161
) \
159162
) \

0 commit comments

Comments
 (0)