The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-15 16:59:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core and DSPCore now have mutual dependencies, which breaks the

Browse Source 
assumption on the part of many linkers that static libraries make
up a DAG, so merge libdspcore into libcore.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6967 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-29 14:06:48 +00:00
parent 10675ba3c0
commit b3a183dffe
78 changed files with 395 additions and 1003 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -254,7 +254,6 @@ include_directories(Source/Core/DebuggerUICommon/Src)
include_directories(Source/Core/DebuggerWX/Src) include_directories(Source/Core/DebuggerWX/Src)
include_directories(Source/Core/DiscIO/Src) include_directories(Source/Core/DiscIO/Src)
include_directories(Source/Core/DolphinWX/Src) include_directories(Source/Core/DolphinWX/Src)
include_directories(Source/Core/DSPCore/Src)
include_directories(Source/Core/InputCommon/Src) include_directories(Source/Core/InputCommon/Src)
include_directories(Source/Core/VideoCommon/Src) include_directories(Source/Core/VideoCommon/Src)
include_directories(Source/Core/VideoUICommon/Src) include_directories(Source/Core/VideoUICommon/Src)

12
Externals/CLRun/SConscript vendored
View File

@ -1,5 +1,17 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
import sys
if sys.platform == 'darwin':
Return()
files = [
'clrun/clrun.c',
'clrun/dynamiclib.c',
'clrun/gencl.c',
'clrun/genclgl.c',
]
env.StaticLibrary(env['local_libs'] + 'clrun', files)
env['CPPPATH'] += ['#Externals/CLRun/include'] env['CPPPATH'] += ['#Externals/CLRun/include']

1
SConstruct
View File

@ -342,7 +342,6 @@ dirs += [
'Source/Core/AudioCommon/Src', 'Source/Core/AudioCommon/Src',
'Source/Core/Common/Src', 'Source/Core/Common/Src',
'Source/Core/Core/Src', 'Source/Core/Core/Src',
'Source/Core/DSPCore/Src',
'Source/Core/DebuggerUICommon/Src', 'Source/Core/DebuggerUICommon/Src',
'Source/Core/DebuggerWX/Src', 'Source/Core/DebuggerWX/Src',
'Source/Core/DiscIO/Src', 'Source/Core/DiscIO/Src',

1
Source/Core/CMakeLists.txt
View File

@ -10,6 +10,5 @@ endif()
add_subdirectory(DiscIO) add_subdirectory(DiscIO)
add_subdirectory(DolphinWX) add_subdirectory(DolphinWX)
add_subdirectory(DSPCore)
add_subdirectory(InputCommon) add_subdirectory(InputCommon)
add_subdirectory(VideoCommon) add_subdirectory(VideoCommon)

35
Source/Core/Core/CMakeLists.txt
View File

@ -27,6 +27,35 @@ set(SRCS Src/ActionReplay.cpp
Src/Debugger/Debugger_SymbolMap.cpp Src/Debugger/Debugger_SymbolMap.cpp
Src/Debugger/Dump.cpp Src/Debugger/Dump.cpp
Src/Debugger/PPCDebugInterface.cpp Src/Debugger/PPCDebugInterface.cpp
Src/DSP/assemble.cpp
Src/DSP/disassemble.cpp
Src/DSP/DSPAccelerator.cpp
Src/DSP/DSPIntCCUtil.cpp
Src/DSP/DSPIntExtOps.cpp
Src/DSP/DSPHWInterface.cpp
Src/DSP/DSPMemoryMap.cpp
Src/DSP/DSPStacks.cpp
Src/DSP/DSPAnalyzer.cpp
Src/DSP/DspIntArithmetic.cpp
Src/DSP/DspIntBranch.cpp
Src/DSP/DspIntLoadStore.cpp
Src/DSP/DspIntMisc.cpp
Src/DSP/DspIntMultiplier.cpp
Src/DSP/DSPEmitter.cpp
Src/DSP/DSPCodeUtil.cpp
Src/DSP/LabelMap.cpp
Src/DSP/DSPInterpreter.cpp
Src/DSP/DSPCore.cpp
Src/DSP/DSPTables.cpp
Src/DSP/Jit/DSPJitRegCache.cpp
Src/DSP/Jit/DSPJitExtOps.cpp
Src/DSP/Jit/DSPJitBranch.cpp
Src/DSP/Jit/DSPJitCCUtil.cpp
Src/DSP/Jit/DSPJitArithmetic.cpp
Src/DSP/Jit/DSPJitLoadStore.cpp
Src/DSP/Jit/DSPJitMultiplier.cpp
Src/DSP/Jit/DSPJitUtil.cpp
Src/DSP/Jit/DSPJitMisc.cpp
Src/HLE/HLE.cpp Src/HLE/HLE.cpp
Src/HLE/HLE_Misc.cpp Src/HLE/HLE_Misc.cpp
Src/HLE/HLE_OS.cpp Src/HLE/HLE_OS.cpp
@ -154,7 +183,7 @@ set(SRCS Src/ActionReplay.cpp
Src/PowerPC/JitCommon/JitCache.cpp Src/PowerPC/JitCommon/JitCache.cpp
Src/PowerPC/JitCommon/Jit_Util.cpp) Src/PowerPC/JitCommon/Jit_Util.cpp)
set(LIBS bdisasm inputcommon dspcore lua sfml-network) set(LIBS bdisasm inputcommon core lua sfml-network)
if(WIN32) if(WIN32)
set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp
@ -181,4 +210,6 @@ endif(OPROFILE_FOUND)
add_library(core STATIC ${SRCS}) add_library(core STATIC ${SRCS})
target_link_libraries(core ${LIBS}) target_link_libraries(core ${LIBS})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-fPIC)
endif()

224
Source/Core/Core/Core.vcproj
View File

