From a54e7ba3ad6fb9f100a20e85e15bcde8108752bf Mon Sep 17 00:00:00 2001 From: nakeee Date: Thu, 4 Dec 2008 15:15:21 +0000 Subject: [PATCH] bluez detection git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1396 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/WiiUseSrc/Src/SConscript | 2 +- SConstruct | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Externals/WiiUseSrc/Src/SConscript b/Externals/WiiUseSrc/Src/SConscript index b1618874de..80b5487f19 100644 --- a/Externals/WiiUseSrc/Src/SConscript +++ b/Externals/WiiUseSrc/Src/SConscript @@ -20,6 +20,6 @@ env_wiiuse = env.Clone( ) libs = [ - 'm', 'bluetooth', + 'm', ] env_wiiuse.SharedLibrary(env['libs_dir']+"wiiuse", files, LIBS=libs) diff --git a/SConstruct b/SConstruct index 480eedfd6e..3529fcebcc 100644 --- a/SConstruct +++ b/SConstruct @@ -182,6 +182,9 @@ if not env['osx64']: if not conf.CheckSDL('1.0.0'): Exit(1) +if not conf.CheckPKG('bluez'): + Exit(1) + if not env['osx64']: if not conf.CheckPKG('ao'): Exit(1) @@ -219,6 +222,9 @@ if not env['osx64']: if not env['osx64']: env.ParseConfig('pkg-config --cflags --libs ao') +# bluetooth for wii +env.ParseConfig('pkg-config --cflags --libs bluez') + # add methods from utils to env env.AddMethod(utils.filterWarnings)