Skip to content

Bugfix assimp addons #8288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Feb 27, 2025
Merged

Bugfix assimp addons #8288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cae81b3
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Jan 10, 2024
95d361b
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Feb 16, 2024
9844c9a
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo May 6, 2024
e614e73
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo May 10, 2024
83ea371
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Jul 12, 2024
90f1e53
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Jul 12, 2024
96e307c
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Oct 16, 2024
d52b761
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Oct 16, 2024
a2fd4e4
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Nov 26, 2024
a4a476f
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Feb 20, 2025
9c6c7e6
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofTheo Feb 26, 2025
bebc126
add wildcard support to libs paths in addons_config.mk fix emscripten…
ofTheo Feb 26, 2025
b95e91f
fix for wildcard support
ofTheo Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/ofxAssimp/addon_config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion addons/ofxAssimpModelLoader/addon_config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,4 @@ osx:

emscripten:
ADDON_LIBS=
ADDON_LIBS=libs/assimp/lib/emscripten/libassimp.a
ADDON_LIBS=libs/assimp/lib/emscripten/%/libassimp.a
11 changes: 7 additions & 4 deletions libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) \
) \
) \
) \
Expand Down