Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9827 for code


Ignore:
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
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • code/branches/wiimote/cmake/LibraryConfig.cmake

    r9812 r9827  
    205205ENDIF(WIN32)
    206206
    207 LIST(APPEND CMAKE_INCLUDE_PATH "/home/georgr/Documents/WiiC")
     207#LIST(APPEND CMAKE_INCLUDE_PATH "/home/georgr/Documents/WiiC")
    208208################# OGRE Plugins ##################
    209209

  • code/branches/wiimote/cmake/LibraryConfigTardis.cmake

    r9812 r9827  
    8484
    8585
    86   LIST(APPEND CMAKE_INCLUDE_PATH "/home/georgr/Documents/WiiC/")
    87 
    88 
    8986  # Sandro fix: add flag that re-enables boost threads. This makes the combination
    9087  #             of GCC version > 4.7 and older libboost work. See

  • code/branches/wiimote/cmake/tools/FindBluetooth.cmake

    r9812 r9827  
    11IF(LINUX)
    2         MESSAGE(STATUS 'sewpertest')
    3         FIND_PATH(BLUETOOTH_INCLUDE_DIR bluetooth.h /usr/include/bluetooth/ /usr/local/include/bluetooth /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth)
    4         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)
    5         MESSAGE(STATUS "sewpertest 2 ${BLUETOOTH_LIBRARY}")
    6         MESSAGE(STATUS "sewpertest 3 ${BLUETOOTH_INCLUDE_DIR}")
     2        #FIND_PATH(BLUETOOTH_INCLUDE_DIR NAMES bluetooth PATHS /usr/include/bluetooth/ /usr/local/include/bluetooth /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth)
     3        #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)
     4        FIND_PATH(BLUETOOTH_INCLUDE_DIR bluetooth /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/)
     5        FIND_LIBRARY(BLUETOOTH_LIBRARY NAMES bluetooth PATHS  /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/lib/x86_64-linux-gnu/)
     6        MESSAGE(STATUS "Bluetooth library test: ${BLUETOOTH_LIBRARY}")
     7        MESSAGE(STATUS "Bluetooth header test: ${BLUETOOTH_INCLUDE_DIR}")
    78        IF(BLUETOOTH_INCLUDE_DIR AND BLUETOOTH_LIBRARY)
    89                SET(BLUETOOTH_FOUND TRUE)

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

    r9812 r9827  
    3838#define CONNECT_H_INCLUDED
    3939
    40 #ifdef LINUX
    41 //#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
    42 #include "/usr/include/bluetooth/bluetooth.h"
    43 #endif
     40/* This is not required, wiic_internal already includes bluetooth. */
     41//#ifdef LINUX
     42////#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
     43        //#include <bluetooth.h>
     44//#endif
    4445
    4546#include "wiic_internal.h"

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

    r9812 r9827  
    4141#include <unistd.h>
    4242
    43 //#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
    44 //#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/hci.h"
    45 //#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/hci_lib.h"
    46 //#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/l2cap.h"
    47 #include "/usr/include/bluetooth/bluetooth.h"
    48 #include "/usr/include/bluetooth/hci.h"
    49 #include "/usr/include/bluetooth/hci_lib.h"
    50 #include "/usr/include/bluetooth/l2cap.h"
     43/* SANDRO HACK can't get bluetooth to work properly at the moment, will come
     44 * back here and fix this very ugly inclusion as soon as I get to grips with
     45 * cmake.
     46 */
     47#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
     48#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/hci.h"
     49#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/hci_lib.h"
     50#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/l2cap.h"
     51//#include "/usr/include/bluetooth/bluetooth.h"
     52//#include "/usr/include/bluetooth/hci.h"
     53//#include "/usr/include/bluetooth/hci_lib.h"
     54//#include "/usr/include/bluetooth/l2cap.h"
    5155
    5256#include "definitions.h"

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

    r9812 r9827  
    4848#else
    4949        /* nix */
    50         //#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
    51         #include "/usr/include/bluetooth/bluetooth.h"
     50/* SANDRO HACK can't get bluetooth to work properly at the moment, will come
     51 * back here and fix this very ugly inclusion as soon as I get to grips with
     52 * cmake.
     53 */
     54//      #include "bluetooth/bluetooth.h"
     55//      #include <bluetooth.h>
     56        #include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
    5257#endif
    5358

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

    r9812 r9827  
    5050#ifndef __APPLE__
    5151        #include <arpa/inet.h>                          /* htons() */
    52 //      #include <bluetooth.h>
    53         #include "/usr/include/bluetooth/bluetooth.h"
     52/* SANDRO HACK can't get bluetooth to work properly at the moment, will come
     53 * back here and fix this very ugly inclusion as soon as I get to grips with
     54 * cmake.
     55 */
     56//      #include <bluetooth.h>
     57//      #include "bluetooth/bluetooth.h"
     58        #include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
    5459#endif
    5560
Note: See TracChangeset for help on using the changeset viewer.