@ -45,7 +45,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\DSPCore\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include" AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -116,7 +116,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\DSPCore\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include" AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -191,7 +191,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
EnableFiberSafeOptimizations="false" EnableFiberSafeOptimizations="false"
AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\DSPCore\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include" AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -269,7 +269,7 @@
OmitFramePointers="true" OmitFramePointers="true"
EnableFiberSafeOptimizations="false" EnableFiberSafeOptimizations="false"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\DSPCore\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include" AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -344,7 +344,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
EnableFiberSafeOptimizations="false" EnableFiberSafeOptimizations="false"
AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\DSPCore\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include" AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include"
PreprocessorDefinitions="NDEBUG;_LIB;DEBUGFAST;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="NDEBUG;_LIB;DEBUGFAST;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
RuntimeLibrary="0" RuntimeLibrary="0"
BufferSecurityCheck="true" BufferSecurityCheck="true"
@ -419,7 +419,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
EnableFiberSafeOptimizations="false" EnableFiberSafeOptimizations="false"
AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\DSPCore\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include" AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include"
PreprocessorDefinitions="NDEBUG;_LIB;DEBUGFAST;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="NDEBUG;_LIB;DEBUGFAST;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
RuntimeLibrary="0" RuntimeLibrary="0"
BufferSecurityCheck="false" BufferSecurityCheck="false"
@ -465,6 +465,218 @@
<References> <References>
</References> </References>
<Files> <Files>
<Filter
Name="Interpreter"
>
<File
RelativePath=".\Src\DSP\DspIntArithmetic.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DspIntBranch.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPIntCCUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPIntCCUtil.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPIntExtOps.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPIntExtOps.h"
>
</File>
<File
RelativePath=".\Src\DSP\DspIntLoadStore.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DspIntMisc.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DspIntMultiplier.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPIntUtil.h"
>
</File>
</Filter>
<Filter
Name="JIT"
>
<File
RelativePath=".\Src\DSP\DSPEmitter.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPEmitter.h"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitArithmetic.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitLoadStore.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitCCUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitExtOps.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitBranch.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitMisc.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitMultiplier.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitRegCache.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitRegCache.h"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitUtil.h"
>
</File>
</Filter>
<File
RelativePath=".\Src\DSP\assemble.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\assemble.h"
>
</File>
<File
RelativePath=".\Src\DSP\disassemble.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\disassemble.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPAccelerator.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPAccelerator.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPAnalyzer.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPAnalyzer.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPBreakpoints.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCodeUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCodeUtil.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCommon.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCore.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCore.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPHost.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPHWInterface.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPHWInterface.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPInterpreter.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPInterpreter.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPMemoryMap.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPMemoryMap.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPStacks.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPStacks.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPTables.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPTables.h"
>
</File>
<File
RelativePath=".\Src\DSP\LabelMap.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\LabelMap.h"
>
</File>
<File
RelativePath=".\Src\SConscript"
>
</File>
<Filter <Filter
Name="HLE" Name="HLE"
> >

52
Source/Core/Core/Core.vcxproj
View File

@ -275,6 +275,35 @@
<ClCompile Include="Src\Debugger\Debugger_SymbolMap.cpp" /> <ClCompile Include="Src\Debugger\Debugger_SymbolMap.cpp" />
<ClCompile Include="Src\Debugger\Dump.cpp" /> <ClCompile Include="Src\Debugger\Dump.cpp" />
<ClCompile Include="Src\Debugger\PPCDebugInterface.cpp" /> <ClCompile Include="Src\Debugger\PPCDebugInterface.cpp" />
<ClCompile Include="Src\DSP\assemble.cpp" />
<ClCompile Include="Src\DSP\disassemble.cpp" />
<ClCompile Include="Src\DSP\DSPAccelerator.cpp" />
<ClCompile Include="Src\DSP\DSPAnalyzer.cpp" />
<ClCompile Include="Src\DSP\DSPCodeUtil.cpp" />
<ClCompile Include="Src\DSP\DSPCore.cpp" />
<ClCompile Include="Src\DSP\DSPEmitter.cpp" />
<ClCompile Include="Src\DSP\DSPHWInterface.cpp" />
<ClCompile Include="Src\DSP\DspIntArithmetic.cpp" />
<ClCompile Include="Src\DSP\DspIntBranch.cpp" />
<ClCompile Include="Src\DSP\DSPIntCCUtil.cpp" />
<ClCompile Include="Src\DSP\DSPInterpreter.cpp" />
<ClCompile Include="Src\DSP\DSPIntExtOps.cpp" />
<ClCompile Include="Src\DSP\DspIntLoadStore.cpp" />
<ClCompile Include="Src\DSP\DspIntMisc.cpp" />
<ClCompile Include="Src\DSP\DspIntMultiplier.cpp" />
<ClCompile Include="Src\DSP\DSPMemoryMap.cpp" />
<ClCompile Include="Src\DSP\DSPStacks.cpp" />
<ClCompile Include="Src\DSP\DSPTables.cpp" />
<ClCompile Include="Src\DSP\Jit\DSPJitArithmetic.cpp" />
<ClCompile Include="Src\DSP\Jit\DSPJitBranch.cpp" />
<ClCompile Include="Src\DSP\Jit\DSPJitCCUtil.cpp" />
<ClCompile Include="Src\DSP\Jit\DSPJitExtOps.cpp" />
<ClCompile Include="Src\DSP\Jit\DSPJitLoadStore.cpp" />
<ClCompile Include="Src\DSP\Jit\DSPJitMisc.cpp" />
<ClCompile Include="Src\DSP\Jit\DSPJitMultiplier.cpp" />
<ClCompile Include="Src\DSP\Jit\DSPJitRegCache.cpp" />
<ClCompile Include="Src\DSP\Jit\DSPJitUtil.cpp" />
<ClCompile Include="Src\DSP\LabelMap.cpp" />
<ClCompile Include="Src\GeckoCode.cpp" /> <ClCompile Include="Src\GeckoCode.cpp" />
<ClCompile Include="Src\GeckoCodeConfig.cpp" /> <ClCompile Include="Src\GeckoCodeConfig.cpp" />
<ClCompile Include="Src\HLE\HLE.cpp" /> <ClCompile Include="Src\HLE\HLE.cpp" />
@ -421,6 +450,27 @@
<ClInclude Include="Src\Debugger\GCELF.h" /> <ClInclude Include="Src\Debugger\GCELF.h" />
<ClInclude Include="Src\Debugger\PPCDebugInterface.h" /> <ClInclude Include="Src\Debugger\PPCDebugInterface.h" />
<ClInclude Include="Src\DolLoader.h" /> <ClInclude Include="Src\DolLoader.h" />
<ClInclude Include="Src\DSP\assemble.h" />
<ClInclude Include="Src\DSP\disassemble.h" />
<ClInclude Include="Src\DSP\DSPAccelerator.h" />
<ClInclude Include="Src\DSP\DSPAnalyzer.h" />
<ClInclude Include="Src\DSP\DSPBreakpoints.h" />
<ClInclude Include="Src\DSP\DSPCodeUtil.h" />
<ClInclude Include="Src\DSP\DSPCommon.h" />
<ClInclude Include="Src\DSP\DSPCore.h" />
<ClInclude Include="Src\DSP\DSPEmitter.h" />
<ClInclude Include="Src\DSP\DSPHost.h" />
<ClInclude Include="Src\DSP\DSPHWInterface.h" />
<ClInclude Include="Src\DSP\DSPIntCCUtil.h" />
<ClInclude Include="Src\DSP\DSPInterpreter.h" />
<ClInclude Include="Src\DSP\DSPIntExtOps.h" />
<ClInclude Include="Src\DSP\DSPIntUtil.h" />
<ClInclude Include="Src\DSP\DSPMemoryMap.h" />
<ClInclude Include="Src\DSP\DSPStacks.h" />
<ClInclude Include="Src\DSP\DSPTables.h" />
<ClInclude Include="Src\DSP\Jit\DSPJitRegCache.h" />
<ClInclude Include="Src\DSP\Jit\DSPJitUtil.h" />
<ClInclude Include="Src\DSP\LabelMap.h" />
<ClInclude Include="Src\GeckoCode.h" /> <ClInclude Include="Src\GeckoCode.h" />
<ClInclude Include="Src\GeckoCodeConfig.h" /> <ClInclude Include="Src\GeckoCodeConfig.h" />
<ClInclude Include="Src\HLE\HLE.h" /> <ClInclude Include="Src\HLE\HLE.h" />
@ -542,4 +592,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

