Move SConscript files out from the Src subdirectories to be

consistent with the other build systems.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7282 8ced0084-cf51-0410-be5f-012b33b47a6e

13 files changed, 453 insertions, 447 deletions

diff --git a/Source/Core/AudioCommon/SConscript b/Source/Core/AudioCommon/SConscript
new file mode 100644
index 0000000000..5c953c4e58
--- /dev/null
+++ b/Source/Core/AudioCommon/SConscript
@@ -0,0 +1,29 @@
+# -*- python -*-
+
+Import('env')
+import sys
+
+files = [
+	'Src/AudioCommon.cpp',
+	'Src/AudioCommonConfig.cpp',
+	'Src/Mixer.cpp',
+	'Src/NullSoundStream.cpp',
+	'Src/WaveFile.cpp',
+	]
+
+if sys.platform == 'darwin':
+	files += ['Src/CoreAudioSoundStream.cpp']
+elif sys.platform == 'win32':
+	files += ['Src/DSoundStream.cpp']
+	files += ['Src/XAudio2Stream.cpp']
+else:
+	if env['HAVE_ALSA']:
+		files += ['Src/AlsaSoundStream.cpp']
+	if env['HAVE_AO']:
+		files += ['Src/AOSoundStream.cpp']
+	if env['HAVE_OPENAL']:
+		files += ['Src/OpenALStream.cpp', 'Src/aldlist.cpp']
+	if env['HAVE_PULSEAUDIO']:
+		files += ['Src/PulseAudioStream.cpp']
+
+env['LIBS'] += env.StaticLibrary('audiocommon', files)
diff --git a/Source/Core/AudioCommon/Src/SConscript b/Source/Core/AudioCommon/Src/SConscript
deleted file mode 100644
index 0e066f8abe..0000000000
--- a/Source/Core/AudioCommon/Src/SConscript
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- python -*-
-
-Import('env')
-import sys
-
-files = [
-	'AudioCommonConfig.cpp',
-	'WaveFile.cpp',
-	'Mixer.cpp',
-	'AudioCommon.cpp',
-	'NullSoundStream.cpp',
-	]
-
-if sys.platform == 'darwin':
-	files += [ 'CoreAudioSoundStream.cpp' ]
-elif sys.platform == 'win32':
-	files += [ 'DSoundStream.cpp' ]
-	files += [ 'XAudio2Stream.cpp' ]
-else:
-	if env['HAVE_ALSA']:
-		files += [ 'AlsaSoundStream.cpp' ]
-	if env['HAVE_AO']:
-		files += [ 'AOSoundStream.cpp' ]
-	if env['HAVE_OPENAL']:
-		files += [ 'OpenALStream.cpp', 'aldlist.cpp' ]
-	if env['HAVE_PULSEAUDIO']:
-		files += [ 'PulseAudioStream.cpp' ]
-
-env['LIBS'] += env.StaticLibrary('audiocommon', files)
diff --git a/Source/Core/Common/SConscript b/Source/Core/Common/SConscript
new file mode 100644
index 0000000000..0515186ff8
--- /dev/null
+++ b/Source/Core/Common/SConscript
@@ -0,0 +1,57 @@
+# -*- python -*-
+
+Import('env')
+import os
+import sys
+
+def createVersion(env, target, source):
+	from SconsTests import utils
+	utils.GenerateRevFile(env['flavor'], source[0].path, target[0].path)
+
+Execute(Delete('Src/svnrev.h'))
+env.Command('Src/svnrev.h', 'Src/svnrev_template.h',
+	[Delete('${TARGET.srcpath}'), createVersion])
+
+files = [
+	'Src/ABI.cpp',
+	'Src/BreakPoints.cpp',
+	'Src/CDUtils.cpp',
+	'Src/CPUDetect.cpp',
+	'Src/ColorUtil.cpp',
+	'Src/ConsoleListener.cpp',
+	'Src/Crypto/aes_cbc.cpp',
+	'Src/Crypto/aes_core.cpp',
+	'Src/Crypto/bn.cpp',
+	'Src/Crypto/ec.cpp',
+	'Src/Crypto/md5.cpp',
+	'Src/Crypto/sha1.cpp',
+	'Src/FileSearch.cpp',
+	'Src/FileUtil.cpp',
+	'Src/Hash.cpp',
+	'Src/IniFile.cpp',
+	'Src/LogManager.cpp',
+	'Src/MathUtil.cpp',
+	'Src/MemArena.cpp',
+	'Src/MemoryUtil.cpp',
+	'Src/Misc.cpp',
+	'Src/MsgHandler.cpp',
+	'Src/NandPaths.cpp',
+	'Src/SDCardUtil.cpp',
+	'Src/StringUtil.cpp',
+	'Src/SymbolDB.cpp',
+	'Src/SysConf.cpp',
+	'Src/Thread.cpp',
+	'Src/Thunk.cpp',
+	'Src/Timer.cpp',
+	'Src/Version.cpp',
+	'Src/VideoBackendBase.cpp',
+	'Src/x64Analyzer.cpp',
+	'Src/x64Emitter.cpp',
+	]
+
+if sys.platform == 'win32':
+	files += ['Src/ExtendedTrace.cpp']
+	files += ['Src/stdafx.cpp']
+
+env['CPPPATH'] += ['Src']
+env['LIBS'] += env.StaticLibrary('common', files)
diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript
deleted file mode 100644
index de51abad34..0000000000
--- a/Source/Core/Common/Src/SConscript
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- python -*-
-
-Import('env')
-import os
-import sys
-
-def createVersion(env, target, source):
-	from SconsTests import utils
-	utils.GenerateRevFile(env['flavor'], source[0].path, target[0].path)
-
-Execute(Delete('svnrev.h'))
-env.Command('svnrev.h', 'svnrev_template.h',
-	[Delete('${TARGET.srcpath}'), createVersion])
-
-files = [
-	"ABI.cpp",
-	"BreakPoints.cpp",
-	"CDUtils.cpp",
-	"ColorUtil.cpp",
-	"ConsoleListener.cpp",
-	"CPUDetect.cpp",
-	"FileSearch.cpp",
-	"FileUtil.cpp",
-	"Hash.cpp",
-	"IniFile.cpp",
-	"LogManager.cpp",
-	"MathUtil.cpp",
-	"MemArena.cpp",
-	"MemoryUtil.cpp",
-	"Misc.cpp",
-	"MsgHandler.cpp",
-	"NandPaths.cpp",
-	"SDCardUtil.cpp",
-	"StringUtil.cpp",
-	"SymbolDB.cpp",
-	"SysConf.cpp",
-	"Thread.cpp",
-	"Thunk.cpp",
-	"Timer.cpp",
-	"Version.cpp",
-	"VideoBackendBase.cpp",
-	"x64Emitter.cpp",
-	"x64Analyzer.cpp",
-	"Crypto/aes_cbc.cpp",
-	"Crypto/aes_core.cpp",
-	"Crypto/bn.cpp",
-	"Crypto/ec.cpp",
-	"Crypto/md5.cpp",
-	"Crypto/sha1.cpp",
-	]
-
-if sys.platform == 'win32':
-	files += [ "ExtendedTrace.cpp" ]
-	files += [ "stdafx.cpp" ]
-
-env['CPPPATH'] += ['.']
-env['LIBS'] += env.StaticLibrary('common', files)
diff --git a/Source/Core/Core/SConscript b/Source/Core/Core/SConscript
new file mode 100644
index 0000000000..a33a94a1b5
--- /dev/null
+++ b/Source/Core/Core/SConscript
@@ -0,0 +1,208 @@
+# -*- python -*-
+
+Import('env')
+import sys
+
+files = [
+	'Src/ARDecrypt.cpp',
+	'Src/ActionReplay.cpp',
+	'Src/Boot/Boot.cpp',
+	'Src/Boot/Boot_BS2Emu.cpp',
+	'Src/Boot/Boot_DOL.cpp',
+	'Src/Boot/Boot_ELF.cpp',
+	'Src/Boot/Boot_WiiWAD.cpp',
+	'Src/Boot/ElfReader.cpp',
+	'Src/BootManager.cpp',
+	'Src/ConfigManager.cpp',
+	'Src/Console.cpp',
+	'Src/Core.cpp',
+	'Src/CoreParameter.cpp',
+	'Src/CoreRerecording.cpp',
+	'Src/CoreTiming.cpp',
+	'Src/DSP/DSPAccelerator.cpp',
+	'Src/DSP/DSPAnalyzer.cpp',
+	'Src/DSP/DSPCodeUtil.cpp',
+	'Src/DSP/DSPCore.cpp',
+	'Src/DSP/DSPEmitter.cpp',
+	'Src/DSP/DSPHWInterface.cpp',
+	'Src/DSP/DSPIntCCUtil.cpp',
+	'Src/DSP/DSPIntExtOps.cpp',
+	'Src/DSP/DSPInterpreter.cpp',
+	'Src/DSP/DSPMemoryMap.cpp',
+	'Src/DSP/DSPStacks.cpp',
+	'Src/DSP/DSPTables.cpp',
+	'Src/DSP/DspIntArithmetic.cpp',
+	'Src/DSP/DspIntBranch.cpp',
+	'Src/DSP/DspIntLoadStore.cpp',
+	'Src/DSP/DspIntMisc.cpp',
+	'Src/DSP/DspIntMultiplier.cpp',
+	'Src/DSP/Jit/DSPJitArithmetic.cpp',
+	'Src/DSP/Jit/DSPJitBranch.cpp',
+	'Src/DSP/Jit/DSPJitCCUtil.cpp',
+	'Src/DSP/Jit/DSPJitExtOps.cpp',
+	'Src/DSP/Jit/DSPJitLoadStore.cpp',
+	'Src/DSP/Jit/DSPJitMisc.cpp',
+	'Src/DSP/Jit/DSPJitMultiplier.cpp',
+	'Src/DSP/Jit/DSPJitRegCache.cpp',
+	'Src/DSP/Jit/DSPJitUtil.cpp',
+	'Src/DSP/LabelMap.cpp',
+	'Src/DSP/assemble.cpp',
+	'Src/DSP/disassemble.cpp',
+	'Src/DSPEmulator.cpp',
+	'Src/Debugger/Debugger_SymbolMap.cpp',
+	'Src/Debugger/Dump.cpp',
+	'Src/Debugger/PPCDebugInterface.cpp',
+	'Src/GeckoCode.cpp',
+	'Src/GeckoCodeConfig.cpp',
+	'Src/HLE/HLE.cpp',
+	'Src/HLE/HLE_Misc.cpp',
+	'Src/HLE/HLE_OS.cpp',
+	'Src/HW/AudioInterface.cpp',
+	'Src/HW/CPU.cpp',
+	'Src/HW/DSP.cpp',
+	'Src/HW/DSPHLE/DSPHLE.cpp',
+	'Src/HW/DSPHLE/HLEMixer.cpp',
+	'Src/HW/DSPHLE/MailHandler.cpp',
+	'Src/HW/DSPHLE/UCodes/UCode_AX.cpp',
+	'Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp',
+	'Src/HW/DSPHLE/UCodes/UCode_CARD.cpp',
+	'Src/HW/DSPHLE/UCodes/UCode_GBA.cpp',
+	'Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp',
+	'Src/HW/DSPHLE/UCodes/UCode_ROM.cpp',
+	'Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp',
+	'Src/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp',
+	'Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp',
+	'Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp',
+	'Src/HW/DSPHLE/UCodes/UCodes.cpp',
+	'Src/HW/DSPLLE/DSPDebugInterface.cpp',
+	'Src/HW/DSPLLE/DSPHost.cpp',
+	'Src/HW/DSPLLE/DSPLLE.cpp',
+	'Src/HW/DSPLLE/DSPLLEGlobals.cpp',
+	'Src/HW/DSPLLE/DSPLLETools.cpp',
+	'Src/HW/DSPLLE/DSPSymbols.cpp',
+	'Src/HW/DVDInterface.cpp',
+	'Src/HW/EXI.cpp',
+	'Src/HW/EXI_Channel.cpp',
+	'Src/HW/EXI_Device.cpp',
+	'Src/HW/EXI_DeviceAD16.cpp',
+	'Src/HW/EXI_DeviceAMBaseboard.cpp',
+	'Src/HW/EXI_DeviceEthernet.cpp',
+	'Src/HW/EXI_DeviceGecko.cpp',
+	'Src/HW/EXI_DeviceIPL.cpp',
+	'Src/HW/EXI_DeviceMemoryCard.cpp',
+	'Src/HW/EXI_DeviceMic.cpp',
+	'Src/HW/GCPad.cpp',
+	'Src/HW/GCPadEmu.cpp',
+	'Src/HW/GPFifo.cpp',
+	'Src/HW/HW.cpp',
+	'Src/HW/Memmap.cpp',
+	'Src/HW/MemmapFunctions.cpp',
+	'Src/HW/MemoryInterface.cpp',
+	'Src/HW/ProcessorInterface.cpp',
+	'Src/HW/SI.cpp',
+	'Src/HW/SI_Device.cpp',
+	'Src/HW/SI_DeviceAMBaseboard.cpp',
+	'Src/HW/SI_DeviceGBA.cpp',
+	'Src/HW/SI_DeviceGCController.cpp',
+	'Src/HW/Sram.cpp',
+	'Src/HW/StreamADPCM.cpp',
+	'Src/HW/SystemTimers.cpp',
+	'Src/HW/VideoInterface.cpp',
+	'Src/HW/WII_IOB.cpp',
+	'Src/HW/WII_IPC.cpp',
+	'Src/HW/Wiimote.cpp',
+	'Src/HW/WiimoteEmu/Attachment/Attachment.cpp',
+	'Src/HW/WiimoteEmu/Attachment/Classic.cpp',
+	'Src/HW/WiimoteEmu/Attachment/Drums.cpp',
+	'Src/HW/WiimoteEmu/Attachment/Guitar.cpp',
+	'Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp',
+	'Src/HW/WiimoteEmu/Attachment/Turntable.cpp',
+	'Src/HW/WiimoteEmu/EmuSubroutines.cpp',
+	'Src/HW/WiimoteEmu/Encryption.cpp',
+	'Src/HW/WiimoteEmu/Speaker.cpp',
+	'Src/HW/WiimoteEmu/WiimoteEmu.cpp',
+	'Src/HW/WiimoteReal/WiimoteReal.cpp',
+	'Src/IPC_HLE/WII_IPC_HLE.cpp',
+	'Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp',
+	'Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp',
+	'Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp',
+	'Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp',
+	'Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp',
+	'Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp',
+	'Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp',
+	'Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp',
+	'Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp',
+	'Src/IPC_HLE/WiiMote_HID_Attr.cpp',
+	'Src/MemTools.cpp',
+	'Src/NetPlay.cpp',
+	'Src/NetPlayClient.cpp',
+	'Src/NetPlayServer.cpp',
+	'Src/OnFrame.cpp',
+	'Src/PatchEngine.cpp',
+	'Src/PowerPC/Interpreter/Interpreter.cpp',
+	'Src/PowerPC/Interpreter/Interpreter_Branch.cpp',
+	'Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp',
+	'Src/PowerPC/Interpreter/Interpreter_Integer.cpp',
+	'Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp',
+	'Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp',
+	'Src/PowerPC/Interpreter/Interpreter_Paired.cpp',
+	'Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp',
+	'Src/PowerPC/Interpreter/Interpreter_Tables.cpp',
+	'Src/PowerPC/Jit64/Jit.cpp',
+	'Src/PowerPC/Jit64/Jit64_Tables.cpp',
+	'Src/PowerPC/Jit64/JitAsm.cpp',
+	'Src/PowerPC/Jit64/JitRegCache.cpp',
+	'Src/PowerPC/Jit64/Jit_Branch.cpp',
+	'Src/PowerPC/Jit64/Jit_FloatingPoint.cpp',
+	'Src/PowerPC/Jit64/Jit_Integer.cpp',
+	'Src/PowerPC/Jit64/Jit_LoadStore.cpp',
+	'Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp',
+	'Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp',
+	'Src/PowerPC/Jit64/Jit_Paired.cpp',
+	'Src/PowerPC/Jit64/Jit_SystemRegisters.cpp',
+	'Src/PowerPC/Jit64IL/IR.cpp',
+	'Src/PowerPC/Jit64IL/IR_X86.cpp',
+	'Src/PowerPC/Jit64IL/JitIL.cpp',
+	'Src/PowerPC/Jit64IL/JitILAsm.cpp',
+	'Src/PowerPC/Jit64IL/JitIL_Branch.cpp',
+	'Src/PowerPC/Jit64IL/JitIL_FloatingPoint.cpp',
+	'Src/PowerPC/Jit64IL/JitIL_Integer.cpp',
+	'Src/PowerPC/Jit64IL/JitIL_LoadStore.cpp',
+	'Src/PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp',
+	'Src/PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp',
+	'Src/PowerPC/Jit64IL/JitIL_Paired.cpp',
+	'Src/PowerPC/Jit64IL/JitIL_SystemRegisters.cpp',
+	'Src/PowerPC/Jit64IL/JitIL_Tables.cpp',
+	'Src/PowerPC/JitCommon/JitAsmCommon.cpp',
+	'Src/PowerPC/JitCommon/JitBackpatch.cpp',
+	'Src/PowerPC/JitCommon/JitBase.cpp',
+	'Src/PowerPC/JitCommon/JitCache.cpp',
+	'Src/PowerPC/JitCommon/Jit_Util.cpp',
+	'Src/PowerPC/LUT_frsqrtex.cpp',
+	'Src/PowerPC/PPCAnalyst.cpp',
+	'Src/PowerPC/PPCCache.cpp',
+	'Src/PowerPC/PPCSymbolDB.cpp',
+	'Src/PowerPC/PPCTables.cpp',
+	'Src/PowerPC/PowerPC.cpp',
+	'Src/PowerPC/Profiler.cpp',
+	'Src/PowerPC/SignatureDB.cpp',
+	'Src/State.cpp',
+	'Src/Tracer.cpp',
+	'Src/VolumeHandler.cpp',
+	]
+
+if sys.platform == 'win32':
+	files += ['Src/HW/BBA-TAP/TAP_Win32.cpp']
+	files += ['Src/HW/WiimoteReal/IOWin.cpp']
+	files += ['Src/stdafx.cpp']
+elif sys.platform == 'darwin':
+	files += ['Src/HW/BBA-TAP/TAP_Apple.cpp']
+	files += ['Src/HW/WiimoteReal/IOdarwin.mm']
+elif sys.platform == 'linux2' and env['HAVE_BLUEZ']:
+	files += ['Src/HW/BBA-TAP/TAP_Unix.cpp']
+	files += ['Src/HW/WiimoteReal/IODummy.cpp']
+else:
+	files += ['Src/HW/BBA-TAP/TAP_Unix.cpp']
+	files += ['Src/HW/WiimoteReal/IODummy.cpp']
+
+env['LIBS'] += env.StaticLibrary('core', files)
diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript
deleted file mode 100644
index e2f9df5e51..0000000000
--- a/Source/Core/Core/Src/SConscript
+++ /dev/null
@@ -1,203 +0,0 @@
-# -*- python -*-
-
-Import('env')
-import sys
-
-files = [
-	"ActionReplay.cpp",
-	"ARDecrypt.cpp",
-	"BootManager.cpp",
-	"ConfigManager.cpp",
-	"Console.cpp",
-	"Core.cpp",
-	"CoreParameter.cpp",
-	"CoreRerecording.cpp",
-	"CoreTiming.cpp",
-	"NetPlay.cpp",
-	"NetPlayClient.cpp",
-	"NetPlayServer.cpp",
-	"OnFrame.cpp",
-	"MemTools.cpp",
-	"PatchEngine.cpp",
-	"DSPEmulator.cpp",
-	"State.cpp",
-	"Tracer.cpp",
-	"VolumeHandler.cpp",
-	"Boot/Boot.cpp",
-	"Boot/Boot_BS2Emu.cpp",
-	"Boot/Boot_DOL.cpp",
-	"Boot/Boot_ELF.cpp",
-	"Boot/Boot_WiiWAD.cpp",
-	"Boot/ElfReader.cpp",
-	"Debugger/Debugger_SymbolMap.cpp",
-	"Debugger/Dump.cpp",
-	"Debugger/PPCDebugInterface.cpp",
-	"DSP/assemble.cpp",
-	"DSP/disassemble.cpp",
-	"DSP/DSPAccelerator.cpp",
-	"DSP/DSPIntCCUtil.cpp",
-	"DSP/DSPIntExtOps.cpp",
-	"DSP/DSPHWInterface.cpp",
-	"DSP/DSPMemoryMap.cpp",
-	"DSP/DSPStacks.cpp",
-	"DSP/DSPAnalyzer.cpp",
-	"DSP/DspIntArithmetic.cpp",
-	"DSP/DspIntBranch.cpp",
-	"DSP/DspIntLoadStore.cpp",
-	"DSP/DspIntMisc.cpp",
-	"DSP/DspIntMultiplier.cpp",
-	"DSP/DSPEmitter.cpp",
-	"DSP/DSPCodeUtil.cpp",
-	"DSP/LabelMap.cpp",
-	"DSP/DSPInterpreter.cpp",
-	"DSP/DSPCore.cpp",
-	"DSP/DSPTables.cpp",
-	"DSP/Jit/DSPJitExtOps.cpp",
-	"DSP/Jit/DSPJitBranch.cpp",
-	"DSP/Jit/DSPJitUtil.cpp",
-	"DSP/Jit/DSPJitCCUtil.cpp",
-	"DSP/Jit/DSPJitArithmetic.cpp",
-	"DSP/Jit/DSPJitLoadStore.cpp",
-	"DSP/Jit/DSPJitMultiplier.cpp",
-	"DSP/Jit/DSPJitMisc.cpp",
-	"DSP/Jit/DSPJitRegCache.cpp",
-	"GeckoCode.cpp",
-	"GeckoCodeConfig.cpp",
-	"HLE/HLE.cpp",
-	"HLE/HLE_Misc.cpp",
-	"HLE/HLE_OS.cpp",
-	"HW/AudioInterface.cpp",
-	"HW/CPU.cpp",
-	"HW/DSP.cpp",
-	"HW/DSPHLE/UCodes/UCode_AX.cpp",
-	"HW/DSPHLE/UCodes/UCode_AXWii.cpp",
-	"HW/DSPHLE/UCodes/UCode_CARD.cpp",
-	"HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp",
-	"HW/DSPHLE/UCodes/UCode_ROM.cpp",
-	"HW/DSPHLE/UCodes/UCodes.cpp",
-	"HW/DSPHLE/UCodes/UCode_GBA.cpp",
-	"HW/DSPHLE/UCodes/UCode_Zelda.cpp",
-	"HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp",
-	"HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp",
-	"HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp",
-	"HW/DSPHLE/HLEMixer.cpp",
-	"HW/DSPHLE/MailHandler.cpp",
-	"HW/DSPHLE/DSPHLE.cpp",
-	"HW/DSPLLE/DSPDebugInterface.cpp",
-	"HW/DSPLLE/DSPHost.cpp",
-	"HW/DSPLLE/DSPSymbols.cpp",
-	"HW/DSPLLE/DSPLLEGlobals.cpp",
-	"HW/DSPLLE/DSPLLE.cpp",
-	"HW/DSPLLE/DSPLLETools.cpp",
-	"HW/DVDInterface.cpp",
-	"HW/EXI.cpp",
-	"HW/EXI_Channel.cpp",
-	"HW/EXI_Device.cpp",
-	"HW/EXI_DeviceIPL.cpp",
-	"HW/EXI_DeviceAD16.cpp",
-	"HW/EXI_DeviceAMBaseboard.cpp",
-	"HW/EXI_DeviceMemoryCard.cpp",
-	"HW/EXI_DeviceMic.cpp",
-	"HW/EXI_DeviceEthernet.cpp",
-	"HW/EXI_DeviceGecko.cpp",
-	"HW/GPFifo.cpp",
-	"HW/GCPad.cpp",
-	"HW/Wiimote.cpp",
-	"HW/WiimoteEmu/WiimoteEmu.cpp",
-	"HW/WiimoteEmu/Attachment/Classic.cpp",
-	"HW/WiimoteEmu/Attachment/Attachment.cpp",
-	"HW/WiimoteEmu/Attachment/Nunchuk.cpp",
-	"HW/WiimoteEmu/Attachment/Drums.cpp",
-	"HW/WiimoteEmu/Attachment/Guitar.cpp",
-	"HW/WiimoteEmu/Attachment/Turntable.cpp",
-	"HW/WiimoteEmu/EmuSubroutines.cpp",
-	"HW/WiimoteEmu/Encryption.cpp",
-	"HW/WiimoteEmu/Speaker.cpp",
-	"HW/WiimoteReal/WiimoteReal.cpp",
-	"HW/GCPadEmu.cpp",
-	"HW/HW.cpp",
-	"HW/Memmap.cpp",
-	"HW/MemmapFunctions.cpp",
-	"HW/MemoryInterface.cpp",
-	"HW/ProcessorInterface.cpp",
-	"HW/SI.cpp",
-	"HW/SI_Device.cpp",
-	"HW/SI_DeviceAMBaseboard.cpp",
-	"HW/SI_DeviceGBA.cpp",
-	"HW/SI_DeviceGCController.cpp",
-	"HW/Sram.cpp",
-	"HW/StreamADPCM.cpp",
-	"HW/SystemTimers.cpp",
-	"HW/VideoInterface.cpp",
-	"HW/WII_IOB.cpp",
-	"HW/WII_IPC.cpp",
-	"IPC_HLE/WII_IPC_HLE.cpp",
-	"IPC_HLE/WII_IPC_HLE_Device_DI.cpp",
-	"IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp",
-	"IPC_HLE/WII_IPC_HLE_Device_es.cpp",
-	"IPC_HLE/WII_IPC_HLE_Device_fs.cpp",
-	"IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp",
-	"IPC_HLE/WII_IPC_HLE_Device_net.cpp",
-	"IPC_HLE/WII_IPC_HLE_WiiMote.cpp",
-	"IPC_HLE/WII_IPC_HLE_Device_usb.cpp",
-	"IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp",
-	"IPC_HLE/WiiMote_HID_Attr.cpp",
-	"PowerPC/PowerPC.cpp",
-	"PowerPC/PPCAnalyst.cpp",
-	"PowerPC/PPCTables.cpp",
-	"PowerPC/LUT_frsqrtex.cpp",
-	"PowerPC/PPCCache.cpp",
-	"PowerPC/Profiler.cpp",
-	"PowerPC/SignatureDB.cpp",
-	"PowerPC/PPCSymbolDB.cpp",
-	"PowerPC/Interpreter/Interpreter.cpp",
-	"PowerPC/Interpreter/Interpreter_Branch.cpp",
-	"PowerPC/Interpreter/Interpreter_Integer.cpp",
-	"PowerPC/Interpreter/Interpreter_FloatingPoint.cpp",
-	"PowerPC/Interpreter/Interpreter_Paired.cpp",
-	"PowerPC/Interpreter/Interpreter_LoadStore.cpp",
-	"PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp",
-	"PowerPC/Interpreter/Interpreter_SystemRegisters.cpp",
-	"PowerPC/Interpreter/Interpreter_Tables.cpp",
-	"PowerPC/JitCommon/JitAsmCommon.cpp",
-	"PowerPC/JitCommon/JitCache.cpp",
-	"PowerPC/JitCommon/JitBackpatch.cpp",
-	"PowerPC/JitCommon/JitBase.cpp",
-	"PowerPC/JitCommon/Jit_Util.cpp",
-	"PowerPC/Jit64IL/JitIL.cpp",
-	"PowerPC/Jit64IL/JitILAsm.cpp",
-	"PowerPC/Jit64IL/JitIL_Branch.cpp",
-	"PowerPC/Jit64IL/JitIL_Integer.cpp",
-	"PowerPC/Jit64IL/JitIL_FloatingPoint.cpp",
-	"PowerPC/Jit64IL/JitIL_LoadStorePaired.cpp",
-	"PowerPC/Jit64IL/JitIL_Paired.cpp",
-	"PowerPC/Jit64IL/JitIL_LoadStore.cpp",
-	"PowerPC/Jit64IL/JitIL_LoadStoreFloating.cpp",
-	"PowerPC/Jit64IL/JitIL_SystemRegisters.cpp",
-	"PowerPC/Jit64IL/IR.cpp",
-	"PowerPC/Jit64IL/IR_X86.cpp",
-	"PowerPC/Jit64IL/JitIL_Tables.cpp",
-	"PowerPC/Jit64/Jit.cpp",
-	"PowerPC/Jit64/JitRegCache.cpp",
-	"PowerPC/Jit64/JitAsm.cpp",
-	"PowerPC/Jit64/Jit_Branch.cpp",
-	"PowerPC/Jit64/Jit_Integer.cpp",
-	"PowerPC/Jit64/Jit_FloatingPoint.cpp",
-	"PowerPC/Jit64/Jit_LoadStorePaired.cpp",
-	"PowerPC/Jit64/Jit_Paired.cpp",
-	"PowerPC/Jit64/Jit_LoadStore.cpp",
-	"PowerPC/Jit64/Jit_LoadStoreFloating.cpp",
-	"PowerPC/Jit64/Jit_SystemRegisters.cpp",
-	"PowerPC/Jit64/Jit64_Tables.cpp",
-	]
-
-if sys.platform == 'win32':
-	files += [ "HW/BBA-TAP/TAP_Win32.cpp", "stdafx.cpp", "HW/WiimoteReal/IOWin.cpp" ]
-elif sys.platform == 'darwin':
-	files += [ "HW/BBA-TAP/TAP_Apple.cpp", "HW/WiimoteReal/IOdarwin.mm" ]
-elif sys.platform == 'linux2' and env['HAVE_BLUEZ']:
-	files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IODummy.cpp" ]
-else:
-	files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IODummy.cpp" ]
-
-env['LIBS'] += env.StaticLibrary('core', files)
diff --git a/Source/Core/DiscIO/SConscript b/Source/Core/DiscIO/SConscript
new file mode 100644
index 0000000000..3c563cf5e3
--- /dev/null
+++ b/Source/Core/DiscIO/SConscript
@@ -0,0 +1,29 @@
+# -*- python -*-
+
+Import('env')
+
+files = [
+	'Src/BannerLoader.cpp',
+	'Src/BannerLoaderGC.cpp',
+	'Src/BannerLoaderWii.cpp',
+	'Src/Blob.cpp',
+	'Src/CISOBlob.cpp',
+	'Src/CompressedBlob.cpp',
+	'Src/DiscScrubber.cpp',
+	'Src/DriveBlob.cpp',
+	'Src/FileBlob.cpp',
+	'Src/FileHandlerARC.cpp',
+	'Src/FileMonitor.cpp',
+	'Src/FileSystemGCWii.cpp',
+	'Src/Filesystem.cpp',
+	'Src/NANDContentLoader.cpp',
+	'Src/VolumeCommon.cpp',
+	'Src/VolumeCreator.cpp',
+	'Src/VolumeDirectory.cpp',
+	'Src/VolumeGC.cpp',
+	'Src/VolumeWad.cpp',
+	'Src/VolumeWiiCrypted.cpp',
+	'Src/WiiWad.cpp',
+	]
+
+env['LIBS'] += env.StaticLibrary('discio', files)
diff --git a/Source/Core/DiscIO/Src/SConscript b/Source/Core/DiscIO/Src/SConscript
deleted file mode 100644
index 4af93b332e..0000000000
--- a/Source/Core/DiscIO/Src/SConscript
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- python -*-
-
-Import('env')
-
-files = [
-	'BannerLoader.cpp',
-	'BannerLoaderGC.cpp',
-	'BannerLoaderWii.cpp',
-	'Blob.cpp',
-	'CompressedBlob.cpp',
-	'CISOBlob.cpp',
-	'DriveBlob.cpp',
-	'DiscScrubber.cpp',
-	'FileBlob.cpp',
-	'FileHandlerARC.cpp',
-	'Filesystem.cpp',
-	'FileSystemGCWii.cpp',
-	'VolumeCommon.cpp',
-	'VolumeCreator.cpp',
-	'VolumeDirectory.cpp',
-	'VolumeGC.cpp',
-	'VolumeWad.cpp',
-	'VolumeWiiCrypted.cpp',
-	'FileMonitor.cpp',
-	'NANDContentLoader.cpp',
-	'WiiWad.cpp',
-	]
-
-env['LIBS'] += env.StaticLibrary('discio', files)
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/SConscript
index 2638f45da3..603ea4f108 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/SConscript
@@ -6,63 +6,63 @@ import sys
 from SconsTests import utils
 
 if env['nowx']:
