Skip to content

Commit fffe487

Browse files
committed
[[ Engine ]] Don't attempt to resolve a shared library path if a module has no resources.
[[ Script ]] Correct the binding string description.
1 parent 96e31ec commit fffe487

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

engine/src/exec-extension.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,9 @@ static bool MCEngineResolveSharedLibrary(MCScriptModuleRef p_module, MCStringRef
215215
if (!MCEngineLookupResourcePathForModule(p_module, Out(t_resource_path)))
216216
return false;
217217

218+
if (MCStringIsEmpty(*t_resource_path))
219+
return false;
220+
218221
#if defined(_MACOSX)
219222
return MCStringFormat(r_path, "%@/code/mac/%@.dylib", *t_resource_path, p_name);
220223
#elif defined(_LINUX) && defined(__32_BIT__)

libscript/src/script-instance.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ static bool MCScriptPerformScriptInvoke(MCScriptFrame*& x_frame, byte_t*& x_next
893893
}
894894

895895
// This method resolves the binding string in the foreign function. The format is:
896-
// [lang:][library@][class.]function[!calling]
896+
// [lang:][library>][class.]function[!calling]
897897
//
898898
// lang - one of c, cpp, objc or java. If not present, it is taken to be c.
899899
// library - the library to load the symbol from. If not present, it is taken to be the

0 commit comments

Comments
 (0)