[Orxonox-commit 5147] r9812 - in code/branches/wiimote: cmake cmake/tools src/external/wiicpp/wiic

[georgr at orxonox.net]

Author: georgr
Date: 2013-11-25 15:33:02 +0100 (Mon, 25 Nov 2013)
New Revision: 9812

Modified:
   code/branches/wiimote/cmake/LibraryConfig.cmake
   code/branches/wiimote/cmake/LibraryConfigTardis.cmake
   code/branches/wiimote/cmake/tools/FindBluetooth.cmake
   code/branches/wiimote/src/external/wiicpp/wiic/io.h
   code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c
   code/branches/wiimote/src/external/wiicpp/wiic/wiic.h
   code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h
Log:
Committing a few local changes, this won't work very well on non-georg boxes. @smerkli: Fix this

Modified: code/branches/wiimote/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/wiimote/cmake/LibraryConfig.cmake	2013-11-25 14:25:56 UTC (rev 9811)
+++ code/branches/wiimote/cmake/LibraryConfig.cmake	2013-11-25 14:33:02 UTC (rev 9812)
@@ -204,7 +204,7 @@
   ENDIF()
 ENDIF(WIN32)
 
-
+LIST(APPEND CMAKE_INCLUDE_PATH "/home/georgr/Documents/WiiC")
 ################# OGRE Plugins ##################
 
 # Check the plugins and determine the plugin folder

Modified: code/branches/wiimote/cmake/LibraryConfigTardis.cmake
===================================================================
--- code/branches/wiimote/cmake/LibraryConfigTardis.cmake	2013-11-25 14:25:56 UTC (rev 9811)
+++ code/branches/wiimote/cmake/LibraryConfigTardis.cmake	2013-11-25 14:33:02 UTC (rev 9812)
@@ -83,6 +83,9 @@
   #SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include")
 
 
+  LIST(APPEND CMAKE_INCLUDE_PATH "/home/georgr/Documents/WiiC/")
+
+
   # Sandro fix: add flag that re-enables boost threads. This makes the combination
   #             of GCC version > 4.7 and older libboost work. See 
   # http://stackoverflow.com/questions/5389853/doesnt-compile-if-included-boost-thread-in-linux-ubuntu10-10

Modified: code/branches/wiimote/cmake/tools/FindBluetooth.cmake
===================================================================
--- code/branches/wiimote/cmake/tools/FindBluetooth.cmake	2013-11-25 14:25:56 UTC (rev 9811)
+++ code/branches/wiimote/cmake/tools/FindBluetooth.cmake	2013-11-25 14:33:02 UTC (rev 9812)
@@ -1,7 +1,7 @@
 IF(LINUX)
         MESSAGE(STATUS 'sewpertest')
-	FIND_PATH(BLUETOOTH_INCLUDE_DIR bluetooth.h /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth)
-	FIND_LIBRARY(BLUETOOTH_LIBRARY NAMES bluetooth PATHS /usr/lib/x86_64-linux-gnu /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/lib/x86_64-linux-gnu) 
+	FIND_PATH(BLUETOOTH_INCLUDE_DIR bluetooth.h /usr/include/bluetooth/ /usr/local/include/bluetooth /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth)
+	FIND_LIBRARY(BLUETOOTH_LIBRARY NAMES bluetooth PATHS  /usr/lib/ /usr/lib/x86_64-linux-gnu /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/lib/x86_64-linux-gnu) 
         MESSAGE(STATUS "sewpertest 2 ${BLUETOOTH_LIBRARY}")
         MESSAGE(STATUS "sewpertest 3 ${BLUETOOTH_INCLUDE_DIR}")
 	IF(BLUETOOTH_INCLUDE_DIR AND BLUETOOTH_LIBRARY)

Modified: code/branches/wiimote/src/external/wiicpp/wiic/io.h
===================================================================
--- code/branches/wiimote/src/external/wiicpp/wiic/io.h	2013-11-25 14:25:56 UTC (rev 9811)
+++ code/branches/wiimote/src/external/wiicpp/wiic/io.h	2013-11-25 14:33:02 UTC (rev 9812)
@@ -38,7 +38,8 @@
 #define CONNECT_H_INCLUDED
 
 #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
 
 #include "wiic_internal.h"

Modified: code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c
===================================================================
--- code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c	2013-11-25 14:25:56 UTC (rev 9811)
+++ code/branches/wiimote/src/external/wiicpp/wiic/io_nix.c	2013-11-25 14:33:02 UTC (rev 9812)
@@ -40,10 +40,14 @@
 #include <stdlib.h>
 #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"
 #include "wiic_internal.h"

Modified: code/branches/wiimote/src/external/wiicpp/wiic/wiic.h
===================================================================
--- code/branches/wiimote/src/external/wiicpp/wiic/wiic.h	2013-11-25 14:25:56 UTC (rev 9811)
+++ code/branches/wiimote/src/external/wiicpp/wiic/wiic.h	2013-11-25 14:33:02 UTC (rev 9812)
@@ -47,7 +47,8 @@
 	#include <IOBluetooth/IOBluetoothUserLib.h>
 #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
 
 #ifdef WIIC_INTERNAL_H_INCLUDED

Modified: code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h
===================================================================
--- code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h	2013-11-25 14:25:56 UTC (rev 9811)
+++ code/branches/wiimote/src/external/wiicpp/wiic/wiic_internal.h	2013-11-25 14:33:02 UTC (rev 9812)
@@ -49,7 +49,8 @@
 
 #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
 
 #include "definitions.h"