Don't depend on DEV_BRANCH

Allows things to be compiled independently

src/include/86box/chipset.h

@@ -195,7 +195,7 @@ extern const device_t nec_mate_unk_device;
 extern const device_t phoenix_486_jumper_device;
 extern const device_t phoenix_486_jumper_pci_device;
 
-#if defined(DEV_BRANCH) && defined(USE_OLIVETTI)
+#ifdef USE_OLIVETTI
 extern const device_t olivetti_eva_device;
-#endif
+#endif /* USE_OLIVETTI */
 #endif /*EMU_CHIPSET_H*/

src/include/86box/keyboard.h

@@ -222,9 +222,9 @@ extern const device_t keyboard_xt86_device;
 extern const device_t keyboard_xt_compaq_device;
 extern const device_t keyboard_xt_t1x00_device;
 extern const device_t keyboard_tandy_device;
-#    if defined(DEV_BRANCH) && defined(USE_LASERXT)
+#    ifdef USE_LASERXT
 extern const device_t keyboard_xt_lxt3_device;
-#    endif /*defined(DEV_BRANCH) && defined(USE_LASERXT) */
+#    endif /* USE_LASERXT */
 extern const device_t keyboard_xt_olivetti_device;
 extern const device_t keyboard_xt_zenith_device;
 extern const device_t keyboard_xt_hyundai_device;

src/include/86box/machine.h

@@ -437,9 +437,9 @@ extern int machine_at_ibmxt286_init(const machine_t *);
 extern int machine_at_siemens_init(const machine_t *); // Siemens PCD-2L. N82330 discrete machine. It segfaults in some places
 
 extern int machine_at_wellamerastar_init(const machine_t *); // Wells American A*Star with custom award BIOS 
-#if defined(DEV_BRANCH) && defined(USE_OPEN_AT)
+#ifdef USE_OPEN_AT
 extern int machine_at_openat_init(const machine_t *);
-#endif
+#endif /* USE_OPEN_AT */
 
 /* m_at_286_386sx.c */
 extern int machine_at_tg286m_init(const machine_t *);
@@ -468,9 +468,9 @@ extern int machine_at_deskmaster286_init(const machine_t *);
 extern int machine_at_pc8_init(const machine_t *);
 extern int machine_at_3302_init(const machine_t *);
 
-#if defined(DEV_BRANCH) && defined(USE_OLIVETTI)
+#ifdef USE_OLIVETTI
 extern int machine_at_m290_init(const machine_t *);
-#endif
+#endif /* USE_OLIVETTI */
 
 extern int machine_at_shuttle386sx_init(const machine_t *);
 extern int machine_at_adi386sx_init(const machine_t *);

src/include/86box/midi.h

@@ -104,18 +104,18 @@ extern void midi_in_sysex(uint8_t *buffer, uint32_t len);
 #ifdef EMU_DEVICE_H
 extern const device_t rtmidi_output_device;
 extern const device_t rtmidi_input_device;
-#    if defined(DEV_BRANCH) && defined(USE_OPL4ML)
+#    ifdef USE_OPL4ML
 extern const device_t opl4_midi_device;
-#    endif
+#    endif /* USE_OPL4ML */
 #    ifdef USE_FLUIDSYNTH
 extern const device_t fluidsynth_device;
-#    endif
+#    endif /* USE_FLUIDSYNTH */
 #    ifdef USE_MUNT
 extern const device_t mt32_old_device;
 extern const device_t mt32_new_device;
 extern const device_t cm32l_device;
 extern const device_t cm32ln_device;
-#    endif
+#    endif /* USE_MUNT */
 #endif
 
 #endif /*EMU_SOUND_MIDI_H*/

src/include/86box/sio.h

@@ -75,9 +75,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)
+#ifdef USE_SIO_DETECT
 extern const device_t sio_detect_device;
-#endif
+#endif /* USE_SIO_DETECT */
 extern const device_t um8663af_device;
 extern const device_t um8663af_ide_device;
 extern const device_t um8663af_sec_device;

src/include/86box/video.h

@@ -330,9 +330,9 @@ extern const device_t ati28800k_device;
 extern const device_t ati28800k_spc4620p_device;
 extern const device_t ati28800k_spc6033p_device;
 extern const device_t compaq_ati28800_device;
-#    if defined(DEV_BRANCH) && defined(USE_XL24)
+#    ifdef USE_XL24
 extern const device_t ati28800_wonderxl24_device;
-#    endif
+#    endif /* USE_XL24 */
 
 /* Bochs */
 extern const device_t bochs_svga_device;
@@ -448,7 +448,7 @@ extern const device_t mystique_220_device;
 extern const device_t millennium_ii_device;
 #ifdef USE_G100
 extern const device_t productiva_g100_device;
-#endif
+#endif /* USE_G100 */
 
 /* Oak OTI-0x7 */
 extern const device_t oti037c_device;