izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07: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
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
-1
View File
@@ -254,7 +254,6 @@ include_directories(Source/Core/DebuggerUICommon/Src)
include_directories(Source/Core/DebuggerWX/Src)
include_directories(Source/Core/DiscIO/Src)
include_directories(Source/Core/DolphinWX/Src)
include_directories(Source/Core/DSPCore/Src)
include_directories(Source/Core/InputCommon/Src)
include_directories(Source/Core/VideoCommon/Src)
include_directories(Source/Core/VideoUICommon/Src)
Externals/CLRun/SConscript
Vendored
+12
View File
@@ -1,5 +1,17 @@
# -*- python -*-
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']
SConstruct
-1
View File
@@ -342,7 +342,6 @@ dirs += [
'Source/Core/AudioCommon/Src',
'Source/Core/Common/Src',
'Source/Core/Core/Src',
'Source/Core/DSPCore/Src',
'Source/Core/DebuggerUICommon/Src',
'Source/Core/DebuggerWX/Src',
'Source/Core/DiscIO/Src',
Source/Core/CMakeLists.txt
-1
View File
@@ -10,6 +10,5 @@ endif()
add_subdirectory(DiscIO)
add_subdirectory(DolphinWX)
add_subdirectory(DSPCore)
add_subdirectory(InputCommon)
add_subdirectory(VideoCommon)
Source/Core/Core/CMakeLists.txt
+33 -2
View File
@@ -27,6 +27,35 @@ set(SRCS Src/ActionReplay.cpp
Src/Debugger/Debugger_SymbolMap.cpp
Src/Debugger/Dump.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_Misc.cpp
Src/HLE/HLE_OS.cpp
@@ -154,7 +183,7 @@ set(SRCS Src/ActionReplay.cpp
Src/PowerPC/JitCommon/JitCache.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)
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})
target_link_libraries(core ${LIBS})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-fPIC)
endif()
Source/Core/Core/Core.vcproj
+218 -6
View File
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
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"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
<Tool
Name="VCCLCompilerTool"
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"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -191,7 +191,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
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"
StringPooling="true"
RuntimeLibrary="0"
@@ -269,7 +269,7 @@
OmitFramePointers="true"
EnableFiberSafeOptimizations="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"
StringPooling="true"
RuntimeLibrary="0"
@@ -344,7 +344,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
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"
RuntimeLibrary="0"
BufferSecurityCheck="true"
@@ -419,7 +419,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
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"
RuntimeLibrary="0"
BufferSecurityCheck="false"
@@ -465,6 +465,218 @@
<References>
</References>
<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
Name="HLE"
>
Source/Core/Core/Core.vcxproj
+51 -1
View File
@@ -275,6 +275,35 @@
<ClCompile Include="Src\Debugger\Debugger_SymbolMap.cpp" />
<ClCompile Include="Src\Debugger\Dump.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\GeckoCodeConfig.cpp" />
<ClCompile Include="Src\HLE\HLE.cpp" />
@@ -421,6 +450,27 @@
<ClInclude Include="Src\Debugger\GCELF.h" />
<ClInclude Include="Src\Debugger\PPCDebugInterface.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\GeckoCodeConfig.h" />
<ClInclude Include="Src\HLE\HLE.h" />
@@ -542,4 +592,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
Source/Core/DSPCore/Src/DSPAccelerator.cpp → Source/Core/Core/Src/DSP/DSPAccelerator.cpp
View File
Source/Core/DSPCore/Src/DSPAccelerator.h → Source/Core/Core/Src/DSP/DSPAccelerator.h
View File
Source/Core/DSPCore/Src/DSPAnalyzer.cpp → Source/Core/Core/Src/DSP/DSPAnalyzer.cpp
View File
Source/Core/DSPCore/Src/DSPAnalyzer.h → Source/Core/Core/Src/DSP/DSPAnalyzer.h
View File
Source/Core/DSPCore/Src/DSPBreakpoints.h → Source/Core/Core/Src/DSP/DSPBreakpoints.h
View File
Source/Core/DSPCore/Src/DSPCodeUtil.cpp → Source/Core/Core/Src/DSP/DSPCodeUtil.cpp
View File
Source/Core/DSPCore/Src/DSPCodeUtil.h → Source/Core/Core/Src/DSP/DSPCodeUtil.h
View File
Source/Core/DSPCore/Src/DSPCommon.h → Source/Core/Core/Src/DSP/DSPCommon.h
View File
Source/Core/DSPCore/Src/DSPCore.cpp → Source/Core/Core/Src/DSP/DSPCore.cpp
View File
Source/Core/DSPCore/Src/DSPCore.h → Source/Core/Core/Src/DSP/DSPCore.h
View File
Source/Core/DSPCore/Src/DSPEmitter.cpp → Source/Core/Core/Src/DSP/DSPEmitter.cpp
View File
Source/Core/DSPCore/Src/DSPEmitter.h → Source/Core/Core/Src/DSP/DSPEmitter.h
View File
Source/Core/DSPCore/Src/DSPHWInterface.cpp → Source/Core/Core/Src/DSP/DSPHWInterface.cpp
View File

Some files were not shown because too many files have changed in this diff Show More