Merge commit '74993cc682b08b20c1c22336ebc385df7a3d7ac3' into linux2025

* commit '74993cc682b08b20c1c22336ebc385df7a3d7ac3':
  Bugfix assimp addons (#8288)
  Update ofRtAudioSoundStream.cpp
  Update config.emscripten.default.mk
  Code sign app (#8285)

Author: danoli3

addons/ofxAssimp/addon_config.mk

@@ -104,4 +104,4 @@ android/x86:
 
 emscripten:
 	ADDON_LIBS=
-	ADDON_LIBS=../ofxAssimpModelLoader/libs/assimp/lib/emscripten/libassimp.a
+	ADDON_LIBS=../ofxAssimpModelLoader/libs/assimp/lib/emscripten/%/libassimp.a

addons/ofxAssimpModelLoader/addon_config.mk

@@ -107,4 +107,4 @@ osx:
 
 emscripten:
 	ADDON_LIBS=
-	ADDON_LIBS=libs/assimp/lib/emscripten/libassimp.a
+	ADDON_LIBS=libs/assimp/lib/emscripten/%/libassimp.a

libs/openFrameworks/sound/ofRtAudioSoundStream.cpp

@@ -146,7 +146,8 @@ bool ofRtAudioSoundStream::setup(const ofSoundStreamSettings & settings_)
 			ofLogNotice() << "Initialing RtAudio with UNSPECIFIED API";
 			audio = std::make_shared<RtAudio>();
 		}
-		ofLogNotice() << "Initialized RtAudio with API: " << RtAudio::getApiName(audio->getCurrentApi());
+        //needs latest RtAudio - this breaks in slightly older linux 
+		//ofLogNotice() << "Initialized RtAudio with API: " << RtAudio::getApiName(audio->getCurrentApi());
 	}
 	catch (std::exception &error) {
 		ofLogError() << "Failed to initialize RtAudio: " << error.what();

libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk

@@ -142,7 +142,10 @@ PLATFORM_LDFLAGS += -s DYNAMIC_EXECUTION=0 -s EMBIND_AOT=1
 PLATFORM_LDFLAGS += -s USE_GLFW=3 -lglfw
 # PLATFORM_LDFLAGS += -sEXPORTED_FUNCTIONS=all
 #PLATFORM_LDFLAGS += -sEXPORTED_FUNCTIONS='["_main", "_malloc", "_free"]'
-PLATFORM_LDFLAGS += -sERROR_ON_UNDEFINED_SYMBOLS=0
+
+#Do not change this!  
+#If there are errors we need to see them! 
+PLATFORM_LDFLAGS += -sERROR_ON_UNDEFINED_SYMBOLS=1
 
 #PLATFORM_LDFLAGS += -s AUDIO_WORKLET=1 -s WASM_WORKERS=1 -sENVIRONMENT="web,worker" -s WEBAUDIO_DEBUG=1
 

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)) \
 			) \
 		) \
 	) \

scripts/osx/xcode_project.sh

@@ -230,6 +230,13 @@ copy_binary() {
 		echo "ERROR: Failed to copy the app"
 		exit 1
 	fi
+
+    if [ -z "${CODE_SIGN_IDENTITY}" ]; then
+        echo "No CODE_SIGN_IDENTITY set. Unable to sign the app."
+        exit 0
+    fi
+    echo "Current CODE_SIGN_IDENTITY: '${CODE_SIGN_IDENTITY}'"
+    codesign --force --sign "${CODE_SIGN_IDENTITY}" "${APP_DEST}/${APP_NAME}"
 }
 
 echo ''