Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-11-26 11:49:22 +00:00
Code Issues Projects Releases Wiki Activity

fix launching emulator for atari target

Browse Source
This commit is contained in:
Irmen de Jong 2022-02-24 23:22:02 +01:00
parent 6185d5eca1
commit 6cce47b2f1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codeGenCpu6502/src/prog8/codegen/cpu6502/AssemblyProgram.kt
View File

@ -94,7 +94,7 @@ internal class AssemblyProgram(
val proc = ProcessBuilder(assemblerCommand).inheritIO().start() val proc = ProcessBuilder(assemblerCommand).inheritIO().start()
val result = proc.waitFor() val result = proc.waitFor()
if (result == 0) { if (result == 0 && compTarget.name!="atari") {
removeGeneratedLabelsFromMonlist() removeGeneratedLabelsFromMonlist()
generateBreakpointList() generateBreakpointList()
} }

2
compiler/src/prog8/CompilerMain.kt
View File

@ -169,7 +169,7 @@ private fun compileMain(args: Array<String>): Boolean {
val programNameInPath = outputPath.resolve(compilationResult.programName) val programNameInPath = outputPath.resolve(compilationResult.programName)
if(startEmulator1==true || startEmulator2==true) { if(startEmulator1==true || startEmulator2==true) {
if (compilationResult.compilationOptions.launcher != LauncherType.NONE) { if (compilationResult.compilationOptions.launcher != LauncherType.NONE || compilationTarget=="atari") {
if (startEmulator1 == true) if (startEmulator1 == true)
compilationResult.compilationOptions.compTarget.machine.launchEmulator(1, programNameInPath) compilationResult.compilationOptions.compTarget.machine.launchEmulator(1, programNameInPath)
else if (startEmulator2 == true) else if (startEmulator2 == true)