Merge pull request #861 from tiseno100/master

Few "improvements" & compile error fixes

src/machine/m_at_286_386sx.c

@@ -420,6 +420,27 @@ machine_at_deskmaster286_init(const machine_t *model)
     return ret;
 }
 
+int
+machine_at_shuttle386sx_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved(L"roms/machines/shuttle386sx/386-Shuttle386SX-Even.BIN",
+				L"roms/machines/shuttle386sx/386-Shuttle386SX-Odd.BIN",
+			   0x000f0000, 131072, 0);
+
+    if (bios_only || !ret)
+	return ret;
+
+    machine_at_common_init(model);
+
+    device_add(&i82335_device);
+    device_add(&keyboard_at_ami_device);
+    device_add(&fdc_at_device);
+
+    return ret;
+}
+
 int
 machine_at_wd76c10_init(const machine_t *model)
 {

src/win/Makefile.mingw

@@ -559,7 +559,7 @@ CPUOBJ		:= cpu.o cpu_table.o \
 		    x86seg.o x87.o x87_timings.o \
 		    $(DYNARECOBJ)
 
-CHIPSETOBJ	:= acc2168.o acer_m3a.o cs8230.o ali1429.o headland.o i82335.o\
+CHIPSETOBJ	:= acc2168.o acer_m3a.o cs8230.o ali1429.o headland.o i82335.o \
 		    intel_420ex.o intel_4x0.o intel_sio.o intel_piix.o ioapic.o \
 		    neat.o opti495.o opti5x7.o scamp.o scat.o \
 		    sis_85c310.o sis_85c471.o sis_85c496.o \