Miscellaneous cosmetic changes to the makefile and header files

src/include/86box/sio.h

@@ -58,7 +58,9 @@ extern const device_t   prime3b_ide_device;
 extern const device_t   prime3c_device;
 extern const device_t   prime3c_ide_device;
 extern const device_t 	ps1_m2133_sio;
+#if defined(DEV_BRANCH) && defined(USE_SIO_DETECT)
 extern const device_t	sio_detect_device;
+#endif
 extern const device_t	um8669f_device;
 extern const device_t	via_vt82c686_sio_device;
 extern const device_t	w83787f_device;

src/include/86box/video.h

@@ -197,7 +197,9 @@ extern const device_t mach64gx_pci_device;
 extern const device_t mach64vt2_device;
 
 /* ATi 18800 */
+#if defined(DEV_BRANCH) && defined(USE_VGAWONDER)
 extern const device_t ati18800_wonder_device;
+#endif
 extern const device_t ati18800_vga88_device;
 extern const device_t ati18800_device;
 

src/win/Makefile.mingw

@@ -49,7 +49,7 @@ ifeq ($(DEV_BUILD), y)
   I450KX		:= y
  endif
  ifndef M154X
-  M145X		:= y
+  M154X		:= y
  endif
  ifndef LASERXT
   LASERXT	:= y
@@ -90,8 +90,8 @@ ifeq ($(DEV_BUILD), y)
  ifndef XL24
   XL24		:= y
  endif
- ifndef USE_VECT486VL
-  USE_VECT486VL	:= y
+ ifndef VECT486VL
+  VECT486VL	:= y
  endif
  ifndef OLIVETTI
   OLIVETTI	:= y
@@ -122,7 +122,7 @@ else
   LASERXT	:= n
  endif
  ifndef M154X
-  M145X		:= n
+  M154X		:= n
  endif
  ifndef MGA
   MGA		:= n
@@ -160,8 +160,8 @@ else
  ifndef XL24
   XL24		:= n
  endif
- ifndef USE_VECT486VL
-  USE_VECT486VL	:= n
+ ifndef VECT486VL
+  VECT486VL	:= n
  endif
  ifndef OLIVETTI
   OLIVETTI	:= n
@@ -545,7 +545,7 @@ OPTS		+= -DUSE_SIO_DETECT
 DEVBROBJ	+= sio_detect.o
 endif
 
-ifeq ($(M145X), y)
+ifeq ($(M154X), y)
 OPTS		+= -DUSE_M154X
 DEVBROBJ	+= ali1531.o ali1543.o
 endif
@@ -563,7 +563,7 @@ ifeq ($(XL24), y)
 OPTS		+= -DUSE_XL24
 endif
 
-ifeq ($(USE_VECT486VL), y)
+ifeq ($(VECT486VL), y)
 OPTS		+= -DUSE_VECT486VL
 endif