[Orxonox-commit 5165] r9830 - in code/branches/wiimote/src: . external/wiicpp/wiic

[smerkli at orxonox.net]

Author: smerkli
Date: 2013-11-26 21:38:24 +0100 (Tue, 26 Nov 2013)
New Revision: 9830

Modified:
   code/branches/wiimote/src/SourceConfig.cmake
   code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c
   code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h
Log:
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. 


Modified: code/branches/wiimote/src/SourceConfig.cmake
===================================================================
--- code/branches/wiimote/src/SourceConfig.cmake	2013-11-25 17:51:39 UTC (rev 9829)
+++ code/branches/wiimote/src/SourceConfig.cmake	2013-11-26 20:38:24 UTC (rev 9830)
@@ -125,6 +125,7 @@
   ${TCL_INCLUDE_PATH}
   ${DIRECTX_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
+  ${BLUETOOTH_INCLUDE_DIR}
 )
 
 IF(CEGUI_OLD_VERSION)

Modified: code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c
===================================================================
--- code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c	2013-11-25 17:51:39 UTC (rev 9829)
+++ code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c	2013-11-26 20:38:24 UTC (rev 9830)
@@ -40,18 +40,10 @@
 #include <stdlib.h>
 #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"
 #include "wiic_internal.h"

Modified: code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h
===================================================================
--- code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h	2013-11-25 17:51:39 UTC (rev 9829)
+++ code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h	2013-11-26 20:38:24 UTC (rev 9830)
@@ -49,13 +49,7 @@
 
 #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
 
 #include "definitions.h"