From 6cce47b2f1f7aecbfcbc98b1b27e9e9cad807182 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Thu, 24 Feb 2022 23:22:02 +0100 Subject: [PATCH] fix launching emulator for atari target --- codeGenCpu6502/src/prog8/codegen/cpu6502/AssemblyProgram.kt | 2 +- compiler/src/prog8/CompilerMain.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/codeGenCpu6502/src/prog8/codegen/cpu6502/AssemblyProgram.kt b/codeGenCpu6502/src/prog8/codegen/cpu6502/AssemblyProgram.kt index 34303cc4a..b1613aa70 100644 --- a/codeGenCpu6502/src/prog8/codegen/cpu6502/AssemblyProgram.kt +++ b/codeGenCpu6502/src/prog8/codegen/cpu6502/AssemblyProgram.kt @@ -94,7 +94,7 @@ internal class AssemblyProgram( val proc = ProcessBuilder(assemblerCommand).inheritIO().start() val result = proc.waitFor() - if (result == 0) { + if (result == 0 && compTarget.name!="atari") { removeGeneratedLabelsFromMonlist() generateBreakpointList() } diff --git a/compiler/src/prog8/CompilerMain.kt b/compiler/src/prog8/CompilerMain.kt index c827884ca..ae6d2e835 100644 --- a/compiler/src/prog8/CompilerMain.kt +++ b/compiler/src/prog8/CompilerMain.kt @@ -169,7 +169,7 @@ private fun compileMain(args: Array): Boolean { val programNameInPath = outputPath.resolve(compilationResult.programName) if(startEmulator1==true || startEmulator2==true) { - if (compilationResult.compilationOptions.launcher != LauncherType.NONE) { + if (compilationResult.compilationOptions.launcher != LauncherType.NONE || compilationTarget=="atari") { if (startEmulator1 == true) compilationResult.compilationOptions.compTarget.machine.launchEmulator(1, programNameInPath) else if (startEmulator2 == true)