mirror of
https://github.com/irmen/prog8.git
synced 2024-09-10 09:54:32 +00:00
fix launching emulator for atari target
This commit is contained in:
parent
6185d5eca1
commit
6cce47b2f1
@ -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()
|
||||||
}
|
}
|
||||||
|
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user