0
Source/Core/DSPCore/Src/DSPAccelerator.cpp → Source/Core/Core/Src/DSP/DSPAccelerator.cpp
View File

0
Source/Core/DSPCore/Src/DSPAccelerator.h → Source/Core/Core/Src/DSP/DSPAccelerator.h
View File

0
Source/Core/DSPCore/Src/DSPAnalyzer.cpp → Source/Core/Core/Src/DSP/DSPAnalyzer.cpp
View File

0
Source/Core/DSPCore/Src/DSPAnalyzer.h → Source/Core/Core/Src/DSP/DSPAnalyzer.h
View File

0
Source/Core/DSPCore/Src/DSPBreakpoints.h → Source/Core/Core/Src/DSP/DSPBreakpoints.h
View File

0
Source/Core/DSPCore/Src/DSPCodeUtil.cpp → Source/Core/Core/Src/DSP/DSPCodeUtil.cpp
View File

0
Source/Core/DSPCore/Src/DSPCodeUtil.h → Source/Core/Core/Src/DSP/DSPCodeUtil.h
View File

0
Source/Core/DSPCore/Src/DSPCommon.h → Source/Core/Core/Src/DSP/DSPCommon.h
View File

0
Source/Core/DSPCore/Src/DSPCore.cpp → Source/Core/Core/Src/DSP/DSPCore.cpp
View File

0
Source/Core/DSPCore/Src/DSPCore.h → Source/Core/Core/Src/DSP/DSPCore.h
View File

0
Source/Core/DSPCore/Src/DSPEmitter.cpp → Source/Core/Core/Src/DSP/DSPEmitter.cpp
View File

0
Source/Core/DSPCore/Src/DSPEmitter.h → Source/Core/Core/Src/DSP/DSPEmitter.h
View File

0
Source/Core/DSPCore/Src/DSPHWInterface.cpp → Source/Core/Core/Src/DSP/DSPHWInterface.cpp
View File

0
Source/Core/DSPCore/Src/DSPHWInterface.h → Source/Core/Core/Src/DSP/DSPHWInterface.h
View File

0
Source/Core/DSPCore/Src/DSPHost.h → Source/Core/Core/Src/DSP/DSPHost.h
View File

0
Source/Core/DSPCore/Src/DSPIntCCUtil.cpp → Source/Core/Core/Src/DSP/DSPIntCCUtil.cpp
View File

0
Source/Core/DSPCore/Src/DSPIntCCUtil.h → Source/Core/Core/Src/DSP/DSPIntCCUtil.h
View File

0
Source/Core/DSPCore/Src/DSPIntExtOps.cpp → Source/Core/Core/Src/DSP/DSPIntExtOps.cpp
View File

0
Source/Core/DSPCore/Src/DSPIntExtOps.h → Source/Core/Core/Src/DSP/DSPIntExtOps.h
View File

0
Source/Core/DSPCore/Src/DSPIntUtil.h → Source/Core/Core/Src/DSP/DSPIntUtil.h
View File

0
Source/Core/DSPCore/Src/DSPInterpreter.cpp → Source/Core/Core/Src/DSP/DSPInterpreter.cpp
View File

0
Source/Core/DSPCore/Src/DSPInterpreter.h → Source/Core/Core/Src/DSP/DSPInterpreter.h
View File

0
Source/Core/DSPCore/Src/DSPMemoryMap.cpp → Source/Core/Core/Src/DSP/DSPMemoryMap.cpp
View File

