80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Removed the USB variable from the makefile as it's no longer needed and only causes confusion.

Browse Source
This commit is contained in:
OBattler
2020-06-13 10:28:58 +02:00
parent ebe07c7e82
commit cfea8c4b64
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/win/Makefile.mingw
View File

@@ -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

9
src/win/Makefile_ndr.mingw
View File

@@ -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