Merge branch 'main' of github.com:Kode/kmake

Kode · Feb 21, 2024 · 928f8af · 928f8af
2 parents f60a918 + 3ebf961
commit 928f8af
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 3 deletions.
diff --git a/kmake/src/Exporters/JsonExporter.ts b/kmake/src/Exporters/JsonExporter.ts
@@ -71,7 +71,53 @@ export class JsonExporter extends Exporter {
 				this.p('"' + realfile.replace(/\\/g, '\\\\') + '",', 2);
 			}
 		}
-		this.p(']', 1);
+		this.p('],', 1);
+
+		this.p('"kongDirs":', 1);
+		this.p('[', 1);
+		for (let i = 0; i < project.getKongDirs().length; ++i) {
+			const kongDir = project.getKongDirs()[i];
+			if (i === project.getKongDirs().length - 1) {
+				this.p('"' + kongDir + '"', 2);
+			}
+			else {
+				this.p('"' + kongDir + '",', 2);
+			}
+		}
+		this.p('],', 1);
+
+		this.p('"name": "' + project.getName() + '",', 1);
+		this.p('"cStd": "' + project.getCStd() + '",', 1);
+
+		this.p('"cFlags":', 1);
+		this.p('[', 1);
+		for (let i = 0; i < project.cFlags.length; ++i) {
+			const cFlag = project.cFlags[i];
+			if (i === project.cFlags.length - 1) {
+				this.p('"' + cFlag + '"', 2);
+			}
+			else {
+				this.p('"' + cFlag + '",', 2);
+			}
+		}
+		this.p('],', 1);
+
+		this.p('"cppStd": "' + project.getCppStd() + '",', 1);
+
+		this.p('"cppFlags":', 1);
+		this.p('[', 1);
+		for (let i = 0; i < project.cppFlags.length; ++i) {
+			const cppFlag = project.cppFlags[i];
+			if (i === project.cppFlags.length - 1) {
+				this.p('"' + cppFlag + '"', 2);
+			}
+			else {
+				this.p('"' + cppFlag + '",', 2);
+			}
+		}
+		this.p('],', 1);
+
+		this.p('"debugDir": "' + project.getDebugDir().replace(/\\/g, '\\\\') + '"', 1);
 
 		this.p('}')
 

diff --git a/lib/kmake/Exporters/JsonExporter.js b/lib/kmake/Exporters/JsonExporter.js
diff --git a/lib/kmake/Exporters/JsonExporter.js.map b/lib/kmake/Exporters/JsonExporter.js.map