A slight reorganization of the source tree and fixed a warning in disk/mo.c.

src/win/Makefile.mingw

@@ -175,7 +175,7 @@ ifndef USB
 USB		:= n
 endif
 ifndef DINPUT
- DINPUT		:= y
+ DINPUT		:= n
 endif
 ifndef OPENAL
 OPENAL		:= y
@@ -248,7 +248,7 @@ endif
 VPATH		:= $(EXPATH) . cpu cpu_common \
 		   cdrom chipset disk floppy game machine \
 		   printer \
-		   sound \
+		   sio sound \
 		    sound/munt sound/munt/c_interface sound/munt/sha1 \
 		    sound/munt/srchelper sound/munt/srchelper/srctools/src \
 		    sound/resid-fp \
@@ -544,8 +544,8 @@ MCHOBJ		:= machine.o machine_table.o \
 		    m_ps2_isa.o m_ps2_mca.o \
 		    m_at_compaq.o \
 		    m_at_286_386sx.o m_at_386dx_486.o \
-		    m_at_socket4_5.o m_at_socket7_s7.o m_at_super7_ss7.o \
-			m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
+		    m_at_socket4_5.o m_at_socket7_s7.o m_at_sockets7.o \
+		    m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
 
 DEVOBJ		:= bugger.o hwm.o hwm_lm75.o hwm_lm78.o ibm_5161.o isamem.o isartc.o lpt.o postcard.o $(SERIAL) \
 		    sio_detect.o sio_acc3221.o \

src/win/Makefile_ndr.mingw

@@ -245,7 +245,7 @@ endif
 VPATH		:= $(EXPATH) . cpu_new cpu_common \
 		   cdrom chipset disk floppy game machine \
 		   printer \
-		   sound \
+		   sio sound \
 		    sound/munt sound/munt/c_interface sound/munt/sha1 \
 		    sound/munt/srchelper sound/munt/srchelper/srctools/src \
 		    sound/resid-fp \
@@ -548,8 +548,8 @@ MCHOBJ		:= machine.o machine_table.o \
 		    m_ps2_isa.o m_ps2_mca.o \
 		    m_at_compaq.o \
 		    m_at_286_386sx.o m_at_386dx_486.o \
-		    m_at_socket4_5.o m_at_socket7_s7.o m_at_super7_ss7.o \
-			m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
+		    m_at_socket4_5.o m_at_socket7_s7.o m_at_sockets7.o \
+		    m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
 
 DEVOBJ		:= bugger.o hwm.o hwm_lm75.o hwm_lm78.o ibm_5161.o isamem.o isartc.o lpt.o postcard.o $(SERIAL) \
 		    sio_acc3221.o \