File tree Expand file tree Collapse file tree 3 files changed +9
-6
lines changed
libs/openFrameworksCompiled/project/makefileCommon Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Original file line number Diff line number Diff line change 113113
114114emscripten :
115115 ADDON_LIBS=
116- ADDON_LIBS=../ofxAssimpModelLoader/libs/assimp/lib/emscripten/libassimp.a
116+ ADDON_LIBS=../ofxAssimpModelLoader/libs/assimp/lib/emscripten/%/ libassimp.a
Original file line number Diff line number Diff line change 112112
113113emscripten :
114114 ADDON_LIBS=
115- ADDON_LIBS=libs/assimp/lib/emscripten/libassimp.a
115+ ADDON_LIBS=libs/assimp/lib/emscripten/%/ libassimp.a
Original file line number Diff line number Diff 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 ) \
You can’t perform that action at this time.
0 commit comments