Commit 1c496869 authored by John P. Willis's avatar John P. Willis

Clean up directory structure

parent facafaec
LIBILXI_OBJS = asm.o cpu.o error.o host.o storage.o lexer.o inst.o util.o bus.o console.o signal.o message.o profile.o config.o disk.o help.o
VM_OBJS = ilxi.o asm.o cpu.o error.o host.o storage.o lexer.o inst.o util.o bus.o console.o signal.o message.o profile.o config.o disk.o help.o
XIASM_OBJS = xiasm.o asm.o cpu.o lexer.o storage.o inst.o error.o util.o console.o bus.o signal.o message.o profile.o config.o
#XIASM_OBJS = xiasm.o asm.o cpu.o lexer.o storage.o inst.o error.o util.o console.o bus.o signal.o message.o profile.o config.o
XIASM_OBJS = xiasm.o
MKDISK_OBJS = mkdisk.o disk.o asm.o cpu.o error.o host.o storage.o lexer.o inst.o util.o bus.o console.o signal.o message.o profile.o config.o
FBCFLAGS = -g -mt #-d STACKDEBUG -d INSTDEBUG #-d LEXDEBUG
all: vm assembler diskutil rom test
all: vm assembler diskutil rom test libilxi
libilxi: libilxi.a
libilxi.so: $(LIBILXI_OBJS)
fbc $(FBCFLAGS) -dylib -x libilxi.so $(LIBILXI_OBJS)
libilxi.a: $(LIBILXI_OBJS)
fbc $(FBCFLAGS) -lib -x libilxi.a $(LIBILXI_OBJS)
diskutil: mkdisk
......@@ -29,8 +39,8 @@ assembler: xiasm
mkdisk: $(MKDISK_OBJS)
fbc $(FBCFLAGS) -x mkdisk $(MKDISK_OBJS)
xiasm: $(XIASM_OBJS)
fbc $(FBCFLAGS) -x xiasm $(XIASM_OBJS)
xiasm: $(XIASM_OBJS) libilxi
fbc $(FBCFLAGS) -l ilxi -x xiasm $(XIASM_OBJS)
xiasm.o: xiasm.bas
fbc $(FBCFLAGS) -m xiasm -o xiasm.o -c xiasm.bas
......@@ -93,4 +103,4 @@ message.o: message.bas
fbc $(FBCFLAGS) -o message.o -c message.bas
clean:
rm -f *.o ilxi xiasm rom.bin t_stack.bin mkdisk diskboot.bin
rm -f *.o ilxi xiasm *.bin mkdisk *.a
......@@ -20,6 +20,8 @@ sub main(args as string)
dim argi as integer = 0
arg_count = lex(args)
redim input_lines(1) as string
print "ILXI EXTERNAL ASSEMBLER V0.02 (C) COHERENT LOGIC DEVELOPMENT 2016"
print ""
......@@ -253,6 +255,7 @@ function lookup_undef(key as string) as undef_entry
for i = 1 to udidx
next
end function
function expand_macros(input_string as string) as string
......
;
; ILXI eXtended Operating System - XOS
; Version 0.1
;
; Copyright (C) 2016 Coherent Logic Development
;
; console.xa - console routines
;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment