diff --git a/CMakeLists.txt b/CMakeLists.txt index 41671f0696..a53c977bc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/Externals/CLRun/SConscript b/Externals/CLRun/SConscript index 03605da868..71fa8780a2 100644 --- a/Externals/CLRun/SConscript +++ b/Externals/CLRun/SConscript @@ -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'] diff --git a/SConstruct b/SConstruct index bb943fe24c..0f25272824 100644 --- a/SConstruct +++ b/SConstruct @@ -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', diff --git a/Source/Core/CMakeLists.txt b/Source/Core/CMakeLists.txt index 640d653f24..022eb4c524 100644 --- a/Source/Core/CMakeLists.txt +++ b/Source/Core/CMakeLists.txt @@ -10,6 +10,5 @@ endif() add_subdirectory(DiscIO) add_subdirectory(DolphinWX) -add_subdirectory(DSPCore) add_subdirectory(InputCommon) add_subdirectory(VideoCommon) diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 582d69b799..ff9326c482 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -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() diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj index e0ad0dca46..23b5d8b72e 100644 --- a/Source/Core/Core/Core.vcproj +++ b/Source/Core/Core/Core.vcproj @@ -45,7 +45,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 52de75e2e6..1f37d7e65d 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -275,6 +275,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -421,6 +450,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -542,4 +592,4 @@ - \ No newline at end of file + diff --git a/Source/Core/DSPCore/Src/DSPAccelerator.cpp b/Source/Core/Core/Src/DSP/DSPAccelerator.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DSPAccelerator.cpp rename to Source/Core/Core/Src/DSP/DSPAccelerator.cpp diff --git a/Source/Core/DSPCore/Src/DSPAccelerator.h b/Source/Core/Core/Src/DSP/DSPAccelerator.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPAccelerator.h rename to Source/Core/Core/Src/DSP/DSPAccelerator.h diff --git a/Source/Core/DSPCore/Src/DSPAnalyzer.cpp b/Source/Core/Core/Src/DSP/DSPAnalyzer.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DSPAnalyzer.cpp rename to Source/Core/Core/Src/DSP/DSPAnalyzer.cpp diff --git a/Source/Core/DSPCore/Src/DSPAnalyzer.h b/Source/Core/Core/Src/DSP/DSPAnalyzer.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPAnalyzer.h rename to Source/Core/Core/Src/DSP/DSPAnalyzer.h diff --git a/Source/Core/DSPCore/Src/DSPBreakpoints.h b/Source/Core/Core/Src/DSP/DSPBreakpoints.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPBreakpoints.h rename to Source/Core/Core/Src/DSP/DSPBreakpoints.h diff --git a/Source/Core/DSPCore/Src/DSPCodeUtil.cpp b/Source/Core/Core/Src/DSP/DSPCodeUtil.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DSPCodeUtil.cpp rename to Source/Core/Core/Src/DSP/DSPCodeUtil.cpp diff --git a/Source/Core/DSPCore/Src/DSPCodeUtil.h b/Source/Core/Core/Src/DSP/DSPCodeUtil.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPCodeUtil.h rename to Source/Core/Core/Src/DSP/DSPCodeUtil.h diff --git a/Source/Core/DSPCore/Src/DSPCommon.h b/Source/Core/Core/Src/DSP/DSPCommon.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPCommon.h rename to Source/Core/Core/Src/DSP/DSPCommon.h diff --git a/Source/Core/DSPCore/Src/DSPCore.cpp b/Source/Core/Core/Src/DSP/DSPCore.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DSPCore.cpp rename to Source/Core/Core/Src/DSP/DSPCore.cpp diff --git a/Source/Core/DSPCore/Src/DSPCore.h b/Source/Core/Core/Src/DSP/DSPCore.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPCore.h rename to Source/Core/Core/Src/DSP/DSPCore.h diff --git a/Source/Core/DSPCore/Src/DSPEmitter.cpp b/Source/Core/Core/Src/DSP/DSPEmitter.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DSPEmitter.cpp rename to Source/Core/Core/Src/DSP/DSPEmitter.cpp diff --git a/Source/Core/DSPCore/Src/DSPEmitter.h b/Source/Core/Core/Src/DSP/DSPEmitter.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPEmitter.h rename to Source/Core/Core/Src/DSP/DSPEmitter.h diff --git a/Source/Core/DSPCore/Src/DSPHWInterface.cpp b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DSPHWInterface.cpp rename to Source/Core/Core/Src/DSP/DSPHWInterface.cpp diff --git a/Source/Core/DSPCore/Src/DSPHWInterface.h b/Source/Core/Core/Src/DSP/DSPHWInterface.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPHWInterface.h rename to Source/Core/Core/Src/DSP/DSPHWInterface.h diff --git a/Source/Core/DSPCore/Src/DSPHost.h b/Source/Core/Core/Src/DSP/DSPHost.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPHost.h rename to Source/Core/Core/Src/DSP/DSPHost.h diff --git a/Source/Core/DSPCore/Src/DSPIntCCUtil.cpp b/Source/Core/Core/Src/DSP/DSPIntCCUtil.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DSPIntCCUtil.cpp rename to Source/Core/Core/Src/DSP/DSPIntCCUtil.cpp diff --git a/Source/Core/DSPCore/Src/DSPIntCCUtil.h b/Source/Core/Core/Src/DSP/DSPIntCCUtil.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPIntCCUtil.h rename to Source/Core/Core/Src/DSP/DSPIntCCUtil.h diff --git a/Source/Core/DSPCore/Src/DSPIntExtOps.cpp b/Source/Core/Core/Src/DSP/DSPIntExtOps.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DSPIntExtOps.cpp rename to Source/Core/Core/Src/DSP/DSPIntExtOps.cpp diff --git a/Source/Core/DSPCore/Src/DSPIntExtOps.h b/Source/Core/Core/Src/DSP/DSPIntExtOps.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPIntExtOps.h rename to Source/Core/Core/Src/DSP/DSPIntExtOps.h diff --git a/Source/Core/DSPCore/Src/DSPIntUtil.h b/Source/Core/Core/Src/DSP/DSPIntUtil.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPIntUtil.h rename to Source/Core/Core/Src/DSP/DSPIntUtil.h diff --git a/Source/Core/DSPCore/Src/DSPInterpreter.cpp b/Source/Core/Core/Src/DSP/DSPInterpreter.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DSPInterpreter.cpp rename to Source/Core/Core/Src/DSP/DSPInterpreter.cpp diff --git a/Source/Core/DSPCore/Src/DSPInterpreter.h b/Source/Core/Core/Src/DSP/DSPInterpreter.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPInterpreter.h rename to Source/Core/Core/Src/DSP/DSPInterpreter.h diff --git a/Source/Core/DSPCore/Src/DSPMemoryMap.cpp b/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DSPMemoryMap.cpp rename to Source/Core/Core/Src/DSP/DSPMemoryMap.cpp diff --git a/Source/Core/DSPCore/Src/DSPMemoryMap.h b/Source/Core/Core/Src/DSP/DSPMemoryMap.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPMemoryMap.h rename to Source/Core/Core/Src/DSP/DSPMemoryMap.h diff --git a/Source/Core/DSPCore/Src/DSPStacks.cpp b/Source/Core/Core/Src/DSP/DSPStacks.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DSPStacks.cpp rename to Source/Core/Core/Src/DSP/DSPStacks.cpp diff --git a/Source/Core/DSPCore/Src/DSPStacks.h b/Source/Core/Core/Src/DSP/DSPStacks.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPStacks.h rename to Source/Core/Core/Src/DSP/DSPStacks.h diff --git a/Source/Core/DSPCore/Src/DSPTables.cpp b/Source/Core/Core/Src/DSP/DSPTables.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DSPTables.cpp rename to Source/Core/Core/Src/DSP/DSPTables.cpp diff --git a/Source/Core/DSPCore/Src/DSPTables.h b/Source/Core/Core/Src/DSP/DSPTables.h similarity index 100% rename from Source/Core/DSPCore/Src/DSPTables.h rename to Source/Core/Core/Src/DSP/DSPTables.h diff --git a/Source/Core/DSPCore/Src/DspIntArithmetic.cpp b/Source/Core/Core/Src/DSP/DspIntArithmetic.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DspIntArithmetic.cpp rename to Source/Core/Core/Src/DSP/DspIntArithmetic.cpp diff --git a/Source/Core/DSPCore/Src/DspIntBranch.cpp b/Source/Core/Core/Src/DSP/DspIntBranch.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DspIntBranch.cpp rename to Source/Core/Core/Src/DSP/DspIntBranch.cpp diff --git a/Source/Core/DSPCore/Src/DspIntLoadStore.cpp b/Source/Core/Core/Src/DSP/DspIntLoadStore.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DspIntLoadStore.cpp rename to Source/Core/Core/Src/DSP/DspIntLoadStore.cpp diff --git a/Source/Core/DSPCore/Src/DspIntMisc.cpp b/Source/Core/Core/Src/DSP/DspIntMisc.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DspIntMisc.cpp rename to Source/Core/Core/Src/DSP/DspIntMisc.cpp diff --git a/Source/Core/DSPCore/Src/DspIntMultiplier.cpp b/Source/Core/Core/Src/DSP/DspIntMultiplier.cpp similarity index 100% rename from Source/Core/DSPCore/Src/DspIntMultiplier.cpp rename to Source/Core/Core/Src/DSP/DspIntMultiplier.cpp diff --git a/Source/Core/DSPCore/Src/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp similarity index 100% rename from Source/Core/DSPCore/Src/Jit/DSPJitArithmetic.cpp rename to Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp diff --git a/Source/Core/DSPCore/Src/Jit/DSPJitBranch.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp similarity index 100% rename from Source/Core/DSPCore/Src/Jit/DSPJitBranch.cpp rename to Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp diff --git a/Source/Core/DSPCore/Src/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp similarity index 100% rename from Source/Core/DSPCore/Src/Jit/DSPJitCCUtil.cpp rename to Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp diff --git a/Source/Core/DSPCore/Src/Jit/DSPJitExtOps.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp similarity index 100% rename from Source/Core/DSPCore/Src/Jit/DSPJitExtOps.cpp rename to Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp diff --git a/Source/Core/DSPCore/Src/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp similarity index 100% rename from Source/Core/DSPCore/Src/Jit/DSPJitLoadStore.cpp rename to Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp diff --git a/Source/Core/DSPCore/Src/Jit/DSPJitMisc.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp similarity index 100% rename from Source/Core/DSPCore/Src/Jit/DSPJitMisc.cpp rename to Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp diff --git a/Source/Core/DSPCore/Src/Jit/DSPJitMultiplier.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp similarity index 100% rename from Source/Core/DSPCore/Src/Jit/DSPJitMultiplier.cpp rename to Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp diff --git a/Source/Core/DSPCore/Src/Jit/DSPJitRegCache.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp similarity index 100% rename from Source/Core/DSPCore/Src/Jit/DSPJitRegCache.cpp rename to Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp diff --git a/Source/Core/DSPCore/Src/Jit/DSPJitRegCache.h b/Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.h similarity index 100% rename from Source/Core/DSPCore/Src/Jit/DSPJitRegCache.h rename to Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.h diff --git a/Source/Core/DSPCore/Src/Jit/DSPJitUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp similarity index 100% rename from Source/Core/DSPCore/Src/Jit/DSPJitUtil.cpp rename to Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp diff --git a/Source/Core/DSPCore/Src/Jit/DSPJitUtil.h b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.h similarity index 100% rename from Source/Core/DSPCore/Src/Jit/DSPJitUtil.h rename to Source/Core/Core/Src/DSP/Jit/DSPJitUtil.h diff --git a/Source/Core/DSPCore/Src/LabelMap.cpp b/Source/Core/Core/Src/DSP/LabelMap.cpp similarity index 100% rename from Source/Core/DSPCore/Src/LabelMap.cpp rename to Source/Core/Core/Src/DSP/LabelMap.cpp diff --git a/Source/Core/DSPCore/Src/LabelMap.h b/Source/Core/Core/Src/DSP/LabelMap.h similarity index 100% rename from Source/Core/DSPCore/Src/LabelMap.h rename to Source/Core/Core/Src/DSP/LabelMap.h diff --git a/Source/Core/DSPCore/Src/assemble.cpp b/Source/Core/Core/Src/DSP/assemble.cpp similarity index 100% rename from Source/Core/DSPCore/Src/assemble.cpp rename to Source/Core/Core/Src/DSP/assemble.cpp diff --git a/Source/Core/DSPCore/Src/assemble.h b/Source/Core/Core/Src/DSP/assemble.h similarity index 100% rename from Source/Core/DSPCore/Src/assemble.h rename to Source/Core/Core/Src/DSP/assemble.h diff --git a/Source/Core/DSPCore/Src/disassemble.cpp b/Source/Core/Core/Src/DSP/disassemble.cpp similarity index 100% rename from Source/Core/DSPCore/Src/disassemble.cpp rename to Source/Core/Core/Src/DSP/disassemble.cpp diff --git a/Source/Core/DSPCore/Src/disassemble.h b/Source/Core/Core/Src/DSP/disassemble.h similarity index 100% rename from Source/Core/DSPCore/Src/disassemble.h rename to Source/Core/Core/Src/DSP/disassemble.h diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp index e1b1147cd1..2e2816ae77 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPDebugInterface.cpp @@ -17,11 +17,11 @@ #include "DSPDebugInterface.h" -#include "DSPCore.h" -#include "disassemble.h" +#include "DSP/DSPCore.h" +#include "DSP/disassemble.h" #include "DSPSymbols.h" -#include "DSPMemoryMap.h" +#include "DSP/DSPMemoryMap.h" void DSPDebugInterface::disasm(unsigned int address, char *dest, int max_size) { diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp index 94c7082b1f..fa9341159b 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp @@ -17,7 +17,7 @@ #include "Common.h" #include "Hash.h" -#include "DSPHost.h" +#include "DSP/DSPHost.h" #include "DSPSymbols.h" #include "DSPLLETools.h" #include "../DSP.h" diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp index f9ab57a44d..f84d630559 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp @@ -26,16 +26,16 @@ #include "IniFile.h" #include "DSPLLEGlobals.h" // Local -#include "DSPInterpreter.h" -#include "DSPHWInterface.h" -#include "disassemble.h" +#include "DSP/DSPInterpreter.h" +#include "DSP/DSPHWInterface.h" +#include "DSP/disassemble.h" #include "DSPSymbols.h" #include "AudioCommon.h" #include "Mixer.h" -#include "DSPTables.h" -#include "DSPCore.h" +#include "DSP/DSPTables.h" +#include "DSP/DSPCore.h" #include "DSPLLE.h" #include "../Memmap.h" #include "../AudioInterface.h" diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp index e102e0ff83..1113bd5014 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLEGlobals.cpp @@ -20,7 +20,7 @@ #include #include "Common.h" // for Common::swap -#include "DSPCore.h" +#include "DSP/DSPCore.h" #include "DSPLLEGlobals.h" #if PROFILE diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp index 18c8628932..ddead22d43 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp @@ -22,11 +22,11 @@ #include "DSPLLEGlobals.h" #include "FileUtil.h" -#include "DSPCore.h" -#include "DSPCodeUtil.h" +#include "DSP/DSPCore.h" +#include "DSP/DSPCodeUtil.h" #include "DSPLLETools.h" -#include "disassemble.h" -#include "DSPInterpreter.h" +#include "DSP/disassemble.h" +#include "DSP/DSPInterpreter.h" bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc) { diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp index e67c48ba98..eb269b6b3b 100644 --- a/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp +++ b/Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp @@ -26,9 +26,9 @@ #include "Common.h" #include "StringUtil.h" -#include "DSPCore.h" +#include "DSP/DSPCore.h" #include "DSPSymbols.h" -#include "disassemble.h" +#include "DSP/disassemble.h" namespace DSPSymbols { diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript index d545c2e6ca..950f04404f 100644 --- a/Source/Core/Core/Src/SConscript +++ b/Source/Core/Core/Src/SConscript @@ -6,8 +6,6 @@ import sys files = [ "ActionReplay.cpp", "ARDecrypt.cpp", - "GeckoCode.cpp", - "GeckoCodeConfig.cpp", "ConfigManager.cpp", "Console.cpp", "Core.cpp", @@ -32,6 +30,37 @@ files = [ "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", @@ -165,7 +194,7 @@ if sys.platform == 'win32': 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/IONix.cpp" ] + files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IODummy.cpp" ] else: files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IODummy.cpp" ] diff --git a/Source/Core/DSPCore/CMakeLists.txt b/Source/Core/DSPCore/CMakeLists.txt deleted file mode 100644 index ab379cd377..0000000000 --- a/Source/Core/DSPCore/CMakeLists.txt +++ /dev/null @@ -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() diff --git a/Source/Core/DSPCore/DSPCore.vcproj b/Source/Core/DSPCore/DSPCore.vcproj deleted file mode 100644 index 43f7401e8a..0000000000 --- a/Source/Core/DSPCore/DSPCore.vcproj +++ /dev/null @@ -1,621 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Core/DSPCore/DSPCore.vcxproj b/Source/Core/DSPCore/DSPCore.vcxproj deleted file mode 100644 index 77eeeea1f3..0000000000 --- a/Source/Core/DSPCore/DSPCore.vcxproj +++ /dev/null @@ -1,239 +0,0 @@ - - - - - DebugFast - Win32 - - - DebugFast - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4ED3C8BE-91A7-4361-8D46-16D03B678D4C} - DSPCore - - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - MultiByte - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - false - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - ..\Common\Src;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreadedDebug - - - true - - - - - Level3 - Disabled - ..\Common\Src;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreadedDebug - - - true - - - - - Level3 - MaxSpeed - true - true - ..\Common\Src;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - ..\Common\Src;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - ..\Common\Src;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - ..\Common\Src;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - - - true - true - true - - - - - - \ No newline at end of file diff --git a/Source/Core/DSPCore/Src/SConscript b/Source/Core/DSPCore/Src/SConscript deleted file mode 100644 index f97a15753c..0000000000 --- a/Source/Core/DSPCore/Src/SConscript +++ /dev/null @@ -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) diff --git a/Source/Core/DebuggerWX/DebuggerWX.vcproj b/Source/Core/DebuggerWX/DebuggerWX.vcproj index 40ec7fe6e6..03c79dfb60 100644 --- a/Source/Core/DebuggerWX/DebuggerWX.vcproj +++ b/Source/Core/DebuggerWX/DebuggerWX.vcproj @@ -46,7 +46,7 @@ Name="VCCLCompilerTool" Optimization="0" 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" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -113,7 +113,7 @@ Name="VCCLCompilerTool" Optimization="0" 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" MinimalRebuild="true" ExceptionHandling="2" @@ -179,7 +179,7 @@ #include -#include "disassemble.h" -#include "DSPInterpreter.h" -#include "DSPMemoryMap.h" +#include "DSP/disassemble.h" +#include "DSP/DSPInterpreter.h" +#include "DSP/DSPMemoryMap.h" #include "HW/DSPLLE/DSPDebugInterface.h" class DSPRegisterView; diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 7e3ea1a5cf..bccbef4232 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -10,8 +10,9 @@ files = [ ] libs = [ - 'audiocommon', 'bdisasm', 'common', 'core', 'discio', 'dspcore', - 'inputcommon', 'lua', 'lzo2', 'sfml-network', 'z', 'GLEW', 'SOIL', + 'core', + 'audiocommon', 'common', 'discio', 'inputcommon', + 'GLEW', 'SOIL', 'bdisasm', 'lua', 'lzo2', 'sfml-network', 'z', ] wxlibs = [ ] @@ -72,7 +73,6 @@ elif sys.platform == 'darwin': else: exe += 'NoGUI' - env.Depends(exe, env['libvideo']) env.Install('#' + env['prefix'] + '/Dolphin.app/Contents/' + 'Frameworks/Cg.framework', source = [ @@ -107,7 +107,7 @@ elif sys.platform == 'darwin': Value(dict( CFBundleExecutable = 'Dolphin', CFBundleIconFile = 'Dolphin.icns', - CFBundleIdentifier = 'com.dolphin-emu.dolphin', + CFBundleIdentifier = 'com.dolphin-emulator.dolphin', CFBundlePackageType = 'APPL', CFBundleShortVersionString = utils.GenerateRevFile('', Dir('#None').abspath, None), @@ -126,7 +126,10 @@ elif sys.platform == 'darwin': "find $SOURCES -name .svn -exec rm -rf {} +") else: 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']: exe = env['binary_dir'] + '/dolphin-emu' else: @@ -137,4 +140,5 @@ else: libs = wxlibs + libs + env['LIBS'] linkflags = ldflags + env['LINKFLAGS'] +env.Depends(exe, env['libvideo']) env.Program(exe, files, LIBS = libs, LINKFLAGS = linkflags) diff --git a/Source/DSPTool/DSPTool.vcproj b/Source/DSPTool/DSPTool.vcproj index c099f71d81..9dd8aa47e1 100644 --- a/Source/DSPTool/DSPTool.vcproj +++ b/Source/DSPTool/DSPTool.vcproj @@ -44,7 +44,7 @@ #include diff --git a/Source/UnitTests/UnitTests.vcproj b/Source/UnitTests/UnitTests.vcproj index af08b8bac1..d85c9fb9c1 100644 --- a/Source/UnitTests/UnitTests.vcproj +++ b/Source/UnitTests/UnitTests.vcproj @@ -44,7 +44,7 @@