Changeset 9830 for code/branches

Timestamp:

Nov 26, 2013, 9:38:24 PM (11 years ago)

Author:

smerkli

Message:

Fixed the ugly bluetooth hack into one that's a little less ugly:
now the only place the path has to be specified is FindBluetooth.cmake.
Kudos to reto for pointing me in the right direction.

Location:

code/branches/wiimote/src

Files:

• SourceConfig.cmake (modified) (1 diff)
• external/wiicpp/wiic/io_nix.c (modified) (1 diff)
• external/wiicpp/wiic/wiic_internal.h (modified) (1 diff)

code/branches/wiimote/src/SourceConfig.cmake

@@ -126 +126 @@
   ${DIRECTX_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
+  ${BLUETOOTH_INCLUDE_DIR}
 )
 

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

@@ -41 +41 @@
 #include <unistd.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 <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
+#include <bluetooth/hci_lib.h>
+#include <bluetooth/l2cap.h>
 
 #include "definitions.h"

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

@@ -50 +50 @@
 #ifndef __APPLE__
         #include <arpa/inet.h>                          /* htons() */
-/* 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" 
+        #include <bluetooth/bluetooth.h>
 #endif