ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Turn back on unit tests in SCons. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7057 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-02-04 01:02:06 +00:00
parent 6d70c14d12
commit cc289a05bb
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Externals/Bochs_disasm/SConscript vendored
View File

@ -15,6 +15,4 @@ if sys.platform == 'win32':
files += [ "stdafx.cpp" ] files += [ "stdafx.cpp" ]
env['CPPPATH'] += ['#Externals/Bochs_disasm'] env['CPPPATH'] += ['#Externals/Bochs_disasm']
#env['LIBS'] += env.StaticObject(files) env['LIBS'] += env.StaticObject(files)
bochs = env.StaticObject(files)
env['LIBS'] += bochs

4
SConstruct
View File

@ -338,10 +338,10 @@ dirs = [
'Source/Core/InputCommon/Src', 'Source/Core/InputCommon/Src',
'Source/Core/VideoCommon/Src', 'Source/Core/VideoCommon/Src',
'Source/Core/VideoUICommon/Src', 'Source/Core/VideoUICommon/Src',
#'Source/DSPTool/Src', 'Source/DSPTool/Src',
'Source/Plugins/Plugin_VideoOGL/Src', 'Source/Plugins/Plugin_VideoOGL/Src',
'Source/Plugins/Plugin_VideoSoftware/Src', 'Source/Plugins/Plugin_VideoSoftware/Src',
#'Source/UnitTests', 'Source/UnitTests',
] ]
# Now that platform configuration is done, propagate it to modules # Now that platform configuration is done, propagate it to modules

3
Source/Core/Common/Src/SConscript
View File

@ -53,5 +53,6 @@ if sys.platform == 'win32':
files += [ "ExtendedTrace.cpp" ] files += [ "ExtendedTrace.cpp" ]
files += [ "stdafx.cpp" ] files += [ "stdafx.cpp" ]
env['common'] = env.StaticObject(files)
env['CPPPATH'] += ['.'] env['CPPPATH'] += ['.']
env['LIBS'] += env.StaticObject(files) env['LIBS'] += env['common']

8
Source/Core/Core/Src/SConscript
View File

@ -28,6 +28,9 @@ files = [
"Debugger/Debugger_SymbolMap.cpp", "Debugger/Debugger_SymbolMap.cpp",
"Debugger/Dump.cpp", "Debugger/Dump.cpp",
"Debugger/PPCDebugInterface.cpp", "Debugger/PPCDebugInterface.cpp",
]
dspcorefiles = [
"DSP/assemble.cpp", "DSP/assemble.cpp",
"DSP/disassemble.cpp", "DSP/disassemble.cpp",
"DSP/DSPAccelerator.cpp", "DSP/DSPAccelerator.cpp",
@ -57,6 +60,9 @@ files = [
"DSP/Jit/DSPJitMultiplier.cpp", "DSP/Jit/DSPJitMultiplier.cpp",
"DSP/Jit/DSPJitMisc.cpp", "DSP/Jit/DSPJitMisc.cpp",
"DSP/Jit/DSPJitRegCache.cpp", "DSP/Jit/DSPJitRegCache.cpp",
]
files += [
"GeckoCode.cpp", "GeckoCode.cpp",
"GeckoCodeConfig.cpp", "GeckoCodeConfig.cpp",
"HLE/HLE.cpp", "HLE/HLE.cpp",
@ -196,4 +202,6 @@ elif sys.platform == 'linux2' and env['HAVE_BLUEZ']:
else: else:
files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IODummy.cpp" ] files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IODummy.cpp" ]
env['dspcore'] = env.StaticObject(dspcorefiles)
env['LIBS'] += env.StaticObject(files) env['LIBS'] += env.StaticObject(files)
env['LIBS'] += env['dspcore']

4
Source/DSPTool/Src/SConscript
View File

@ -8,8 +8,8 @@ files = [
] ]
libs = [ libs = [
'core', env['common'],
'common', env['dspcore'],
] ]
if sys.platform == 'darwin': if sys.platform == 'darwin':

3
Source/UnitTests/SConscript
View File

@ -10,7 +10,8 @@ files = [
] ]
libs = [ libs = [
'core', 'common', env['common'],
env['dspcore'],
] ]
if sys.platform == 'darwin': if sys.platform == 'darwin':