Remove HIDAPI Autotools build system and unused files

2024-11-14 13:27:45 -07:00 · 2017-04-24 20:10:50 -07:00 · 2017-04-24 20:10:50 -07:00 · 537fbf33a7
commit 537fbf33a7
parent 655ab9b4e2
55 changed files with 0 additions and 4581 deletions
--- a/Externals/hidapi/.gitignore
+++ b/Externals/hidapi/.gitignore
@ -1,20 +0,0 @@
-
-# Autotools-added generated files
-Makefile.in
-aclocal.m4
-autom4te.cache/
-config.*
-configure
-depcomp
-install-sh
-libusb/Makefile.in
-linux/Makefile.in
-ltmain.sh
-mac/Makefile.in
-missing
-testgui/Makefile.in
-windows/Makefile.in
-
-Makefile
-stamp-h1
-libtool
--- a/Externals/hidapi/Makefile.am
+++ b/Externals/hidapi/Makefile.am
@ -1,81 +0,0 @@
-
-ACLOCAL_AMFLAGS = -I m4
-
-if OS_FREEBSD
-pkgconfigdir=$(prefix)/libdata/pkgconfig
-else
-pkgconfigdir=$(libdir)/pkgconfig
-endif
-
-if OS_LINUX
-pkgconfig_DATA=pc/hidapi-hidraw.pc pc/hidapi-libusb.pc
-else
-pkgconfig_DATA=pc/hidapi.pc
-endif
-
-SUBDIRS=
-
-if OS_LINUX
-SUBDIRS += linux libusb
-endif
-
-if OS_DARWIN
-SUBDIRS += mac
-endif
-
-if OS_FREEBSD
-SUBDIRS += libusb
-endif
-
-if OS_KFREEBSD
-SUBDIRS += libusb
-endif
-
-if OS_WINDOWS
-SUBDIRS += windows
-endif
-
-SUBDIRS += hidtest
-
-if BUILD_TESTGUI
-SUBDIRS += testgui
-endif
-
-EXTRA_DIST = udev doxygen
-
-dist_doc_DATA = \
- README.txt \
- AUTHORS.txt \
- LICENSE-bsd.txt \
- LICENSE-gpl3.txt \
- LICENSE-orig.txt \
- LICENSE.txt
-
-SCMCLEAN_TARGETS= \
- aclocal.m4 \
- config.guess \
- config.sub \
- configure \
- config.h.in \
- depcomp \
- install-sh \
- ltmain.sh \
- missing \
- mac/Makefile.in \
- testgui/Makefile.in \
- libusb/Makefile.in \
- Makefile.in \
- linux/Makefile.in \
- windows/Makefile.in \
- m4/libtool.m4 \
- m4/lt~obsolete.m4 \
- m4/ltoptions.m4 \
- m4/ltsugar.m4 \
- m4/ltversion.m4
-
-SCMCLEAN_DIR_TARGETS = \
- autom4te.cache
-
-scm-clean: distclean
-	rm -f $(SCMCLEAN_TARGETS)
-	rm -Rf $(SCMCLEAN_DIR_TARGETS)
--- a/Externals/hidapi/android/jni/Android.mk
+++ b/Externals/hidapi/android/jni/Android.mk
@ -1,19 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-HIDAPI_ROOT_REL:= ../..
-HIDAPI_ROOT_ABS:= $(LOCAL_PATH)/../..
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-  $(HIDAPI_ROOT_REL)/libusb/hid.c
-
-LOCAL_C_INCLUDES += \
-  $(HIDAPI_ROOT_ABS)/hidapi \
-  $(HIDAPI_ROOT_ABS)/android
-
-LOCAL_SHARED_LIBRARIES := libusb1.0
-
-LOCAL_MODULE := libhidapi
-
-include $(BUILD_SHARED_LIBRARY)
--- a/Externals/hidapi/bootstrap
+++ b/Externals/hidapi/bootstrap
@ -1,2 +0,0 @@
-#!/bin/sh -x
-autoreconf --install --verbose --force
--- a/Externals/hidapi/configure.ac
+++ b/Externals/hidapi/configure.ac
@ -1,236 +0,0 @@
-AC_PREREQ(2.63)
-
-# Version number. This is currently the only place.
-m4_define([HIDAPI_MAJOR],   0)
-m4_define([HIDAPI_MINOR],   8)
-m4_define([HIDAPI_RELEASE], 0)
-m4_define([HIDAPI_RC],      -rc1)
-m4_define([VERSION_STRING], HIDAPI_MAJOR[.]HIDAPI_MINOR[.]HIDAPI_RELEASE[]HIDAPI_RC)
-
-AC_INIT([hidapi],[VERSION_STRING],[alan@signal11.us])
-
-# Library soname version
-# Follow the following rules (particularly the ones in the second link):
-#  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-#  http://sourceware.org/autobook/autobook/autobook_91.html
-lt_current="0"
-lt_revision="0"
-lt_age="0"
-LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}"
-
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-AC_CONFIG_MACRO_DIR([m4])
-
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-LT_INIT
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_OBJC
-PKG_PROG_PKG_CONFIG
-
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-hidapi_lib_error() {
-	echo ""
-	echo "  Library $1 was not found on this system."
-	echo "  Please install it and re-run ./configure"
-	echo ""
-	exit 1
-}
-
-hidapi_prog_error() {
-	echo ""
-	echo "  Program $1 was not found on this system."
-	echo "  This program is part of $2."
-	echo "  Please install it and re-run ./configure"
-	echo ""
-	exit 1
-}
-
-AC_MSG_CHECKING([operating system])
-AC_MSG_RESULT($host)
-case $host in
-*-linux*)
-	AC_MSG_RESULT([ (Linux back-end)])
-	AC_DEFINE(OS_LINUX, 1, [Linux implementations])
-	AC_SUBST(OS_LINUX)
-	backend="linux"
-	os="linux"
-	threads="pthreads"
-
-	# HIDAPI/hidraw libs
-	PKG_CHECK_MODULES([libudev], [libudev], true, [hidapi_lib_error libudev])
-	LIBS_HIDRAW_PR+=" $libudev_LIBS"
-	CFLAGS_HIDRAW+=" $libudev_CFLAGS"
-
-	# HIDAPI/libusb libs
-	AC_CHECK_LIB([rt], [clock_gettime], [LIBS_LIBUSB_PRIVATE+=" -lrt"], [hidapi_lib_error librt])
-	PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], true, [hidapi_lib_error libusb-1.0])
-	LIBS_LIBUSB_PRIVATE+=" $libusb_LIBS"
-	CFLAGS_LIBUSB+=" $libusb_CFLAGS"
-	;;
-*-darwin*)
-	AC_MSG_RESULT([ (Mac OS X back-end)])
-	AC_DEFINE(OS_DARWIN, 1, [Mac implementation])
-	AC_SUBST(OS_DARWIN)
-	backend="mac"
-	os="darwin"
-	threads="pthreads"
-	LIBS="${LIBS} -framework IOKit -framework CoreFoundation"
-	;;
-*-freebsd*)
-	AC_MSG_RESULT([ (FreeBSD back-end)])
-	AC_DEFINE(OS_FREEBSD, 1, [FreeBSD implementation])
-	AC_SUBST(OS_FREEBSD)
-	backend="libusb"
-	os="freebsd"
-	threads="pthreads"
-
-	CFLAGS="$CFLAGS -I/usr/local/include"
-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
-	LIBS="${LIBS}"
-	AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb])
-	AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])
-	echo libs_priv: $LIBS_LIBUSB_PRIVATE
-	;;
-*-kfreebsd*)
-	AC_MSG_RESULT([ (kFreeBSD back-end)])
-	AC_DEFINE(OS_KFREEBSD, 1, [kFreeBSD implementation])
-	AC_SUBST(OS_KFREEBSD)
-	backend="libusb"
-	os="kfreebsd"
-	threads="pthreads"
-
-	AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb])
-	echo libs_priv: $LIBS_LIBUSB_PRIVATE
-	;;
-*-mingw*)
-	AC_MSG_RESULT([ (Windows back-end, using MinGW)])
-	backend="windows"
-	os="windows"
-	threads="windows"
-	win_implementation="mingw"
-	;;
-*-cygwin*)
-	AC_MSG_RESULT([ (Windows back-end, using Cygwin)])
-	backend="windows"
-	os="windows"
-	threads="windows"
-	win_implementation="cygwin"
-	;;
-*)
-	AC_MSG_ERROR([HIDAPI is not supported on your operating system yet])
-esac
-
-LIBS_HIDRAW="${LIBS} ${LIBS_HIDRAW_PR}"
-LIBS_LIBUSB="${LIBS} ${LIBS_LIBUSB_PRIVATE}"
-AC_SUBST([LIBS_HIDRAW])
-AC_SUBST([LIBS_LIBUSB])
-AC_SUBST([CFLAGS_LIBUSB])
-AC_SUBST([CFLAGS_HIDRAW])
-
-if test "x$os" = xwindows; then
-	AC_DEFINE(OS_WINDOWS, 1, [Windows implementations])
-	AC_SUBST(OS_WINDOWS)
-	LDFLAGS="${LDFLAGS} -no-undefined"
-	LIBS="${LIBS} -lsetupapi"
-fi
-
-if test "x$threads" = xpthreads; then
-	AX_PTHREAD([found_pthreads=yes], [found_pthreads=no])
-
-	if test "x$found_pthreads" = xyes; then
-		if test "x$os" = xlinux; then
-			# Only use pthreads for libusb implementation on Linux.
-			LIBS_LIBUSB="$PTHREAD_LIBS $LIBS_LIBUSB"
-			CFLAGS_LIBUSB="$CFLAGS_LIBUSB $PTHREAD_CFLAGS"
-			# There's no separate CC on Linux for threading,
-			# so it's ok that both implementations use $PTHREAD_CC
-			CC="$PTHREAD_CC"
-		else
-			LIBS="$PTHREAD_LIBS $LIBS"
-			CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-			CC="$PTHREAD_CC"
-		fi
-	fi
-fi
-
-# Test GUI
-AC_ARG_ENABLE([testgui],
-	[AS_HELP_STRING([--enable-testgui],
-		[enable building of test GUI (default n)])],
-	[testgui_enabled=$enableval],
-	[testgui_enabled='no'])
-AM_CONDITIONAL([BUILD_TESTGUI], [test "x$testgui_enabled" != "xno"])
-
-# Configure the MacOS TestGUI app bundle
-rm -Rf testgui/TestGUI.app
-mkdir -p testgui/TestGUI.app
-cp -R ${srcdir}/testgui/TestGUI.app.in/* testgui/TestGUI.app
-chmod -R u+w testgui/TestGUI.app
-mkdir testgui/TestGUI.app/Contents/MacOS/
-
-if test "x$testgui_enabled" != "xno"; then
-	if test "x$os" = xdarwin; then
-		# On Mac OS, don't use pkg-config.
-		AC_CHECK_PROG([foxconfig], [fox-config], [fox-config], false)
-		if test "x$foxconfig" = "xfalse"; then
-			hidapi_prog_error fox-config "FOX Toolkit"
-		fi
-		LIBS_TESTGUI+=`$foxconfig --libs`
-		LIBS_TESTGUI+=" -framework Cocoa -L/usr/X11R6/lib"
-		CFLAGS_TESTGUI+=`$foxconfig --cflags`
-		OBJCFLAGS+=" -x objective-c++"
-	elif test "x$os" = xwindows; then
-		# On Windows, just set the paths for Fox toolkit
-		if test "x$win_implementation" = xmingw; then
-			CFLAGS_TESTGUI="-I\$(srcdir)/../../hidapi-externals/fox/include -g -c"
-			LIBS_TESTGUI=" -mwindows \$(srcdir)/../../hidapi-externals/fox/lib/libFOX-1.6.a -lgdi32 -Wl,--enable-auto-import -static-libgcc -static-libstdc++ -lkernel32"
-		else
-			# Cygwin
-			CFLAGS_TESTGUI="-DWIN32 -I\$(srcdir)/../../hidapi-externals/fox/include -g -c"
-			LIBS_TESTGUI="\$(srcdir)/../../hidapi-externals/fox/lib/libFOX-cygwin-1.6.a -lgdi32 -Wl,--enable-auto-import -static-libgcc -static-libstdc++ -lkernel32"
-		fi
-	else
-		# On Linux and FreeBSD platforms, use pkg-config to find fox.
-		PKG_CHECK_MODULES([fox], [fox17], [], [PKG_CHECK_MODULES([fox], [fox])])
-		LIBS_TESTGUI="${LIBS_TESTGUI} $fox_LIBS"
-		if test "x$os" = xfreebsd; then
-			LIBS_TESTGUI="${LIBS_TESTGUI} -L/usr/local/lib"
-		fi
-		CFLAGS_TESTGUI="${CFLAGS_TESTGUI} $fox_CFLAGS"
-	fi
-fi
-AC_SUBST([LIBS_TESTGUI])
-AC_SUBST([CFLAGS_TESTGUI])
-AC_SUBST([backend])
-
-# OS info for Automake
-AM_CONDITIONAL(OS_LINUX, test "x$os" = xlinux)
-AM_CONDITIONAL(OS_DARWIN, test "x$os" = xdarwin)
-AM_CONDITIONAL(OS_FREEBSD, test "x$os" = xfreebsd)
-AM_CONDITIONAL(OS_KFREEBSD, test "x$os" = xkfreebsd)
-AM_CONDITIONAL(OS_WINDOWS, test "x$os" = xwindows)
-
-AC_CONFIG_HEADERS([config.h])
-
-if test "x$os" = "xlinux"; then
-	AC_CONFIG_FILES([pc/hidapi-hidraw.pc])
-	AC_CONFIG_FILES([pc/hidapi-libusb.pc])
-else
-	AC_CONFIG_FILES([pc/hidapi.pc])
-fi
-
-AC_SUBST(LTLDFLAGS)
-
-AC_CONFIG_FILES([Makefile \
-	hidtest/Makefile \
-	libusb/Makefile \
-	linux/Makefile \
-	mac/Makefile \
-	testgui/Makefile \
-	windows/Makefile])
-AC_OUTPUT
--- a/Externals/hidapi/doxygen/Doxyfile
+++ b/Externals/hidapi/doxygen/Doxyfile
--- a/Externals/hidapi/hidtest/.gitignore
+++ b/Externals/hidapi/hidtest/.gitignore
@ -1,17 +0,0 @@
-Debug
-Release
-*.exp
-*.ilk
-*.lib
-*.suo
-*.vcproj.*
-*.ncb
-*.suo
-*.dll
-*.pdb
-*.o
-.deps/
-.libs/
-hidtest-hidraw
-hidtest-libusb
-hidtest
--- a/Externals/hidapi/hidtest/Makefile.am
+++ b/Externals/hidapi/hidtest/Makefile.am
@ -1,20 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/hidapi/
-
-## Linux
-if OS_LINUX
-noinst_PROGRAMS = hidtest-libusb hidtest-hidraw
-
-hidtest_hidraw_SOURCES = hidtest.cpp
-hidtest_hidraw_LDADD = $(top_builddir)/linux/libhidapi-hidraw.la
-
-hidtest_libusb_SOURCES = hidtest.cpp
-hidtest_libusb_LDADD = $(top_builddir)/libusb/libhidapi-libusb.la
-else
-
-# Other OS's
-noinst_PROGRAMS = hidtest
-
-hidtest_SOURCES = hidtest.cpp
-hidtest_LDADD = $(top_builddir)/$(backend)/libhidapi.la
-
-endif
--- a/Externals/hidapi/hidtest/hidtest.cpp
+++ b/Externals/hidapi/hidtest/hidtest.cpp
@ -1,194 +0,0 @@
-/*******************************************************
- Windows HID simplification
-
- Alan Ott
- Signal 11 Software
-
- 8/22/2009
-
- Copyright 2009
- 
- This contents of this file may be used by anyone
- for any reason without any conditions and may be
- used as a starting point for your own applications
- which use HIDAPI.
-********************************************************/
-
-#include <stdio.h>
-#include <wchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include "hidapi.h"
-
-// Headers needed for sleeping.
-#ifdef _WIN32
-	#include <windows.h>
-#else
-	#include <unistd.h>
-#endif
-
-int main(int argc, char* argv[])
-{
-	int res;
-	unsigned char buf[256];
-	#define MAX_STR 255
-	wchar_t wstr[MAX_STR];
-	hid_device *handle;
-	int i;
-
-#ifdef WIN32
-	UNREFERENCED_PARAMETER(argc);
-	UNREFERENCED_PARAMETER(argv);
-#endif
-
-	struct hid_device_info *devs, *cur_dev;
-	
-	if (hid_init())
-		return -1;
-
-	devs = hid_enumerate(0x0, 0x0);
-	cur_dev = devs;	
-	while (cur_dev) {
-		printf("Device Found\n  type: %04hx %04hx\n  path: %s\n  serial_number: %ls", cur_dev->vendor_id, cur_dev->product_id, cur_dev->path, cur_dev->serial_number);
-		printf("\n");
-		printf("  Manufacturer: %ls\n", cur_dev->manufacturer_string);
-		printf("  Product:      %ls\n", cur_dev->product_string);
-		printf("  Release:      %hx\n", cur_dev->release_number);
-		printf("  Interface:    %d\n",  cur_dev->interface_number);
-		printf("\n");
-		cur_dev = cur_dev->next;
-	}
-	hid_free_enumeration(devs);
-
-	// Set up the command buffer.
-	memset(buf,0x00,sizeof(buf));
-	buf[0] = 0x01;
-	buf[1] = 0x81;
-	
-
-	// Open the device using the VID, PID,
-	// and optionally the Serial number.
-	////handle = hid_open(0x4d8, 0x3f, L"12345");
-	handle = hid_open(0x4d8, 0x3f, NULL);
-	if (!handle) {
-		printf("unable to open device\n");
- 		return 1;
-	}
-
-	// Read the Manufacturer String
-	wstr[0] = 0x0000;
-	res = hid_get_manufacturer_string(handle, wstr, MAX_STR);
-	if (res < 0)
-		printf("Unable to read manufacturer string\n");
-	printf("Manufacturer String: %ls\n", wstr);
-
-	// Read the Product String
-	wstr[0] = 0x0000;
-	res = hid_get_product_string(handle, wstr, MAX_STR);
-	if (res < 0)
-		printf("Unable to read product string\n");
-	printf("Product String: %ls\n", wstr);
-
-	// Read the Serial Number String
-	wstr[0] = 0x0000;
-	res = hid_get_serial_number_string(handle, wstr, MAX_STR);
-	if (res < 0)
-		printf("Unable to read serial number string\n");
-	printf("Serial Number String: (%d) %ls", wstr[0], wstr);
-	printf("\n");
-
-	// Read Indexed String 1
-	wstr[0] = 0x0000;
-	res = hid_get_indexed_string(handle, 1, wstr, MAX_STR);
-	if (res < 0)
-		printf("Unable to read indexed string 1\n");
-	printf("Indexed String 1: %ls\n", wstr);
-
-	// Set the hid_read() function to be non-blocking.
-	hid_set_nonblocking(handle, 1);
-	
-	// Try to read from the device. There shoud be no
-	// data here, but execution should not block.
-	res = hid_read(handle, buf, 17);
-
-	// Send a Feature Report to the device
-	buf[0] = 0x2;
-	buf[1] = 0xa0;
-	buf[2] = 0x0a;
-	buf[3] = 0x00;
-	buf[4] = 0x00;
-	res = hid_send_feature_report(handle, buf, 17);
-	if (res < 0) {
-		printf("Unable to send a feature report.\n");
-	}
-
-	memset(buf,0,sizeof(buf));
-
-	// Read a Feature Report from the device
-	buf[0] = 0x2;
-	res = hid_get_feature_report(handle, buf, sizeof(buf));
-	if (res < 0) {
-		printf("Unable to get a feature report.\n");
-		printf("%ls", hid_error(handle));
-	}
-	else {
-		// Print out the returned buffer.
-		printf("Feature Report\n   ");
-		for (i = 0; i < res; i++)
-			printf("%02hhx ", buf[i]);
-		printf("\n");
-	}
-
-	memset(buf,0,sizeof(buf));
-
-	// Toggle LED (cmd 0x80). The first byte is the report number (0x1).
-	buf[0] = 0x1;
-	buf[1] = 0x80;
-	res = hid_write(handle, buf, 17);
-	if (res < 0) {
-		printf("Unable to write()\n");
-		printf("Error: %ls\n", hid_error(handle));
-	}
-	
-
-	// Request state (cmd 0x81). The first byte is the report number (0x1).
-	buf[0] = 0x1;
-	buf[1] = 0x81;
-	hid_write(handle, buf, 17);
-	if (res < 0)
-		printf("Unable to write() (2)\n");
-
-	// Read requested state. hid_read() has been set to be
-	// non-blocking by the call to hid_set_nonblocking() above.
-	// This loop demonstrates the non-blocking nature of hid_read().
-	res = 0;
-	while (res == 0) {
-		res = hid_read(handle, buf, sizeof(buf));
-		if (res == 0)
-			printf("waiting...\n");
-		if (res < 0)
-			printf("Unable to read()\n");
-		#ifdef WIN32
-		Sleep(500);
-		#else
-		usleep(500*1000);
-		#endif
-	}
-
-	printf("Data read:\n   ");
-	// Print out the returned buffer.
-	for (i = 0; i < res; i++)
-		printf("%02hhx ", buf[i]);
-	printf("\n");
-
-	hid_close(handle);
-
-	/* Free static HIDAPI objects. */
-	hid_exit();
-
-#ifdef WIN32
-	system("pause");
-#endif
-
-	return 0;
-}
--- a/Externals/hidapi/libusb/.gitignore
+++ b/Externals/hidapi/libusb/.gitignore
@ -1,8 +0,0 @@
-*.o
-*.so
-*.la
-*.lo
-*.a
-.libs
-.deps
-hidtest-libusb
--- a/Externals/hidapi/libusb/Makefile-manual
+++ b/Externals/hidapi/libusb/Makefile-manual
@ -1,18 +0,0 @@
-
-
-OS=$(shell uname)
-
-ifeq ($(OS), Linux)
-	FILE=Makefile.linux
-endif
-
-ifeq ($(OS), FreeBSD)
-	FILE=Makefile.freebsd
-endif
-
-ifeq ($(FILE), )
-all:
-	$(error Your platform ${OS} is not supported by hidapi/libusb at this time.)
-endif
-
-include $(FILE)
--- a/Externals/hidapi/libusb/Makefile.am
+++ b/Externals/hidapi/libusb/Makefile.am
@ -1,27 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/hidapi $(CFLAGS_LIBUSB)
-
-if OS_LINUX
-lib_LTLIBRARIES = libhidapi-libusb.la
-libhidapi_libusb_la_SOURCES = hid.c
-libhidapi_libusb_la_LDFLAGS = $(LTLDFLAGS) $(PTHREAD_CFLAGS)
-libhidapi_libusb_la_LIBADD = $(LIBS_LIBUSB)
-endif
-
-if OS_FREEBSD
-lib_LTLIBRARIES = libhidapi.la
-libhidapi_la_SOURCES = hid.c
-libhidapi_la_LDFLAGS = $(LTLDFLAGS)
-libhidapi_la_LIBADD = $(LIBS_LIBUSB)
-endif
-
-if OS_KFREEBSD
-lib_LTLIBRARIES = libhidapi.la
-libhidapi_la_SOURCES = hid.c
-libhidapi_la_LDFLAGS = $(LTLDFLAGS)
-libhidapi_la_LIBADD = $(LIBS_LIBUSB)
-endif
-
-hdrdir = $(includedir)/hidapi
-hdr_HEADERS = $(top_srcdir)/hidapi/hidapi.h
-
-EXTRA_DIST = Makefile-manual
--- a/Externals/hidapi/libusb/Makefile.freebsd
+++ b/Externals/hidapi/libusb/Makefile.freebsd
@ -1,46 +0,0 @@
-###########################################
-# Simple Makefile for HIDAPI test program
-#
-# Alan Ott
-# Signal 11 Software
-# 2010-06-01
-###########################################
-
-all: hidtest libs
-
-libs: libhidapi.so
-
-CC       ?= cc
-CFLAGS   ?= -Wall -g -fPIC
-
-CXX      ?= c++
-CXXFLAGS ?= -Wall -g
-
-COBJS     = hid.o
-CPPOBJS   = ../hidtest/hidtest.o
-OBJS      = $(COBJS) $(CPPOBJS)
-INCLUDES  = -I../hidapi -I/usr/local/include
-LDFLAGS   = -L/usr/local/lib
-LIBS      = -lusb -liconv -pthread
-
-
-# Console Test Program
-hidtest: $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
-
-# Shared Libs
-libhidapi.so: $(COBJS)
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,$@.0 $^ -o $@ $(LIBS)
-
-# Objects
-$(COBJS): %.o: %.c
-	$(CC) $(CFLAGS) -c $(INCLUDES) $< -o $@
-
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(INCLUDES) $< -o $@
-
-
-clean:
-	rm -f $(OBJS) hidtest libhidapi.so ../hidtest/hidtest.o
-
-.PHONY: clean libs
--- a/Externals/hidapi/libusb/Makefile.linux
+++ b/Externals/hidapi/libusb/Makefile.linux
@ -1,49 +0,0 @@
-###########################################
-# Simple Makefile for HIDAPI test program
-#
-# Alan Ott
-# Signal 11 Software
-# 2010-06-01
-###########################################
-
-all: hidtest-libusb libs
-
-libs: libhidapi-libusb.so
-
-CC       ?= gcc
-CFLAGS   ?= -Wall -g -fpic
-
-CXX      ?= g++
-CXXFLAGS ?= -Wall -g -fpic
-
-LDFLAGS  ?= -Wall -g
-
-COBJS_LIBUSB = hid.o
-COBJS = $(COBJS_LIBUSB)
-CPPOBJS   = ../hidtest/hidtest.o
-OBJS      = $(COBJS) $(CPPOBJS)
-LIBS_USB  = `pkg-config libusb-1.0 --libs` -lrt -lpthread
-LIBS      = $(LIBS_USB)
-INCLUDES ?= -I../hidapi `pkg-config libusb-1.0 --cflags`
-
-
-# Console Test Program
-hidtest-libusb: $(COBJS_LIBUSB) $(CPPOBJS)
-	$(CXX) $(LDFLAGS) $^ $(LIBS_USB) -o $@
-
-# Shared Libs
-libhidapi-libusb.so: $(COBJS_LIBUSB)
-	$(CC) $(LDFLAGS) $(LIBS_USB) -shared -fpic -Wl,-soname,$@.0 $^ -o $@
-
-# Objects
-$(COBJS): %.o: %.c
-	$(CC) $(CFLAGS) -c $(INCLUDES) $< -o $@
-
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(INCLUDES) $< -o $@
-
-
-clean:
-	rm -f $(OBJS) hidtest-libusb libhidapi-libusb.so ../hidtest/hidtest.o
-
-.PHONY: clean libs
--- a/Externals/hidapi/linux/.gitignore
+++ b/Externals/hidapi/linux/.gitignore
@ -1,18 +0,0 @@
-Debug
-Release
-*.exp
-*.ilk
-*.lib
-*.suo
-*.vcproj.*
-*.ncb
-*.suo
-*.dll
-*.pdb
-*.o
-*.so
-hidtest-hidraw
-.deps
-.libs
-*.lo
-*.la
--- a/Externals/hidapi/linux/Makefile-manual
+++ b/Externals/hidapi/linux/Makefile-manual
@ -1,49 +0,0 @@
-###########################################
-# Simple Makefile for HIDAPI test program
-#
-# Alan Ott
-# Signal 11 Software
-# 2010-06-01
-###########################################
-
-all: hidtest-hidraw libs
-
-libs: libhidapi-hidraw.so
-
-CC       ?= gcc
-CFLAGS   ?= -Wall -g -fpic
-
-CXX      ?= g++
-CXXFLAGS ?= -Wall -g -fpic
-
-LDFLAGS  ?= -Wall -g
-
-
-COBJS     = hid.o
-CPPOBJS   = ../hidtest/hidtest.o
-OBJS      = $(COBJS) $(CPPOBJS)
-LIBS_UDEV = `pkg-config libudev --libs` -lrt
-LIBS      = $(LIBS_UDEV)
-INCLUDES ?= -I../hidapi `pkg-config libusb-1.0 --cflags`
-
-
-# Console Test Program
-hidtest-hidraw: $(COBJS) $(CPPOBJS)
-	$(CXX) $(LDFLAGS) $^ $(LIBS_UDEV) -o $@
-
-# Shared Libs
-libhidapi-hidraw.so: $(COBJS)
-	$(CC) $(LDFLAGS) $(LIBS_UDEV) -shared -fpic -Wl,-soname,$@.0 $^ -o $@
-
-# Objects
-$(COBJS): %.o: %.c
-	$(CC) $(CFLAGS) -c $(INCLUDES) $< -o $@
-
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(INCLUDES) $< -o $@
-
-
-clean:
-	rm -f $(OBJS) hidtest-hidraw libhidapi-hidraw.so ../hidtest/hidtest.o
-
-.PHONY: clean libs
--- a/Externals/hidapi/linux/Makefile.am
+++ b/Externals/hidapi/linux/Makefile.am
@ -1,10 +0,0 @@
-lib_LTLIBRARIES = libhidapi-hidraw.la
-libhidapi_hidraw_la_SOURCES = hid.c
-libhidapi_hidraw_la_LDFLAGS = $(LTLDFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/hidapi/ $(CFLAGS_HIDRAW)
-libhidapi_hidraw_la_LIBADD = $(LIBS_HIDRAW)
-
-hdrdir = $(includedir)/hidapi
-hdr_HEADERS = $(top_srcdir)/hidapi/hidapi.h
-
-EXTRA_DIST = Makefile-manual
--- a/Externals/hidapi/m4/.gitignore
+++ b/Externals/hidapi/m4/.gitignore
@ -1,5 +0,0 @@
-# Ignore All, except pkg.m4, and of course this file.
-*
-!.gitignore
-!pkg.m4
-!ax_pthread.m4
--- a/Externals/hidapi/m4/ax_pthread.m4
+++ b/Externals/hidapi/m4/ax_pthread.m4
@ -1,309 +0,0 @@
-# ===========================================================================
-#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro figures out how to build C programs using POSIX threads. It
-#   sets the PTHREAD_LIBS output variable to the threads library and linker
-#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-#   flags that are needed. (The user can also force certain compiler
-#   flags/libs to be tested by setting these environment variables.)
-#
-#   Also sets PTHREAD_CC to any special C compiler that is needed for
-#   multi-threaded programs (defaults to the value of CC otherwise). (This
-#   is necessary on AIX to use the special cc_r compiler alias.)
-#
-#   NOTE: You are assumed to not only compile your program with these flags,
-#   but also link it with them as well. e.g. you should link with
-#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#
-#   If you are only building threads programs, you may wish to use these
-#   variables in your default LIBS, CFLAGS, and CC:
-#
-#     LIBS="$PTHREAD_LIBS $LIBS"
-#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#     CC="$PTHREAD_CC"
-#
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-#   PTHREAD_CFLAGS.
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-#   is not found. If ACTION-IF-FOUND is not specified, the default action
-#   will define HAVE_PTHREAD.
-#
-#   Please let the authors know if this macro fails on any platform, or if
-#   you have any other suggestions or comments. This macro was based on work
-#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-#   grateful for the helpful feedback of numerous users.
-#
-#   Updated for Autoconf 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 18
-
-AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-AC_DEFUN([AX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_PUSH([C])
-ax_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-        AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
-        AC_MSG_RESULT($ax_pthread_ok)
-        if test x"$ax_pthread_ok" = xno; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads too;
-#      also defines -D_REENTRANT)
-#      ... -mt is also the pthreads flag for HP/aCC
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case ${host_os} in
-        solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-        # a function called by this macro, so we could check for that, but
-        # who knows whether they'll stub that too in a future libc.)  So,
-        # we'll just look for -pthreads and -lpthread first:
-
-        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
-        ;;
-
-        darwin*)
-        ax_pthread_flags="-pthread $ax_pthread_flags"
-        ;;
-esac
-
-if test x"$ax_pthread_ok" = xno; then
-for flag in $ax_pthread_flags; do
-
-        case $flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $flag])
-                PTHREAD_CFLAGS="$flag"
-                ;;
-
-                pthread-config)
-                AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
-                if test x"$ax_pthread_config" = xno; then continue; fi
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                ;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$flag])
-                PTHREAD_LIBS="-l$flag"
-                ;;
-        esac
-
-        save_LIBS="$LIBS"
-        save_CFLAGS="$CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-                        static void routine(void *a) { a = 0; }
-                        static void *start_routine(void *a) { return a; }],
-                       [pthread_t th; pthread_attr_t attr;
-                        pthread_create(&th, 0, start_routine, 0);
-                        pthread_join(th, 0);
-                        pthread_attr_init(&attr);
-                        pthread_cleanup_push(routine, 0);
-                        pthread_cleanup_pop(0) /* ; */])],
-                [ax_pthread_ok=yes],
-                [])
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        AC_MSG_RESULT($ax_pthread_ok)
-        if test "x$ax_pthread_ok" = xyes; then
-                break;
-        fi
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$ax_pthread_ok" = xyes; then
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        AC_MSG_CHECKING([for joinable pthread attribute])
-        attr_name=unknown
-        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-                           [int attr = $attr; return attr /* ; */])],
-                [attr_name=$attr; break],
-                [])
-        done
-        AC_MSG_RESULT($attr_name)
-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
-                               [Define to necessary symbol if this constant
-                                uses a non-standard name on your system.])
-        fi
-
-        AC_MSG_CHECKING([if more special flags are required for pthreads])
-        flag=no
-        case ${host_os} in
-            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
-            osf* | hpux*) flag="-D_REENTRANT";;
-            solaris*)
-            if test "$GCC" = "yes"; then
-                flag="-D_REENTRANT"
-            else
-                flag="-mt -D_REENTRANT"
-            fi
-            ;;
-        esac
-        AC_MSG_RESULT(${flag})
-        if test "x$flag" != xno; then
-            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-        fi
-
-        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-            ax_cv_PTHREAD_PRIO_INHERIT, [
-                AC_LINK_IFELSE([
-                    AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
-                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
-            AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.]))
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        # More AIX lossage: must compile with xlc_r or cc_r
-        if test x"$GCC" != xyes; then
-          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
-        else
-          PTHREAD_CC=$CC
-        fi
-else
-        PTHREAD_CC="$CC"
-fi
-
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_CFLAGS)
-AC_SUBST(PTHREAD_CC)
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$ax_pthread_ok" = xyes; then
-        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
-        :
-else
-        ax_pthread_ok=no
-        $2
-fi
-AC_LANG_POP
-])dnl AX_PTHREAD
--- a/Externals/hidapi/m4/pkg.m4
+++ b/Externals/hidapi/m4/pkg.m4
@ -1,157 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
--- a/Externals/hidapi/mac/.gitignore
+++ b/Externals/hidapi/mac/.gitignore
@ -1,17 +0,0 @@
-Debug
-Release
-*.exp
-*.ilk
-*.lib
-*.suo
-*.vcproj.*
-*.ncb
-*.suo
-*.dll
-*.pdb
-*.o
-hidapi-hidtest
-.deps
-.libs
-*.la
-*.lo
--- a/Externals/hidapi/mac/Makefile-manual
+++ b/Externals/hidapi/mac/Makefile-manual
@ -1,32 +0,0 @@
-###########################################
-# Simple Makefile for HIDAPI test program
-#
-# Alan Ott
-# Signal 11 Software
-# 2010-07-03
-###########################################
-
-all: hidtest
-
-CC=gcc
-CXX=g++
-COBJS=hid.o
-CPPOBJS=../hidtest/hidtest.o
-OBJS=$(COBJS) $(CPPOBJS)
-CFLAGS+=-I../hidapi -Wall -g -c 
-LIBS=-framework IOKit -framework CoreFoundation
-
-
-hidtest: $(OBJS)
-	g++ -Wall -g $^ $(LIBS) -o hidtest
-
-$(COBJS): %.o: %.c
-	$(CC) $(CFLAGS) $< -o $@
-
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CFLAGS) $< -o $@
-
-clean:
-	rm -f *.o hidtest $(CPPOBJS)
-
-.PHONY: clean
--- a/Externals/hidapi/mac/Makefile.am
+++ b/Externals/hidapi/mac/Makefile.am
@ -1,9 +0,0 @@
-lib_LTLIBRARIES = libhidapi.la
-libhidapi_la_SOURCES = hid.c
-libhidapi_la_LDFLAGS = $(LTLDFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/hidapi/
-
-hdrdir = $(includedir)/hidapi
-hdr_HEADERS = $(top_srcdir)/hidapi/hidapi.h
-
-EXTRA_DIST = Makefile-manual
--- a/Externals/hidapi/pc/.gitignore
+++ b/Externals/hidapi/pc/.gitignore
@ -1 +0,0 @@
-*.pc
--- a/Externals/hidapi/pc/hidapi-hidraw.pc.in
+++ b/Externals/hidapi/pc/hidapi-hidraw.pc.in
@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: hidapi-hidraw
-Description: C Library for USB/Bluetooth HID device access from Linux, Mac OS X, FreeBSD, and Windows. This is the hidraw implementation.
-Version: @VERSION@
-Libs: -L${libdir} -lhidapi-hidraw
-Cflags: -I${includedir}/hidapi
--- a/Externals/hidapi/pc/hidapi-libusb.pc.in
+++ b/Externals/hidapi/pc/hidapi-libusb.pc.in
@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: hidapi-libusb
-Description: C Library for USB HID device access from Linux, Mac OS X, FreeBSD, and Windows. This is the libusb implementation.
-Version: @VERSION@
-Libs: -L${libdir} -lhidapi-libusb
-Cflags: -I${includedir}/hidapi
--- a/Externals/hidapi/pc/hidapi.pc.in
+++ b/Externals/hidapi/pc/hidapi.pc.in
@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: hidapi
-Description: C Library for USB/Bluetooth HID device access from Linux, Mac OS X, FreeBSD, and Windows.
-Version: @VERSION@
-Libs: -L${libdir} -lhidapi
-Cflags: -I${includedir}/hidapi
--- a/Externals/hidapi/testgui/.gitignore
+++ b/Externals/hidapi/testgui/.gitignore
@ -1,20 +0,0 @@
-Debug
-Release
-*.exp
-*.ilk
-*.lib
-*.suo
-*.vcproj.*
-*.ncb
-*.suo
-*.dll
-*.pdb
-*.o
-hidapi-testgui
-hidapi-hidraw-testgui
-hidapi-libusb-testgui
-.deps
-.libs
-*.la
-*.lo
-TestGUI.app
--- a/Externals/hidapi/testgui/Makefile-manual
+++ b/Externals/hidapi/testgui/Makefile-manual
@ -1,26 +0,0 @@
-
-
-OS=$(shell uname)
-
-ifeq ($(OS), Darwin)
-	FILE=Makefile.mac
-endif
-
-ifneq (,$(findstring MINGW,$(OS)))
-	FILE=Makefile.mingw
-endif
-
-ifeq ($(OS), Linux)
-	FILE=Makefile.linux
-endif
-
-ifeq ($(OS), FreeBSD)
-	FILE=Makefile.freebsd
-endif
-
-ifeq ($(FILE), )
-all:
-	$(error Your platform ${OS} is not supported at this time.)
-endif
-
-include $(FILE)
--- a/Externals/hidapi/testgui/Makefile.am
+++ b/Externals/hidapi/testgui/Makefile.am
@ -1,43 +0,0 @@
-
-AM_CPPFLAGS = -I$(top_srcdir)/hidapi/ $(CFLAGS_TESTGUI)
-
-if OS_LINUX
-## Linux
-bin_PROGRAMS = hidapi-hidraw-testgui hidapi-libusb-testgui
-
-hidapi_hidraw_testgui_SOURCES = test.cpp
-hidapi_hidraw_testgui_LDADD = $(top_builddir)/linux/libhidapi-hidraw.la $(LIBS_TESTGUI)
-
-hidapi_libusb_testgui_SOURCES = test.cpp
-hidapi_libusb_testgui_LDADD = $(top_builddir)/libusb/libhidapi-libusb.la $(LIBS_TESTGUI)
-else
-## Other OS's
-bin_PROGRAMS = hidapi-testgui
-
-hidapi_testgui_SOURCES = test.cpp
-hidapi_testgui_LDADD = $(top_builddir)/$(backend)/libhidapi.la $(LIBS_TESTGUI)
-endif
-
-if OS_DARWIN
-hidapi_testgui_SOURCES = test.cpp mac_support_cocoa.m mac_support.h
-# Rules for copying the binary and its dependencies into the app bundle.
-TestGUI.app/Contents/MacOS/hidapi-testgui$(EXEEXT): hidapi-testgui$(EXEEXT)
-	$(srcdir)/copy_to_bundle.sh
-
-all: all-am TestGUI.app/Contents/MacOS/hidapi-testgui$(EXEEXT)
-
-endif
-
-EXTRA_DIST = \
- copy_to_bundle.sh \
- Makefile-manual \
- Makefile.freebsd \
- Makefile.linux \
- Makefile.mac \
- Makefile.mingw \
- TestGUI.app.in \
- testgui.sln \
- testgui.vcproj
-
-distclean-local:
-	rm -rf TestGUI.app
--- a/Externals/hidapi/testgui/Makefile.freebsd
+++ b/Externals/hidapi/testgui/Makefile.freebsd
@ -1,33 +0,0 @@
-###########################################
-# Simple Makefile for HIDAPI test program
-#
-# Alan Ott
-# Signal 11 Software
-# 2010-06-01
-###########################################
-
-all: testgui
-
-CC=cc
-CXX=c++
-COBJS=../libusb/hid.o
-CPPOBJS=test.o
-OBJS=$(COBJS) $(CPPOBJS)
-CFLAGS=-I../hidapi -I/usr/local/include `fox-config --cflags` -Wall -g -c
-LDFLAGS= -L/usr/local/lib
-LIBS= -lusb -liconv `fox-config --libs` -pthread
-
-
-testgui: $(OBJS)
-	$(CXX) -Wall -g $^ $(LDFLAGS) -o $@ $(LIBS)
-
-$(COBJS): %.o: %.c
-	$(CC) $(CFLAGS) $< -o $@
-
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CFLAGS) $< -o $@
-
-clean:
-	rm *.o testgui
-
-.PHONY: clean
--- a/Externals/hidapi/testgui/Makefile.linux
+++ b/Externals/hidapi/testgui/Makefile.linux
@ -1,32 +0,0 @@
-###########################################
-# Simple Makefile for HIDAPI test program
-#
-# Alan Ott
-# Signal 11 Software
-# 2010-06-01
-###########################################
-
-all: testgui
-
-CC=gcc
-CXX=g++
-COBJS=../libusb/hid.o
-CPPOBJS=test.o
-OBJS=$(COBJS) $(CPPOBJS)
-CFLAGS=-I../hidapi -Wall -g -c `fox-config --cflags` `pkg-config libusb-1.0 --cflags`
-LIBS=-ludev -lrt -lpthread `fox-config --libs` `pkg-config libusb-1.0 --libs`
-
-
-testgui: $(OBJS)
-	g++ -Wall -g $^ $(LIBS) -o testgui
-
-$(COBJS): %.o: %.c
-	$(CC) $(CFLAGS) $< -o $@
-
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CFLAGS) $< -o $@
-
-clean:
-	rm *.o testgui
-
-.PHONY: clean
--- a/Externals/hidapi/testgui/Makefile.mac
+++ b/Externals/hidapi/testgui/Makefile.mac
@ -1,46 +0,0 @@
-###########################################
-# Simple Makefile for HIDAPI test program
-#
-# Alan Ott
-# Signal 11 Software
-# 2010-07-03
-###########################################
-
-all: hidapi-testgui
-
-CC=gcc
-CXX=g++
-COBJS=../mac/hid.o
-CPPOBJS=test.o
-OBJCOBJS=mac_support_cocoa.o
-OBJS=$(COBJS) $(CPPOBJS) $(OBJCOBJS)
-CFLAGS=-I../hidapi -Wall -g -c `fox-config --cflags`
-LDFLAGS=-L/usr/X11R6/lib
-LIBS=`fox-config --libs` -framework IOKit -framework CoreFoundation -framework Cocoa
-
-
-hidapi-testgui: $(OBJS) TestGUI.app
-	g++ -Wall -g $(OBJS) $(LIBS) $(LDFLAGS) -o hidapi-testgui
-	./copy_to_bundle.sh
-	#cp TestGUI.app/Contents/MacOS/hidapi-testgui  TestGUI.app/Contents/MacOS/tg
-	#cp start.sh TestGUI.app/Contents/MacOS/hidapi-testgui
-
-$(COBJS): %.o: %.c
-	$(CC) $(CFLAGS) $< -o $@
-
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CFLAGS) $< -o $@
-
-$(OBJCOBJS): %.o: %.m
-	$(CXX) $(CFLAGS) -x objective-c++ $< -o $@
-
-TestGUI.app: TestGUI.app.in
-	rm -Rf TestGUI.app
-	mkdir -p TestGUI.app
-	cp -R TestGUI.app.in/ TestGUI.app
-
-clean:
-	rm -f $(OBJS) hidapi-testgui
-	rm -Rf TestGUI.app
-
-.PHONY: clean
--- a/Externals/hidapi/testgui/Makefile.mingw
+++ b/Externals/hidapi/testgui/Makefile.mingw
@ -1,32 +0,0 @@
-###########################################
-# Simple Makefile for HIDAPI test program
-#
-# Alan Ott
-# Signal 11 Software
-# 2010-06-01
-###########################################
-
-all: hidapi-testgui
-
-CC=gcc
-CXX=g++
-COBJS=../windows/hid.o
-CPPOBJS=test.o
-OBJS=$(COBJS) $(CPPOBJS)
-CFLAGS=-I../hidapi -I../../hidapi-externals/fox/include -g -c
-LIBS= -mwindows -lsetupapi -L../../hidapi-externals/fox/lib -Wl,-Bstatic -lFOX-1.6 -Wl,-Bdynamic -lgdi32 -Wl,--enable-auto-import -static-libgcc -static-libstdc++ -lkernel32
-
-
-hidapi-testgui: $(OBJS)
-	g++ -g $^ $(LIBS) -o hidapi-testgui
-
-$(COBJS): %.o: %.c
-	$(CC) $(CFLAGS) $< -o $@
-
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CFLAGS) $< -o $@
-
-clean:
-	rm -f *.o hidapi-testgui.exe
-
-.PHONY: clean
--- a/Externals/hidapi/testgui/TestGUI.app.in/Contents/Info.plist
+++ b/Externals/hidapi/testgui/TestGUI.app.in/Contents/Info.plist
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDisplayName</key>
-	<string></string>
-	<key>CFBundleExecutable</key>
-	<string>hidapi-testgui</string>
-	<key>CFBundleIconFile</key>
-	<string>Signal11.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>us.signal11.hidtestgui</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>testgui</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-</dict>
-</plist>
--- a/Externals/hidapi/testgui/TestGUI.app.in/Contents/PkgInfo
+++ b/Externals/hidapi/testgui/TestGUI.app.in/Contents/PkgInfo
@ -1 +0,0 @@
-APPL????
--- a/Externals/hidapi/testgui/TestGUI.app.in/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/Externals/hidapi/testgui/TestGUI.app.in/Contents/Resources/English.lproj/InfoPlist.strings
--- a/Externals/hidapi/testgui/TestGUI.app.in/Contents/Resources/Signal11.icns
+++ b/Externals/hidapi/testgui/TestGUI.app.in/Contents/Resources/Signal11.icns
--- a/Externals/hidapi/testgui/copy_to_bundle.sh
+++ b/Externals/hidapi/testgui/copy_to_bundle.sh
@ -1,97 +0,0 @@
-#!/bin/bash
-
-#### Configuration:
-# The name of the executable. It is assumed
-# that it is in the current working directory.
-EXE_NAME=hidapi-testgui
-# Path to the executable directory inside the bundle.
-# This must be an absolute path, so use $PWD.
-EXEPATH=$PWD/TestGUI.app/Contents/MacOS
-# Libraries to explicitly bundle, even though they
-# may not be in /opt/local. One per line. These
-# are used with grep, so only a portion of the name
-# is required. eg: libFOX, libz, etc.
-LIBS_TO_BUNDLE=libFOX
-
-
-function copydeps {
-	local file=$1
-	# echo "Copying deps for $file...."
-	local BASE_OF_EXE=`basename $file`
-
-	# A will contain the dependencies of this library
-	local A=`otool -LX $file |cut -f 1 -d " "`
-	local i
-	for i in $A; do
-		local BASE=`basename $i`
-
-		# See if it's a lib we specifically want to bundle
-		local bundle_this_lib=0
-		local j
-		for j in $LIBS_TO_BUNDLE; do
-			echo $i |grep -q $j
-			if [ $? -eq 0 ]; then
-				bundle_this_lib=1
-				echo "bundling $i because it's in the list."
-				break;
-			fi
-		done
-
-		# See if it's in /opt/local. Bundle all in /opt/local
-		local isOptLocal=0
-		echo $i |grep -q /opt/local
-		if [ $? -eq 0 ]; then
-			isOptLocal=1
-			echo "bundling $i because it's in /opt/local."
-		fi
-		
-		# Bundle the library
-		if [ $isOptLocal -ne 0 ] || [ $bundle_this_lib -ne 0 ]; then
-
-			# Copy the file into the bundle if it exists.
-			if [ -f $EXEPATH/$BASE ]; then
-				z=0
-			else
-				cp $i $EXEPATH
-				chmod 755 $EXEPATH/$BASE
-			fi
-			
-			
-			# echo "$BASE_OF_EXE depends on $BASE"
-			
-			# Fix the paths using install_name_tool and then
-			# call this function recursively for each dependency
-			# of this library. 
-			if [ $BASE_OF_EXE != $BASE ]; then
-			
-				# Fix the paths
-				install_name_tool -id @executable_path/$BASE $EXEPATH/$BASE
-				install_name_tool -change $i @executable_path/$BASE $EXEPATH/$BASE_OF_EXE
-
-				# Call this function (recursive) on
-				# on each dependency of this library.
-				copydeps $EXEPATH/$BASE
-			fi
-		fi
-	done
-}
-
-rm -f $EXEPATH/*
-
-# Copy the binary into the bundle. Use ../libtool to do this if it's
-# available beacuse if $EXE_NAME was built with autotools, it will be
-# necessary.  If ../libtool not available, just use cp to do the copy, but
-# only if $EXE_NAME is a binary.
-if [ -x ../libtool ]; then
-	../libtool --mode=install cp $EXE_NAME $EXEPATH
-else
-	file -bI $EXE_NAME |grep binary
-	if [ $? -ne 0 ]; then
-		echo "There is no ../libtool and $EXE_NAME is not a binary."
-		echo "I'm not sure what to do."
-		exit 1
-	else
-		cp $EXE_NAME $EXEPATH
-	fi
-fi
-copydeps $EXEPATH/$EXE_NAME
--- a/Externals/hidapi/testgui/mac_support.cpp
+++ b/Externals/hidapi/testgui/mac_support.cpp
@ -1,134 +0,0 @@
-/*******************************
- Mac support for HID Test GUI
- 
- Alan Ott
- Signal 11 Software
-
- Some of this code is from Apple Documentation, most notably
- http://developer.apple.com/legacy/mac/library/documentation/AppleScript/Conceptual/AppleEvents/AppleEvents.pdf 
-*******************************/
-
-#include <Carbon/Carbon.h>
-#include <fx.h>
-
-
-extern FXMainWindow *g_main_window;
-
-static pascal OSErr HandleQuitMessage(const AppleEvent *theAppleEvent, AppleEvent 
-									  *reply, long handlerRefcon) 
-{
-	puts("Quitting\n");
-	FXApp::instance()->exit();
-	return 0;
-}
-
-static pascal OSErr HandleReopenMessage(const AppleEvent *theAppleEvent, AppleEvent 
-									  *reply, long handlerRefcon) 
-{
-	puts("Showing");
-	g_main_window->show();
-	return 0;
-}
-
-static pascal OSErr HandleWildCardMessage(const AppleEvent *theAppleEvent, AppleEvent 
-									  *reply, long handlerRefcon) 
-{
-	puts("WildCard\n");
-	return 0;
-}
-
-OSStatus AEHandler(EventHandlerCallRef inCaller, EventRef inEvent, void* inRefcon) 
-{ 
-    Boolean     release = false; 
-    EventRecord eventRecord; 
-    OSErr       ignoreErrForThisSample; 
-	
-    // Events of type kEventAppleEvent must be removed from the queue 
-    //  before being passed to AEProcessAppleEvent. 
-    if (IsEventInQueue(GetMainEventQueue(), inEvent)) 
-    { 
-        // RemoveEventFromQueue will release the event, which will 
-        //  destroy it if we don't retain it first. 
-        RetainEvent(inEvent); 
-        release = true; 
-        RemoveEventFromQueue(GetMainEventQueue(), inEvent); 
-    } 
-    // Convert the event ref to the type AEProcessAppleEvent expects. 
-    ConvertEventRefToEventRecord(inEvent, &eventRecord); 
-    ignoreErrForThisSample = AEProcessAppleEvent(&eventRecord); 
-    if (release) 
-        ReleaseEvent(inEvent); 
-    // This Carbon event has been handled, even if no AppleEvent handlers 
-    //  were installed for the Apple event. 
-    return noErr; 
-}
-
-static void HandleEvent(EventRecord *event) 
-{ 
-	//printf("What: %d message %x\n", event->what, event->message);
-	if (event->what == osEvt) {
-		if (((event->message >> 24) & 0xff) == suspendResumeMessage) {
-			if (event->message & resumeFlag) {
-				g_main_window->show();				
-			}
-		}
-	}
-
-#if 0
-    switch (event->what) 
-    { 
-        case mouseDown: 
-            //HandleMouseDown(event); 
-            break; 
-        case keyDown: 
-        case autoKey: 
-            //HandleKeyPress(event); 
-            break; 
-        case kHighLevelEvent: 
-			puts("Calling ProcessAppleEvent\n");
-            AEProcessAppleEvent(event); 
-            break; 
-    } 
-#endif
-} 
-
-void
-init_apple_message_system()
-{
-	OSErr err;
-	static const EventTypeSpec appleEvents[] = 
-	{
-		{ kEventClassAppleEvent, kEventAppleEvent }
-	};
-	
-	/* Install the handler for Apple Events */
-	InstallApplicationEventHandler(NewEventHandlerUPP(AEHandler), 
-	              GetEventTypeCount(appleEvents), appleEvents, 0, NULL); 
-
-	/* Install handlers for the individual Apple Events that come
-	   from the Dock icon: the Reopen (click), and the Quit messages. */
-	err = AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, 
-	              NewAEEventHandlerUPP(HandleQuitMessage), 0, false);
-	err = AEInstallEventHandler(kCoreEventClass, kAEReopenApplication, 
-	              NewAEEventHandlerUPP(HandleReopenMessage), 0, false);
-#if 0
-	// Left as an example of a wild card match.
-	err = AEInstallEventHandler(kCoreEventClass, typeWildCard, 
-	              NewAEEventHandlerUPP(HandleWildMessage), 0, false);
-#endif
-}
-
-void
-check_apple_events()
-{
-	RgnHandle       cursorRgn = NULL; 
-	Boolean         gotEvent=TRUE; 
-	EventRecord     event; 
-
-	while (gotEvent) { 
-		gotEvent = WaitNextEvent(everyEvent, &event, 0L/*timeout*/, cursorRgn); 
-		if (gotEvent) { 
-			HandleEvent(&event); 
-		} 
-	}
-}
--- a/Externals/hidapi/testgui/mac_support.h
+++ b/Externals/hidapi/testgui/mac_support.h
@ -1,17 +0,0 @@
-/*******************************
- Mac support for HID Test GUI
- 
- Alan Ott
- Signal 11 Software
- 
-*******************************/
-
-#ifndef MAC_SUPPORT_H__
-#define MAC_SUPPORT_H__
-
-extern "C" {
-	void init_apple_message_system();
-	void check_apple_events();
-}
-
-#endif
--- a/Externals/hidapi/testgui/mac_support_cocoa.m
+++ b/Externals/hidapi/testgui/mac_support_cocoa.m
@ -1,94 +0,0 @@
-/*******************************
- Mac support for HID Test GUI
- 
- Alan Ott
- Signal 11 Software
-*******************************/
-
-#include <fx.h>
-#import <Cocoa/Cocoa.h>
-
-extern FXMainWindow *g_main_window;
-
-
-@interface MyAppDelegate : NSObject
-{
-} 
-@end
-
-@implementation MyAppDelegate
- (void) applicationWillBecomeActive:(NSNotification*)notif
-{
-	printf("WillBecomeActive\n");
-	g_main_window->show();
-
-}
-
- (void) applicationWillTerminate:(NSNotification*)notif
-{
-	/* Doesn't get called. Not sure why */
-	printf("WillTerminate\n");
-	FXApp::instance()->exit();
-}
-
- (NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication*)sender
-{
-	/* Doesn't get called. Not sure why */
-	printf("ShouldTerminate\n");
-	return YES;
-}
-
- (void) applicationWillHide:(NSNotification*)notif
-{
-	printf("WillHide\n");
-	g_main_window->hide();
-}
-
- (void) handleQuitEvent:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent
-{
-	printf("QuitEvent\n");
-	FXApp::instance()->exit();
-}
-
-@end
-
-extern "C" {
-
-void
-init_apple_message_system()
-{
-	static MyAppDelegate *d = [MyAppDelegate new];
-
-	[[NSApplication sharedApplication] setDelegate:d];
-
-	/* Register for Apple Events. */
-	/* This is from
-	   http://stackoverflow.com/questions/1768497/application-exit-event */
-	NSAppleEventManager *aem = [NSAppleEventManager sharedAppleEventManager];
-	[aem setEventHandler:d
-	     andSelector:@selector(handleQuitEvent:withReplyEvent:)
-	     forEventClass:kCoreEventClass andEventID:kAEQuitApplication];
-}
-
-void
-check_apple_events()
-{
-	NSApplication *app = [NSApplication sharedApplication];
-
-	NSAutoreleasePool *pool = [NSAutoreleasePool new];
-	while (1) {
-		NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
-		                        untilDate:nil
-                                        inMode:NSDefaultRunLoopMode
-                                        dequeue:YES];
-		if (event == NULL)
-			break;
-		else {
-			//printf("Event happened: Type: %d\n", event->_type);
-			[app sendEvent: event];
-		}
-	}
-	[pool release];
-}
-
-} /* extern "C" */
--- a/Externals/hidapi/testgui/start.sh
+++ b/Externals/hidapi/testgui/start.sh
@ -1,2 +0,0 @@
-#!/bin/bash
-xterm -e /Users/alan/work/hidapi/testgui/TestGUI.app/Contents/MacOS/tg
--- a/Externals/hidapi/testgui/test.cpp
+++ b/Externals/hidapi/testgui/test.cpp
@ -1,532 +0,0 @@
-/*******************************************************
- Demo Program for HIDAPI
- 
- Alan Ott
- Signal 11 Software
-
- 2010-07-20
-
- Copyright 2010, All Rights Reserved
- 
- This contents of this file may be used by anyone
- for any reason without any conditions and may be
- used as a starting point for your own applications
- which use HIDAPI.
-********************************************************/
-
-
-#include <fx.h>
-
-#include "hidapi.h"
-#include "mac_support.h"
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-
-#ifdef _WIN32
-	// Thanks Microsoft, but I know how to use strncpy().
-	#pragma warning(disable:4996)
-#endif
-
-class MainWindow : public FXMainWindow {
-	FXDECLARE(MainWindow)
-	
-public:
-	enum {
-		ID_FIRST = FXMainWindow::ID_LAST,
-		ID_CONNECT,
-		ID_DISCONNECT,
-		ID_RESCAN,
-		ID_SEND_OUTPUT_REPORT,
-		ID_SEND_FEATURE_REPORT,
-		ID_GET_FEATURE_REPORT,
-		ID_CLEAR,
-		ID_TIMER,
-		ID_MAC_TIMER,
-		ID_LAST,
-	};
-	
-private:
-	FXList *device_list;
-	FXButton *connect_button;
-	FXButton *disconnect_button;
-	FXButton *rescan_button;
-	FXButton *output_button;
-	FXLabel *connected_label;
-	FXTextField *output_text;
-	FXTextField *output_len;
-	FXButton *feature_button;
-	FXButton *get_feature_button;
-	FXTextField *feature_text;
-	FXTextField *feature_len;
-	FXTextField *get_feature_text;
-	FXText *input_text;
-	FXFont *title_font;
-	
-	struct hid_device_info *devices;
-	hid_device *connected_device;
-	size_t getDataFromTextField(FXTextField *tf, char *buf, size_t len);
-	int getLengthFromTextField(FXTextField *tf);
-
-
-protected:
-	MainWindow() {};
-public:
-	MainWindow(FXApp *a);
-	~MainWindow();
-	virtual void create();
-	
-	long onConnect(FXObject *sender, FXSelector sel, void *ptr);
-	long onDisconnect(FXObject *sender, FXSelector sel, void *ptr);
-	long onRescan(FXObject *sender, FXSelector sel, void *ptr);
-	long onSendOutputReport(FXObject *sender, FXSelector sel, void *ptr);
-	long onSendFeatureReport(FXObject *sender, FXSelector sel, void *ptr);
-	long onGetFeatureReport(FXObject *sender, FXSelector sel, void *ptr);
-	long onClear(FXObject *sender, FXSelector sel, void *ptr);
-	long onTimeout(FXObject *sender, FXSelector sel, void *ptr);
-	long onMacTimeout(FXObject *sender, FXSelector sel, void *ptr);
-};
-
-// FOX 1.7 changes the timeouts to all be nanoseconds.
-// Fox 1.6 had all timeouts as milliseconds.
-#if (FOX_MINOR >= 7)
-	const int timeout_scalar = 1000*1000;
-#else
-	const int timeout_scalar = 1;
-#endif
-
-FXMainWindow *g_main_window;
-
-
-FXDEFMAP(MainWindow) MainWindowMap [] = {
-	FXMAPFUNC(SEL_COMMAND, MainWindow::ID_CONNECT, MainWindow::onConnect ),
-	FXMAPFUNC(SEL_COMMAND, MainWindow::ID_DISCONNECT, MainWindow::onDisconnect ),
-	FXMAPFUNC(SEL_COMMAND, MainWindow::ID_RESCAN, MainWindow::onRescan ),
-	FXMAPFUNC(SEL_COMMAND, MainWindow::ID_SEND_OUTPUT_REPORT, MainWindow::onSendOutputReport ),
-	FXMAPFUNC(SEL_COMMAND, MainWindow::ID_SEND_FEATURE_REPORT, MainWindow::onSendFeatureReport ),
-	FXMAPFUNC(SEL_COMMAND, MainWindow::ID_GET_FEATURE_REPORT, MainWindow::onGetFeatureReport ),
-	FXMAPFUNC(SEL_COMMAND, MainWindow::ID_CLEAR, MainWindow::onClear ),
-	FXMAPFUNC(SEL_TIMEOUT, MainWindow::ID_TIMER, MainWindow::onTimeout ),
-	FXMAPFUNC(SEL_TIMEOUT, MainWindow::ID_MAC_TIMER, MainWindow::onMacTimeout ),
-};
-
-FXIMPLEMENT(MainWindow, FXMainWindow, MainWindowMap, ARRAYNUMBER(MainWindowMap));
-
-MainWindow::MainWindow(FXApp *app)
-	: FXMainWindow(app, "HIDAPI Test Application", NULL, NULL, DECOR_ALL, 200,100, 425,700)
-{
-	devices = NULL;
-	connected_device = NULL;
-
-	FXVerticalFrame *vf = new FXVerticalFrame(this, LAYOUT_FILL_Y|LAYOUT_FILL_X);
-
-	FXLabel *label = new FXLabel(vf, "HIDAPI Test Tool");
-	title_font = new FXFont(getApp(), "Arial", 14, FXFont::Bold);
-	label->setFont(title_font);
-	
-	new FXLabel(vf,
-		"Select a device and press Connect.", NULL, JUSTIFY_LEFT);
-	new FXLabel(vf,
-		"Output data bytes can be entered in the Output section, \n"
-		"separated by space, comma or brackets. Data starting with 0x\n"
-		"is treated as hex. Data beginning with a 0 is treated as \n"
-		"octal. All other data is treated as decimal.", NULL, JUSTIFY_LEFT);
-	new FXLabel(vf,
-		"Data received from the device appears in the Input section.",
-		NULL, JUSTIFY_LEFT);
-	new FXLabel(vf,
-		"Optionally, a report length may be specified. Extra bytes are\n"
-		"padded with zeros. If no length is specified, the length is \n"
-		"inferred from the data.",
-		NULL, JUSTIFY_LEFT);
-	new FXLabel(vf, "");
-
-	// Device List and Connect/Disconnect buttons
-	FXHorizontalFrame *hf = new FXHorizontalFrame(vf, LAYOUT_FILL_X);
-	//device_list = new FXList(new FXHorizontalFrame(hf,FRAME_SUNKEN|FRAME_THICK, 0,0,0,0, 0,0,0,0), NULL, 0, LISTBOX_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0,0,300,200);
-	device_list = new FXList(new FXHorizontalFrame(hf,FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0), NULL, 0, LISTBOX_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0,0,300,200);
-	FXVerticalFrame *buttonVF = new FXVerticalFrame(hf);
-	connect_button = new FXButton(buttonVF, "Connect", NULL, this, ID_CONNECT, BUTTON_NORMAL|LAYOUT_FILL_X);
-	disconnect_button = new FXButton(buttonVF, "Disconnect", NULL, this, ID_DISCONNECT, BUTTON_NORMAL|LAYOUT_FILL_X);
-	disconnect_button->disable();
-	rescan_button = new FXButton(buttonVF, "Re-Scan devices", NULL, this, ID_RESCAN, BUTTON_NORMAL|LAYOUT_FILL_X);
-	new FXHorizontalFrame(buttonVF, 0, 0,0,0,0, 0,0,50,0);
-
-	connected_label = new FXLabel(vf, "Disconnected");
-	
-	new FXHorizontalFrame(vf);
-	
-	// Output Group Box
-	FXGroupBox *gb = new FXGroupBox(vf, "Output", FRAME_GROOVE|LAYOUT_FILL_X);
-	FXMatrix *matrix = new FXMatrix(gb, 3, MATRIX_BY_COLUMNS|LAYOUT_FILL_X);
-	new FXLabel(matrix, "Data");
-	new FXLabel(matrix, "Length");
-	new FXLabel(matrix, "");
-
-	//hf = new FXHorizontalFrame(gb, LAYOUT_FILL_X);
-	output_text = new FXTextField(matrix, 30, NULL, 0, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
-	output_text->setText("1 0x81 0");
-	output_len = new FXTextField(matrix, 5, NULL, 0, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
-	output_button = new FXButton(matrix, "Send Output Report", NULL, this, ID_SEND_OUTPUT_REPORT, BUTTON_NORMAL|LAYOUT_FILL_X);
-	output_button->disable();
-	//new FXHorizontalFrame(matrix, LAYOUT_FILL_X);
-
-	//hf = new FXHorizontalFrame(gb, LAYOUT_FILL_X);
-	feature_text = new FXTextField(matrix, 30, NULL, 0, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
-	feature_len = new FXTextField(matrix, 5, NULL, 0, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
-	feature_button = new FXButton(matrix, "Send Feature Report", NULL, this, ID_SEND_FEATURE_REPORT, BUTTON_NORMAL|LAYOUT_FILL_X);
-	feature_button->disable();
-
-	get_feature_text = new FXTextField(matrix, 30, NULL, 0, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
-	new FXWindow(matrix);
-	get_feature_button = new FXButton(matrix, "Get Feature Report", NULL, this, ID_GET_FEATURE_REPORT, BUTTON_NORMAL|LAYOUT_FILL_X);
-	get_feature_button->disable();
-
-
-	// Input Group Box
-	gb = new FXGroupBox(vf, "Input", FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y);
-	FXVerticalFrame *innerVF = new FXVerticalFrame(gb, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-	input_text = new FXText(new FXHorizontalFrame(innerVF,LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, 0,0,0,0, 0,0,0,0), NULL, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-	input_text->setEditable(false);
-	new FXButton(innerVF, "Clear", NULL, this, ID_CLEAR, BUTTON_NORMAL|LAYOUT_RIGHT);
-	
-
-}
-
-MainWindow::~MainWindow()
-{
-	if (connected_device)
-		hid_close(connected_device);
-	hid_exit();
-	delete title_font;
-}
-
-void
-MainWindow::create()
-{
-	FXMainWindow::create();
-	show();
-
-	onRescan(NULL, 0, NULL);
-	
-
-#ifdef __APPLE__
-	init_apple_message_system();
-#endif
-	
-	getApp()->addTimeout(this, ID_MAC_TIMER,
-		50 * timeout_scalar /*50ms*/);
-}
-
-long
-MainWindow::onConnect(FXObject *sender, FXSelector sel, void *ptr)
-{
-	if (connected_device != NULL)
-		return 1;
-	
-	FXint cur_item = device_list->getCurrentItem();
-	if (cur_item < 0)
-		return -1;
-	FXListItem *item = device_list->getItem(cur_item);
-	if (!item)
-		return -1;
-	struct hid_device_info *device_info = (struct hid_device_info*) item->getData();
-	if (!device_info)
-		return -1;
-	
-	connected_device =  hid_open_path(device_info->path);
-	
-	if (!connected_device) {
-		FXMessageBox::error(this, MBOX_OK, "Device Error", "Unable To Connect to Device");
-		return -1;
-	}
-	
-	hid_set_nonblocking(connected_device, 1);
-
-	getApp()->addTimeout(this, ID_TIMER,
-		5 * timeout_scalar /*5ms*/);
-	
-	FXString s;
-	s.format("Connected to: %04hx:%04hx -", device_info->vendor_id, device_info->product_id);
-	s += FXString(" ") + device_info->manufacturer_string;
-	s += FXString(" ") + device_info->product_string;
-	connected_label->setText(s);
-	output_button->enable();
-	feature_button->enable();
-	get_feature_button->enable();
-	connect_button->disable();
-	disconnect_button->enable();
-	input_text->setText("");
-
-
-	return 1;
-}
-
-long
-MainWindow::onDisconnect(FXObject *sender, FXSelector sel, void *ptr)
-{
-	hid_close(connected_device);
-	connected_device = NULL;
-	connected_label->setText("Disconnected");
-	output_button->disable();
-	feature_button->disable();
-	get_feature_button->disable();
-	connect_button->enable();
-	disconnect_button->disable();
-
-	getApp()->removeTimeout(this, ID_TIMER);
-	
-	return 1;
-}
-
-long
-MainWindow::onRescan(FXObject *sender, FXSelector sel, void *ptr)
-{
-	struct hid_device_info *cur_dev;
-
-	device_list->clearItems();
-	
-	// List the Devices
-	hid_free_enumeration(devices);
-	devices = hid_enumerate(0x0, 0x0);
-	cur_dev = devices;	
-	while (cur_dev) {
-		// Add it to the List Box.
-		FXString s;
-		FXString usage_str;
-		s.format("%04hx:%04hx -", cur_dev->vendor_id, cur_dev->product_id);
-		s += FXString(" ") + cur_dev->manufacturer_string;
-		s += FXString(" ") + cur_dev->product_string;
-		usage_str.format(" (usage: %04hx:%04hx) ", cur_dev->usage_page, cur_dev->usage);
-		s += usage_str;
-		FXListItem *li = new FXListItem(s, NULL, cur_dev);
-		device_list->appendItem(li);
-		
-		cur_dev = cur_dev->next;
-	}
-
-	if (device_list->getNumItems() == 0)
-		device_list->appendItem("*** No Devices Connected ***");
-	else {
-		device_list->selectItem(0);
-	}
-
-	return 1;
-}
-
-size_t
-MainWindow::getDataFromTextField(FXTextField *tf, char *buf, size_t len)
-{
-	const char *delim = " ,{}\t\r\n";
-	FXString data = tf->getText();
-	const FXchar *d = data.text();
-	size_t i = 0;
-	
-	// Copy the string from the GUI.
-	size_t sz = strlen(d);
-	char *str = (char*) malloc(sz+1);
-	strcpy(str, d);
-	
-	// For each token in the string, parse and store in buf[].
-	char *token = strtok(str, delim);
-	while (token) {
-		char *endptr;
-		long int val = strtol(token, &endptr, 0);
-		buf[i++] = val;
-		token = strtok(NULL, delim);
-	}
-	
-	free(str);
-	return i;
-}
-
-/* getLengthFromTextField()
-   Returns length:
-	 0: empty text field
-	>0: valid length
-	-1: invalid length */
-int
-MainWindow::getLengthFromTextField(FXTextField *tf)
-{
-	long int len;
-	FXString str = tf->getText();
-	size_t sz = str.length();
-
-	if (sz > 0) {
-		char *endptr;
-		len = strtol(str.text(), &endptr, 0);
-		if (endptr != str.text() && *endptr == '\0') {
-			if (len <= 0) {
-				FXMessageBox::error(this, MBOX_OK, "Invalid length", "Enter a length greater than zero.");
-				return -1;
-			}
-			return len;
-		}
-		else
-			return -1;
-	}
-
-	return 0;
-}
-
-long
-MainWindow::onSendOutputReport(FXObject *sender, FXSelector sel, void *ptr)
-{
-	char buf[256];
-	size_t data_len, len;
-	int textfield_len;
-
-	memset(buf, 0x0, sizeof(buf));
-	textfield_len = getLengthFromTextField(output_len);
-	data_len = getDataFromTextField(output_text, buf, sizeof(buf));
-
-	if (textfield_len < 0) {
-		FXMessageBox::error(this, MBOX_OK, "Invalid length", "Length field is invalid. Please enter a number in hex, octal, or decimal.");
-		return 1;
-	}
-
-	if (textfield_len > sizeof(buf)) {
-		FXMessageBox::error(this, MBOX_OK, "Invalid length", "Length field is too long.");
-		return 1;
-	}
-
-	len = (textfield_len)? textfield_len: data_len;
-
-	int res = hid_write(connected_device, (const unsigned char*)buf, len);
-	if (res < 0) {
-		FXMessageBox::error(this, MBOX_OK, "Error Writing", "Could not write to device. Error reported was: %ls", hid_error(connected_device));
-	}
-	
-	return 1;
-}
-
-long
-MainWindow::onSendFeatureReport(FXObject *sender, FXSelector sel, void *ptr)
-{
-	char buf[256];
-	size_t data_len, len;
-	int textfield_len;
-
-	memset(buf, 0x0, sizeof(buf));
-	textfield_len = getLengthFromTextField(feature_len);
-	data_len = getDataFromTextField(feature_text, buf, sizeof(buf));
-
-	if (textfield_len < 0) {
-		FXMessageBox::error(this, MBOX_OK, "Invalid length", "Length field is invalid. Please enter a number in hex, octal, or decimal.");
-		return 1;
-	}
-
-	if (textfield_len > sizeof(buf)) {
-		FXMessageBox::error(this, MBOX_OK, "Invalid length", "Length field is too long.");
-		return 1;
-	}
-
-	len = (textfield_len)? textfield_len: data_len;
-
-	int res = hid_send_feature_report(connected_device, (const unsigned char*)buf, len); 
-	if (res < 0) {
-		FXMessageBox::error(this, MBOX_OK, "Error Writing", "Could not send feature report to device. Error reported was: %ls", hid_error(connected_device));
-	}
-
-	return 1;
-}
-
-long
-MainWindow::onGetFeatureReport(FXObject *sender, FXSelector sel, void *ptr)
-{
-	char buf[256];
-	size_t len;
-
-	memset(buf, 0x0, sizeof(buf));
-	len = getDataFromTextField(get_feature_text, buf, sizeof(buf));
-
-	if (len != 1) {
-		FXMessageBox::error(this, MBOX_OK, "Too many numbers", "Enter only a single report number in the text field");
-	}
-
-	int res = hid_get_feature_report(connected_device, (unsigned char*)buf, sizeof(buf));
-	if (res < 0) {
-		FXMessageBox::error(this, MBOX_OK, "Error Getting Report", "Could not get feature report from device. Error reported was: %ls", hid_error(connected_device));
-	}
-
-	if (res > 0) {
-		FXString s;
-		s.format("Returned Feature Report. %d bytes:\n", res);
-		for (int i = 0; i < res; i++) {
-			FXString t;
-			t.format("%02hhx ", buf[i]);
-			s += t;
-			if ((i+1) % 4 == 0)
-				s += " ";
-			if ((i+1) % 16 == 0)
-				s += "\n";
-		}
-		s += "\n";
-		input_text->appendText(s);
-		input_text->setBottomLine(INT_MAX);
-	}
-	
-	return 1;
-}
-
-long
-MainWindow::onClear(FXObject *sender, FXSelector sel, void *ptr)
-{
-	input_text->setText("");
-	return 1;
-}
-
-long
-MainWindow::onTimeout(FXObject *sender, FXSelector sel, void *ptr)
-{
-	unsigned char buf[256];
-	int res = hid_read(connected_device, buf, sizeof(buf));
-	
-	if (res > 0) {
-		FXString s;
-		s.format("Received %d bytes:\n", res);
-		for (int i = 0; i < res; i++) {
-			FXString t;
-			t.format("%02hhx ", buf[i]);
-			s += t;
-			if ((i+1) % 4 == 0)
-				s += " ";
-			if ((i+1) % 16 == 0)
-				s += "\n";
-		}
-		s += "\n";
-		input_text->appendText(s);
-		input_text->setBottomLine(INT_MAX);
-	}
-	if (res < 0) {
-		input_text->appendText("hid_read() returned error\n");
-		input_text->setBottomLine(INT_MAX);
-	}
-
-	getApp()->addTimeout(this, ID_TIMER,
-		5 * timeout_scalar /*5ms*/);
-	return 1;
-}
-
-long
-MainWindow::onMacTimeout(FXObject *sender, FXSelector sel, void *ptr)
-{
-#ifdef __APPLE__
-	check_apple_events();
-	
-	getApp()->addTimeout(this, ID_MAC_TIMER,
-		50 * timeout_scalar /*50ms*/);
-#endif
-
-	return 1;
-}
-
-int main(int argc, char **argv)
-{
-	FXApp app("HIDAPI Test Application", "Signal 11 Software");
-	app.init(argc, argv);
-	g_main_window = new MainWindow(&app);
-	app.create();
-	app.run();
-	return 0;
-}
--- a/Externals/hidapi/testgui/testgui.sln
+++ b/Externals/hidapi/testgui/testgui.sln
@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgui", "testgui.vcproj", "{08769AC3-785A-4DDC-BFC7-1775414B7AB7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{08769AC3-785A-4DDC-BFC7-1775414B7AB7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{08769AC3-785A-4DDC-BFC7-1775414B7AB7}.Debug|Win32.Build.0 = Debug|Win32
-		{08769AC3-785A-4DDC-BFC7-1775414B7AB7}.Release|Win32.ActiveCfg = Release|Win32
-		{08769AC3-785A-4DDC-BFC7-1775414B7AB7}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/Externals/hidapi/testgui/testgui.vcproj
+++ b/Externals/hidapi/testgui/testgui.vcproj
@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="testgui"
-	ProjectGUID="{08769AC3-785A-4DDC-BFC7-1775414B7AB7}"
-	RootNamespace="testgui"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\hidapi-externals\fox\include&quot;;..\hidapi"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="setupapi.lib fox-1.6.lib"
-				OutputFile="$(ProjectName).exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\hidapi\objfre_wxp_x86\i386;&quot;..\..\hidapi-externals\fox\lib&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				EntryPointSymbol="mainCRTStartup"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;..\..\hidapi-externals\fox\include&quot;;..\hidapi"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="setupapi.lib fox-1.6.lib"
-				OutputFile="$(ProjectName).exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\hidapi\objfre_wxp_x86\i386;&quot;..\..\hidapi-externals\fox\lib&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				EntryPointSymbol="mainCRTStartup"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\windows\hid.c"
-				>
-			</File>
-			<File
-				RelativePath=".\test.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\hidapi\hidapi.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/Externals/hidapi/udev/99-hid.rules
+++ b/Externals/hidapi/udev/99-hid.rules
@ -1,32 +0,0 @@
-# This is a sample udev file for HIDAPI devices which changes the permissions
-# to 0666 (world readable/writable) for a specified device on Linux systems.
-
-
-# If you are using the libusb implementation of hidapi (hid-libusb.c), then
-# use something like the following line, substituting the VID and PID with
-# those of your device. Note that for kernels before 2.6.24, you will need
-# to substitute "usb" with "usb_device". It shouldn't hurt to use two lines
-# (one each way) for compatibility with older systems.
-
-# HIDAPI/libusb
-SUBSYSTEM=="usb", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="003f", MODE="0666"
-
-
-# If you are using the hidraw implementation, then do something like the
-# following, substituting the VID and PID with your device. Busnum 1 is USB.
-
-# HIDAPI/hidraw
-KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="003f", MODE="0666"
-
-# Once done, optionally rename this file for your device, and drop it into
-# /etc/udev/rules.d and unplug and re-plug your device. This is all that is
-# necessary to see the new permissions. Udev does not have to be restarted.
-
-# Note that the hexadecimal values for VID and PID are case sensitive and
-# must be lower case.
-
-# If you think permissions of 0666 are too loose, then see:
-# http://reactivated.net/writing_udev_rules.html for more information on finer
-# grained permission setting. For example, it might be sufficient to just
-# set the group or user owner for specific devices (for example the plugdev
-# group on some systems).
--- a/Externals/hidapi/windows/.gitignore
+++ b/Externals/hidapi/windows/.gitignore
@ -1,15 +0,0 @@
-Debug
-Release
-*.exp
-*.ilk
-*.lib
-*.suo
-*.vcproj.*
-*.ncb
-*.suo
-*.dll
-*.pdb
-.deps
-.libs
-*.lo
-*.la
--- a/Externals/hidapi/windows/Makefile-manual
+++ b/Externals/hidapi/windows/Makefile-manual
@ -1,14 +0,0 @@
-
-
-OS=$(shell uname)
-
-ifneq (,$(findstring MINGW,$(OS)))
-	FILE=Makefile.mingw
-endif
-
-ifeq ($(FILE), )
-all:
-	$(error Your platform ${OS} is not supported at this time.)
-endif
-
-include $(FILE)
--- a/Externals/hidapi/windows/Makefile.am
+++ b/Externals/hidapi/windows/Makefile.am
@ -1,16 +0,0 @@
-lib_LTLIBRARIES = libhidapi.la
-libhidapi_la_SOURCES = hid.c
-libhidapi_la_LDFLAGS = $(LTLDFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/hidapi/
-libhidapi_la_LIBADD = $(LIBS)
-
-hdrdir = $(includedir)/hidapi
-hdr_HEADERS = $(top_srcdir)/hidapi/hidapi.h
-
-EXTRA_DIST = \
-  ddk_build \
-  hidapi.vcproj \
-  hidtest.vcproj \
-  Makefile-manual \
-  Makefile.mingw \
-  hidapi.sln
--- a/Externals/hidapi/windows/Makefile.mingw
+++ b/Externals/hidapi/windows/Makefile.mingw
@ -1,35 +0,0 @@
-###########################################
-# Simple Makefile for HIDAPI test program
-#
-# Alan Ott
-# Signal 11 Software
-# 2010-06-01
-###########################################
-
-all: hidtest libhidapi.dll
-
-CC=gcc
-CXX=g++
-COBJS=hid.o
-CPPOBJS=../hidtest/hidtest.o
-OBJS=$(COBJS) $(CPPOBJS)
-CFLAGS=-I../hidapi -g -c
-LIBS= -lsetupapi
-DLL_LDFLAGS = -mwindows -lsetupapi
-
-hidtest: $(OBJS)
-	g++ -g $^ $(LIBS) -o hidtest
-
-libhidapi.dll: $(OBJS)
-	$(CC) -g $^ $(DLL_LDFLAGS) -o libhidapi.dll
-
-$(COBJS): %.o: %.c
-	$(CC) $(CFLAGS) $< -o $@
-
-$(CPPOBJS): %.o: %.cpp
-	$(CXX) $(CFLAGS) $< -o $@
-
-clean:
-	rm *.o ../hidtest/*.o hidtest.exe
-
-.PHONY: clean
--- a/Externals/hidapi/windows/ddk_build/.gitignore
+++ b/Externals/hidapi/windows/ddk_build/.gitignore
@ -1,2 +0,0 @@
-*.log
-obj*_*_*
--- a/Externals/hidapi/windows/ddk_build/hidapi.def
+++ b/Externals/hidapi/windows/ddk_build/hidapi.def
@ -1,17 +0,0 @@
-LIBRARY   hidapi
-EXPORTS
-   hid_open    @1
-   hid_write   @2
-   hid_read    @3
-   hid_close   @4
-   hid_get_product_string @5
-   hid_get_manufacturer_string @6
-   hid_get_serial_number_string @7
-   hid_get_indexed_string @8
-   hid_error @9
-   hid_set_nonblocking @10
-   hid_enumerate @11
-   hid_open_path @12
-   hid_send_feature_report @13
-   hid_get_feature_report @14
-   
--- a/Externals/hidapi/windows/ddk_build/makefile
+++ b/Externals/hidapi/windows/ddk_build/makefile
@ -1,49 +0,0 @@
-#############################################################################
-#
-#               Copyright (C) Microsoft Corporation 1995, 1996
-#       All Rights Reserved.
-#
-#       MAKEFILE for HID directory
-#
-#############################################################################
-
-!IFDEF WIN95_BUILD
-
-ROOT=..\..\..\..
-
-VERSIONLIST = debug retail
-IS_32 = TRUE
-IS_SDK = TRUE
-IS_PRIVATE = TRUE
-IS_SDK = TRUE
-IS_DDK = TRUE
-WIN32 = TRUE
-COMMONMKFILE = hidapi.mk
-
-!include $(ROOT)\dev\master.mk
-
-
-!ELSE
-
-#
-# DO NOT EDIT THIS FILE!!!  Edit .\sources. if you want to add a new source
-# file to this component.  This file merely indirects to the real make file
-# that is shared by all the driver components of the Windows NT DDK
-#
-
-!IF DEFINED(_NT_TARGET_VERSION)
-!	IF $(_NT_TARGET_VERSION)>=0x501
-!		INCLUDE $(NTMAKEENV)\makefile.def
-!	ELSE
-#               Only warn once per directory
-!               INCLUDE $(NTMAKEENV)\makefile.plt
-!               IF "$(BUILD_PASS)"=="PASS1"
-!		    message BUILDMSG: Warning : The sample "$(MAKEDIR)" is not valid for the current OS target.
-!               ENDIF
-!	ENDIF
-!ELSE
-!	INCLUDE $(NTMAKEENV)\makefile.def
-!ENDIF
-
-!ENDIF
-
--- a/Externals/hidapi/windows/ddk_build/sources
+++ b/Externals/hidapi/windows/ddk_build/sources
@ -1,23 +0,0 @@
-TARGETNAME=hidapi
-TARGETTYPE=DYNLINK
-UMTYPE=console
-UMENTRY=main
-
-MSC_WARNING_LEVEL=/W3 /WX
-
-TARGETLIBS=$(SDK_LIB_PATH)\hid.lib \
-           $(SDK_LIB_PATH)\setupapi.lib \
-           $(SDK_LIB_PATH)\kernel32.lib \
-           $(SDK_LIB_PATH)\comdlg32.lib
-
-USE_MSVCRT=1
-
-INCLUDES= ..\..\hidapi
-SOURCES= ..\hid.c \
-
-
-TARGET_DESTINATION=retail
-
-MUI=0
-MUI_COMMENT="HID Interface DLL"
-