Support Ninja for emscripten builds

kmake/src/Exporters/EmscriptenExporter.ts

@@ -6,10 +6,12 @@ import * as fs from 'kmake/fsextra';
 import * as path from 'path';
 import { CompilerCommandsExporter } from 'kmake/Exporters/CompileCommandsExporter';
 import { MakeExporter } from 'kmake/Exporters/MakeExporter';
+import { NinjaExporter } from 'kmake/Exporters/NinjaExporter';
 
 export class EmscriptenExporter extends Exporter {
 	compileCommands: CompilerCommandsExporter;
 	make: MakeExporter;
+	ninja: NinjaExporter;
 
 	constructor(project: Project, options: any) {
 		super(options);
@@ -36,10 +38,24 @@ export class EmscriptenExporter extends Exporter {
 
 		linkerFlags += ' -o ' + executableName + '.html --preload-file ' + this.debugDirName(project);
 
-		this.make = new MakeExporter(options, 'emcc', 'emcc', '', '', '', '.html', this.libsMakeLine);
+		this.make = new MakeExporter(options, 'emcc', 'emcc', '', '', '', '.html', this.libsLine);
+		this.ninja = new NinjaExporter(options, 'emcc', 'emcc', '', '', '', '.html', this.libsLine);
 	}
 
-	libsMakeLine(project: Project): string {
+	libsLine(project: Project): string {
+		let libs = '';
+		for (let lib of project.getLibs()) {
+			if (lib.startsWith('USE_')) {
+				libs += ' -s' + lib;
+			}
+			else {
+				libs += ' -l' + lib;
+			}
+		}
+		return libs;
+	}
+
+	libsNinjaLine(project: Project): string {
 		let libs = '';
 		for (let lib of project.getLibs()) {
 			if (lib.startsWith('USE_')) {

kmake/src/Exporters/NinjaExporter.ts

@@ -14,14 +14,25 @@ export class NinjaExporter extends Exporter {
 	linkerFlags: string;
 	outputExtension: string;
 
-	constructor(options: any, cCompiler: string, cppCompiler: string, cFlags: string, cppFlags: string, linkerFlags: string, outputExtension: string) {
+	constructor(options: any, cCompiler: string, cppCompiler: string, cFlags: string, cppFlags: string, linkerFlags: string, outputExtension: string, libsLine: (p: Project) => string = null) {
 		super(options);
 		this.cCompiler = cCompiler;
 		this.cppCompiler = cppCompiler;
 		this.cFlags = cFlags;
 		this.cppFlags = cppFlags;
 		this.linkerFlags = linkerFlags;
 		this.outputExtension = outputExtension;
+		if (libsLine != null) {
+			this.libsLine = libsLine;
+		}
+	}
+
+	libsLine(project: Project): string {
+		let libs = '';
+		for (let lib of project.getLibs()) {
+			libs += ' -l' + lib;
+		}
+		return libs;
 	}
 
 	async exportSolution(project: Project, from: string, to: string, platform: string, vrApi: any, options: any) {
@@ -66,9 +77,7 @@ export class NinjaExporter extends Exporter {
 		}
 
 		let libsline = this.linkerFlags;
-		for (let lib of project.getLibs()) {
-			libsline += ' -l' + lib;
-		}
+		libsline += this.libsLine(project);
 		libsline += ' ';
 
 		let defline = '';