Changeset 9827 for code/branches/wiimote/src/external

Timestamp:

Nov 25, 2013, 5:27:23 PM (11 years ago)

Author:

smerkli

Message:

Tried a few fixes to get Bluetooth to be included
properly, but no success so far. Will have to ask someone
who knows more about our CMake setup for this.

Location:

code/branches/wiimote/src/external/wiicpp/wiic

Files:

• io.h (modified) (1 diff)
• io_nix.c (modified) (1 diff)
• wiic.h (modified) (1 diff)
• wiic_internal.h (modified) (1 diff)

code/branches/wiimote/src/external/wiicpp/wiic/io.h

@@ -38 +38 @@
 #define CONNECT_H_INCLUDED
 
-#ifdef LINUX
-//#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
-#include "/usr/include/bluetooth/bluetooth.h"
-#endif
+/* This is not required, wiic_internal already includes bluetooth. */
+//#ifdef LINUX
+////#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
+        //#include <bluetooth.h>
+//#endif
 
 #include "wiic_internal.h"

code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c

@@ -41 +41 @@
 #include <unistd.h>
 
-//#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
-//#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/hci.h"
-//#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/hci_lib.h"
-//#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/l2cap.h"
-#include "/usr/include/bluetooth/bluetooth.h"
-#include "/usr/include/bluetooth/hci.h"
-#include "/usr/include/bluetooth/hci_lib.h"
-#include "/usr/include/bluetooth/l2cap.h"
+/* SANDRO HACK can't get bluetooth to work properly at the moment, will come
+ * back here and fix this very ugly inclusion as soon as I get to grips with
+ * cmake.
+ */
+#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
+#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/hci.h"
+#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/hci_lib.h"
+#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/l2cap.h"
+//#include "/usr/include/bluetooth/bluetooth.h"
+//#include "/usr/include/bluetooth/hci.h"
+//#include "/usr/include/bluetooth/hci_lib.h"
+//#include "/usr/include/bluetooth/l2cap.h"
 
 #include "definitions.h"

code/branches/wiimote/src/external/wiicpp/wiic/wiic.h

@@ -48 +48 @@
 #else
         /* nix */
-        //#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
-        #include "/usr/include/bluetooth/bluetooth.h"
+/* SANDRO HACK can't get bluetooth to work properly at the moment, will come
+ * back here and fix this very ugly inclusion as soon as I get to grips with
+ * cmake.
+ */
+//      #include "bluetooth/bluetooth.h"
+//      #include <bluetooth.h>
+        #include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
 #endif
 

code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h

@@ -50 +50 @@
 #ifndef __APPLE__
         #include <arpa/inet.h>                          /* htons() */
-//      #include <bluetooth.h>
-        #include "/usr/include/bluetooth/bluetooth.h"
+/* SANDRO HACK can't get bluetooth to work properly at the moment, will come
+ * back here and fix this very ugly inclusion as soon as I get to grips with
+ * cmake.
+ */
+//      #include <bluetooth.h>
+//      #include "bluetooth/bluetooth.h"
+        #include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h" 
 #endif