-	files = ['MainNoGUI.cpp']
+	files = ['Src/MainNoGUI.cpp']
 else:
 	files = [
-		'AboutDolphin.cpp',
-		'ARCodeAddEdit.cpp',
-		'GeckoCodeDiag.cpp',
-		'ConfigMain.cpp',
-		'Frame.cpp',
-		'FrameAui.cpp',
-		'FrameTools.cpp',
-		'LogWindow.cpp',
-		'LogConfigWindow.cpp',
-		'GameListCtrl.cpp',
-		'HotkeyDlg.cpp',
-		'InputConfigDiag.cpp',
-		'InputConfigDiagBitmaps.cpp',
-		'ISOFile.cpp',
-		'ISOProperties.cpp',
-		'PatchAddEdit.cpp',
-		'PHackSettings.cpp',
-		'CheatsWindow.cpp',
-		'Main.cpp',
-		'MemcardManager.cpp',
-		'MemoryCards/GCMemcard.cpp',
-		'MemoryCards/WiiSaveCrypted.cpp',
-		'NetWindow.cpp',
-		'UDPConfigDiag.cpp',
-		'WiimoteConfigDiag.cpp',
-		'WXInputBase.cpp',
-		'WxUtils.cpp',
-		'Debugger/BreakpointDlg.cpp',
-		'Debugger/BreakpointView.cpp',
-		'Debugger/BreakpointWindow.cpp',
-		'Debugger/CodeView.cpp',
-		'Debugger/CodeWindow.cpp',
-		'Debugger/CodeWindowFunctions.cpp',
-		'Debugger/DebuggerPanel.cpp',
-		'Debugger/DebuggerUIUtil.cpp',
-		'Debugger/DSPDebugWindow.cpp',
-		'Debugger/DSPRegisterView.cpp',
-		'Debugger/JitWindow.cpp',
-		'Debugger/MemoryCheckDlg.cpp',
-		'Debugger/MemoryView.cpp',
-		'Debugger/MemoryWindow.cpp',
-		'Debugger/RegisterView.cpp',
-		'Debugger/RegisterWindow.cpp',
-		'VideoConfigDiag.cpp',
+		'Src/ARCodeAddEdit.cpp',
+		'Src/AboutDolphin.cpp',
+		'Src/CheatsWindow.cpp',
+		'Src/ConfigMain.cpp',
+		'Src/Debugger/BreakpointDlg.cpp',
+		'Src/Debugger/BreakpointView.cpp',
+		'Src/Debugger/BreakpointWindow.cpp',
+		'Src/Debugger/CodeView.cpp',
+		'Src/Debugger/CodeWindow.cpp',
+		'Src/Debugger/CodeWindowFunctions.cpp',
+		'Src/Debugger/DSPDebugWindow.cpp',
+		'Src/Debugger/DSPRegisterView.cpp',
+		'Src/Debugger/DebuggerPanel.cpp',
+		'Src/Debugger/DebuggerUIUtil.cpp',
+		'Src/Debugger/JitWindow.cpp',
+		'Src/Debugger/MemoryCheckDlg.cpp',
+		'Src/Debugger/MemoryView.cpp',
+		'Src/Debugger/MemoryWindow.cpp',
+		'Src/Debugger/RegisterView.cpp',
+		'Src/Debugger/RegisterWindow.cpp',
+		'Src/Frame.cpp',
+		'Src/FrameAui.cpp',
+		'Src/FrameTools.cpp',
+		'Src/GameListCtrl.cpp',
+		'Src/GeckoCodeDiag.cpp',
+		'Src/HotkeyDlg.cpp',
+		'Src/ISOFile.cpp',
+		'Src/ISOProperties.cpp',
+		'Src/InputConfigDiag.cpp',
+		'Src/InputConfigDiagBitmaps.cpp',
+		'Src/LogConfigWindow.cpp',
+		'Src/LogWindow.cpp',
+		'Src/Main.cpp',
+		'Src/MemcardManager.cpp',
+		'Src/MemoryCards/GCMemcard.cpp',
+		'Src/MemoryCards/WiiSaveCrypted.cpp',
+		'Src/NetWindow.cpp',
+		'Src/PHackSettings.cpp',
+		'Src/PatchAddEdit.cpp',
+		'Src/UDPConfigDiag.cpp',
+		'Src/VideoConfigDiag.cpp',
+		'Src/WXInputBase.cpp',
+		'Src/WiimoteConfigDiag.cpp',
+		'Src/WxUtils.cpp',
 		]
 
 if sys.platform == 'win32':
