mirror of
https://github.com/digarok/Appy.git
synced 2024-06-13 21:29:31 +00:00
Compare commits
No commits in common. "5c1390ac57e22fc9ab83e9a24ff1eb5c64941a35" and "52f839cd7de8e203ca7868a66dc7c1f1ae972d2f" have entirely different histories.
5c1390ac57
...
52f839cd7d
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -1,5 +1,4 @@
|
|||
# cadius disk files
|
||||
*.2mg
|
||||
*.po
|
||||
*.2mg
|
||||
# merlin assembly listings
|
||||
*_output.txt
|
|
@ -1,5 +1,4 @@
|
|||
assemble: [testsrc/sp.s, testsrc/pc.s, testsrc/fmt.s]
|
||||
assembleflags: "-V"
|
||||
indent: [testsrc/fmt2.s]
|
||||
disks:
|
||||
- name: mydiskimage
|
||||
|
|
|
@ -13,9 +13,8 @@ func Assemble() {
|
|||
// assemble all files in list
|
||||
for _, filename := range project.AppyProj.Assemble {
|
||||
fmt.Printf("Assembling %v\n", filename)
|
||||
fmt.Printf(">> %v %v %v\n", project.LocalConf.Programs.Merlin32, project.AppyProj.AssembleFlags, filename)
|
||||
|
||||
out, err := exec.Command(project.LocalConf.Programs.Merlin32, project.AppyProj.AssembleFlags, filename).Output()
|
||||
out, err := exec.Command(project.LocalConf.Programs.Merlin32, "-V", filename).Output()
|
||||
if err != nil {
|
||||
color.Cyan(string(out))
|
||||
log.Fatal(err)
|
||||
|
|
|
@ -10,11 +10,10 @@ import (
|
|||
)
|
||||
|
||||
type Project struct {
|
||||
name string
|
||||
Disks []Disk
|
||||
Assemble []string
|
||||
Indent []string
|
||||
AssembleFlags string
|
||||
name string
|
||||
Disks []Disk
|
||||
Assemble []string
|
||||
Indent []string
|
||||
}
|
||||
|
||||
type Disk struct {
|
||||
|
@ -48,7 +47,6 @@ var LocalConf LocalConfig
|
|||
|
||||
func SelfConfigure() {
|
||||
AppyProj.name = "Default"
|
||||
AppyProj.AssembleFlags = ""
|
||||
LocalConf.Programs.Merlin32 = Merlin32Path
|
||||
LocalConf.Programs.Cadius = CadiusPath
|
||||
LocalConf.Programs.Gsplus = GsplusPath
|
||||
|
|
|
@ -9,7 +9,7 @@ main nop
|
|||
sta :jo+1
|
||||
|
||||
|
||||
:jo lda $400
|
||||
:jo+1 lda $400
|
||||
lda $400
|
||||
rts
|
||||
|
||||
|
@ -21,8 +21,7 @@ HEXDEC mx %11
|
|||
STA DEC8+1
|
||||
STA DEC8+2
|
||||
STA DEC8+3
|
||||
ReallyThisisaLoooooongLabelwith stal $e12000,x ; look at this long line
|
||||
ReallyThisisaLoooooongLabelwith stal $e12000,y ; look at this long line
|
||||
|
||||
* TABS....
|
||||
* $D5 $0008 sequence [Application Specific]
|
||||
DEC8 ds 24
|
Loading…
Reference in New Issue
Block a user