Skip to content

Commit ba43e8f

Browse files
committed
Fix nocompile support for ninja
1 parent f6a6e07 commit ba43e8f

File tree

6 files changed

+16
-2
lines changed

6 files changed

+16
-2
lines changed

kmake/src/Exporters/MakeExporter.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ export class MakeExporter extends Exporter {
4141
for (let fileobject of project.getFiles()) {
4242
let file = fileobject.file;
4343
if (file.endsWith('.cpp') || file.endsWith('.c') || file.endsWith('.cc') || file.endsWith('.s') || file.endsWith('.S')) {
44+
if (fileobject.options && fileobject.options.nocompile) {
45+
continue;
46+
}
47+
4448
let name = file.toLowerCase();
4549
if (name.indexOf('/') >= 0) name = name.substr(name.lastIndexOf('/') + 1);
4650
name = name.substr(0, name.lastIndexOf('.'));

kmake/src/Exporters/NinjaExporter.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ export class NinjaExporter extends Exporter {
4141
for (let fileobject of project.getFiles()) {
4242
let file = fileobject.file;
4343
if (file.endsWith('.cpp') || file.endsWith('.c') || file.endsWith('.cc') || file.endsWith('.s') || file.endsWith('.S')) {
44+
if (fileobject.options && fileobject.options.nocompile) {
45+
continue;
46+
}
47+
4448
let name = file.toLowerCase();
4549
if (name.indexOf('/') >= 0) name = name.substr(name.lastIndexOf('/') + 1);
4650
name = name.substr(0, name.lastIndexOf('.'));

lib/kmake/Exporters/MakeExporter.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/kmake/Exporters/MakeExporter.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/kmake/Exporters/NinjaExporter.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)