From cfea8c4b64886d5ed1d86d1a484bc0edd33fe709 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sat, 13 Jun 2020 10:28:58 +0200 Subject: [PATCH] Removed the USB variable from the makefile as it's no longer needed and only causes confusion. --- src/win/Makefile.mingw | 9 +-------- src/win/Makefile_ndr.mingw | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index 83e4f74e7..e1ce386d5 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -171,9 +171,6 @@ endif ifndef WX WX := n endif -ifndef USB -USB := n -endif ifndef DINPUT DINPUT := n endif @@ -587,10 +584,6 @@ ZIPOBJ := zip.o MOOBJ := mo.o -ifeq ($(USB), y) -USBOBJ := usb.o -endif - SCSIOBJ := scsi.o scsi_device.o \ scsi_cdrom.o scsi_disk.o \ scsi_x54x.o \ @@ -683,7 +676,7 @@ endif OBJ := $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \ $(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(MOOBJ) $(HDDOBJ) \ - $(USBOBJ) $(NETOBJ) $(PRINTOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \ + $(NETOBJ) $(PRINTOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \ $(PLATOBJ) $(UIOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ) \ $(DISCORDOBJ) ifdef EXOBJ diff --git a/src/win/Makefile_ndr.mingw b/src/win/Makefile_ndr.mingw index 63a9c3c60..a3dc0382e 100644 --- a/src/win/Makefile_ndr.mingw +++ b/src/win/Makefile_ndr.mingw @@ -174,9 +174,6 @@ endif ifndef WX WX := n endif -ifndef USB -USB := n -endif ifndef DINPUT DINPUT := y endif @@ -591,10 +588,6 @@ ZIPOBJ := zip.o MOOBJ := mo.o -ifeq ($(USB), y) -USBOBJ := usb.o -endif - SCSIOBJ := scsi.o scsi_device.o \ scsi_cdrom.o scsi_disk.o \ scsi_x54x.o \ @@ -687,7 +680,7 @@ endif OBJ := $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \ $(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(MOOBJ) $(HDDOBJ) \ - $(USBOBJ) $(NETOBJ) $(PRINTOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \ + $(NETOBJ) $(PRINTOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \ $(PLATOBJ) $(UIOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ) \ $(DISCORDOBJ) ifdef EXOBJ