--- uae/src/Makefile.in	2018/04/24 16:40:53	1.1.1.4
+++ uae/src/Makefile.in	2018/04/24 16:44:47	1.1.1.6
@@ -4,15 +4,15 @@
 
 @SET_MAKE@
 CC        = @CC@
+WRC       = @WRC@
 CPP       = @CPP@
 LDFLAGS   = @LDFLAGS@
-CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@ $(AFINCLUDE) \
-            -DSTATFS_NO_ARGS=@STATFS_NO_ARGS@ \
-            -DSTATBUF_BAVAIL=@STATBUF_BAVAIL@ 
+CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@
 X_CFLAGS  = @X_CFLAGS@ @GTK_CFLAGS@ -DSHM_SUPPORT_LINKS=@SHM_SUPPORT_LINKS@
 TARGET    = @TARGET@
 LIBRARIES = @LIBRARIES@ @LIBS@ @GTK_LIBS@
 MATHLIB   = @MATHLIB@
+RESOBJS   = @RESOBJS@
 
 NO_SCHED_CFLAGS = @NO_SCHED_CFLAGS@
 
@@ -27,24 +27,19 @@ sysconfdir      = @sysconfdir@
 
 VPATH = @top_srcdir@/src
 
-.SUFFIXES: .o .c .h .m .i .S
+.SUFFIXES: .o .c .h .m .i .S .rc .res
 
 .SECONDARY: p2c.c p2c.h cpuemu.c cpustbl.c cputbl.h
 
-# If you want to use the AF System to play sound, set theese to the
-# correct paths. If not, leave them commented out.
-# (Don't forget to define AF_SOUND in config.h)
-#AFINCLUDE=-I/usr/local/vol/AudioFile/include
-#AFLDFLAGS=-L/usr/local/vol/AudioFile/lib -lAF
-
 INCLUDES=-I. -I@top_srcdir@/src/include/
 
 OBJS = main.o newcpu.o memory.o @CPUOBJS@ custom.o cia.o serial.o blitter.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 \
-       disk.o audio.o compiler.o uaelib.o picasso96.o p2c.o cpustbl.o \
-       uaeexe.o missing.o sounddep/sound.o osdep/joystick.o machdep/support.o \
-       @ASMOBJS@ @GFXOBJS@ @DEBUGOBJS@
+       disk.o audio.o compiler.o uaelib.o drawing.o picasso96.o cpustbl.o \
+       uaeexe.o bsdsocket.o missing.o sd-sound.o od-joy.o md-support.o \
+       fsusage.o cfgfile.o getopt.o getopt1.o \
+       @P2C@ @ASMOBJS@ @GFXOBJS@ @DEBUGOBJS@
 
 all: $(TARGET)
 
@@ -52,6 +47,9 @@ x11: progs
 
 svgalib: progs
 
+win32: progs $(RESOBJS)
+	$(WRC) $(RESOBJS) uae.exe
+
 ggilib: progs
 
 asciiart: progs
@@ -73,19 +71,20 @@ readdisk: readdisk.o missing.o
 	$(CC) readdisk.o missing.o -o readdisk $(LDFLAGS) $(DEBUGFLAGS)
 
 uae: $(OBJS)
-	$(CC) $(OBJS) -o uae $(GFXLDFLAGS) $(AFLDFLAGS) $(LDFLAGS) $(DEBUGFLAGS) $(LIBRARIES) $(MATHLIB)
+	$(CC) $(OBJS) -o uae $(GFXLDFLAGS) $(LDFLAGS) $(DEBUGFLAGS) $(LIBRARIES) $(MATHLIB)
 
 clean:
 	-rm -f $(OBJS) *.o uae readdisk
 	-rm -f gencpu genblitter blit.h genp2c cpudefs.c cpuopti
-	-rm -f cpuemu.c build68k cputmp.s cpufast.s cpustbl.c cputbl.h
-	-rm -f blitfunc.c blitfunc.h blittable.c p2c.c p2c.h
+	-rm -f cpuemu.c build68k cputmp.s cpufast*.s cpustbl.c cputbl.h
+	-rm -f blitfunc.c blitfunc.h blittable.c p2c.c p2c.h p2c_x86.S
 
 halfclean:
 	-rm -f $(OBJS)
 
 streifenfrei: clean
-	-rm -f Makefile config.cache config.log config.status sysconfig.h
+	-rm -f Makefile sysconfig.h
+	-rm -f od-joy.c md-X86.S sd-sound.c md-support.c
 	-rm -f machdep osdep threaddep sounddep target.h config.h
 
 blit.h: genblitter
@@ -132,10 +131,12 @@ cpufast.s: cpuemu.c cpuopti
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp.s
 	./cpuopti <cputmp.s >$@
 	rm cputmp.s
-	
+
 osdep/beos.o: osdep/beos.cpp
 	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) osdep/beos.cpp -o osdep/beos.o
 
+.rc.res:
+	$(WRC) $(INCLUDES) $<
 .m.o:
 	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $<
 .c.o:
@@ -174,3 +175,53 @@ execlib.o: config.h
 disk.o: config.h include/events.h
 blitter.o: config.h include/events.h blit.h
 
+# sam: this is for people with low memory. (is there a way do do this with a single rule ?)
+cpufast1.s: cpuemu.c cpuopti
+	$(CC) -DPART_1 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp1.s
+	./cpuopti <cputmp1.s >$@
+	rm cputmp1.s
+cpufast2.s: cpuemu.c cpuopti
+	$(CC) -DPART_2 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp2.s
+	./cpuopti <cputmp2.s >$@
+	rm cputmp2.s
+cpufast3.s: cpuemu.c cpuopti
+	$(CC) -DPART_3 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp3.s
+	./cpuopti <cputmp3.s >$@
+	rm cputmp3.s
+cpufast4.s: cpuemu.c cpuopti
+	$(CC) -DPART_4 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp4.s
+	./cpuopti <cputmp4.s >$@
+	rm cputmp4.s
+cpufast5.s: cpuemu.c cpuopti
+	$(CC) -DPART_5 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp5.s
+	./cpuopti <cputmp5.s >$@
+	rm cputmp5.s
+cpufast6.s: cpuemu.c cpuopti
+	$(CC) -DPART_6 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp6.s
+	./cpuopti <cputmp6.s >$@
+	rm cputmp6.s
+cpufast7.s: cpuemu.c cpuopti
+	$(CC) -DPART_7 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp7.s
+	./cpuopti <cputmp7.s >$@
+	rm cputmp7.s
+cpufast8.s: cpuemu.c cpuopti
+	$(CC) -DPART_8 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp8.s
+	./cpuopti <cputmp8.s >$@
+	rm cputmp8.s
+
+cpuemu1.o: cpuemu.c
+	$(CC) -DPART_1 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu2.o: cpuemu.c
+	$(CC) -DPART_2 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu3.o: cpuemu.c
+	$(CC) -DPART_3 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu4.o: cpuemu.c
+	$(CC) -DPART_4 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu5.o: cpuemu.c
+	$(CC) -DPART_5 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu6.o: cpuemu.c
+	$(CC) -DPART_6 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu7.o: cpuemu.c
+	$(CC) -DPART_7 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu8.o: cpuemu.c
+	$(CC) -DPART_8 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@