From 77a3a5078e30bf1a41450a0f78252c8789aa0420 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Wed, 13 Oct 2010 09:57:13 +0000 Subject: [PATCH] Fix building on Linux without bluetooth headers. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6276 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/WiiUse/Src/io_nix.c | 1 + Externals/WiiUse/Src/wiiuse.c | 5 +++-- Externals/WiiUse/Src/wiiuse.h | 5 ++++- Externals/WiiUse/Src/wiiuse_internal.h | 3 --- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Externals/WiiUse/Src/io_nix.c b/Externals/WiiUse/Src/io_nix.c index 863b1b4421..237d1751dc 100644 --- a/Externals/WiiUse/Src/io_nix.c +++ b/Externals/WiiUse/Src/io_nix.c @@ -39,6 +39,7 @@ #include #include +#include "definitions.h" #include "wiiuse_internal.h" static int wiiuse_connect_single(struct wiimote_t* wm, char* address); diff --git a/Externals/WiiUse/Src/wiiuse.c b/Externals/WiiUse/Src/wiiuse.c index 59cc15beda..a54c1610aa 100644 --- a/Externals/WiiUse/Src/wiiuse.c +++ b/Externals/WiiUse/Src/wiiuse.c @@ -37,6 +37,7 @@ #include #include +#include #ifndef _WIN32 #include @@ -122,7 +123,7 @@ struct wiimote_t** wiiuse_init(int wiimotes) { wm[i]->unid = i+1; - #ifdef __linux__ + #if defined __linux__ && HAVE_BLUEZ wm[i]->bdaddr = *BDADDR_ANY; wm[i]->out_sock = -1; wm[i]->in_sock = -1; @@ -159,7 +160,7 @@ void wiiuse_disconnected(struct wiimote_t* wm) { wm->state = WIIMOTE_INIT_STATES; memset(wm->event_buf, 0, sizeof(wm->event_buf)); - #ifdef __linux__ + #if defined __linux__ && HAVE_BLUEZ wm->out_sock = -1; wm->in_sock = -1; #elif defined(_WIN32) diff --git a/Externals/WiiUse/Src/wiiuse.h b/Externals/WiiUse/Src/wiiuse.h index ae8253c44f..70e453e32b 100644 --- a/Externals/WiiUse/Src/wiiuse.h +++ b/Externals/WiiUse/Src/wiiuse.h @@ -48,7 +48,10 @@ #include #include #elif defined(__linux__) + #include "config.h" + #if HAVE_BLUEZ #include + #endif #endif #ifdef WIIUSE_INTERNAL_H_INCLUDED @@ -153,7 +156,7 @@ typedef struct wiimote_t { #if defined(__APPLE__) WCONST IOBluetoothDeviceRef *device; WCONST char bdaddr_str[18]; - #elif defined(__linux__) + #elif defined(__linux__) && HAVE_BLUEZ WCONST bdaddr_t bdaddr; /**< bt address (linux) */ WCONST char bdaddr_str[18]; /**< readable bt address */ WCONST int out_sock; /**< output socket */ diff --git a/Externals/WiiUse/Src/wiiuse_internal.h b/Externals/WiiUse/Src/wiiuse_internal.h index f8a5f11db4..fca3a5a6c2 100644 --- a/Externals/WiiUse/Src/wiiuse_internal.h +++ b/Externals/WiiUse/Src/wiiuse_internal.h @@ -46,11 +46,8 @@ #ifdef __linux__ #include /* htons() */ - #include #endif -#include "definitions.h" - /* wiiuse version */ #define WIIUSE_VERSION "0.12"