Skip to content

[pull] master from GaijinEntertainment:master #688

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
pull merged 2 commits into from
Dec 24, 2025
Merged

[pull] master from GaijinEntertainment:master #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5279c0
more paths
borisbat Dec 24, 2025
6015ce7
Merge pull request #1991 from GaijinEntertainment/up2date
borisbat Dec 24, 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: 2 additions & 0 deletions include/daScript/ast/ast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,6 +1552,8 @@ namespace das
int32_t jit_size_level = 3u; // Opt level for LLVM for binary size
string jit_path_to_shared_lib; // Path to libDaScript. Optional, we'll try to find it in _das_root_/lib/ if not provided.
string jit_path_to_linker; // Path to linker. Optional, we'll use clang-cl from LLVM on Windows and cc otherwise.
// dll loading
vector<string> dll_search_paths; // additional search paths for dll loading
};

struct CommentReader : public ptr_ref_count {
Expand Down
15 changes: 14 additions & 1 deletion src/builtin/module_builtin_dasbind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,20 @@ FastCallWrapper getExtraWrapper ( int nargs, int res, int perm ) {
if ( !libhandle ) {
libhandle = loadDynamicLibrary(library.c_str());
if (!libhandle) {
libhandle = loadDynamicLibrary((getDasRoot() + "/" + library).c_str());
if ( *daScriptEnvironment::bound && (*daScriptEnvironment::bound)->g_Program ) {
for ( auto & root : (*daScriptEnvironment::bound)->g_Program->policies.dll_search_paths ) {
libhandle = loadDynamicLibrary((root + "/" + library).c_str());
if ( libhandle ) break;
}
/* // we figure this out later
if ( !libhandle ) {
libhandle = loadDynamicLibrary(((*daScriptEnvironment::bound)->g_Program->policies.jit_path_to_shared_lib + "/" + library).c_str());
}
*/
}
if ( !libhandle ) {
libhandle = loadDynamicLibrary((getDasRoot() + "/" + library).c_str());
}
}
}
g_dasBindLib[library] = libhandle;
Expand Down