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

format

Browse source
This commit is contained in:
Nishi 2026-05-15 00:01:48 +09:00
commit 9eb085ee28
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/watcom.js
View file

@ -20,9 +20,9 @@ Watcom.compile = function(target, obj, src) {
const includes = pmake.includes(target).map(add_i).join(" "); const includes = pmake.includes(target).map(add_i).join(" ");
const flags = "-bt=nt -fr= -q " + includes + " -fo=" + obj + " " + src; const flags = "-bt=nt -fr= -q " + includes + " -fo=" + obj + " " + src;
if(src.endsWith(".rc")){ if(src.endsWith(".rc")) {
return "wrc -bt=nt -r -fo=" + obj + " " + src; return "wrc -bt=nt -r -fo=" + obj + " " + src;
}else if(src.endsWith(".c")) { } else if(src.endsWith(".c")) {
return "wcc386 " + flags; return "wcc386 " + flags;
} else { } else {
return "wpp386 " + flags; return "wpp386 " + flags;

4
src/js/cmdline.js
View file

@ -164,9 +164,9 @@ function make(output) {
for(var i = 0; i < objs.length; i++) { for(var i = 0; i < objs.length; i++) {
var usage = ""; var usage = "";
if(self.sources[i].endswith(".rc")){ if(self.sources[i].endswith(".rc")) {
usage = "RC"; usage = "RC";
}else if(pmake.isCxx(self.sources[i])) { } else if(pmake.isCxx(self.sources[i])) {
usage = "CXX"; usage = "CXX";
} else { } else {
usage = "CC"; usage = "CC";

10
src/js/core.js
View file

@ -194,9 +194,9 @@ Compiler.prototype.output = function(target) {
} else if(target instanceof pmake.LibraryProject) { } else if(target instanceof pmake.LibraryProject) {
return "lib" + target.output + ".a"; return "lib" + target.output + ".a";
} else if(target instanceof pmake.ExecutableProject) { } else if(target instanceof pmake.ExecutableProject) {
if(pmake.system.target == "Windows"){ if(pmake.system.target == "Windows") {
return target.output + ".exe"; return target.output + ".exe";
}else{ } else {
return target.output; return target.output;
} }
} }
@ -208,7 +208,7 @@ const POSIXCompiler = pmake.inherit(Compiler, function(target) {
this.ar = "ar"; this.ar = "ar";
this.cc = "cc"; this.cc = "cc";
this.cxx = "c++"; this.cxx = "c++";
this.rc = "windres"; this.rc = "windres";
}); });
POSIXCompiler.prototype.compile = function(target, obj, src) { POSIXCompiler.prototype.compile = function(target, obj, src) {
@ -219,9 +219,9 @@ POSIXCompiler.prototype.compile = function(target, obj, src) {
const includes = pmake.includes(target).map(add_i).join(" "); const includes = pmake.includes(target).map(add_i).join(" ");
const flags = includes + " -c -o " + obj + " " + src; const flags = includes + " -c -o " + obj + " " + src;
if(src.endsWith(".rc")){ if(src.endsWith(".rc")) {
return this.prefix + this.rc + " -O coff " + src + " " + obj; return this.prefix + this.rc + " -O coff " + src + " " + obj;
}else if(src.endsWith(".c")) { } else if(src.endsWith(".c")) {
return this.prefix + this.cc + " " + flags; return this.prefix + this.cc + " " + flags;
} else if(is_cxx(src)) { } else if(is_cxx(src)) {
return this.prefix + this.cxx + " " + flags; return this.prefix + this.cxx + " " + flags;