--- uae/src/Makefile.dos	2018/04/24 16:38:39	1.1
+++ uae/src/Makefile.dos	2018/04/24 16:38:58	1.1.1.2
@@ -1,23 +1,24 @@
 #
-# Makefile.dos for UAE
+# Makefile.dos for DosUAE
 #
 
 CC        = gcc
 CPP       = gcc -E
-CFLAGS    = -O3 -fomit-frame-pointer -fstrength-reduce -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes -D__DOS__ -DX86_ASSEMBLY -D__inline__=inline -DSTATFS_NO_ARGS=2 -DSTATBUF_BAVAIL=f_bfree
-CFLAGS_NOT_OPT = -D__DOS__ -DX86_ASSEMBLY -D__inline__=inline -DSTATFS_NO_ARGS=2 -DSTATBUF_BAVAIL=f_bfree
-GFXOBJS   = dos-vbe.o dos-ui.o
+CFLAGS    = -O3 -fomit-frame-pointer -Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes -fno-strength-reduce -D__DOS__ -DX86_ASSEMBLY -DUSE_UNDERSCORE -DINTEL_FLAG_OPT=1 '-DREGPARAM=__attribute__((regparm(3)))' -D__inline__=inline -DSTATFS_NO_ARGS=2 -DSTATBUF_BAVAIL=f_bfree -DUSE_ZFILE
+GFXOBJS   = tui.o machdep/video/conio-ui.o machdep/video/vbe.o 
 ASMOBJS   = X86.o
 CPUOBJS   = cpufast0.o cpufast1.o cpufast2.o cpufast3.o cpufast4.o cpufast5.o cpufast6.o cpufast7.o cpufast8.o cpufast9.o cpufastA.o cpufastB.o cpufastC.o cpufastD.o cpufastE.o cpufastF.o
 
-.SUFFIXES: .o .c .h .m
+.SUFFIXES: .o .c .h .m .i
 
-INCLUDES=-Iinclude
+INCLUDES=-I. -Iinclude -Imachdep
 
-OBJS = main.o newcpu.o memory.o debug.o custom.o cia.o disk.o blitter.o $(GFXOBJS) \
-       autoconf.o os.o ersatz.o filesys.o hardfile.o keybuf.o expansion.o zfile.o \
-       fpp.o readcpu.o cpudefs.o gfxutil.o gfxlib.o blitfunc.o blittable.o $(ASMOBJS) \
-       serial.o uaelib.o $(CPUOBJS) cpustbl.o dos-sb.o dos-dma.o
+OBJS = main.o newcpu.o memory.o debug.o custom.o cia.o disk.o blitter.o os.o \
+       autoconf.o ersatz.o filesys.o hardfile.o keybuf.o expansion.o zfile.o \
+       fpp.o readcpu.o cpudefs.o gfxutil.o gfxlib.o blitfunc.o blittable.o \
+       compiler.o serial.o uaelib.o execlib.o timerdev.o machdep/support.o \
+       $(ASMOBJS) $(CPUOBJS) $(GFXOBJS) cpustbl.o \
+       machdep/sound/sb.o machdep/sound/dma.o machdep/sound/gus.o
 
 all: uae.exe readdisk.exe
 
@@ -32,28 +33,34 @@ uae.exe: $(OBJS)
 	coff2exe uae
 
 clean:
-	-del *.o
-	-del uae
-	-del uae.exe
-	-del readdisk
-	-del readdisk.exe
-	-del gencpu.exe
-	-del genblitter.exe
-	-del build68k.exe
-	-del cpudefs.c
-	-del cpuopti.exe
-	-del cpu?.c
-	-del blit.h
-	-del cputbl.h
-	-del cpustbl.c
-	-del cpufast?.s
-	-del blitfunc.c
-	-del blitfunc.h
-	-del blittable.c
-	-del config.h
+	del *.o
+	del machdep\*.o
+	del machdep\video\*.o
+	del machdep\sound\*.o
+	del uae
+	del uae.exe
+	del readdisk
+	del readdisk.exe
+	del gencpu.exe
+	del genblitter.exe
+	del build68k.exe
+	del cpudefs.c
+	del cpuopti.exe
+	del cpu?.c
+	del blit.h
+	del cputbl.h
+	del cpustbl.c
+	del cpufast?.s
+	del blitfunc.c
+	del blitfunc.h
+	del blittable.c
+	del config.h
 
 halfclean:
-	-del *.o
+	del *.o
+	del machdep\*.o
+	del machdep\video\*.o
+	del machdep\sound\*.o
 
 blit.h: genblitter.exe
 	genblitter i >blit.h
@@ -64,14 +71,14 @@ blitfunc.h: genblitter.exe
 blittable.c: genblitter.exe blitfunc.h
 	genblitter t >blittable.c
 
-genblitter.exe: genblitter.o
-	$(CC) $(LDFLAGS) -o genblitter.exe genblitter.o
+genblitter.exe: genblitter.o blitops.o
+	$(CC) -o genblitter.exe genblitter.o blitops.o
 build68k.exe: build68k.o
-	$(CC) $(LDFLAGS) -o build68k.exe build68k.o
+	$(CC) -o build68k.exe build68k.o
 cpuopti.exe: cpuopti.o
-	$(CC) $(LDFLAGS) -o cpuopti.exe cpuopti.o
+	$(CC) -o cpuopti.exe cpuopti.o
 gencpu.exe: gencpu.o readcpu.o cpudefs.o
-	$(CC) $(LDFLAGS) -o gencpu.exe gencpu.o readcpu.o cpudefs.o
+	$(CC) -o gencpu.exe gencpu.o readcpu.o cpudefs.o
 
 custom.o: blit.h
 
@@ -251,23 +258,26 @@ cpufastF.s: cpuF.c cputbl.h cpuopti.exe
 X86.o: X86.S
 	$(CC) $(INCLUDES) -c $(CFLAGS) X86.S
 
-gencpu.o: gencpu.c
-	$(CC) $(INCLUDES) -c $(CFLAGS_NOT_OPT) gencpu.c
-
 .m.o:
-	$(CC) $(INCLUDES) -c $(CFLAGS) $(DEBUGFLAGS) $*.m
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.m
 .c.o:
-	$(CC) $(INCLUDES) -c $(CFLAGS) $(DEBUGFLAGS) $*.c
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c -o $@
 .c.s:
 	$(CC) $(INCLUDES) -S $(CFLAGS) $*.c
+.c.i:
+	$(CC) $(INCLUDES) -E $(CFLAGS) $*.c > $@
 .S.o:
-	$(CC) $(INCLUDES) -c $(CFLAGS) $(DEBUGFLAGS) $*.S
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.S
 
 # Saves recompiling...
 touch:
 	touch *.o
-	touch build68k
-	touch cpudefs.*
+	touch machdep\*.o
+	touch machdep\video\*.o
+	touch machdep\sound\*.o
+	touch build68k.exe
+	touch cpudefs.c
+	touch cpudefs.o
 	touch gencpu.exe
 	touch genblitter.exe
 	touch cpu*.*
@@ -293,8 +303,10 @@ memory.o: config.h
 debug.o: config.h
 fpp.o: config.h
 ersatz.o: config.h
+filesys.o: config.h
+execlib.o: config.h
 disk.o: config.h include/events.h
 blitter.o: config.h include/events.h
 
 config.h: ../config.h
-	-copy ..\config.h
+	copy ..\config.h