github/AmigaExamples
1
0
Fork 0
mirror of https://frontier.innolan.net/github/AmigaExamples.git synced 2026-09-12 15:41:58 +00:00
Code Releases Activity

Got build working on newer OSX, included missing ADFs

Browse Source
This commit is contained in:
alpine9000
2019-06-11 13:58:03 +10:00
parent abe4b9e850
commit ffc5f1f93d
40 changed files with 4937 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/base.mk
+9 -9
View File
@@ -1,6 +1,6 @@
HOST_WARNINGS=-pedantic-errors -Wfatal-errors -Wall -Werror -Wextra -Wno-unused-parameter -Wshadow
HOST_CFLAGS=$(HOST_WARNINGS)
SDK_INCLUDE=-I/usr/local/amiga/vgcc/ndk/include/
MAKEADFDIR=../tools/makeadf/
MAKEADF=$(MAKEADFDIR)/out/makeadf
IMAGECONDIR=../tools/imagecon
@@ -16,7 +16,7 @@ A600_RUN_SCRIPT=~/Google\ Drive/Amiga/amiga600.sh
A1200T_RUN_SCRIPT=~/Google\ Drive/Amiga/amiga1200t.sh
#VASM_ARGS=-phxass -Fhunk -quiet -spaces
VASM_ARGS=-Fhunk -quiet -esc
VASM_ARGS=-Fhunk -quiet -esc
ifndef FLOPPY
FLOPPY=bin/$(EXAMPLE_NAME).adf
@@ -110,18 +110,18 @@ out/bootblock.bin: out/bootblock.o
vlink -brawbin1 $< -o $@
out/bootblock.o: $(BOOTBLOCK_ASM) $(PROGRAM_BIN)
vasmm68k_mot $(VASM_ARGS) $(VASM_EXTRA_BOOTBLOCK_ARGS) -DUSERSTACK_ADDRESS="\$$$(USERSTACK_ADDRESS)" -DBASE_ADDRESS="\$$$(BASE_ADDRESS)" $< -o $@ -I/usr/local/amiga/os-include
vasmm68k_mot $(VASM_ARGS) $(VASM_EXTRA_BOOTBLOCK_ARGS) -DUSERSTACK_ADDRESS="\$$$(USERSTACK_ADDRESS)" -DBASE_ADDRESS="\$$$(BASE_ADDRESS)" $< -o $@ $(SDK_INCLUDE) -I../include
out/main.o: $(MODULE) $(EXTRA)
vasmm68k_mot $(VASM_ARGS) $(VASM_EXTRA_ARGS) $< -o $@ -I/usr/local/amiga/os-include
@vasmm68k_mot -depend=make $(VASM_ARGS) $(VASM_EXTRA_ARGS) $< -o $@ -I/usr/local/amiga/os-include > $*.d
vasmm68k_mot $(VASM_ARGS) $(VASM_EXTRA_ARGS) $< -o $@ $(SDK_INCLUDE)
@vasmm68k_mot -depend=make $(VASM_ARGS) $(VASM_EXTRA_ARGS) $< -o $@ $(SDK_INCLUDE) > $*.d
out/%.o: %.s
vasmm68k_mot $(VASM_ARGS) $(VASM_EXTRA_ARGS) $< -o $@ -I/usr/local/amiga/os-include
@vasmm68k_mot -depend=make $(VASM_ARGS) $(VASM_EXTRA_ARGS) $< -o $@ -I/usr/local/amiga/os-include > out/$*.d
vasmm68k_mot $(VASM_ARGS) $(VASM_EXTRA_ARGS) $< -o $@ $(SDK_INCLUDE)
@vasmm68k_mot -depend=make $(VASM_ARGS) $(VASM_EXTRA_ARGS) $< -o $@ $(SDK_INCLUDE) > out/$*.d
out/%.o: %.c
vc -O3 -c $< -o $@
m68k-amigaosvasm-gcc -O3 -c $< -o $@
-@vc -O3 -S $< -o out/$*.s > /dev/null 2> /dev/null
-@vc -O0 -S $< -o out/$*-noopt.s > /dev/null 2> /dev/null
@@ -142,4 +142,4 @@ out/shrunk.bin: $(SHRINKLER_EXE) out/main.bin
clean:
rm -rf out bin *~
-include $(ALL_DEPENDS)
-include $(ALL_DEPENDS)
shared/bootblock.s
+16 -15
View File
@@ -1,6 +1,7 @@
include exec/io.i
include lvo/exec_lib.i
include devices/trackdisk.i
;; include funcdef.i
;; include exec/io.i
;; include exec/exec_lib.i
;; include devices/trackdisk.i
bootblock:
dc.b "DOS",0
dc.l 0
@@ -10,23 +11,23 @@ bootEntry:
;; a6 = Exec base
;; a1 = trackdisk.device I/O request pointer
lea BASE_ADDRESS,a5 ; main.s entry point
lea BASE_ADDRESS,a5 ; main.s entry point
;; move.l #$ff000,a7
;; Load the progam from the floppy using trackdisk.device
move.l #mainEnd-mainStart,IO_LENGTH(a1)
move.l a5,IO_DATA(a1)
move.l #mainStart-bootblock,IO_OFFSET(a1)
jsr _LVODoIO(a6)
move.l #mainEnd-mainStart,36(a1) ;IO_LENGTH(a1)
move.l a5,40(a1) ;IO_DATA(a1)
move.l #mainStart-bootblock,44(a1) ;IO_OFFSET(a1)
jsr -456(a6) ;DoIO
;; Turn off drive motor
move.l #0,IO_LENGTH(a1)
move.w #TD_MOTOR,IO_COMMAND(a1)
jsr _LVODoIO(a6)
move.l #0,36(a1) ;IO_LENGTH(a1)
move.w #9,28(a1) ;#TD_MOTOR,28(a1) ;IO_COMMAND(a1)
jsr -456(a6) ;DoIO
jmp (a5) ; -> main.s entry point
;; Pad the remainder of the bootblock
cnop 0,1024
@@ -34,4 +35,4 @@ mainStart:
incbin "out/main.bin"
cnop 0,512
mainEnd:
end
end
shared/shrinkler_bootblock.s
+3 -2
View File
@@ -1,6 +1,7 @@
include "funcdef.i"
include "../include/registers.i"
include "exec/io.i"
include "lvo/exec_lib.i"
include "exec/exec_lib.i"
include "devices/trackdisk.i"
@@ -75,4 +76,4 @@ mainStart:
endif ; SHRINKLER==0
cnop 0,512
mainEnd:
end
end
shared/tools.mk
+1 -1
View File
@@ -1,5 +1,5 @@
WARN_ERROR=-Werror
HOST_WARNINGS=$(WARN_ERROR) -pedantic-errors -Wfatal-errors -Wall -Wextra -Wno-unused-parameter -Wshadow -limagequant
HOST_WARNINGS=$(WARN_ERROR) -pedantic-errors -Wfatal-errors -Wall -Wextra -Wno-unused-parameter -Wshadow -limagequant -Wno-unused-command-line-argument -Wno-ignored-attributes
HOST_CFLAGS=$(HOST_WARNINGS) -O3 $(EXTRA_CFLAGS)
$(PROGRAM): out bin $(OBJS)