Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9812


Ignore:
Timestamp:
Nov 25, 2013, 3:33:02 PM (11 years ago)
Author:
georgr
Message:

Committing a few local changes, this won't work very well on non-georg boxes. @smerkli: Fix this

Location:
code/branches/wiimote
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

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

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

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

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

    r9780 r9812  
    11IF(LINUX)
    22        MESSAGE(STATUS 'sewpertest')
    3         FIND_PATH(BLUETOOTH_INCLUDE_DIR bluetooth.h /home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth)
    4         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)
     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)
    55        MESSAGE(STATUS "sewpertest 2 ${BLUETOOTH_LIBRARY}")
    66        MESSAGE(STATUS "sewpertest 3 ${BLUETOOTH_INCLUDE_DIR}")

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

    r9780 r9812  
    3939
    4040#ifdef LINUX
    41 #include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
     41//#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
     42#include "/usr/include/bluetooth/bluetooth.h"
    4243#endif
    4344

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

    r9780 r9812  
    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"
     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"
    4751
    4852#include "definitions.h"

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

    r9780 r9812  
    4848#else
    4949        /* nix */
    50         #include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
     50        //#include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
     51        #include "/usr/include/bluetooth/bluetooth.h"
    5152#endif
    5253

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

    r9780 r9812  
    5050#ifndef __APPLE__
    5151        #include <arpa/inet.h>                          /* htons() */
    52         #include "/home/georgr/libbluetooth-dev/libbluetooth-dev/usr/include/bluetooth/bluetooth.h"
     52//      #include <bluetooth.h>
     53        #include "/usr/include/bluetooth/bluetooth.h"
    5354#endif
    5455
Note: See TracChangeset for help on using the changeset viewer.