0
Source/Core/DSPCore/Src/DSPMemoryMap.h → Source/Core/Core/Src/DSP/DSPMemoryMap.h
View File

0
Source/Core/DSPCore/Src/DSPStacks.cpp → Source/Core/Core/Src/DSP/DSPStacks.cpp
View File

0
Source/Core/DSPCore/Src/DSPStacks.h → Source/Core/Core/Src/DSP/DSPStacks.h
View File

0
Source/Core/DSPCore/Src/DSPTables.cpp → Source/Core/Core/Src/DSP/DSPTables.cpp
View File

0
Source/Core/DSPCore/Src/DSPTables.h → Source/Core/Core/Src/DSP/DSPTables.h
View File

0
Source/Core/DSPCore/Src/DspIntArithmetic.cpp → Source/Core/Core/Src/DSP/DspIntArithmetic.cpp
View File

0
Source/Core/DSPCore/Src/DspIntBranch.cpp → Source/Core/Core/Src/DSP/DspIntBranch.cpp
View File

0
Source/Core/DSPCore/Src/DspIntLoadStore.cpp → Source/Core/Core/Src/DSP/DspIntLoadStore.cpp
View File

0
Source/Core/DSPCore/Src/DspIntMisc.cpp → Source/Core/Core/Src/DSP/DspIntMisc.cpp
View File

0
Source/Core/DSPCore/Src/DspIntMultiplier.cpp → Source/Core/Core/Src/DSP/DspIntMultiplier.cpp
View File

0
Source/Core/DSPCore/Src/Jit/DSPJitArithmetic.cpp → Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
View File

0
Source/Core/DSPCore/Src/Jit/DSPJitBranch.cpp → Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp
View File

0
Source/Core/DSPCore/Src/Jit/DSPJitCCUtil.cpp → Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp
View File

0
Source/Core/DSPCore/Src/Jit/DSPJitExtOps.cpp → Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
View File

0
Source/Core/DSPCore/Src/Jit/DSPJitLoadStore.cpp → Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp
View File

0
Source/Core/DSPCore/Src/Jit/DSPJitMisc.cpp → Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
View File

0
Source/Core/DSPCore/Src/Jit/DSPJitMultiplier.cpp → Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp
View File

0
Source/Core/DSPCore/Src/Jit/DSPJitRegCache.cpp → Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp
View File

0
Source/Core/DSPCore/Src/Jit/DSPJitRegCache.h → Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.h
View File

0
Source/Core/DSPCore/Src/Jit/DSPJitUtil.cpp → Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
View File

0
Source/Core/DSPCore/Src/Jit/DSPJitUtil.h → Source/Core/Core/Src/DSP/Jit/DSPJitUtil.h
View File

0
Source/Core/DSPCore/Src/LabelMap.cpp → Source/Core/Core/Src/DSP/LabelMap.cpp
View File

0
Source/Core/DSPCore/Src/LabelMap.h → Source/Core/Core/Src/DSP/LabelMap.h
View File

0
Source/Core/DSPCore/Src/assemble.cpp → Source/Core/Core/Src/DSP/assemble.cpp
View File

0
Source/Core/DSPCore/Src/assemble.h → Source/Core/Core/Src/DSP/assemble.h
View File

0
Source/Core/DSPCore/Src/disassemble.cpp → Source/Core/Core/Src/DSP/disassemble.cpp
View File

0
Source/Core/DSPCore/Src/disassemble.h → Source/Core/Core/Src/DSP/disassemble.h
View File

6
Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp
View File