-	files += ["stdafx.cpp"]
+	files += ['Src/stdafx.cpp']
 elif sys.platform == 'darwin':
 	env['CPPPATH'] += ['#Externals']
 	env['FRAMEWORKPATH'] += ['Externals/Cg']
 	env['FRAMEWORKS'] += ['ApplicationServices', 'Carbon', 'Cocoa']
 	env['FRAMEWORKS'] += ['AudioUnit', 'IOBluetooth', 'IOKit', 'OpenGL']
-	env['FRAMEWORKSFLAGS'] = ['-Wl,-weak_framework,Cg']
+	env['FRAMEWORKSFLAGS'] = ['-Wl,-lazy_framework,Cg']
 	env['FRAMEWORKSFLAGS'] += ['-Wl,-weak_framework,OpenCL']
 	env['LIBS'] += ['iconv', 'z']
 
@@ -127,7 +127,7 @@ elif sys.platform == 'darwin':
 		)))
 
 else:
-	files += ['X11Utils.cpp']
+	files += ['Src/X11Utils.cpp']
 	exe = env['binary_dir'] + '/dolphin-emu'
 	if env['nowx']:
 		exe += '-nogui'
diff --git a/Source/Core/InputCommon/SConscript b/Source/Core/InputCommon/SConscript
new file mode 100644
index 0000000000..82e0de571c
--- /dev/null
+++ b/Source/Core/InputCommon/SConscript
@@ -0,0 +1,34 @@
+# -*- python -*-
+
+import sys
+Import('env')
+
+files = [
+	'Src/ControllerEmu.cpp',
+	'Src/ControllerInterface/ControllerInterface.cpp',
+	'Src/InputConfig.cpp',
+	'Src/UDPWiimote.cpp',
+	'Src/UDPWrapper.cpp',
+	]
+
+if sys.platform == 'win32':
+	files += [
+		'Src/ControllerInterface/DInput/DInput.cpp',
+		'Src/ControllerInterface/DInput/DInputJoystick.cpp',
+		'Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp'
+		'Src/ControllerInterface/SDL/SDL.cpp',
+		'Src/ControllerInterface/XInput/XInput.cpp',
+		]
+elif sys.platform == 'darwin':
+	files += [
+		'Src/ControllerInterface/OSX/OSX.mm',
+		'Src/ControllerInterface/OSX/OSXKeyboard.mm',
+		'Src/ControllerInterface/OSX/OSXJoystick.mm',
+		]
+elif env['HAVE_X11']:
+	files += [
+		'Src/ControllerInterface/SDL/SDL.cpp',
+		'Src/ControllerInterface/Xlib/Xlib.cpp',
+		]
+
+env['LIBS'] += env.StaticLibrary('inputcommon', files)
diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript
deleted file mode 100644
index e085527348..0000000000
--- a/Source/Core/InputCommon/Src/SConscript
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- python -*-
-import sys
-Import('env')
-
-files = [
-	'ControllerEmu.cpp',
-	'InputConfig.cpp',
-	'ControllerInterface/ControllerInterface.cpp',
-	'UDPWiimote.cpp',
-	'UDPWrapper.cpp',
-	]
-
-if sys.platform == 'win32':
-	files += [
-		'ControllerInterface/DInput/DInput.cpp',
-		'ControllerInterface/DInput/DInputJoystick.cpp',
-		'ControllerInterface/DInput/DInputKeyboardMouse.cpp'
-		'ControllerInterface/SDL/SDL.cpp',
-		'ControllerInterface/XInput/XInput.cpp',
-		]
-elif sys.platform == 'darwin':
-	files += [
-		'ControllerInterface/OSX/OSX.mm',
-		'ControllerInterface/OSX/OSXKeyboard.mm',
-		'ControllerInterface/OSX/OSXJoystick.mm',
-		]
-elif env['HAVE_X11']:
-	files += [
-		'ControllerInterface/SDL/SDL.cpp',
-		'ControllerInterface/Xlib/Xlib.cpp',
-		]
-
-env['LIBS'] += env.StaticLibrary('inputcommon', files)
diff --git a/Source/Core/VideoCommon/SConscript b/Source/Core/VideoCommon/SConscript
new file mode 100644
index 0000000000..5499f422db
--- /dev/null
+++ b/Source/Core/VideoCommon/SConscript
@@ -0,0 +1,48 @@
+# -*- python -*-
+
+Import('env')
+
+files = [
+	'Src/BPFunctions.cpp',
+	'Src/BPMemory.cpp',
+	'Src/BPStructs.cpp',
+	'Src/CPMemory.cpp',
+	'Src/CommandProcessor.cpp',
+	'Src/DLCache.cpp',
+	'Src/Debugger.cpp',
+	'Src/Fifo.cpp',
+	'Src/FramebufferManagerBase.cpp',
+	'Src/HiresTextures.cpp',
+	'Src/ImageWrite.cpp',
+	'Src/IndexGenerator.cpp',
+	'Src/LightingShaderGen.cpp',
+	'Src/MainBase.cpp',
+	'Src/OnScreenDisplay.cpp',
+	'Src/OpcodeDecoding.cpp',
+	'Src/OpenCL.cpp',
+	'Src/OpenCL/OCLTextureDecoder.cpp',
+	'Src/PixelEngine.cpp',
+	'Src/PixelShaderGen.cpp',
+	'Src/PixelShaderManager.cpp',
+	'Src/RenderBase.cpp',
+	'Src/Statistics.cpp',
+	'Src/TextureCacheBase.cpp',
+	'Src/TextureConversionShader.cpp',
+	'Src/TextureDecoder.cpp',
+	'Src/VertexLoader.cpp',
+	'Src/VertexLoaderManager.cpp',
+	'Src/VertexLoader_Color.cpp',
+	'Src/VertexLoader_Normal.cpp',
+	'Src/VertexLoader_Position.cpp',
+	'Src/VertexLoader_TextCoord.cpp',
+	'Src/VertexManagerBase.cpp',
+	'Src/VertexShaderGen.cpp',
+	'Src/VertexShaderManager.cpp',
+	'Src/VideoConfig.cpp',
+	'Src/VideoState.cpp',
+	'Src/XFMemory.cpp',
+	'Src/XFStructs.cpp',
+	'Src/memcpy_amd.cpp',
+	]
+
+env['LIBS'] += env.StaticLibrary('videocommon', files)
diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript
deleted file mode 100644
index e7af7d9c36..0000000000
--- a/Source/Core/VideoCommon/Src/SConscript
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- python -*-
-
-Import('env')
-
-files = [
-	'BPFunctions.cpp',
-	'BPMemory.cpp',
-	'BPStructs.cpp',
-	'CPMemory.cpp',
-	'CommandProcessor.cpp',
-	'Debugger.cpp',
-	'DLCache.cpp',
-	'Fifo.cpp',
-	'FramebufferManagerBase.cpp',
-	'HiresTextures.cpp',
-	'ImageWrite.cpp',
-	'IndexGenerator.cpp',
-	'LightingShaderGen.cpp',
-	'MainBase.cpp',
-	'OnScreenDisplay.cpp',
-	'OpcodeDecoding.cpp',
-	'OpenCL.cpp',
-	'OpenCL/OCLTextureDecoder.cpp',
-	'PixelEngine.cpp',
-	'PixelShaderGen.cpp',
-	'PixelShaderManager.cpp',
-	'RenderBase.cpp',
-	'Statistics.cpp',
-	'TextureCacheBase.cpp',
-	'TextureConversionShader.cpp',
-	'TextureDecoder.cpp',
-	'VertexLoader.cpp',
-	'VertexLoaderManager.cpp',
-	'VertexLoader_Color.cpp',
-	'VertexLoader_Normal.cpp',
-	'VertexLoader_Position.cpp',
-	'VertexLoader_TextCoord.cpp',
-	'VertexManagerBase.cpp',
-	'VertexShaderGen.cpp',
-	'VertexShaderManager.cpp',
-	'VideoConfig.cpp',
-	'VideoState.cpp',
-	'XFMemory.cpp',
-	'XFStructs.cpp',
-	'memcpy_amd.cpp',
-	]
-
-env['LIBS'] += env.StaticLibrary('videocommon', files)