rgb/pmake
1
0
Fork 0
forked from pyrite-dev/pmake
Code Pull requests Activity

fix

Browse source
This commit is contained in:
Nishi 2026-05-12 08:36:20 +09:00
commit 831c207d25
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/cmdline.js
View file

@ -140,7 +140,9 @@ function make(output) {
const self = targets.filter(target_filter)[0]; const self = targets.filter(target_filter)[0];
const objs = self.sources.map(pmake.compiler.output); const objs = self.sources.map(pmake.compiler.output);
const libs = pmake.libs(self).join(" "); const libs = pmake.libs(self, null, true).join(" ");
console.log(libs);
mk.write("\n"); mk.write("\n");

7
src/js/core.js
View file

@ -133,21 +133,22 @@ pmake.libdirs = function(target) {
return target.libdirs.concat(targets.map(libdirs).flat()); return target.libdirs.concat(targets.map(libdirs).flat());
}; };
pmake.libs = function(target, if_str) { pmake.libs = function(target, if_str, nostr) {
function libs(x) { function libs(x) {
if(x instanceof pmake.LibraryProject) { if(x instanceof pmake.LibraryProject) {
function recursion(x) { function recursion(x) {
if(x instanceof pmake.LibraryProject) { if(x instanceof pmake.LibraryProject) {
return pmake.libs(x, if_str); return pmake.libs(x, if_str);
} else { } else if(!nostr) {
return [ x ]; return [ x ];
} }
return [];
} }
const r = x.libraries.map(recursion).flat().concat([ x.base + "/" + pmake.compiler.output(x) ]); const r = x.libraries.map(recursion).flat().concat([ x.base + "/" + pmake.compiler.output(x) ]);
return r; return r;
} else if((typeof x) == "string") { } else if((typeof x) == "string" && !nostr) {
return [ x ]; return [ x ];
} }

2
src/js_fs.c
View file

@ -52,7 +52,7 @@ static duk_ret_t js_fs_glob(duk_context* self) {
if(glob(duk_to_string(self, i), 0, NULL, &g) == 0) { if(glob(duk_to_string(self, i), 0, NULL, &g) == 0) {
int j; int j;
for(j = 0; j < g.gl_matchc; j++) { for(j = 0; j < g.gl_pathc; j++) {
duk_push_string(self, g.gl_pathv[j]); duk_push_string(self, g.gl_pathv[j]);
duk_put_prop_index(self, arr, c); duk_put_prop_index(self, arr, c);
c++; c++;