--- frontvm/hardware/Makefile 2018/04/24 17:57:15 1.1.1.1 +++ frontvm/hardware/Makefile 2018/04/24 17:57:29 1.1.1.2 @@ -2,20 +2,12 @@ SDLLIB = $(shell sdl-config --libs) SDLFLAGS = $(shell sdl-config --cflags) -INCFLAGS = -I../cpu - -CPUOBJS = ../cpu/hatari-glue.o ../cpu/memory.o ../cpu/newcpu.o \ - ../cpu/readcpu.o ../cpu/cpustbl.o ../cpu/cpudefs.o \ - ../cpu/cpuemu1.o ../cpu/cpuemu2.o ../cpu/cpuemu3.o \ - ../cpu/cpuemu4.o ../cpu/cpuemu5.o ../cpu/cpuemu6.o \ - ../cpu/cpuemu7.o ../cpu/cpuemu8.o - SRCS = disasm.c audio.c configuration.c dialog.c \ - file.c hostcall.c int.c keymap.c \ - m68000.c main.c memAlloc.c misc.c \ - reset.c stMemory.c screen.c screenConvert.c \ + file.c hostcall.c keymap.c \ + main.c memAlloc.c misc.c \ + screen.c screenConvert.c \ sdlgui.c shortcut.c scalebit.c \ - loadfe2.c video.c input.c fe2.c + input.c fe2.c OBJS = $(SRCS:.c=.o) @@ -23,7 +15,7 @@ OBJS = $(SRCS:.c=.o) $(CC) $(CFLAGS) $(INCFLAGS) $(SDLFLAGS) -c $< ../frontier: $(OBJS) - $(CC) $(OBJS) $(CPUOBJS) $(SDLLIB) $(LIBFLAGS) -o ../frontier + $(CC) $(OBJS) $(FE2OBJS) $(SDLLIB) $(LIBFLAGS) -o ../frontier clean: rm -f *.o