Changeset 9812 for code/branches/wiimote/src

Timestamp:

Nov 25, 2013, 3:33:02 PM (11 years ago)

Author:

georgr

Message:

Committing a few local changes, this won't work very well on non-georg boxes. @smerkli: Fix 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

@@ -39 +39 @@
 
 #ifdef LINUX
-#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
+//#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
+#include "/usr/include/bluetooth/bluetooth.h"
 #endif
 

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 "/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 "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
+        #include "/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 "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
+//      #include <bluetooth.h>
+        #include "/usr/include/bluetooth/bluetooth.h"
 #endif