Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9830 for code


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

Legend:

Unmodified
Added
Removed

  • code/branches/wiimote/src/SourceConfig.cmake

    r9683 r9830  
    126126  ${DIRECTX_INCLUDE_DIR}
    127127  ${ZLIB_INCLUDE_DIR}
     128  ${BLUETOOTH_INCLUDE_DIR}
    128129)
    129130

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

    r9827 r9830  
    4141#include <unistd.h>
    4242
    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"
     43#include <bluetooth/bluetooth.h>
     44#include <bluetooth/hci.h>
     45#include <bluetooth/hci_lib.h>
     46#include <bluetooth/l2cap.h>
    5547
    5648#include "definitions.h"

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

    r9827 r9830  
    5050#ifndef __APPLE__
    5151        #include <arpa/inet.h>                          /* htons() */
    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"
     52        #include <bluetooth/bluetooth.h>
    5953#endif
    6054
Note: See TracChangeset for help on using the changeset viewer.