@ -17,11 +17,11 @@
#include "DSPDebugInterface.h" #include "DSPDebugInterface.h"
#include "DSPCore.h" #include "DSP/DSPCore.h"
#include "disassemble.h" #include "DSP/disassemble.h"
#include "DSPSymbols.h" #include "DSPSymbols.h"
#include "DSPMemoryMap.h" #include "DSP/DSPMemoryMap.h"
void DSPDebugInterface::disasm(unsigned int address, char *dest, int max_size) void DSPDebugInterface::disasm(unsigned int address, char *dest, int max_size)
{ {

2
Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
View File

@ -17,7 +17,7 @@
#include "Common.h" #include "Common.h"
#include "Hash.h" #include "Hash.h"
#include "DSPHost.h" #include "DSP/DSPHost.h"
#include "DSPSymbols.h" #include "DSPSymbols.h"
#include "DSPLLETools.h" #include "DSPLLETools.h"
#include "../DSP.h" #include "../DSP.h"

10
Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
View File

@ -26,16 +26,16 @@
#include "IniFile.h" #include "IniFile.h"
#include "DSPLLEGlobals.h" // Local #include "DSPLLEGlobals.h" // Local
#include "DSPInterpreter.h" #include "DSP/DSPInterpreter.h"
#include "DSPHWInterface.h" #include "DSP/DSPHWInterface.h"
#include "disassemble.h" #include "DSP/disassemble.h"
#include "DSPSymbols.h" #include "DSPSymbols.h"
#include "AudioCommon.h" #include "AudioCommon.h"
#include "Mixer.h" #include "Mixer.h"
#include "DSPTables.h" #include "DSP/DSPTables.h"
#include "DSPCore.h" #include "DSP/DSPCore.h"
#include "DSPLLE.h" #include "DSPLLE.h"
#include "../Memmap.h" #include "../Memmap.h"
#include "../AudioInterface.h" #include "../AudioInterface.h"

2
Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp
View File

@ -20,7 +20,7 @@
#include <stdarg.h> #include <stdarg.h>
#include "Common.h" // for Common::swap #include "Common.h" // for Common::swap
#include "DSPCore.h" #include "DSP/DSPCore.h"
#include "DSPLLEGlobals.h" #include "DSPLLEGlobals.h"
#if PROFILE #if PROFILE

8
Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp
View File

@ -22,11 +22,11 @@
#include "DSPLLEGlobals.h" #include "DSPLLEGlobals.h"
#include "FileUtil.h" #include "FileUtil.h"
#include "DSPCore.h" #include "DSP/DSPCore.h"
#include "DSPCodeUtil.h" #include "DSP/DSPCodeUtil.h"
#include "DSPLLETools.h" #include "DSPLLETools.h"
#include "disassemble.h" #include "DSP/disassemble.h"
#include "DSPInterpreter.h" #include "DSP/DSPInterpreter.h"
bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc) bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc)
{ {

4
Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp
View File

@ -26,9 +26,9 @@
#include "Common.h" #include "Common.h"
#include "StringUtil.h" #include "StringUtil.h"
#include "DSPCore.h" #include "DSP/DSPCore.h"
#include "DSPSymbols.h" #include "DSPSymbols.h"
#include "disassemble.h" #include "DSP/disassemble.h"
namespace DSPSymbols { namespace DSPSymbols {

35
Source/Core/Core/Src/SConscript
View File

@ -6,8 +6,6 @@ import sys
files = [ files = [
"ActionReplay.cpp", "ActionReplay.cpp",
"ARDecrypt.cpp", "ARDecrypt.cpp",
"GeckoCode.cpp",
"GeckoCodeConfig.cpp",
"ConfigManager.cpp", "ConfigManager.cpp",
"Console.cpp", "Console.cpp",
"Core.cpp", "Core.cpp",
@ -32,6 +30,37 @@ files = [
"Debugger/Debugger_SymbolMap.cpp", "Debugger/Debugger_SymbolMap.cpp",
"Debugger/Dump.cpp", "Debugger/Dump.cpp",
"Debugger/PPCDebugInterface.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.cpp",
"HLE/HLE_Misc.cpp", "HLE/HLE_Misc.cpp",
"HLE/HLE_OS.cpp", "HLE/HLE_OS.cpp",
@ -165,7 +194,7 @@ if sys.platform == 'win32':
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
files += [ "HW/BBA-TAP/TAP_Apple.cpp", "HW/WiimoteReal/IOdarwin.mm" ] files += [ "HW/BBA-TAP/TAP_Apple.cpp", "HW/WiimoteReal/IOdarwin.mm" ]
elif sys.platform == 'linux2' and env['HAVE_BLUEZ']: elif sys.platform == 'linux2' and env['HAVE_BLUEZ']:
files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IONix.cpp" ] files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IODummy.cpp" ]
else: else:
files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IODummy.cpp" ] files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IODummy.cpp" ]

35
Source/Core/DSPCore/CMakeLists.txt
View File

@ -1,35 +0,0 @@
set(SRCS Src/assemble.cpp
Src/disassemble.cpp
Src/DSPAccelerator.cpp
Src/DSPIntCCUtil.cpp
Src/DSPIntExtOps.cpp
Src/DSPHWInterface.cpp
Src/DSPMemoryMap.cpp
Src/DSPStacks.cpp
Src/DSPAnalyzer.cpp
Src/DspIntArithmetic.cpp
Src/DspIntBranch.cpp
Src/DspIntLoadStore.cpp
Src/DspIntMisc.cpp
Src/DspIntMultiplier.cpp
Src/DSPEmitter.cpp
Src/DSPCodeUtil.cpp
Src/LabelMap.cpp
Src/DSPInterpreter.cpp
Src/DSPCore.cpp
Src/DSPTables.cpp
Src/Jit/DSPJitRegCache.cpp
Src/Jit/DSPJitExtOps.cpp
Src/Jit/DSPJitBranch.cpp
Src/Jit/DSPJitCCUtil.cpp
Src/Jit/DSPJitArithmetic.cpp
Src/Jit/DSPJitLoadStore.cpp
Src/Jit/DSPJitMultiplier.cpp
Src/Jit/DSPJitUtil.cpp
Src/Jit/DSPJitMisc.cpp)
add_library(dspcore STATIC ${SRCS})
target_link_libraries(dspcore core)
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-fPIC)
endif()

621
Source/Core/DSPCore/DSPCore.vcproj
View File

@ -1,621 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="DSPCore"
ProjectGUID="{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED}"
RootNamespace="DSPCore"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\Common\Src"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\Common\Src"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\Common\Src"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\Common\Src"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\Common\Src"
PreprocessorDefinitions="DEBUGFAST;WIN32;_LIB;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="DebugFast|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\Common\Src"
PreprocessorDefinitions="DEBUGFAST;WIN32;_LIB;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Interpreter"
>
<File
RelativePath=".\Src\DspIntArithmetic.cpp"
>
</File>
<File
RelativePath=".\Src\DspIntBranch.cpp"
>
</File>
<File
RelativePath=".\Src\DSPIntCCUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DSPIntCCUtil.h"
>
</File>
<File
RelativePath=".\Src\DSPIntExtOps.cpp"
>
</File>
<File
RelativePath=".\Src\DSPIntExtOps.h"
>
</File>
<File
RelativePath=".\Src\DspIntLoadStore.cpp"
>
</File>
<File
RelativePath=".\Src\DspIntMisc.cpp"
>
</File>
<File
RelativePath=".\Src\DspIntMultiplier.cpp"
>
</File>
<File
RelativePath=".\Src\DSPIntUtil.h"
>
</File>
</Filter>
<Filter
Name="JIT"
>
<File
RelativePath=".\Src\DSPEmitter.cpp"
>
</File>
<File
RelativePath=".\Src\DSPEmitter.h"
>
</File>
<File
RelativePath=".\Src\Jit\DSPJitArithmetic.cpp"
>
</File>
<File
RelativePath=".\Src\Jit\DSPJitLoadStore.cpp"
>
</File>
<File
RelativePath=".\Src\Jit\DSPJitCCUtil.cpp"
>
</File>
<File
RelativePath=".\Src\Jit\DSPJitExtOps.cpp"
>
</File>
<File
RelativePath=".\Src\Jit\DSPJitBranch.cpp"
>
</File>
<File
RelativePath=".\Src\Jit\DSPJitMisc.cpp"
>
</File>
<File
RelativePath=".\Src\Jit\DSPJitMultiplier.cpp"
>
</File>
<File
RelativePath=".\Src\Jit\DSPJitRegCache.cpp"
>
</File>
<File
RelativePath=".\Src\Jit\DSPJitRegCache.h"
>
</File>
<File
RelativePath=".\Src\Jit\DSPJitUtil.cpp"
>
</File>
<File
RelativePath=".\Src\Jit\DSPJitUtil.h"
>
</File>
</Filter>
<File
RelativePath=".\Src\assemble.cpp"
>
</File>
<File
RelativePath=".\Src\assemble.h"
>
</File>
<File
RelativePath=".\Src\disassemble.cpp"
>
</File>
<File
RelativePath=".\Src\disassemble.h"
>
</File>
<File
RelativePath=".\Src\DSPAccelerator.cpp"
>
</File>
<File
RelativePath=".\Src\DSPAccelerator.h"
>
</File>
<File
RelativePath=".\Src\DSPAnalyzer.cpp"
>
</File>
<File
RelativePath=".\Src\DSPAnalyzer.h"
>
</File>
<File
RelativePath=".\Src\DSPBreakpoints.h"
>
</File>
<File
RelativePath=".\Src\DSPCodeUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DSPCodeUtil.h"
>
</File>
<File
RelativePath=".\Src\DSPCommon.h"
>
</File>
<File
RelativePath=".\Src\DSPCore.cpp"
>
</File>
<File
RelativePath=".\Src\DSPCore.h"
>
</File>
<File
RelativePath=".\Src\DSPHost.h"
>
</File>
<File
RelativePath=".\Src\DSPHWInterface.cpp"
>
</File>
<File
RelativePath=".\Src\DSPHWInterface.h"
>
</File>
<File
RelativePath=".\Src\DSPInterpreter.cpp"
>
</File>
<File
RelativePath=".\Src\DSPInterpreter.h"
>
</File>
<File
RelativePath=".\Src\DSPMemoryMap.cpp"
>
</File>
<File
RelativePath=".\Src\DSPMemoryMap.h"
>
</File>
<File
RelativePath=".\Src\DSPStacks.cpp"
>
</File>
<File
RelativePath=".\Src\DSPStacks.h"
>
</File>
<File
RelativePath=".\Src\DSPTables.cpp"
>
</File>
<File
RelativePath=".\Src\DSPTables.h"
>
</File>
<File
RelativePath=".\Src\LabelMap.cpp"
>
</File>
<File
RelativePath=".\Src\LabelMap.h"
>
</File>
<File
RelativePath=".\Src\SConscript"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

239
Source/Core/DSPCore/DSPCore.vcxproj
View File

@ -1,239 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DebugFast|Win32">
<Configuration>DebugFast</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DebugFast|x64">
<Configuration>DebugFast</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Src\assemble.cpp" />
<ClCompile Include="Src\disassemble.cpp" />
<ClCompile Include="Src\DSPAccelerator.cpp" />
<ClCompile Include="Src\DSPAnalyzer.cpp" />
<ClCompile Include="Src\DSPCodeUtil.cpp" />
<ClCompile Include="Src\DSPCore.cpp" />
<ClCompile Include="Src\DSPEmitter.cpp" />
<ClCompile Include="Src\DSPHWInterface.cpp" />
<ClCompile Include="Src\DspIntArithmetic.cpp" />
<ClCompile Include="Src\DspIntBranch.cpp" />
<ClCompile Include="Src\DSPIntCCUtil.cpp" />
<ClCompile Include="Src\DSPInterpreter.cpp" />
<ClCompile Include="Src\DSPIntExtOps.cpp" />
<ClCompile Include="Src\DspIntLoadStore.cpp" />
<ClCompile Include="Src\DspIntMisc.cpp" />
<ClCompile Include="Src\DspIntMultiplier.cpp" />
<ClCompile Include="Src\DSPMemoryMap.cpp" />
<ClCompile Include="Src\DSPStacks.cpp" />
<ClCompile Include="Src\DSPTables.cpp" />
<ClCompile Include="Src\Jit\DSPJitArithmetic.cpp" />
<ClCompile Include="Src\Jit\DSPJitBranch.cpp" />
<ClCompile Include="Src\Jit\DSPJitCCUtil.cpp" />
<ClCompile Include="Src\Jit\DSPJitExtOps.cpp" />
<ClCompile Include="Src\Jit\DSPJitLoadStore.cpp" />
<ClCompile Include="Src\Jit\DSPJitMisc.cpp" />
<ClCompile Include="Src\Jit\DSPJitMultiplier.cpp" />
<ClCompile Include="Src\Jit\DSPJitRegCache.cpp" />
<ClCompile Include="Src\Jit\DSPJitUtil.cpp" />
<ClCompile Include="Src\LabelMap.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Src\assemble.h" />
<ClInclude Include="Src\disassemble.h" />
<ClInclude Include="Src\DSPAccelerator.h" />
<ClInclude Include="Src\DSPAnalyzer.h" />
<ClInclude Include="Src\DSPBreakpoints.h" />
<ClInclude Include="Src\DSPCodeUtil.h" />
<ClInclude Include="Src\DSPCommon.h" />
<ClInclude Include="Src\DSPCore.h" />
<ClInclude Include="Src\DSPEmitter.h" />
<ClInclude Include="Src\DSPHost.h" />
<ClInclude Include="Src\DSPHWInterface.h" />
<ClInclude Include="Src\DSPIntCCUtil.h" />
<ClInclude Include="Src\DSPInterpreter.h" />
<ClInclude Include="Src\DSPIntExtOps.h" />
<ClInclude Include="Src\DSPIntUtil.h" />
<ClInclude Include="Src\DSPMemoryMap.h" />
<ClInclude Include="Src\DSPStacks.h" />
<ClInclude Include="Src\DSPTables.h" />
<ClInclude Include="Src\Jit\DSPJitRegCache.h" />
<ClInclude Include="Src\Jit\DSPJitUtil.h" />
<ClInclude Include="Src\LabelMap.h" />
</ItemGroup>
<ItemGroup>
<None Include="Src\SConscript" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{4ED3C8BE-91A7-4361-8D46-16D03B678D4C}</ProjectGuid>
<RootNamespace>DSPCore</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\Common\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\Common\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\Common\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\Common\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\Common\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\Common\Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

37
Source/Core/DSPCore/Src/SConscript
View File

@ -1,37 +0,0 @@
# -*- python -*-
Import('env')
files = [
"assemble.cpp",
"disassemble.cpp",
"DSPAccelerator.cpp",
"DSPIntCCUtil.cpp",
"DSPIntExtOps.cpp",
"DSPHWInterface.cpp",
"DSPMemoryMap.cpp",
"DSPStacks.cpp",
"DSPAnalyzer.cpp",
"DspIntArithmetic.cpp",
"DspIntBranch.cpp",
"DspIntLoadStore.cpp",
"DspIntMisc.cpp",
"DspIntMultiplier.cpp",
"DSPEmitter.cpp",
"DSPCodeUtil.cpp",
"LabelMap.cpp",
"DSPInterpreter.cpp",
"DSPCore.cpp",
"DSPTables.cpp",
"Jit/DSPJitExtOps.cpp",
"Jit/DSPJitBranch.cpp",
"Jit/DSPJitUtil.cpp",
"Jit/DSPJitCCUtil.cpp",
"Jit/DSPJitArithmetic.cpp",
"Jit/DSPJitLoadStore.cpp",
"Jit/DSPJitMultiplier.cpp",
"Jit/DSPJitMisc.cpp",
"Jit/DSPJitRegCache.cpp",
]
env.StaticLibrary(env['local_libs'] + 'dspcore', files)

12
Source/Core/DebuggerWX/DebuggerWX.vcproj
View File

@ -46,7 +46,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\DSPCore\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -113,7 +113,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\DSPCore\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true" MinimalRebuild="true"
ExceptionHandling="2" ExceptionHandling="2"
@ -179,7 +179,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\DSPCore\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0" RuntimeLibrary="0"
BufferSecurityCheck="false" BufferSecurityCheck="false"
@ -246,7 +246,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP" AdditionalOptions="/MP"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\DSPCore\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0" RuntimeLibrary="0"
BufferSecurityCheck="false" BufferSecurityCheck="false"
@ -311,7 +311,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\DSPCore\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src"
PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;DEBUGFAST" PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;DEBUGFAST"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
@ -379,7 +379,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\DSPCore\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerUICommon\Src"
PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;DEBUGFAST" PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;DEBUGFAST"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"

6
Source/Core/DebuggerWX/Src/DSPDebugWindow.h
View File

@ -35,9 +35,9 @@
#include <wx/statline.h> #include <wx/statline.h>
#include <wx/aui/aui.h> #include <wx/aui/aui.h>
#include "disassemble.h" #include "DSP/disassemble.h"
#include "DSPInterpreter.h" #include "DSP/DSPInterpreter.h"
#include "DSPMemoryMap.h" #include "DSP/DSPMemoryMap.h"
#include "HW/DSPLLE/DSPDebugInterface.h" #include "HW/DSPLLE/DSPDebugInterface.h"
class DSPRegisterView; class DSPRegisterView;

14
Source/Core/DolphinWX/Src/SConscript
View File

@ -10,8 +10,9 @@ files = [
] ]
libs = [ libs = [
'audiocommon', 'bdisasm', 'common', 'core', 'discio', 'dspcore', 'core',
'inputcommon', 'lua', 'lzo2', 'sfml-network', 'z', 'GLEW', 'SOIL', 'audiocommon', 'common', 'discio', 'inputcommon',
'GLEW', 'SOIL', 'bdisasm', 'lua', 'lzo2', 'sfml-network', 'z',
] ]
wxlibs = [ ] wxlibs = [ ]
@ -72,7 +73,6 @@ elif sys.platform == 'darwin':
else: else:
exe += 'NoGUI' exe += 'NoGUI'
env.Depends(exe, env['libvideo'])
env.Install('#' + env['prefix'] + '/Dolphin.app/Contents/' + env.Install('#' + env['prefix'] + '/Dolphin.app/Contents/' +
'Frameworks/Cg.framework', source = [ 'Frameworks/Cg.framework', source = [
@ -107,7 +107,7 @@ elif sys.platform == 'darwin':
Value(dict( Value(dict(
CFBundleExecutable = 'Dolphin', CFBundleExecutable = 'Dolphin',
CFBundleIconFile = 'Dolphin.icns', CFBundleIconFile = 'Dolphin.icns',
CFBundleIdentifier = 'com.dolphin-emu.dolphin', CFBundleIdentifier = 'com.dolphin-emulator.dolphin',
CFBundlePackageType = 'APPL', CFBundlePackageType = 'APPL',
CFBundleShortVersionString = CFBundleShortVersionString =
utils.GenerateRevFile('', Dir('#None').abspath, None), utils.GenerateRevFile('', Dir('#None').abspath, None),
@ -126,7 +126,10 @@ elif sys.platform == 'darwin':
"find $SOURCES -name .svn -exec rm -rf {} +") "find $SOURCES -name .svn -exec rm -rf {} +")
else: else:
files += [ 'X11Utils.cpp' ] files += [ 'X11Utils.cpp' ]
libs += [ 'SDL' ] libs += [ 'SDL', 'clrun' ]
ldflags += [ '-Wl,--whole-archive,' + env['libvideo'][0].path ]
ldflags += [ '-Wl,--no-whole-archive' ]
ldflags += [ '-Wl,-Wsymbolic' ]
if env['HAVE_WX']: if env['HAVE_WX']:
exe = env['binary_dir'] + '/dolphin-emu' exe = env['binary_dir'] + '/dolphin-emu'
else: else:
@ -137,4 +140,5 @@ else:
libs = wxlibs + libs + env['LIBS'] libs = wxlibs + libs + env['LIBS']
linkflags = ldflags + env['LINKFLAGS'] linkflags = ldflags + env['LINKFLAGS']
env.Depends(exe, env['libvideo'])
env.Program(exe, files, LIBS = libs, LINKFLAGS = linkflags) env.Program(exe, files, LIBS = libs, LINKFLAGS = linkflags)

12
Source/DSPTool/DSPTool.vcproj
View File

@ -44,7 +44,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../Core/DSPCore/Src;../Core/Common/Src" AdditionalIncludeDirectories="../Core/Common/Src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -120,7 +120,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../Core/DSPCore/Src;../Core/Common/Src" AdditionalIncludeDirectories="../Core/Common/Src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -197,7 +197,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../Core/DSPCore/Src;../Core/Common/Src" AdditionalIncludeDirectories="../Core/Common/Src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
@ -277,7 +277,7 @@
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../Core/DSPCore/Src;../Core/Common/Src" AdditionalIncludeDirectories="../Core/Common/Src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
@ -355,7 +355,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../Core/DSPCore/Src;../Core/Common/Src" AdditionalIncludeDirectories="../Core/Common/Src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
@ -434,7 +434,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../Core/DSPCore/Src;../Core/Common/Src" AdditionalIncludeDirectories="../Core/Common/Src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"

4
Source/DSPTool/Src/main.cpp
View File

@ -18,8 +18,8 @@
#include "Common.h" #include "Common.h"
#include "FileUtil.h" #include "FileUtil.h"
#include "StringUtil.h" #include "StringUtil.h"
#include "DSPCodeUtil.h" #include "DSP/DSPCodeUtil.h"
#include "DSPTables.h" #include "DSP/DSPTables.h"
// Stub out the dsplib host stuff, since this is just a simple cmdline tools. // Stub out the dsplib host stuff, since this is just a simple cmdline tools.
u8 DSPHost_ReadHostMemory(u32 addr) { return 0; } u8 DSPHost_ReadHostMemory(u32 addr) { return 0; }

6
Source/Dolphin.sln
View File

@ -116,12 +116,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCo
{B807E8DB-4241-4754-BC2A-2F435BCA881A} = {B807E8DB-4241-4754-BC2A-2F435BCA881A} {B807E8DB-4241-4754-BC2A-2F435BCA881A} = {B807E8DB-4241-4754-BC2A-2F435BCA881A}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPCore", "Core\DSPCore\DSPCore.vcproj", "{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED}"
ProjectSection(ProjectDependencies) = postProject
{B807E8DB-4241-4754-BC2A-2F435BCA881A} = {B807E8DB-4241-4754-BC2A-2F435BCA881A}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool.vcproj", "{1970D175-3DE8-4738-942A-4D98D1CDBF64}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool.vcproj", "{1970D175-3DE8-4738-942A-4D98D1CDBF64}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED} = {838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED} {838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED} = {838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED}

5
Source/Dolphin_2010.sln
View File

@ -25,11 +25,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCo
{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPCore", "Core\DSPCore\DSPCore.vcxproj", "{4ED3C8BE-91A7-4361-8D46-16D03B678D4C}"
ProjectSection(ProjectDependencies) = postProject
{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "..\Externals\SOIL\SOIL.vcxproj", "{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "..\Externals\SOIL\SOIL.vcxproj", "{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\Externals\SFML\build\vc2010\SFML_Network.vcxproj", "{93D73454-2512-424E-9CDA-4BB357FE13DD}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\Externals\SFML\build\vc2010\SFML_Network.vcxproj", "{93D73454-2512-424E-9CDA-4BB357FE13DD}"

2
Source/UnitTests/CMakeLists.txt
View File

@ -1,4 +1,4 @@
set(LIBS dspcore set(LIBS core
common) common)
set(SRCS AudioJitTests.cpp set(SRCS AudioJitTests.cpp

4
Source/UnitTests/DSPJitTester.h
View File

@ -62,8 +62,8 @@
#ifndef __DSP_JIT_TESTER_ #ifndef __DSP_JIT_TESTER_
#define __DSP_JIT_TESTER_ #define __DSP_JIT_TESTER_
#include "DSPCore.h" #include "DSP/DSPCore.h"
#include "DSPInterpreter.h" #include "DSP/DSPInterpreter.h"
#include <map> #include <map>
#include <vector> #include <vector>

8
Source/UnitTests/UnitTests.vcproj
View File

@ -44,7 +44,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../Core/Core/Src;../Core/Common/Src;../PluginSpecs;../Core/InputCommon/Src;../Core/DSPCore/Src" AdditionalIncludeDirectories="../Core/Core/Src;../Core/Common/Src;../PluginSpecs;../Core/InputCommon/Src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -120,7 +120,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../Core/Core/Src;../Core/Common/Src;../PluginSpecs;../Core/InputCommon/Src;../Core/DSPCore/Src" AdditionalIncludeDirectories="../Core/Core/Src;../Core/Common/Src;../PluginSpecs;../Core/InputCommon/Src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -197,7 +197,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../Core/Core/Src;../Core/Common/Src;../PluginSpecs;../Core/InputCommon/Src;../Core/DSPCore/Src" AdditionalIncludeDirectories="../Core/Core/Src;../Core/Common/Src;../PluginSpecs;../Core/InputCommon/Src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
@ -277,7 +277,7 @@
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../Core/Core/Src;../Core/Common/Src;../PluginSpecs;../Core/InputCommon/Src;../Core/DSPCore/Src" AdditionalIncludeDirectories="../Core/Core/Src;../Core/Common/Src;../PluginSpecs;../Core/InputCommon/Src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"