From e79fcce1d48e0101697b75e03b975b6cb4557e0d Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@googlemail.com>
Date: Sat, 13 Nov 2010 19:36:33 +0000
Subject: [PATCH] Fix compiling wiiuse on with CMake and SCons Also fix
 confusing formatting in a SConscript file

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6395 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 CMakeLists.txt                       | 12 +-----------
 SConstruct                           |  2 +-
 Source/Core/DolphinWX/Src/SConscript | 11 ++++++-----
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 711dbadb82..eb79afab6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -194,6 +194,7 @@ include_directories(Source/Core/DSPCore/Src)
 include_directories(Source/Core/InputCommon/Src)
 include_directories(Source/Core/InputUICommon/Src)
 include_directories(Source/Core/VideoCommon/Src)
+include_directories(Source/Core/wiiuse/Src)
 
 
 ########################################
@@ -269,17 +270,6 @@ else(ZLIB_FOUND)
 	include_directories(Externals/zlib)
 endif(ZLIB_FOUND)
 
-if(UNIX OR APPLE)
-	add_subdirectory(Externals/WiiUse)
-	include_directories(Externals/WiiUse/Src)
-elseif(WIN32)
-	# use the precompiled ones
-	# TODO: Use the 64 bit lib on 64 bit systems...
-	# TODO: If WDK is installed, we can compile this from source as well
-	find_library(WIIUSE wiiuse PATHS Externals/WiiUse/Win32 NO_DEFAULT_PATH)
-	include_directories(Externals/WiiUse/Src)
-endif()
-
 if(WIN32)
 	find_library(GLEW glew32s PATHS Externals/GLew)
 	include_directories(Externals/GLew/include)
diff --git a/SConstruct b/SConstruct
index 18913e571d..063ed7648f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -98,7 +98,7 @@ if env['flavor'] == 'debug':
     env['CPPDEFINES'] += ['_DEBUG']
 elif env['flavor'] == 'fastlog':
     env['CPPDEFINES'] += ['DEBUGFAST']
-env['CPPPATH'] = ['#Source/PluginSpecs']
+env['CPPPATH'] = ['#Source/PluginSpecs', 'Source/Core/wiiuse/Src']
 env['LIBPATH'] = []
 env['LIBS'] = []
 
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index bdad6a7958..4d5dac0b9f 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -97,11 +97,12 @@ elif sys.platform == 'darwin' and env['HAVE_WX']:
 	env.Fixup(exeGUIdist, exeGUI)
 else:
 	files += [ 'X11Utils.cpp' ]
-	libs += [ 'SDL' ]
-	exeGUI = env['binary_dir'] + '/dolphin-emu'
-	exeNoGUI = env['binary_dir'] + '/dolphin-emu-nogui'
-	env.InstallAs(env['data_dir'] + '/sys', '#Data/Sys')
-	env.InstallAs(env['data_dir'] + '/user', '#Data/User')
+
+libs += [ 'SDL' ]
+exeGUI = env['binary_dir'] + '/dolphin-emu'
+exeNoGUI = env['binary_dir'] + '/dolphin-emu-nogui'
+env.InstallAs(env['data_dir'] + '/sys', '#Data/Sys')
+env.InstallAs(env['data_dir'] + '/user', '#Data/User')
 
 if env['HAVE_WX']:
 	env.Program(exeGUI, files, LIBS = wxlibs + libs + env['LIBS'])