Merge main, resolve conflicts with vala

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/compilers/llvm-mos.ts b/lib/compilers/llvm-mos.ts
index 473e93263..9ff68a784 100644
--- a/lib/compilers/llvm-mos.ts
+++ b/lib/compilers/llvm-mos.ts
@@ -90,6 +90,15 @@ export class LLVMMOSCompiler extends ClangCompiler {
             if (await utils.fileExists(nesFile)) {
                 await this.addArtifactToResult(res, nesFile, ArtifactType.nesrom);
             }
+        } else if (this.compiler.exe.includes('c64')) {
+            let prgFile = outputFilename;
+            if (outputFilename.endsWith('.elf')) {
+                prgFile = outputFilename.substr(0, outputFilename.length - 4);
+            }
+
+            if (await utils.fileExists(prgFile)) {
+                await this.addArtifactToResult(res, prgFile, ArtifactType.c64prg);
+            }
         }
 
         return res;