From 1b1b18f1dd5cd891696ac2d56d3dfbf67669348b Mon Sep 17 00:00:00 2001 From: OBattler Date: Sat, 5 Nov 2016 01:02:32 +0100 Subject: [PATCH] Removed the CRC64 stuff from the Windows makefiles. --- src/Makefile.mingw | 7 +++---- src/Makefile.mingw64 | 7 +++---- src/disc_86f.c | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Makefile.mingw b/src/Makefile.mingw index f91d6d978..9228c4814 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -1,4 +1,4 @@ -VPATH = . crcspeed dosbox lzf resid-fp slirp +VPATH = . dosbox lzf resid-fp slirp CPP = g++.exe CC = gcc.exe WINDRES = windres.exe @@ -22,7 +22,6 @@ OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o acerm3a.o ali1429 vid_vga.o vid_voodoo.o video.o wd76c10.o win.o win-config.o win-d3d.o win-d3d-fs.o win-ddraw.o \ win-ddraw-fs.o win-ddraw-screenshot.o win-deviceconfig.o win-hdconf.o win-joystick.o win-joystickconfig.o win-keyboard.o win-midi.o win-mouse.o \ win-status.o win-video.o x86seg.o x87.o xtide.o pc.res -CRCOBJ = crcspeed.o crc64speed.o DBOBJ = dbopl.o nukedopl.o vid_cga_comp.o LZFOBJ = lzf_c.o lzf_d.o SIDOBJ = convolve.o convolve-sse.o envelope.o extfilt.o filter.o pot.o sid.o voice.o wave6581__ST.o wave6581_P_T.o wave6581_PS_.o wave6581_PST.o wave8580__ST.o wave8580_P_T.o wave8580_PS_.o wave8580_PST.o wave.o @@ -31,8 +30,8 @@ SLIRPOBJ = bootp.o ip_icmp.o misc.o socket.o tcp_timer.o cksum.o ip_input.o queu LIBS = -mwindows -lwinmm -lopenal.dll -lopenal -lddraw -ldinput8 -ldxguid -ld3d9 -ld3dx9 -lwsock32 -liphlpapi -lstdc++ -static-libstdc++ -static-libgcc -static -86Box.exe: $(OBJ) $(CRCOBJ) $(DBOBJ) $(LZFOBJ) $(SIDOBJ) $(SLIRPOBJ) - $(CC) $(OBJ) $(CRCOBJ) $(DBOBJ) $(LZFOBJ) $(SIDOBJ) $(SLIRPOBJ) -o "86Box.exe" $(LIBS) +86Box.exe: $(OBJ) $(DBOBJ) $(LZFOBJ) $(SIDOBJ) $(SLIRPOBJ) + $(CC) $(OBJ) $(DBOBJ) $(LZFOBJ) $(SIDOBJ) $(SLIRPOBJ) -o "86Box.exe" $(LIBS) strip "86Box.exe" all : 86Box.exe diff --git a/src/Makefile.mingw64 b/src/Makefile.mingw64 index 04f59513c..7aff5e6f3 100644 --- a/src/Makefile.mingw64 +++ b/src/Makefile.mingw64 @@ -1,4 +1,4 @@ -VPATH = . crcspeed dosbox lzf resid-fp slirp +VPATH = . dosbox lzf resid-fp slirp CPP = g++.exe CC = gcc.exe WINDRES = windres.exe @@ -22,7 +22,6 @@ OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o acerm3a.o ali1429 vid_vga.o vid_voodoo.o video.o wd76c10.o win.o win-config.o win-d3d.o win-d3d-fs.o win-ddraw.o \ win-ddraw-fs.o win-ddraw-screenshot.o win-deviceconfig.o win-hdconf.o win-joystick.o win-joystickconfig.o win-keyboard.o win-midi.o win-mouse.o \ win-status.o win-video.o x86seg.o x87.o xtide.o pc.res -CRCOBJ = crcspeed.o crc64speed.o DBOBJ = dbopl.o nukedopl.o vid_cga_comp.o LZFOBJ = lzf_c.o lzf_d.o SIDOBJ = convolve.o convolve-sse.o envelope.o extfilt.o filter.o pot.o sid.o voice.o wave6581__ST.o wave6581_P_T.o wave6581_PS_.o wave6581_PST.o wave8580__ST.o wave8580_P_T.o wave8580_PS_.o wave8580_PST.o wave.o @@ -31,8 +30,8 @@ SLIRPOBJ = bootp.o ip_icmp.o misc.o socket.o tcp_timer.o cksum.o ip_input.o queu LIBS = -mwindows -lwinmm -lopenal -lddraw -ldinput8 -ldxguid -ld3d9 -ld3dx9 -lwsock32 -liphlpapi -lstdc++ -static-libstdc++ -static-libgcc -static -lopenal.dll -lgcov -lPacket -lwpcap -86Box64.exe: $(OBJ) $(CRCOBJ) $(DBOBJ) $(LZFOBJ) $(SIDOBJ) $(SLIRPOBJ) - $(CC) $(OBJ) $(CRCOBJ) $(DBOBJ) $(LZFOBJ) $(SIDOBJ) $(SLIRPOBJ) -o "86Box64.exe" $(LIBS) +86Box64.exe: $(OBJ) $(DBOBJ) $(LZFOBJ) $(SIDOBJ) $(SLIRPOBJ) + $(CC) $(OBJ) $(DBOBJ) $(LZFOBJ) $(SIDOBJ) $(SLIRPOBJ) -o "86Box64.exe" $(LIBS) strip "86Box64.exe" peflags --bigaddr=false 86Box64.exe diff --git a/src/disc_86f.c b/src/disc_86f.c index fac7d9c27..c43404896 100644 --- a/src/disc_86f.c +++ b/src/disc_86f.c @@ -3264,7 +3264,7 @@ void d86f_init() memset(d86f, 0, sizeof(d86f)); d86f_setupcrc(0x1021); - crc64speed_init(); + // crc64speed_init(); d86f[0].state = d86f[1].state = STATE_IDLE; }