Put Wacom tablets on dev branch

CMakeLists.txt

@@ -163,6 +163,7 @@ cmake_dependent_option(OPEN_AT        "OpenAT"
 cmake_dependent_option(OPL4ML         "OPL4-ML daughterboard"                       ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(PCL            "Generic PCL5e Printer"                       ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(SIO_DETECT     "Super I/O Detection Helper"                  ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(WACOM          "Wacom Input Devices"                         ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(XL24           "ATI VGA Wonder XL24 (ATI-28800-6)"           ON      "DEV_BRANCH"    OFF)
 
 # Ditto but for Qt

src/device/CMakeLists.txt

@@ -45,3 +45,8 @@ endif()
 if(LASERXT)
     target_compile_definitions(dev PRIVATE USE_LASERXT)
 endif()
+
+if(WACOM)
+    target_compile_definitions(dev PRIVATE USE_WACOM)
+    target_sources(dev PRIVATE mouse_wacom_tablet.c)
+endif()

src/device/mouse.c

@@ -98,7 +98,7 @@ static mouse_t mouse_devices[] = {
     { &mouse_wacom_device        },
     { &mouse_wacom_artpad_device },
 #endif
-    { &mouse_mtouch_device                   },
+    { &mouse_mtouch_device       },
     { NULL                       }
     // clang-format on
 };

src/include/86box/mouse.h

@@ -71,8 +71,10 @@ extern const device_t mouse_mssystems_device;
 extern const device_t mouse_msserial_device;
 extern const device_t mouse_ltserial_device;
 extern const device_t mouse_ps2_device;
+#    ifdef USE_WACOM
 extern const device_t mouse_wacom_device;
 extern const device_t mouse_wacom_artpad_device;
+#    endif
 extern const device_t mouse_mtouch_device;
 #endif
 

src/qt/CMakeLists.txt

@@ -190,6 +190,10 @@ if(RTMIDI)
     target_compile_definitions(ui PRIVATE USE_RTMIDI)
 endif()
 
+if(WACOM)
+    target_compile_definitions(ui PRIVATE USE_WACOM)
+endif()
+
 if(WIN32)
     enable_language(RC)
     target_sources(86Box PUBLIC 86Box-qt.rc)