mirror of https://github.com/digarok/Appy.git
Add assembler macro variable
This commit is contained in:
parent
35c693212e
commit
5c1390ac57
|
@ -1,4 +1,5 @@
|
||||||
# cadius disk files
|
# cadius disk files
|
||||||
*.2mg
|
*.2mg
|
||||||
|
*.po
|
||||||
# merlin assembly listings
|
# merlin assembly listings
|
||||||
*_output.txt
|
*_output.txt
|
|
@ -1,4 +1,5 @@
|
||||||
assemble: [testsrc/sp.s, testsrc/pc.s, testsrc/fmt.s]
|
assemble: [testsrc/sp.s, testsrc/pc.s, testsrc/fmt.s]
|
||||||
|
assembleflags: "-V"
|
||||||
indent: [testsrc/fmt2.s]
|
indent: [testsrc/fmt2.s]
|
||||||
disks:
|
disks:
|
||||||
- name: mydiskimage
|
- name: mydiskimage
|
||||||
|
|
|
@ -13,8 +13,9 @@ func Assemble() {
|
||||||
// assemble all files in list
|
// assemble all files in list
|
||||||
for _, filename := range project.AppyProj.Assemble {
|
for _, filename := range project.AppyProj.Assemble {
|
||||||
fmt.Printf("Assembling %v\n", filename)
|
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, "-V", filename).Output()
|
out, err := exec.Command(project.LocalConf.Programs.Merlin32, project.AppyProj.AssembleFlags, filename).Output()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
color.Cyan(string(out))
|
color.Cyan(string(out))
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
|
|
|
@ -10,10 +10,11 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type Project struct {
|
type Project struct {
|
||||||
name string
|
name string
|
||||||
Disks []Disk
|
Disks []Disk
|
||||||
Assemble []string
|
Assemble []string
|
||||||
Indent []string
|
Indent []string
|
||||||
|
AssembleFlags string
|
||||||
}
|
}
|
||||||
|
|
||||||
type Disk struct {
|
type Disk struct {
|
||||||
|
@ -47,6 +48,7 @@ var LocalConf LocalConfig
|
||||||
|
|
||||||
func SelfConfigure() {
|
func SelfConfigure() {
|
||||||
AppyProj.name = "Default"
|
AppyProj.name = "Default"
|
||||||
|
AppyProj.AssembleFlags = ""
|
||||||
LocalConf.Programs.Merlin32 = Merlin32Path
|
LocalConf.Programs.Merlin32 = Merlin32Path
|
||||||
LocalConf.Programs.Cadius = CadiusPath
|
LocalConf.Programs.Cadius = CadiusPath
|
||||||
LocalConf.Programs.Gsplus = GsplusPath
|
LocalConf.Programs.Gsplus = GsplusPath
|
||||||
|
|
|
@ -9,7 +9,7 @@ main nop
|
||||||
sta :jo+1
|
sta :jo+1
|
||||||
|
|
||||||
|
|
||||||
:jo+1 lda $400
|
:jo lda $400
|
||||||
lda $400
|
lda $400
|
||||||
rts
|
rts
|
||||||
|
|
||||||
|
@ -21,7 +21,8 @@ HEXDEC mx %11
|
||||||
STA DEC8+1
|
STA DEC8+1
|
||||||
STA DEC8+2
|
STA DEC8+2
|
||||||
STA DEC8+3
|
STA DEC8+3
|
||||||
ReallyThisisaLoooooongLabelwith stal $e12000,y ; look at this long line
|
ReallyThisisaLoooooongLabelwith stal $e12000,x ; look at this long line
|
||||||
|
|
||||||
* TABS....
|
* TABS....
|
||||||
* $D5 $0008 sequence [Application Specific]
|
* $D5 $0008 sequence [Application Specific]
|
||||||
|
DEC8 ds 24
|
Loading…
Reference in New Issue