From 8fdaaa2eabf6c74b1c839d9115a7c7e1cd3a63d8 Mon Sep 17 00:00:00 2001 From: kojin Date: Wed, 1 Sep 2021 16:31:46 -0400 Subject: [PATCH] common: reorganize --- PCSX2_suite.sln | 97 +++----- common/{src/Utilities => }/AlignedMalloc.cpp | 5 +- common/{include/Utilities => }/AppTrait.h | 0 common/{include/Utilities => }/Assertions.h | 3 + common/{src/Utilities => }/CMakeLists.txt | 0 .../{src/Utilities => }/CheckedStaticBox.cpp | 3 +- .../Utilities => }/CheckedStaticBox.h | 2 +- common/{src/Utilities => }/Console.cpp | 8 +- common/{include/Utilities => }/Console.h | 0 .../{src/Utilities => }/Darwin/DarwinMisc.cpp | 0 .../Utilities => }/Darwin/DarwinSemaphore.cpp | 0 .../Utilities => }/Darwin/DarwinThreads.cpp | 0 common/{include/Utilities => }/Dependencies.h | 6 +- .../{include/Utilities => }/EmbeddedImage.h | 0 common/{src/Utilities => }/EventSource.cpp | 0 common/{include/Utilities => }/EventSource.h | 2 +- .../{include/Utilities => }/EventSource.inl | 2 +- common/{src/Utilities => }/Exceptions.cpp | 7 +- common/{include/Utilities => }/Exceptions.h | 6 +- .../{src/Utilities => }/FastFormatString.cpp | 6 +- common/{include/Utilities => }/General.h | 4 + common/{src/Utilities => }/IniInterface.cpp | 6 +- common/{include/Utilities => }/IniInterface.h | 0 .../{src/Utilities => }/Linux/LnxHostSys.cpp | 9 +- common/{src/Utilities => }/Linux/LnxMisc.cpp | 4 +- .../{src/Utilities => }/Linux/LnxThreads.cpp | 7 +- common/{include/Utilities => }/MathUtils.h | 2 +- common/{include/Utilities => }/MemcpyFast.h | 3 + common/{include/Utilities => }/MemsetFast.inl | 0 common/{src/Utilities => }/Mutex.cpp | 11 +- .../{include/Utilities => }/PageFaultSource.h | 0 common/{include/Utilities => }/Path.h | 2 +- common/{src/Utilities => }/PathUtils.cpp | 3 +- common/{include => }/Pcsx2Defs.h | 23 +- common/{include => }/Pcsx2Types.h | 13 +- common/{src/Utilities => }/Perf.cpp | 13 +- common/{include/Utilities => }/Perf.h | 3 + .../Utilities => }/PersistentThread.h | 6 +- .../{src/Utilities => }/PrecompiledHeader.cpp | 0 common/PrecompiledHeader.h | 14 ++ .../PrecompiledHeader.h => RedtapeWindows.h} | 21 +- common/{src/Utilities => }/RwMutex.cpp | 3 +- common/{include/Utilities => }/RwMutex.h | 2 +- common/{include/Utilities => }/SafeArray.h | 2 +- common/{include/Utilities => }/SafeArray.inl | 0 common/{include/Utilities => }/ScopedAlloc.h | 2 +- common/{include/Utilities => }/ScopedPtrMT.h | 0 common/{src/Utilities => }/Semaphore.cpp | 11 +- common/{src/Utilities => }/StringHelpers.cpp | 3 +- .../{include/Utilities => }/StringHelpers.h | 7 +- common/{src/Utilities => }/ThreadTools.cpp | 12 +- common/{include/Utilities => }/Threading.h | 11 +- .../{src/Utilities => }/ThreadingDialogs.cpp | 5 +- .../Utilities => }/ThreadingDialogs.h | 0 .../{src/Utilities => }/ThreadingInternal.h | 0 common/{include/Utilities => }/TraceLog.h | 0 common/{src/Utilities => }/VirtualMemory.cpp | 9 +- .../Utilities => }/Windows/WinHostSys.cpp | 7 +- .../{src/Utilities => }/Windows/WinMisc.cpp | 12 +- .../Utilities => }/Windows/WinThreads.cpp | 7 +- common/{include => }/afxresmw.h | 0 .../Utilities => }/boost_spsc_queue.hpp | 0 common/build/Utilities/utilities.vcxproj | 131 ----------- .../build/Utilities/utilities.vcxproj.filters | 214 ------------------ common/build/x86emitter/x86emitter.vcxproj | 92 -------- .../x86emitter/x86emitter.vcxproj.filters | 150 ------------ common/common.vcxproj | 162 +++++++++++++ .../x86emitter => emitter}/CMakeLists.txt | 0 .../x86emitter => emitter}/LnxCpuDetect.cpp | 6 +- .../PrecompiledHeader.cpp | 0 .../PrecompiledHeader.h | 10 +- .../x86emitter => emitter}/WinCpuDetect.cpp | 5 +- common/{src/x86emitter => emitter}/bmi.cpp | 5 +- .../{src/x86emitter => emitter}/cpudetect.cpp | 9 +- .../cpudetect_internal.h | 4 +- common/{src/x86emitter => emitter}/fpu.cpp | 3 +- common/{src/x86emitter => emitter}/groups.cpp | 5 +- .../x86emitter => emitter}/implement/bmi.h | 0 .../implement/dwshift.h | 0 .../x86emitter => emitter}/implement/group1.h | 0 .../x86emitter => emitter}/implement/group2.h | 0 .../x86emitter => emitter}/implement/group3.h | 0 .../implement/helpers.h | 0 .../x86emitter => emitter}/implement/incdec.h | 0 .../implement/jmpcall.h | 0 .../x86emitter => emitter}/implement/movs.h | 0 .../implement/simd_arithmetic.h | 0 .../implement/simd_comparisons.h | 0 .../implement/simd_helpers.h | 0 .../implement/simd_moremovs.h | 0 .../implement/simd_shufflepack.h | 0 .../implement/simd_templated_helpers.h | 0 .../x86emitter => emitter}/implement/test.h | 0 .../x86emitter => emitter}/implement/xchg.h | 0 .../x86emitter => emitter}/instructions.h | 0 .../x86emitter => emitter}/internal.h | 5 +- common/{src/x86emitter => emitter}/jmp.cpp | 3 +- common/{src/x86emitter => emitter}/legacy.cpp | 3 +- .../legacy_instructions.h | 0 .../x86emitter => emitter}/legacy_internal.h | 6 +- .../x86emitter => emitter}/legacy_sse.cpp | 3 +- .../x86emitter => emitter}/legacy_types.h | 0 common/{src/x86emitter => emitter}/movs.cpp | 5 +- common/{src/x86emitter => emitter}/simd.cpp | 5 +- .../{include/x86emitter => emitter}/tools.h | 2 +- .../x86emitter => emitter}/x86_intrin.h | 0 .../x86emitter => emitter}/x86emitter.cpp | 5 +- .../x86emitter => emitter}/x86emitter.h | 10 +- .../x86emitter => emitter}/x86types.h | 4 +- common/include/Utilities/RedtapeWindows.h | 46 ---- common/include/wx/folderdesc.txt | 15 -- common/{include/Utilities => }/mt_queue.h | 0 common/{src/Utilities => }/pxCheckBox.cpp | 5 +- common/{include/Utilities => }/pxCheckBox.h | 2 +- common/{include/Utilities => }/pxEvents.h | 4 +- .../{include/Utilities => }/pxForwardDefs.h | 0 common/{src/Utilities => }/pxRadioPanel.cpp | 8 +- common/{include/Utilities => }/pxRadioPanel.h | 4 +- common/{src/Utilities => }/pxStaticText.cpp | 4 +- common/{include/Utilities => }/pxStaticText.h | 1 + common/{src/Utilities => }/pxStreams.cpp | 9 +- common/{include/Utilities => }/pxStreams.h | 2 +- common/{src/Utilities => }/pxTranslate.cpp | 2 +- .../Utilities => }/pxWindowTextWriter.cpp | 5 +- common/svn_readme.txt | 17 -- common/vsprops/BaseProperties.props | 4 +- common/vsprops/CommonLibrary.props | 2 +- .../{src/Utilities => }/wxAppWithHelpers.cpp | 8 +- .../Utilities => }/wxAppWithHelpers.h | 8 +- common/{include/Utilities => }/wxBaseTools.h | 2 +- common/{src/Utilities => }/wxGuiTools.cpp | 6 +- common/{include/Utilities => }/wxGuiTools.h | 16 +- common/{src/Utilities => }/wxHelpers.cpp | 11 +- common/{src/Utilities => }/x86/MemcpyFast.cpp | 3 +- pcsx2/CDVD/CompressedFileReaderUtils.h | 2 +- pcsx2/CDVD/CsoFileReader.cpp | 2 +- pcsx2/CDVD/ThreadedFileReader.h | 2 +- pcsx2/Common.h | 2 +- pcsx2/Config.h | 4 +- pcsx2/DebugTools/BiosDebugData.h | 2 +- pcsx2/DebugTools/Breakpoints.h | 2 +- pcsx2/DebugTools/Debug.h | 2 +- pcsx2/DebugTools/DisassemblyManager.h | 4 +- pcsx2/DebugTools/ExpressionParser.h | 2 +- pcsx2/DebugTools/MipsStackWalk.h | 2 +- pcsx2/DebugTools/SymbolMap.h | 2 +- pcsx2/GS/GS.cpp | 2 +- pcsx2/GS/GS.h | 2 +- pcsx2/GS/GSThread_CXX11.h | 2 +- pcsx2/GS/GSVector.h | 2 +- pcsx2/Gif_Unit.h | 2 +- pcsx2/IPC.h | 2 +- pcsx2/IPU/IPU.cpp | 2 +- pcsx2/IPU/mpeg2lib/Mpeg.cpp | 2 +- pcsx2/IopGte.cpp | 2 +- pcsx2/MMI.cpp | 2 +- pcsx2/Memory.cpp | 2 +- pcsx2/Memory.h | 2 +- pcsx2/MemoryTypes.h | 2 + pcsx2/PAD/Windows/DirectInput.cpp | 2 +- pcsx2/PAD/Windows/PAD.h | 4 +- pcsx2/Patch.h | 2 +- pcsx2/PathDefs.h | 2 +- pcsx2/Pcsx2Config.cpp | 2 +- pcsx2/PrecompiledHeader.h | 16 +- pcsx2/R5900OpcodeTables.h | 2 +- .../Utilities/InputRecordingLogger.h | 2 +- pcsx2/Recording/VirtualPad/VirtualPad.cpp | 2 +- pcsx2/Recording/VirtualPad/VirtualPad.h | 2 +- pcsx2/Recording/VirtualPad/VirtualPadData.h | 2 +- .../VirtualPad/VirtualPadResources.h | 2 +- pcsx2/SPU2/Wavedump_wav.cpp | 2 +- pcsx2/SPU2/Windows/CfgHelpers.cpp | 4 +- pcsx2/SPU2/Windows/ConfigDebug.cpp | 2 +- pcsx2/SPU2/Windows/SPU2.rc | 2 +- pcsx2/SPU2/spu2.cpp | 2 +- pcsx2/SPU2/spu2.h | 2 +- pcsx2/SaveState.cpp | 2 +- pcsx2/SaveState.h | 2 +- pcsx2/System.cpp | 4 +- pcsx2/System.h | 4 +- pcsx2/System/RecTypes.h | 2 +- pcsx2/System/SysCoreThread.cpp | 6 +- pcsx2/System/SysThreads.h | 4 +- pcsx2/USB/USB.cpp | 2 +- pcsx2/ZipTools/ThreadedZipTools.h | 4 +- pcsx2/ZipTools/thread_gzip.cpp | 2 +- pcsx2/gui/App.h | 2 +- pcsx2/gui/AppAssert.cpp | 2 +- pcsx2/gui/AppCommon.h | 16 +- pcsx2/gui/AppConfig.cpp | 2 +- pcsx2/gui/AppConfig.h | 4 +- pcsx2/gui/AppCoreThread.cpp | 2 +- pcsx2/gui/AppEventListeners.h | 5 +- pcsx2/gui/AppEventSources.cpp | 4 +- pcsx2/gui/AppInit.cpp | 2 +- pcsx2/gui/AppMain.cpp | 4 +- pcsx2/gui/AppRes.cpp | 2 +- pcsx2/gui/AppUserMode.cpp | 2 +- pcsx2/gui/ConsoleLogger.cpp | 6 +- pcsx2/gui/Dialogs/AboutBoxDialog.cpp | 2 +- pcsx2/gui/Dialogs/ConfirmationDialogs.cpp | 2 +- pcsx2/gui/Dialogs/GSDumpDialog.cpp | 2 +- pcsx2/gui/Dialogs/LogOptionsDialog.h | 4 +- pcsx2/gui/Dialogs/ModalPopups.h | 2 +- pcsx2/gui/MainMenuClicks.cpp | 2 +- pcsx2/gui/MemoryCardFile.cpp | 2 +- pcsx2/gui/MemoryCardFolder.cpp | 2 +- pcsx2/gui/Panels/LogOptionsPanels.cpp | 2 +- pcsx2/gui/Panels/MemoryCardListPanel.cpp | 2 +- pcsx2/gui/Panels/MemoryCardListView.cpp | 2 +- pcsx2/gui/RecentIsoList.cpp | 2 +- pcsx2/gui/SysState.cpp | 2 +- pcsx2/gui/i18n.cpp | 2 +- pcsx2/gui/pxEventThread.h | 4 +- pcsx2/pcsx2.vcxproj | 11 +- pcsx2/pcsx2.vcxproj.filters | 3 - pcsx2/ps2/BiosTools.cpp | 2 +- pcsx2/vtlb.cpp | 2 +- pcsx2/vtlb.h | 2 +- pcsx2/windows/Win32.h | 2 +- pcsx2/windows/wxResources.rc | 2 +- pcsx2/x86/R5900_Profiler.h | 2 +- pcsx2/x86/iCore.h | 2 +- pcsx2/x86/iFPUd.cpp | 2 +- pcsx2/x86/iMMI.cpp | 2 +- pcsx2/x86/iMisc.cpp | 2 +- pcsx2/x86/iR3000A.cpp | 2 +- pcsx2/x86/iR3000A.h | 2 +- pcsx2/x86/iR5900.h | 2 +- pcsx2/x86/ix86-32/iCore-32.cpp | 2 +- pcsx2/x86/ix86-32/iR5900-32.cpp | 4 +- pcsx2/x86/ix86-32/recVTLB.cpp | 2 +- pcsx2/x86/microVU.cpp | 2 +- pcsx2/x86/microVU.h | 4 +- pcsx2/x86/newVif.h | 2 +- pcsx2/x86/newVif_Dynarec.cpp | 2 +- pcsx2/x86/newVif_UnpackSSE.h | 2 +- tools/bin2cpp/bin2cpp.cpp | 2 +- 239 files changed, 559 insertions(+), 1145 deletions(-) rename common/{src/Utilities => }/AlignedMalloc.cpp (96%) rename common/{include/Utilities => }/AppTrait.h (100%) rename common/{include/Utilities => }/Assertions.h (99%) rename common/{src/Utilities => }/CMakeLists.txt (100%) rename common/{src/Utilities => }/CheckedStaticBox.cpp (97%) rename common/{include/Utilities => }/CheckedStaticBox.h (97%) rename common/{src/Utilities => }/Console.cpp (99%) rename common/{include/Utilities => }/Console.h (100%) rename common/{src/Utilities => }/Darwin/DarwinMisc.cpp (100%) rename common/{src/Utilities => }/Darwin/DarwinSemaphore.cpp (100%) rename common/{src/Utilities => }/Darwin/DarwinThreads.cpp (100%) rename common/{include/Utilities => }/Dependencies.h (99%) rename common/{include/Utilities => }/EmbeddedImage.h (100%) rename common/{src/Utilities => }/EventSource.cpp (100%) rename common/{include/Utilities => }/EventSource.h (99%) rename common/{include/Utilities => }/EventSource.inl (99%) rename common/{src/Utilities => }/Exceptions.cpp (99%) rename common/{include/Utilities => }/Exceptions.h (99%) rename common/{src/Utilities => }/FastFormatString.cpp (98%) rename common/{include/Utilities => }/General.h (99%) rename common/{src/Utilities => }/IniInterface.cpp (99%) rename common/{include/Utilities => }/IniInterface.h (100%) rename common/{src/Utilities => }/Linux/LnxHostSys.cpp (99%) rename common/{src/Utilities => }/Linux/LnxMisc.cpp (97%) rename common/{src/Utilities => }/Linux/LnxThreads.cpp (98%) rename common/{include/Utilities => }/MathUtils.h (97%) rename common/{include/Utilities => }/MemcpyFast.h (96%) rename common/{include/Utilities => }/MemsetFast.inl (100%) rename common/{src/Utilities => }/Mutex.cpp (98%) rename common/{include/Utilities => }/PageFaultSource.h (100%) rename common/{include/Utilities => }/Path.h (99%) rename common/{src/Utilities => }/PathUtils.cpp (99%) rename common/{include => }/Pcsx2Defs.h (95%) rename common/{include => }/Pcsx2Types.h (98%) rename common/{src/Utilities => }/Perf.cpp (98%) rename common/{include/Utilities => }/Perf.h (96%) rename common/{include/Utilities => }/PersistentThread.h (98%) rename common/{src/Utilities => }/PrecompiledHeader.cpp (100%) create mode 100644 common/PrecompiledHeader.h rename common/{src/Utilities/PrecompiledHeader.h => RedtapeWindows.h} (68%) rename common/{src/Utilities => }/RwMutex.cpp (98%) rename common/{include/Utilities => }/RwMutex.h (98%) rename common/{include/Utilities => }/SafeArray.h (99%) rename common/{include/Utilities => }/SafeArray.inl (100%) rename common/{include/Utilities => }/ScopedAlloc.h (99%) rename common/{include/Utilities => }/ScopedPtrMT.h (100%) rename common/{src/Utilities => }/Semaphore.cpp (97%) rename common/{src/Utilities => }/StringHelpers.cpp (99%) rename common/{include/Utilities => }/StringHelpers.h (98%) rename common/{src/Utilities => }/ThreadTools.cpp (99%) rename common/{include/Utilities => }/Threading.h (98%) rename common/{src/Utilities => }/ThreadingDialogs.cpp (97%) rename common/{include/Utilities => }/ThreadingDialogs.h (100%) rename common/{src/Utilities => }/ThreadingInternal.h (100%) rename common/{include/Utilities => }/TraceLog.h (100%) rename common/{src/Utilities => }/VirtualMemory.cpp (99%) rename common/{src/Utilities => }/Windows/WinHostSys.cpp (97%) rename common/{src/Utilities => }/Windows/WinMisc.cpp (95%) rename common/{src/Utilities => }/Windows/WinThreads.cpp (97%) rename common/{include => }/afxresmw.h (100%) rename common/{include/Utilities => }/boost_spsc_queue.hpp (100%) delete mode 100644 common/build/Utilities/utilities.vcxproj delete mode 100644 common/build/Utilities/utilities.vcxproj.filters delete mode 100644 common/build/x86emitter/x86emitter.vcxproj delete mode 100644 common/build/x86emitter/x86emitter.vcxproj.filters create mode 100644 common/common.vcxproj rename common/{src/x86emitter => emitter}/CMakeLists.txt (100%) rename common/{src/x86emitter => emitter}/LnxCpuDetect.cpp (95%) rename common/{src/x86emitter => emitter}/PrecompiledHeader.cpp (100%) rename common/{src/x86emitter => emitter}/PrecompiledHeader.h (87%) rename common/{src/x86emitter => emitter}/WinCpuDetect.cpp (97%) rename common/{src/x86emitter => emitter}/bmi.cpp (94%) rename common/{src/x86emitter => emitter}/cpudetect.cpp (98%) rename common/{src/x86emitter => emitter}/cpudetect_internal.h (94%) rename common/{src/x86emitter => emitter}/fpu.cpp (97%) rename common/{src/x86emitter => emitter}/groups.cpp (99%) rename common/{include/x86emitter => emitter}/implement/bmi.h (100%) rename common/{include/x86emitter => emitter}/implement/dwshift.h (100%) rename common/{include/x86emitter => emitter}/implement/group1.h (100%) rename common/{include/x86emitter => emitter}/implement/group2.h (100%) rename common/{include/x86emitter => emitter}/implement/group3.h (100%) rename common/{include/x86emitter => emitter}/implement/helpers.h (100%) rename common/{include/x86emitter => emitter}/implement/incdec.h (100%) rename common/{include/x86emitter => emitter}/implement/jmpcall.h (100%) rename common/{include/x86emitter => emitter}/implement/movs.h (100%) rename common/{include/x86emitter => emitter}/implement/simd_arithmetic.h (100%) rename common/{include/x86emitter => emitter}/implement/simd_comparisons.h (100%) rename common/{include/x86emitter => emitter}/implement/simd_helpers.h (100%) rename common/{include/x86emitter => emitter}/implement/simd_moremovs.h (100%) rename common/{include/x86emitter => emitter}/implement/simd_shufflepack.h (100%) rename common/{include/x86emitter => emitter}/implement/simd_templated_helpers.h (100%) rename common/{include/x86emitter => emitter}/implement/test.h (100%) rename common/{include/x86emitter => emitter}/implement/xchg.h (100%) rename common/{include/x86emitter => emitter}/instructions.h (100%) rename common/{include/x86emitter => emitter}/internal.h (98%) rename common/{src/x86emitter => emitter}/jmp.cpp (99%) rename common/{src/x86emitter => emitter}/legacy.cpp (99%) rename common/{include/x86emitter => emitter}/legacy_instructions.h (100%) rename common/{include/x86emitter => emitter}/legacy_internal.h (91%) rename common/{src/x86emitter => emitter}/legacy_sse.cpp (96%) rename common/{include/x86emitter => emitter}/legacy_types.h (100%) rename common/{src/x86emitter => emitter}/movs.cpp (99%) rename common/{src/x86emitter => emitter}/simd.cpp (99%) rename common/{include/x86emitter => emitter}/tools.h (99%) rename common/{include/x86emitter => emitter}/x86_intrin.h (100%) rename common/{src/x86emitter => emitter}/x86emitter.cpp (99%) rename common/{include/x86emitter => emitter}/x86emitter.h (89%) rename common/{include/x86emitter => emitter}/x86types.h (99%) delete mode 100644 common/include/Utilities/RedtapeWindows.h delete mode 100644 common/include/wx/folderdesc.txt rename common/{include/Utilities => }/mt_queue.h (100%) rename common/{src/Utilities => }/pxCheckBox.cpp (97%) rename common/{include/Utilities => }/pxCheckBox.h (99%) rename common/{include/Utilities => }/pxEvents.h (99%) rename common/{include/Utilities => }/pxForwardDefs.h (100%) rename common/{src/Utilities => }/pxRadioPanel.cpp (98%) rename common/{include/Utilities => }/pxRadioPanel.h (98%) rename common/{src/Utilities => }/pxStaticText.cpp (99%) rename common/{include/Utilities => }/pxStaticText.h (99%) rename common/{src/Utilities => }/pxStreams.cpp (98%) rename common/{include/Utilities => }/pxStreams.h (99%) rename common/{src/Utilities => }/pxTranslate.cpp (97%) rename common/{src/Utilities => }/pxWindowTextWriter.cpp (97%) delete mode 100644 common/svn_readme.txt rename common/{src/Utilities => }/wxAppWithHelpers.cpp (99%) rename common/{include/Utilities => }/wxAppWithHelpers.h (97%) rename common/{include/Utilities => }/wxBaseTools.h (98%) rename common/{src/Utilities => }/wxGuiTools.cpp (99%) rename common/{include/Utilities => }/wxGuiTools.h (99%) rename common/{src/Utilities => }/wxHelpers.cpp (98%) rename common/{src/Utilities => }/x86/MemcpyFast.cpp (97%) diff --git a/PCSX2_suite.sln b/PCSX2_suite.sln index 9c7c0bf721..eeb41c31c2 100644 --- a/PCSX2_suite.sln +++ b/PCSX2_suite.sln @@ -1,25 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30503.244 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31606.5 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rdparty", "3rdparty", "{78EBE642-7A4D-4EA7-86BE-5639C6646C38}" ProjectSection(SolutionItems) = preProject 3rdparty\svn_readme.txt = 3rdparty\svn_readme.txt EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{88F517F9-CE1C-4005-9BDF-4481FEB55053}" - ProjectSection(SolutionItems) = preProject - common\svn_readme.txt = common\svn_readme.txt - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Include", "Include", "{0FADC26C-0E9D-4DD7-84B1-BF4F7754E90C}" - ProjectSection(SolutionItems) = preProject - common\include\afxresmw.h = common\include\afxresmw.h - common\include\Pcsx2Defs.h = common\include\Pcsx2Defs.h - common\include\Pcsx2Types.h = common\include\Pcsx2Types.h - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{2D6F0A62-A247-4CCF-947F-FCD54BE16103}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcsx2", "pcsx2\pcsx2.vcxproj", "{1CEFD830-2B76-4596-A4EE-BCD7280A60BD}" @@ -34,10 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "3rdparty\soun EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "3rdparty\zlib\zlib.vcxproj", "{2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x86emitter", "common\build\x86emitter\x86emitter.vcxproj", "{A51123F5-9505-4EAE-85E7-D320290A272C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilities", "common\build\Utilities\utilities.vcxproj", "{4639972E-424E-4E13-8B07-CA403C481346}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin2cpp", "tools\bin2cpp\bin2c.vcxproj", "{677B7D11-D5E1-40B3-88B1-9A4DF83D2213}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "3rdparty\libjpeg\libjpeg.vcxproj", "{BC236261-77E8-4567-8D09-45CD02965EB6}" @@ -72,6 +56,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchdr", "3rdparty\libchdr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpgd", "3rdparty\jpgd\jpgd.vcxproj", "{ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcxproj", "{4639972E-424E-4E13-8B07-CA403C481346}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug AVX2|Win32 = Debug AVX2|Win32 @@ -160,54 +146,6 @@ Global {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release|Win32.Build.0 = Release|Win32 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release|x64.ActiveCfg = Release|x64 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release|x64.Build.0 = Release|x64 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug AVX2|Win32.ActiveCfg = Debug|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug AVX2|Win32.Build.0 = Debug|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug AVX2|x64.Build.0 = Debug|x64 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug|Win32.ActiveCfg = Debug|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug|Win32.Build.0 = Debug|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug|x64.ActiveCfg = Debug|x64 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug|x64.Build.0 = Debug|x64 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel AVX2|Win32.ActiveCfg = Devel|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel AVX2|Win32.Build.0 = Devel|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel AVX2|x64.Build.0 = Devel|x64 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel|Win32.ActiveCfg = Devel|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel|Win32.Build.0 = Devel|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel|x64.ActiveCfg = Devel|x64 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel|x64.Build.0 = Devel|x64 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX2|Win32.ActiveCfg = Release|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX2|Win32.Build.0 = Release|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX2|x64.ActiveCfg = Release|x64 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX2|x64.Build.0 = Release|x64 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release|Win32.ActiveCfg = Release|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release|Win32.Build.0 = Release|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release|x64.ActiveCfg = Release|x64 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release|x64.Build.0 = Release|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug AVX2|Win32.ActiveCfg = Debug|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug AVX2|Win32.Build.0 = Debug|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug AVX2|x64.ActiveCfg = Debug|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug AVX2|x64.Build.0 = Debug|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug|Win32.ActiveCfg = Debug|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug|Win32.Build.0 = Debug|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug|x64.ActiveCfg = Debug|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug|x64.Build.0 = Debug|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel AVX2|Win32.ActiveCfg = Devel|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel AVX2|Win32.Build.0 = Devel|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel AVX2|x64.ActiveCfg = Devel|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel AVX2|x64.Build.0 = Devel|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel|Win32.ActiveCfg = Devel|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel|Win32.Build.0 = Devel|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel|x64.ActiveCfg = Devel|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel|x64.Build.0 = Devel|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|Win32.ActiveCfg = Release|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|Win32.Build.0 = Release|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|x64.ActiveCfg = Release|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|x64.Build.0 = Release|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Release|Win32.ActiveCfg = Release|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Release|Win32.Build.0 = Release|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Release|x64.ActiveCfg = Release|x64 - {4639972E-424E-4E13-8B07-CA403C481346}.Release|x64.Build.0 = Release|x64 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Debug AVX2|Win32.ActiveCfg = Debug|Win32 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Debug AVX2|Win32.Build.0 = Debug|Win32 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Debug AVX2|x64.ActiveCfg = Debug|x64 @@ -616,16 +554,37 @@ Global {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Release|Win32.Build.0 = Release|Win32 {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Release|x64.ActiveCfg = Release|x64 {ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}.Release|x64.Build.0 = Release|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Debug AVX2|Win32.ActiveCfg = Debug|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Debug AVX2|Win32.Build.0 = Debug|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Debug AVX2|x64.ActiveCfg = Debug|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Debug AVX2|x64.Build.0 = Debug|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Debug|Win32.ActiveCfg = Debug|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Debug|Win32.Build.0 = Debug|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Debug|x64.ActiveCfg = Debug|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Debug|x64.Build.0 = Debug|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Devel AVX2|Win32.ActiveCfg = Devel|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Devel AVX2|Win32.Build.0 = Devel|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Devel AVX2|x64.ActiveCfg = Devel|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Devel AVX2|x64.Build.0 = Devel|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Devel|Win32.ActiveCfg = Devel|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Devel|Win32.Build.0 = Devel|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Devel|x64.ActiveCfg = Devel|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Devel|x64.Build.0 = Devel|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|Win32.ActiveCfg = Release|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|Win32.Build.0 = Release|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|x64.ActiveCfg = Release|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|x64.Build.0 = Release|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Release|Win32.ActiveCfg = Release|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Release|Win32.Build.0 = Release|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Release|x64.ActiveCfg = Release|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {0FADC26C-0E9D-4DD7-84B1-BF4F7754E90C} = {88F517F9-CE1C-4005-9BDF-4481FEB55053} {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} - {A51123F5-9505-4EAE-85E7-D320290A272C} = {88F517F9-CE1C-4005-9BDF-4481FEB55053} - {4639972E-424E-4E13-8B07-CA403C481346} = {88F517F9-CE1C-4005-9BDF-4481FEB55053} {677B7D11-D5E1-40B3-88B1-9A4DF83D2213} = {2D6F0A62-A247-4CCF-947F-FCD54BE16103} {BC236261-77E8-4567-8D09-45CD02965EB6} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38} diff --git a/common/src/Utilities/AlignedMalloc.cpp b/common/AlignedMalloc.cpp similarity index 96% rename from common/src/Utilities/AlignedMalloc.cpp rename to common/AlignedMalloc.cpp index fac931b7ab..eab02f15fe 100644 --- a/common/src/Utilities/AlignedMalloc.cpp +++ b/common/AlignedMalloc.cpp @@ -16,7 +16,9 @@ // This module contains implementations of _aligned_malloc for platforms that don't have // it built into their CRT/libc. -#include "PrecompiledHeader.h" +#ifndef _WIN32 + +#include "common/Assertions.h" void *__fastcall _aligned_malloc(size_t size, size_t align) { @@ -47,3 +49,4 @@ __fi void _aligned_free(void *pmem) { free(pmem); } +#endif diff --git a/common/include/Utilities/AppTrait.h b/common/AppTrait.h similarity index 100% rename from common/include/Utilities/AppTrait.h rename to common/AppTrait.h diff --git a/common/include/Utilities/Assertions.h b/common/Assertions.h similarity index 99% rename from common/include/Utilities/Assertions.h rename to common/Assertions.h index b2774f24c1..75089c286b 100644 --- a/common/include/Utilities/Assertions.h +++ b/common/Assertions.h @@ -15,6 +15,9 @@ #pragma once +#include +#include "common/Pcsx2Defs.h" + #ifndef __pxFUNCTION__ #if defined(__GNUG__) #define __pxFUNCTION__ __PRETTY_FUNCTION__ diff --git a/common/src/Utilities/CMakeLists.txt b/common/CMakeLists.txt similarity index 100% rename from common/src/Utilities/CMakeLists.txt rename to common/CMakeLists.txt diff --git a/common/src/Utilities/CheckedStaticBox.cpp b/common/CheckedStaticBox.cpp similarity index 97% rename from common/src/Utilities/CheckedStaticBox.cpp rename to common/CheckedStaticBox.cpp index e0e57cb8c3..80f1beb859 100644 --- a/common/src/Utilities/CheckedStaticBox.cpp +++ b/common/CheckedStaticBox.cpp @@ -13,8 +13,7 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "CheckedStaticBox.h" +#include "common/CheckedStaticBox.h" CheckedStaticBox::CheckedStaticBox(wxWindow *parent, int orientation, const wxString &title) : wxPanelWithHelpers(parent, wxVERTICAL) diff --git a/common/include/Utilities/CheckedStaticBox.h b/common/CheckedStaticBox.h similarity index 97% rename from common/include/Utilities/CheckedStaticBox.h rename to common/CheckedStaticBox.h index 1ae9c453ad..2079c0a357 100644 --- a/common/include/Utilities/CheckedStaticBox.h +++ b/common/CheckedStaticBox.h @@ -15,7 +15,7 @@ #pragma once -#include "wxGuiTools.h" +#include "common/wxGuiTools.h" class CheckedStaticBox : public wxPanelWithHelpers { diff --git a/common/src/Utilities/Console.cpp b/common/Console.cpp similarity index 99% rename from common/src/Utilities/Console.cpp rename to common/Console.cpp index 748767481e..1c96101f0c 100644 --- a/common/src/Utilities/Console.cpp +++ b/common/Console.cpp @@ -13,11 +13,9 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "Threading.h" -#include "TraceLog.h" - -#include "RedtapeWindows.h" // nneded for OutputDebugString +#include "common/Threading.h" +#include "common/TraceLog.h" +#include "common/RedtapeWindows.h" // OutputDebugString using namespace Threading; diff --git a/common/include/Utilities/Console.h b/common/Console.h similarity index 100% rename from common/include/Utilities/Console.h rename to common/Console.h diff --git a/common/src/Utilities/Darwin/DarwinMisc.cpp b/common/Darwin/DarwinMisc.cpp similarity index 100% rename from common/src/Utilities/Darwin/DarwinMisc.cpp rename to common/Darwin/DarwinMisc.cpp diff --git a/common/src/Utilities/Darwin/DarwinSemaphore.cpp b/common/Darwin/DarwinSemaphore.cpp similarity index 100% rename from common/src/Utilities/Darwin/DarwinSemaphore.cpp rename to common/Darwin/DarwinSemaphore.cpp diff --git a/common/src/Utilities/Darwin/DarwinThreads.cpp b/common/Darwin/DarwinThreads.cpp similarity index 100% rename from common/src/Utilities/Darwin/DarwinThreads.cpp rename to common/Darwin/DarwinThreads.cpp diff --git a/common/include/Utilities/Dependencies.h b/common/Dependencies.h similarity index 99% rename from common/include/Utilities/Dependencies.h rename to common/Dependencies.h index abb6db24b2..4e5aefe16d 100644 --- a/common/include/Utilities/Dependencies.h +++ b/common/Dependencies.h @@ -270,6 +270,6 @@ extern wxString fromUTF8(const char *src); extern wxString fromAscii(const char *src); -#include "Utilities/Assertions.h" -#include "Utilities/Exceptions.h" -#include "Utilities/ScopedAlloc.h" +#include "common/Assertions.h" +#include "common/Exceptions.h" +#include "common/ScopedAlloc.h" diff --git a/common/include/Utilities/EmbeddedImage.h b/common/EmbeddedImage.h similarity index 100% rename from common/include/Utilities/EmbeddedImage.h rename to common/EmbeddedImage.h diff --git a/common/src/Utilities/EventSource.cpp b/common/EventSource.cpp similarity index 100% rename from common/src/Utilities/EventSource.cpp rename to common/EventSource.cpp diff --git a/common/include/Utilities/EventSource.h b/common/EventSource.h similarity index 99% rename from common/include/Utilities/EventSource.h rename to common/EventSource.h index c853dced77..d947d4c38d 100644 --- a/common/include/Utilities/EventSource.h +++ b/common/EventSource.h @@ -16,7 +16,7 @@ #pragma once #include -#include "Threading.h" +#include "common/Threading.h" // -------------------------------------------------------------------------------------- // EventSource< template EvtType > diff --git a/common/include/Utilities/EventSource.inl b/common/EventSource.inl similarity index 99% rename from common/include/Utilities/EventSource.inl rename to common/EventSource.inl index 80636684cc..6a254e6e70 100644 --- a/common/include/Utilities/EventSource.inl +++ b/common/EventSource.inl @@ -15,7 +15,7 @@ #pragma once -#include "Threading.h" +#include "common/Threading.h" using Threading::ScopedLock; diff --git a/common/src/Utilities/Exceptions.cpp b/common/Exceptions.cpp similarity index 99% rename from common/src/Utilities/Exceptions.cpp rename to common/Exceptions.cpp index fc9d52a28f..018d3a181c 100644 --- a/common/src/Utilities/Exceptions.cpp +++ b/common/Exceptions.cpp @@ -13,15 +13,14 @@ * If not, see . */ -#include "PrecompiledHeader.h" - #include -#include "Threading.h" - #if defined(__UNIX__) #include #endif +#include "common/Threading.h" +#include "common/General.h" + // for lack of a better place... Fnptr_OutOfMemory pxDoOutOfMemory = NULL; diff --git a/common/include/Utilities/Exceptions.h b/common/Exceptions.h similarity index 99% rename from common/include/Utilities/Exceptions.h rename to common/Exceptions.h index 8a704e3f80..8367d33944 100644 --- a/common/include/Utilities/Exceptions.h +++ b/common/Exceptions.h @@ -15,8 +15,10 @@ #pragma once -#include "Assertions.h" #include +#include +#include "common/Assertions.h" +#include "common/Dependencies.h" // Because wxTrap isn't available on Linux builds of wxWidgets (non-Debug, typically) void pxTrap(); @@ -58,6 +60,8 @@ void pxTrap(); namespace Exception { +class BaseException; + int MakeNewType(); BaseException *FromErrno(const wxString &streamname, int errcode); diff --git a/common/src/Utilities/FastFormatString.cpp b/common/FastFormatString.cpp similarity index 98% rename from common/src/Utilities/FastFormatString.cpp rename to common/FastFormatString.cpp index cc8323fc29..adb1b79ad8 100644 --- a/common/src/Utilities/FastFormatString.cpp +++ b/common/FastFormatString.cpp @@ -13,9 +13,9 @@ * If not, see . */ -#include "PrecompiledHeader.h" - -#include "SafeArray.inl" +#include "common/Pcsx2Defs.h" +#include "common/SafeArray.inl" +#include "common/StringHelpers.h" // Implement some very commonly used SafeArray types here // (done here for lack of a better place) diff --git a/common/include/Utilities/General.h b/common/General.h similarity index 99% rename from common/include/Utilities/General.h rename to common/General.h index c15f1ba1db..ad72cd06de 100644 --- a/common/include/Utilities/General.h +++ b/common/General.h @@ -15,6 +15,10 @@ #pragma once +#include +#include +#include "common/Pcsx2Defs.h" + // This macro is actually useful for about any and every possible application of C++ // equality operators. #define OpEqu(field) (field == right.field) diff --git a/common/src/Utilities/IniInterface.cpp b/common/IniInterface.cpp similarity index 99% rename from common/src/Utilities/IniInterface.cpp rename to common/IniInterface.cpp index a194d950bc..90b1354eb4 100644 --- a/common/src/Utilities/IniInterface.cpp +++ b/common/IniInterface.cpp @@ -13,11 +13,11 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "IniInterface.h" - #include +#include "common/IniInterface.h" +#include "common/Console.h" + const wxRect wxDefaultRect(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord); wxDirName g_fullBaseDirName = wxDirName(L""); diff --git a/common/include/Utilities/IniInterface.h b/common/IniInterface.h similarity index 100% rename from common/include/Utilities/IniInterface.h rename to common/IniInterface.h diff --git a/common/src/Utilities/Linux/LnxHostSys.cpp b/common/Linux/LnxHostSys.cpp similarity index 99% rename from common/src/Utilities/Linux/LnxHostSys.cpp rename to common/Linux/LnxHostSys.cpp index cdd9f7a783..45ad567877 100644 --- a/common/src/Utilities/Linux/LnxHostSys.cpp +++ b/common/Linux/LnxHostSys.cpp @@ -13,17 +13,15 @@ * If not, see . */ - -#include "../PrecompiledHeader.h" -#include "PageFaultSource.h" - +#ifndef _WIN32 #include - #include #include #include #include +#include "common/PageFaultSource.h" + // Apple uses the MAP_ANON define instead of MAP_ANONYMOUS, but they mean // the same thing. #if defined(__APPLE__) && !defined(MAP_ANONYMOUS) @@ -226,3 +224,4 @@ void HostSys::MemProtect(void *baseaddr, size_t size, const PageProtectionMode & baseaddr, (uptr)baseaddr + size, WX_STR(mode.ToString()))); } } +#endif diff --git a/common/src/Utilities/Linux/LnxMisc.cpp b/common/Linux/LnxMisc.cpp similarity index 97% rename from common/src/Utilities/Linux/LnxMisc.cpp rename to common/Linux/LnxMisc.cpp index 486a2b97a5..60f00a3c86 100644 --- a/common/src/Utilities/Linux/LnxMisc.cpp +++ b/common/Linux/LnxMisc.cpp @@ -13,8 +13,7 @@ * If not, see . */ -#include "../PrecompiledHeader.h" - +#ifndef _WIN32 #include #include #include @@ -59,3 +58,4 @@ void ScreensaverAllow(bool allow) { // no-op } +#endif diff --git a/common/src/Utilities/Linux/LnxThreads.cpp b/common/Linux/LnxThreads.cpp similarity index 98% rename from common/src/Utilities/Linux/LnxThreads.cpp rename to common/Linux/LnxThreads.cpp index c2f8ddf7e1..a547816e2f 100644 --- a/common/src/Utilities/Linux/LnxThreads.cpp +++ b/common/Linux/LnxThreads.cpp @@ -13,9 +13,7 @@ * If not, see . */ - -#include "../PrecompiledHeader.h" -#include "PersistentThread.h" +#ifndef _WIN32 #include #if defined(__linux__) #include @@ -23,6 +21,8 @@ #include #endif +#include "common/PersistentThread.h" + // We wont need this until we actually have this more then just stubbed out, so I'm commenting this out // to remove an unneeded dependency. //#include "x86emitter/tools.h" @@ -130,3 +130,4 @@ void Threading::SetNameOfCurrentThread(const char *name) } #endif +#endif diff --git a/common/include/Utilities/MathUtils.h b/common/MathUtils.h similarity index 97% rename from common/include/Utilities/MathUtils.h rename to common/MathUtils.h index e2e8cf57f4..7aae82d6f6 100644 --- a/common/include/Utilities/MathUtils.h +++ b/common/MathUtils.h @@ -17,7 +17,7 @@ // Hopefully this file will be used for cross-source math utilities. // Currently these are strewn across the code base. Please collect them all! -#include "Pcsx2Defs.h" +#include "common/Pcsx2Defs.h" // On GCC >= 4.7, this is equivalent to __builtin_clrsb(n); inline u32 count_leading_sign_bits(s32 n) diff --git a/common/include/Utilities/MemcpyFast.h b/common/MemcpyFast.h similarity index 96% rename from common/include/Utilities/MemcpyFast.h rename to common/MemcpyFast.h index 9345dd71bd..6e09f3075c 100644 --- a/common/include/Utilities/MemcpyFast.h +++ b/common/MemcpyFast.h @@ -15,6 +15,9 @@ #pragma once +#include "common/Pcsx2Types.h" +#include "common/Pcsx2Defs.h" + // For 32-bit MSVC compiles, memcmp performs much worse than memcmp_mmx and // other implementations. So for this combination only, prefer memcmp_mmx #if defined(_MSC_VER) && !defined(_M_X86_64) diff --git a/common/include/Utilities/MemsetFast.inl b/common/MemsetFast.inl similarity index 100% rename from common/include/Utilities/MemsetFast.inl rename to common/MemsetFast.inl diff --git a/common/src/Utilities/Mutex.cpp b/common/Mutex.cpp similarity index 98% rename from common/src/Utilities/Mutex.cpp rename to common/Mutex.cpp index 2b968dd066..8736f0dd60 100644 --- a/common/src/Utilities/Mutex.cpp +++ b/common/Mutex.cpp @@ -13,13 +13,10 @@ * If not, see . */ - -#include "PrecompiledHeader.h" - -#include "Threading.h" -#include "wxBaseTools.h" -#include "wxGuiTools.h" -#include "ThreadingInternal.h" +#include "common/Threading.h" +#include "common/wxBaseTools.h" +#include "common/wxGuiTools.h" +#include "common/ThreadingInternal.h" namespace Threading { diff --git a/common/include/Utilities/PageFaultSource.h b/common/PageFaultSource.h similarity index 100% rename from common/include/Utilities/PageFaultSource.h rename to common/PageFaultSource.h diff --git a/common/include/Utilities/Path.h b/common/Path.h similarity index 99% rename from common/include/Utilities/Path.h rename to common/Path.h index 2face02584..337068c189 100644 --- a/common/include/Utilities/Path.h +++ b/common/Path.h @@ -16,7 +16,7 @@ #pragma once #include -#include "StringHelpers.h" +#include "common/StringHelpers.h" #define g_MaxPath 255 // 255 is safer with antiquated Win32 ASCII APIs. diff --git a/common/src/Utilities/PathUtils.cpp b/common/PathUtils.cpp similarity index 99% rename from common/src/Utilities/PathUtils.cpp rename to common/PathUtils.cpp index 4fbdd5f168..542c3acdcf 100644 --- a/common/src/Utilities/PathUtils.cpp +++ b/common/PathUtils.cpp @@ -13,8 +13,7 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "Path.h" +#include "common/Path.h" #include #include diff --git a/common/include/Pcsx2Defs.h b/common/Pcsx2Defs.h similarity index 95% rename from common/include/Pcsx2Defs.h rename to common/Pcsx2Defs.h index 042e4c59db..7731c86b9b 100644 --- a/common/include/Pcsx2Defs.h +++ b/common/Pcsx2Defs.h @@ -13,8 +13,7 @@ * If not, see . */ -#ifndef __PCSX2DEFS_H__ -#define __PCSX2DEFS_H__ +#pragma once #ifdef __CYGWIN__ #define __linux__ @@ -30,7 +29,7 @@ #include "Pcsx2Types.h" -#include "x86emitter/x86_intrin.h" +#include "common/emitter/x86_intrin.h" // Renamed ARRAYSIZE to ArraySize -- looks nice and gets rid of Windows.h conflicts (air) // Notes: I'd have used ARRAY_SIZE instead but ran into cross-platform lib conflicts with @@ -47,7 +46,6 @@ // level conditionals). Normally not a concern, but if you stick if( IsDevbuild ) in // some tight loops it will likely make debug builds unusably slow. // -#ifdef __cplusplus #ifdef PCSX2_DEVBUILD static const bool IsDevBuild = true; #else @@ -60,21 +58,6 @@ static const bool IsDebugBuild = true; static const bool IsDebugBuild = false; #endif -#else - -#ifdef PCSX2_DEVBUILD -static const u8 IsDevBuild = 1; -#else -static const u8 IsDevBuild = 0; -#endif - -#ifdef PCSX2_DEBUG -static const u8 IsDebugBuild = 1; -#else -static const u8 IsDebugBuild = 0; -#endif -#endif - #ifdef PCSX2_DEBUG #define pxDebugCode(code) code #else @@ -201,5 +184,3 @@ static const int __pagesize = PCSX2_PAGESIZE; #define __ri __releaseinline #define __fi __forceinline #define __fc __fastcall - -#endif diff --git a/common/include/Pcsx2Types.h b/common/Pcsx2Types.h similarity index 98% rename from common/include/Pcsx2Types.h rename to common/Pcsx2Types.h index aba0f212f2..606c94d719 100644 --- a/common/include/Pcsx2Types.h +++ b/common/Pcsx2Types.h @@ -13,8 +13,9 @@ * If not, see . */ -#ifndef __PCSX2TYPES_H__ -#define __PCSX2TYPES_H__ +#pragma once + +#include // -------------------------------------------------------------------------------------- // Forward declarations @@ -22,20 +23,14 @@ // Forward declarations for wxWidgets-supporting features. // If you aren't linking against wxWidgets libraries, then functions that // depend on these types will not be usable (they will yield linker errors). - -#ifdef __cplusplus class wxString; class FastFormatAscii; class FastFormatUnicode; -#endif - // -------------------------------------------------------------------------------------- // Basic Atomic Types // -------------------------------------------------------------------------------------- -#include - // Note: char does not have a default sign, unlike other types. As we actually want // char and not signed char in pcsx2, we define s8 to char @@ -189,5 +184,3 @@ typedef long vol_t; #else typedef s32 vol_t; #endif - -#endif diff --git a/common/src/Utilities/Perf.cpp b/common/Perf.cpp similarity index 98% rename from common/src/Utilities/Perf.cpp rename to common/Perf.cpp index 01a263fd5e..bd67c3ef47 100644 --- a/common/src/Utilities/Perf.cpp +++ b/common/Perf.cpp @@ -13,20 +13,19 @@ * If not, see . */ -#include "PrecompiledHeader.h" - -#include "Perf.h" - +#include "common/Perf.h" +#include "common/Pcsx2Types.h" #ifdef __unix__ -#include "unistd.h" +#include +#endif +#ifdef ENABLE_VTUNE +#include "jitprofiling.h" #endif //#define ProfileWithPerf #define MERGE_BLOCK_RESULT #ifdef ENABLE_VTUNE -#include "jitprofiling.h" - #ifdef _WIN32 #pragma comment(lib, "jitprofiling.lib") #endif diff --git a/common/include/Utilities/Perf.h b/common/Perf.h similarity index 96% rename from common/include/Utilities/Perf.h rename to common/Perf.h index d6a3eecb0b..e087b59275 100644 --- a/common/include/Utilities/Perf.h +++ b/common/Perf.h @@ -15,6 +15,9 @@ #pragma once +#include +#include "common/Pcsx2Types.h" + namespace Perf { diff --git a/common/include/Utilities/PersistentThread.h b/common/PersistentThread.h similarity index 98% rename from common/include/Utilities/PersistentThread.h rename to common/PersistentThread.h index d0ee1ba639..320cd0928f 100644 --- a/common/include/Utilities/PersistentThread.h +++ b/common/PersistentThread.h @@ -15,9 +15,9 @@ #pragma once -#include "Threading.h" -#include "ScopedPtrMT.h" -#include "EventSource.h" +#include "common/Threading.h" +#include "common/ScopedPtrMT.h" +#include "common/EventSource.h" namespace Threading { diff --git a/common/src/Utilities/PrecompiledHeader.cpp b/common/PrecompiledHeader.cpp similarity index 100% rename from common/src/Utilities/PrecompiledHeader.cpp rename to common/PrecompiledHeader.cpp diff --git a/common/PrecompiledHeader.h b/common/PrecompiledHeader.h new file mode 100644 index 0000000000..66cb0635b7 --- /dev/null +++ b/common/PrecompiledHeader.h @@ -0,0 +1,14 @@ +/* PCSX2 - PS2 Emulator for PCs + * Copyright (C) 2002-2010 PCSX2 Dev Team + * + * PCSX2 is free software: you can redistribute it and/or modify it under the terms + * of the GNU Lesser General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with PCSX2. + * If not, see . + */ \ No newline at end of file diff --git a/common/src/Utilities/PrecompiledHeader.h b/common/RedtapeWindows.h similarity index 68% rename from common/src/Utilities/PrecompiledHeader.h rename to common/RedtapeWindows.h index bcf1f64bb3..6caa925645 100644 --- a/common/src/Utilities/PrecompiledHeader.h +++ b/common/RedtapeWindows.h @@ -13,18 +13,11 @@ * If not, see . */ -// Can't use #pragma once in the precompiled header, as it won't work correctly with GCC PCH. - -#ifndef UTILITIES_PRECOMPILED_HEADER -#define UTILITIES_PRECOMPILED_HEADER - -#include "Dependencies.h" - -#include "Assertions.h" -#include "MemcpyFast.h" -#include "TraceLog.h" -#include "Exceptions.h" -#include "SafeArray.h" -#include "General.h" - +#pragma once +#ifdef _WIN32 +#include +#include +#include +#include +#include #endif diff --git a/common/src/Utilities/RwMutex.cpp b/common/RwMutex.cpp similarity index 98% rename from common/src/Utilities/RwMutex.cpp rename to common/RwMutex.cpp index c5c358ab6d..7241f46c29 100644 --- a/common/src/Utilities/RwMutex.cpp +++ b/common/RwMutex.cpp @@ -13,8 +13,7 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "RwMutex.h" +#include "common/RwMutex.h" // -------------------------------------------------------------------------------------- // RwMutex diff --git a/common/include/Utilities/RwMutex.h b/common/RwMutex.h similarity index 98% rename from common/include/Utilities/RwMutex.h rename to common/RwMutex.h index c44421469f..3028022a14 100644 --- a/common/include/Utilities/RwMutex.h +++ b/common/RwMutex.h @@ -15,7 +15,7 @@ #pragma once -#include "Threading.h" +#include "common/Threading.h" namespace Threading { diff --git a/common/include/Utilities/SafeArray.h b/common/SafeArray.h similarity index 99% rename from common/include/Utilities/SafeArray.h rename to common/SafeArray.h index 0ed131421e..007dfca162 100644 --- a/common/include/Utilities/SafeArray.h +++ b/common/SafeArray.h @@ -15,7 +15,7 @@ #pragma once -#include "Utilities/Dependencies.h" +#include "common/Dependencies.h" // pxUSE_SECURE_MALLOC - enables bounds checking on scoped malloc allocations. diff --git a/common/include/Utilities/SafeArray.inl b/common/SafeArray.inl similarity index 100% rename from common/include/Utilities/SafeArray.inl rename to common/SafeArray.inl diff --git a/common/include/Utilities/ScopedAlloc.h b/common/ScopedAlloc.h similarity index 99% rename from common/include/Utilities/ScopedAlloc.h rename to common/ScopedAlloc.h index 83ae216fce..37b3f26fab 100644 --- a/common/include/Utilities/ScopedAlloc.h +++ b/common/ScopedAlloc.h @@ -15,7 +15,7 @@ #pragma once -#include "Exceptions.h" +#include "common/Exceptions.h" // pxUSE_SECURE_MALLOC - enables bounds checking on scoped malloc allocations. diff --git a/common/include/Utilities/ScopedPtrMT.h b/common/ScopedPtrMT.h similarity index 100% rename from common/include/Utilities/ScopedPtrMT.h rename to common/ScopedPtrMT.h diff --git a/common/src/Utilities/Semaphore.cpp b/common/Semaphore.cpp similarity index 97% rename from common/src/Utilities/Semaphore.cpp rename to common/Semaphore.cpp index 3f5a8fc6ef..fad184a47f 100644 --- a/common/src/Utilities/Semaphore.cpp +++ b/common/Semaphore.cpp @@ -13,13 +13,10 @@ * If not, see . */ - -#include "PrecompiledHeader.h" - -#include "Threading.h" -#include "wxBaseTools.h" -#include "wxGuiTools.h" -#include "ThreadingInternal.h" +#include "common/Threading.h" +#include "common/wxBaseTools.h" +#include "common/wxGuiTools.h" +#include "common/ThreadingInternal.h" // -------------------------------------------------------------------------------------- // Semaphore Implementations diff --git a/common/src/Utilities/StringHelpers.cpp b/common/StringHelpers.cpp similarity index 99% rename from common/src/Utilities/StringHelpers.cpp rename to common/StringHelpers.cpp index 0b2af8b08e..588eaacf9e 100644 --- a/common/src/Utilities/StringHelpers.cpp +++ b/common/StringHelpers.cpp @@ -13,8 +13,9 @@ * If not, see . */ -#include "PrecompiledHeader.h" #include // for wxPoint/wxRect stuff +#include "common/Pcsx2Defs.h" +#include "common/StringHelpers.h" __fi wxString fromUTF8(const char *src) { diff --git a/common/include/Utilities/StringHelpers.h b/common/StringHelpers.h similarity index 98% rename from common/include/Utilities/StringHelpers.h rename to common/StringHelpers.h index d64ac41652..6efee1c7fb 100644 --- a/common/include/Utilities/StringHelpers.h +++ b/common/StringHelpers.h @@ -15,11 +15,10 @@ #pragma once -#include "Dependencies.h" -#include "SafeArray.h" -#include "ScopedAlloc.h" - #include +#include "common/Dependencies.h" +#include "common/SafeArray.h" +#include "common/ScopedAlloc.h" #if _WIN32 #define WX_STR(str) (str.wc_str()) diff --git a/common/src/Utilities/ThreadTools.cpp b/common/ThreadTools.cpp similarity index 99% rename from common/src/Utilities/ThreadTools.cpp rename to common/ThreadTools.cpp index f22cc2dba6..5687645a05 100644 --- a/common/src/Utilities/ThreadTools.cpp +++ b/common/ThreadTools.cpp @@ -13,17 +13,15 @@ * If not, see . */ - -#include "PrecompiledHeader.h" - #ifdef __linux__ #include // for pthread_kill, which is in pthread.h on w32-pthreads #endif -#include "PersistentThread.h" -#include "wxBaseTools.h" -#include "ThreadingInternal.h" -#include "EventSource.inl" +#include "common/PersistentThread.h" +#include "common/wxBaseTools.h" +#include "common/ThreadingInternal.h" +#include "common/EventSource.inl" +#include "common/General.h" using namespace Threading; diff --git a/common/include/Utilities/Threading.h b/common/Threading.h similarity index 98% rename from common/include/Utilities/Threading.h rename to common/Threading.h index 36e32a27a8..9a409af4bd 100644 --- a/common/include/Utilities/Threading.h +++ b/common/Threading.h @@ -15,16 +15,19 @@ #pragma once +#ifdef _WIN32 +// thanks I hate it. +#include +#define HAVE_MODE_T +#endif #include #include // EBUSY #include - #ifdef __APPLE__ #include #endif - -#include "Pcsx2Defs.h" -#include "TraceLog.h" +#include "common/Pcsx2Defs.h" +#include "common/TraceLog.h" #undef Yield // release the burden of windows.h global namespace spam. diff --git a/common/src/Utilities/ThreadingDialogs.cpp b/common/ThreadingDialogs.cpp similarity index 97% rename from common/src/Utilities/ThreadingDialogs.cpp rename to common/ThreadingDialogs.cpp index 8a2b0bda74..f63e3280ea 100644 --- a/common/src/Utilities/ThreadingDialogs.cpp +++ b/common/ThreadingDialogs.cpp @@ -13,9 +13,8 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "ThreadingDialogs.h" -#include "pxStaticText.h" +#include "common/ThreadingDialogs.h" +#include "common/pxStaticText.h" using namespace pxSizerFlags; diff --git a/common/include/Utilities/ThreadingDialogs.h b/common/ThreadingDialogs.h similarity index 100% rename from common/include/Utilities/ThreadingDialogs.h rename to common/ThreadingDialogs.h diff --git a/common/src/Utilities/ThreadingInternal.h b/common/ThreadingInternal.h similarity index 100% rename from common/src/Utilities/ThreadingInternal.h rename to common/ThreadingInternal.h diff --git a/common/include/Utilities/TraceLog.h b/common/TraceLog.h similarity index 100% rename from common/include/Utilities/TraceLog.h rename to common/TraceLog.h diff --git a/common/src/Utilities/VirtualMemory.cpp b/common/VirtualMemory.cpp similarity index 99% rename from common/src/Utilities/VirtualMemory.cpp rename to common/VirtualMemory.cpp index f6cb61cb04..1495e424de 100644 --- a/common/src/Utilities/VirtualMemory.cpp +++ b/common/VirtualMemory.cpp @@ -13,15 +13,12 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "PageFaultSource.h" - #ifndef __WXMSW__ #include #endif - -#include "EventSource.inl" -#include "MemsetFast.inl" +#include "common/PageFaultSource.h" +#include "common/EventSource.inl" +#include "common/MemsetFast.inl" template class EventSource; diff --git a/common/src/Utilities/Windows/WinHostSys.cpp b/common/Windows/WinHostSys.cpp similarity index 97% rename from common/src/Utilities/Windows/WinHostSys.cpp rename to common/Windows/WinHostSys.cpp index 3121f24a23..4f666a22ed 100644 --- a/common/src/Utilities/Windows/WinHostSys.cpp +++ b/common/Windows/WinHostSys.cpp @@ -13,11 +13,8 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "Utilities/RedtapeWindows.h" -#include "PageFaultSource.h" - -#include +#include "common/RedtapeWindows.h" +#include "common/PageFaultSource.h" static long DoSysPageFaultExceptionFilter(EXCEPTION_POINTERS *eps) { diff --git a/common/src/Utilities/Windows/WinMisc.cpp b/common/Windows/WinMisc.cpp similarity index 95% rename from common/src/Utilities/Windows/WinMisc.cpp rename to common/Windows/WinMisc.cpp index 38d75fe832..bfb04648f5 100644 --- a/common/src/Utilities/Windows/WinMisc.cpp +++ b/common/Windows/WinMisc.cpp @@ -13,14 +13,14 @@ * If not, see . */ +#include +#include "common/Pcsx2Defs.h" +#include "common/RedtapeWindows.h" +#include "common/Exceptions.h" +#include "common/Dependencies.h" + #pragma comment(lib, "User32.lib") -#include "PrecompiledHeader.h" -#include "RedtapeWindows.h" -#include - -#include - static __aligned16 LARGE_INTEGER lfreq; void InitCPUTicks() diff --git a/common/src/Utilities/Windows/WinThreads.cpp b/common/Windows/WinThreads.cpp similarity index 97% rename from common/src/Utilities/Windows/WinThreads.cpp rename to common/Windows/WinThreads.cpp index 19219a176e..08d06b8b9d 100644 --- a/common/src/Utilities/Windows/WinThreads.cpp +++ b/common/Windows/WinThreads.cpp @@ -13,10 +13,9 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "RedtapeWindows.h" -#include "x86emitter/tools.h" -#include "PersistentThread.h" +#include "common/RedtapeWindows.h" +#include "common/PersistentThread.h" +#include "common/emitter/tools.h" #ifndef __WXMSW__ diff --git a/common/include/afxresmw.h b/common/afxresmw.h similarity index 100% rename from common/include/afxresmw.h rename to common/afxresmw.h diff --git a/common/include/Utilities/boost_spsc_queue.hpp b/common/boost_spsc_queue.hpp similarity index 100% rename from common/include/Utilities/boost_spsc_queue.hpp rename to common/boost_spsc_queue.hpp diff --git a/common/build/Utilities/utilities.vcxproj b/common/build/Utilities/utilities.vcxproj deleted file mode 100644 index f8f246b452..0000000000 --- a/common/build/Utilities/utilities.vcxproj +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - {4639972E-424E-4E13-8B07-CA403C481346} - - - - StaticLibrary - $(DefaultPlatformToolset) - Unicode - true - true - false - - - - - - - - - - - - - - - AllRules.ruleset - - - - Async - Use - PrecompiledHeader.h - - - - - true - - - - - - - - - - - - - true - - - - - Create - - - - - - - - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {0fae817d-9a32-4830-857e-81da57246e16} - - - {3fcc50c2-81e9-5db2-b8d8-2129427568b1} - - - {6744dad8-9c70-574a-bff2-9f8dddb24a75} - - - - - \ No newline at end of file diff --git a/common/build/Utilities/utilities.vcxproj.filters b/common/build/Utilities/utilities.vcxproj.filters deleted file mode 100644 index 5bdb75b022..0000000000 --- a/common/build/Utilities/utilities.vcxproj.filters +++ /dev/null @@ -1,214 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {54fbf775-c53a-4e27-8903-2f68688d7764} - - - {903e4e1a-fc21-4f41-83c6-fb70d90cbb58} - - - {b7963f4a-9718-4852-bb0a-62dc0931f98e} - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {a3d21581-efe9-4749-a801-0ae50cbed855} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Linux - - - Source Files\Linux - - - Source Files\Linux - - - Source Files\Windows - - - Source Files\Windows - - - Source Files\Windows - - - Source Files\Threading - - - Source Files\Threading - - - Source Files\Threading - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Linux - - - - - Header Files - - - - - Source Files\Threading - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Threading - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/common/build/x86emitter/x86emitter.vcxproj b/common/build/x86emitter/x86emitter.vcxproj deleted file mode 100644 index b8ed49acdf..0000000000 --- a/common/build/x86emitter/x86emitter.vcxproj +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - {A51123F5-9505-4EAE-85E7-D320290A272C} - - - - StaticLibrary - $(DefaultPlatformToolset) - Unicode - true - true - false - - - - - - - - - - - - - - AllRules.ruleset - - - - Use - PrecompiledHeader.h - - - - - - - - - - - - - Create - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {01f4ce10-2cfb-41a8-b41f-e54337868a1d} - false - - - - - \ No newline at end of file diff --git a/common/build/x86emitter/x86emitter.vcxproj.filters b/common/build/x86emitter/x86emitter.vcxproj.filters deleted file mode 100644 index de4feea1b0..0000000000 --- a/common/build/x86emitter/x86emitter.vcxproj.filters +++ /dev/null @@ -1,150 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {349ada14-68b6-4be5-8232-b162efb0a5aa} - - - {12d7c7d4-d7f1-43cb-86c3-585dad794bf6} - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {66921012-17b3-45f6-aa8c-82e845c489f8} - - - {ae9884f6-cbd3-4fb6-a011-c776dce9b6ee} - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Linux - - - Source Files\Windows - - - Source Files - - - - - Source Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Implement - - - Header Files\Implement - - - Header Files\Implement - - - Header Files\Implement - - - Header Files\Implement - - - Header Files\Implement - - - Header Files\Implement - - - Header Files\Implement - - - Header Files\Implement - - - Header Files\Implement - - - Header Files\Implement_Simd - - - Header Files\Implement_Simd - - - Header Files\Implement_Simd - - - Header Files\Implement_Simd - - - Header Files\Implement_Simd - - - Header Files\Implement - - - diff --git a/common/common.vcxproj b/common/common.vcxproj new file mode 100644 index 0000000000..3d6c7e09ec --- /dev/null +++ b/common/common.vcxproj @@ -0,0 +1,162 @@ + + + + + + {4639972E-424E-4E13-8B07-CA403C481346} + + + + StaticLibrary + $(DefaultPlatformToolset) + Unicode + true + true + false + + + + + + + + + + + + + + + AllRules.ruleset + + + + Async + Use + PrecompiledHeader.h + PrecompiledHeader.h + WIN32_LEAN_AND_MEAN;NOMINMAX;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + true + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {0fae817d-9a32-4830-857e-81da57246e16} + + + {3fcc50c2-81e9-5db2-b8d8-2129427568b1} + + + {6744dad8-9c70-574a-bff2-9f8dddb24a75} + + + + + \ No newline at end of file diff --git a/common/src/x86emitter/CMakeLists.txt b/common/emitter/CMakeLists.txt similarity index 100% rename from common/src/x86emitter/CMakeLists.txt rename to common/emitter/CMakeLists.txt diff --git a/common/src/x86emitter/LnxCpuDetect.cpp b/common/emitter/LnxCpuDetect.cpp similarity index 95% rename from common/src/x86emitter/LnxCpuDetect.cpp rename to common/emitter/LnxCpuDetect.cpp index b4ec113c29..9100e486a0 100644 --- a/common/src/x86emitter/LnxCpuDetect.cpp +++ b/common/emitter/LnxCpuDetect.cpp @@ -13,9 +13,8 @@ * If not, see . */ - -#include "PrecompiledHeader.h" -#include "cpudetect_internal.h" +#ifndef _WIN32 +#include "common/emitter/cpudetect_internal.h" #include // Note: Apparently this solution is Linux/Solaris only. @@ -31,3 +30,4 @@ void x86capabilities::CountLogicalCores() // Not implemented yet for linux (see cpudetect_internal.h for details) SingleCoreAffinity::SingleCoreAffinity() = default; SingleCoreAffinity::~SingleCoreAffinity() = default; +#endif \ No newline at end of file diff --git a/common/src/x86emitter/PrecompiledHeader.cpp b/common/emitter/PrecompiledHeader.cpp similarity index 100% rename from common/src/x86emitter/PrecompiledHeader.cpp rename to common/emitter/PrecompiledHeader.cpp diff --git a/common/src/x86emitter/PrecompiledHeader.h b/common/emitter/PrecompiledHeader.h similarity index 87% rename from common/src/x86emitter/PrecompiledHeader.h rename to common/emitter/PrecompiledHeader.h index 2ebb4dea2f..52d7469283 100644 --- a/common/src/x86emitter/PrecompiledHeader.h +++ b/common/emitter/PrecompiledHeader.h @@ -20,16 +20,16 @@ #include -#include "Pcsx2Defs.h" +#include "common/Pcsx2Defs.h" #include #include // string.h under c++ #include // stdio.h under c++ #include -#include "Utilities/Console.h" -#include "Utilities/Exceptions.h" -#include "Utilities/General.h" -#include "Utilities/MemcpyFast.h" +#include "common/Console.h" +#include "common/Exceptions.h" +#include "common/General.h" +#include "common/MemcpyFast.h" #endif diff --git a/common/src/x86emitter/WinCpuDetect.cpp b/common/emitter/WinCpuDetect.cpp similarity index 97% rename from common/src/x86emitter/WinCpuDetect.cpp rename to common/emitter/WinCpuDetect.cpp index 6f639e3789..1976f58e2f 100644 --- a/common/src/x86emitter/WinCpuDetect.cpp +++ b/common/emitter/WinCpuDetect.cpp @@ -13,9 +13,8 @@ * If not, see . */ - -#include "PrecompiledHeader.h" -#include "cpudetect_internal.h" +#include "common/Console.h" +#include "common/emitter/cpudetect_internal.h" void x86capabilities::CountLogicalCores() { diff --git a/common/src/x86emitter/bmi.cpp b/common/emitter/bmi.cpp similarity index 94% rename from common/src/x86emitter/bmi.cpp rename to common/emitter/bmi.cpp index 33303b7518..d1ce6a2db7 100644 --- a/common/src/x86emitter/bmi.cpp +++ b/common/emitter/bmi.cpp @@ -13,9 +13,8 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "internal.h" -#include "tools.h" +#include "common/emitter/internal.h" +#include "common/emitter/tools.h" namespace x86Emitter { diff --git a/common/src/x86emitter/cpudetect.cpp b/common/emitter/cpudetect.cpp similarity index 98% rename from common/src/x86emitter/cpudetect.cpp rename to common/emitter/cpudetect.cpp index 80ec1a22f5..ec8beccddb 100644 --- a/common/src/x86emitter/cpudetect.cpp +++ b/common/emitter/cpudetect.cpp @@ -13,10 +13,11 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "cpudetect_internal.h" -#include "internal.h" -#include "x86_intrin.h" +#include "common/MemcpyFast.h" +#include "common/General.h" +#include "common/emitter/cpudetect_internal.h" +#include "common/emitter/internal.h" +#include "common/emitter/x86_intrin.h" // CPU information support #if defined(_WIN32) diff --git a/common/src/x86emitter/cpudetect_internal.h b/common/emitter/cpudetect_internal.h similarity index 94% rename from common/src/x86emitter/cpudetect_internal.h rename to common/emitter/cpudetect_internal.h index a1c9f61038..b880e7bfbe 100644 --- a/common/src/x86emitter/cpudetect_internal.h +++ b/common/emitter/cpudetect_internal.h @@ -15,8 +15,8 @@ #pragma once -#include "Utilities/RedtapeWindows.h" -#include "x86emitter/tools.h" +#include "common/RedtapeWindows.h" +#include "common/emitter/tools.h" // -------------------------------------------------------------------------------------- // Thread Affinity Lock diff --git a/common/src/x86emitter/fpu.cpp b/common/emitter/fpu.cpp similarity index 97% rename from common/src/x86emitter/fpu.cpp rename to common/emitter/fpu.cpp index c833917f99..24a0eb947b 100644 --- a/common/src/x86emitter/fpu.cpp +++ b/common/emitter/fpu.cpp @@ -13,8 +13,7 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "legacy_internal.h" +#include "common/emitter/legacy_internal.h" //------------------------------------------------------------------ // FPU instructions diff --git a/common/src/x86emitter/groups.cpp b/common/emitter/groups.cpp similarity index 99% rename from common/src/x86emitter/groups.cpp rename to common/emitter/groups.cpp index 07b783e416..90a627807c 100644 --- a/common/src/x86emitter/groups.cpp +++ b/common/emitter/groups.cpp @@ -28,9 +28,8 @@ * sudonim(1@gmail.com) */ -#include "PrecompiledHeader.h" -#include "internal.h" -#include "implement/helpers.h" +#include "common/emitter/internal.h" +#include "common/emitter/implement/helpers.h" namespace x86Emitter { diff --git a/common/include/x86emitter/implement/bmi.h b/common/emitter/implement/bmi.h similarity index 100% rename from common/include/x86emitter/implement/bmi.h rename to common/emitter/implement/bmi.h diff --git a/common/include/x86emitter/implement/dwshift.h b/common/emitter/implement/dwshift.h similarity index 100% rename from common/include/x86emitter/implement/dwshift.h rename to common/emitter/implement/dwshift.h diff --git a/common/include/x86emitter/implement/group1.h b/common/emitter/implement/group1.h similarity index 100% rename from common/include/x86emitter/implement/group1.h rename to common/emitter/implement/group1.h diff --git a/common/include/x86emitter/implement/group2.h b/common/emitter/implement/group2.h similarity index 100% rename from common/include/x86emitter/implement/group2.h rename to common/emitter/implement/group2.h diff --git a/common/include/x86emitter/implement/group3.h b/common/emitter/implement/group3.h similarity index 100% rename from common/include/x86emitter/implement/group3.h rename to common/emitter/implement/group3.h diff --git a/common/include/x86emitter/implement/helpers.h b/common/emitter/implement/helpers.h similarity index 100% rename from common/include/x86emitter/implement/helpers.h rename to common/emitter/implement/helpers.h diff --git a/common/include/x86emitter/implement/incdec.h b/common/emitter/implement/incdec.h similarity index 100% rename from common/include/x86emitter/implement/incdec.h rename to common/emitter/implement/incdec.h diff --git a/common/include/x86emitter/implement/jmpcall.h b/common/emitter/implement/jmpcall.h similarity index 100% rename from common/include/x86emitter/implement/jmpcall.h rename to common/emitter/implement/jmpcall.h diff --git a/common/include/x86emitter/implement/movs.h b/common/emitter/implement/movs.h similarity index 100% rename from common/include/x86emitter/implement/movs.h rename to common/emitter/implement/movs.h diff --git a/common/include/x86emitter/implement/simd_arithmetic.h b/common/emitter/implement/simd_arithmetic.h similarity index 100% rename from common/include/x86emitter/implement/simd_arithmetic.h rename to common/emitter/implement/simd_arithmetic.h diff --git a/common/include/x86emitter/implement/simd_comparisons.h b/common/emitter/implement/simd_comparisons.h similarity index 100% rename from common/include/x86emitter/implement/simd_comparisons.h rename to common/emitter/implement/simd_comparisons.h diff --git a/common/include/x86emitter/implement/simd_helpers.h b/common/emitter/implement/simd_helpers.h similarity index 100% rename from common/include/x86emitter/implement/simd_helpers.h rename to common/emitter/implement/simd_helpers.h diff --git a/common/include/x86emitter/implement/simd_moremovs.h b/common/emitter/implement/simd_moremovs.h similarity index 100% rename from common/include/x86emitter/implement/simd_moremovs.h rename to common/emitter/implement/simd_moremovs.h diff --git a/common/include/x86emitter/implement/simd_shufflepack.h b/common/emitter/implement/simd_shufflepack.h similarity index 100% rename from common/include/x86emitter/implement/simd_shufflepack.h rename to common/emitter/implement/simd_shufflepack.h diff --git a/common/include/x86emitter/implement/simd_templated_helpers.h b/common/emitter/implement/simd_templated_helpers.h similarity index 100% rename from common/include/x86emitter/implement/simd_templated_helpers.h rename to common/emitter/implement/simd_templated_helpers.h diff --git a/common/include/x86emitter/implement/test.h b/common/emitter/implement/test.h similarity index 100% rename from common/include/x86emitter/implement/test.h rename to common/emitter/implement/test.h diff --git a/common/include/x86emitter/implement/xchg.h b/common/emitter/implement/xchg.h similarity index 100% rename from common/include/x86emitter/implement/xchg.h rename to common/emitter/implement/xchg.h diff --git a/common/include/x86emitter/instructions.h b/common/emitter/instructions.h similarity index 100% rename from common/include/x86emitter/instructions.h rename to common/emitter/instructions.h diff --git a/common/include/x86emitter/internal.h b/common/emitter/internal.h similarity index 98% rename from common/include/x86emitter/internal.h rename to common/emitter/internal.h index 231630ea43..2687b48673 100644 --- a/common/include/x86emitter/internal.h +++ b/common/emitter/internal.h @@ -15,9 +15,8 @@ #pragma once -#include "x86types.h" -#include "instructions.h" - +#include "common/emitter/x86types.h" +#include "common/emitter/instructions.h" namespace x86Emitter { diff --git a/common/src/x86emitter/jmp.cpp b/common/emitter/jmp.cpp similarity index 99% rename from common/src/x86emitter/jmp.cpp rename to common/emitter/jmp.cpp index 511daad804..c301c29a23 100644 --- a/common/src/x86emitter/jmp.cpp +++ b/common/emitter/jmp.cpp @@ -28,8 +28,7 @@ * sudonim(1@gmail.com) */ -#include "PrecompiledHeader.h" -#include "internal.h" +#include "common/emitter/internal.h" namespace x86Emitter { diff --git a/common/src/x86emitter/legacy.cpp b/common/emitter/legacy.cpp similarity index 99% rename from common/src/x86emitter/legacy.cpp rename to common/emitter/legacy.cpp index 146b2f3fe6..f762172650 100644 --- a/common/src/x86emitter/legacy.cpp +++ b/common/emitter/legacy.cpp @@ -25,8 +25,7 @@ // ix86 legacy emitter functions //------------------------------------------------------------------ -#include "PrecompiledHeader.h" -#include "legacy_internal.h" +#include "common/emitter/legacy_internal.h" emitterT void ModRM(uint mod, uint reg, uint rm) { diff --git a/common/include/x86emitter/legacy_instructions.h b/common/emitter/legacy_instructions.h similarity index 100% rename from common/include/x86emitter/legacy_instructions.h rename to common/emitter/legacy_instructions.h diff --git a/common/include/x86emitter/legacy_internal.h b/common/emitter/legacy_internal.h similarity index 91% rename from common/include/x86emitter/legacy_internal.h rename to common/emitter/legacy_internal.h index 53f647a1ab..ba5f0d6464 100644 --- a/common/include/x86emitter/legacy_internal.h +++ b/common/emitter/legacy_internal.h @@ -15,7 +15,7 @@ #pragma once -#include "internal.h" +#include "common/emitter/internal.h" //------------------------------------------------------------------ // Legacy Helper Macros and Functions (depreciated) @@ -28,8 +28,8 @@ using x86Emitter::xWrite16; using x86Emitter::xWrite32; using x86Emitter::xWrite64; -#include "legacy_types.h" -#include "legacy_instructions.h" +#include "common/emitter/legacy_types.h" +#include "common/emitter/legacy_instructions.h" #define MEMADDR(addr, oplen) (addr) diff --git a/common/src/x86emitter/legacy_sse.cpp b/common/emitter/legacy_sse.cpp similarity index 96% rename from common/src/x86emitter/legacy_sse.cpp rename to common/emitter/legacy_sse.cpp index 315df9c6d4..4aea6489c9 100644 --- a/common/src/x86emitter/legacy_sse.cpp +++ b/common/emitter/legacy_sse.cpp @@ -13,8 +13,7 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "legacy_internal.h" +#include "common/emitter/legacy_internal.h" using namespace x86Emitter; diff --git a/common/include/x86emitter/legacy_types.h b/common/emitter/legacy_types.h similarity index 100% rename from common/include/x86emitter/legacy_types.h rename to common/emitter/legacy_types.h diff --git a/common/src/x86emitter/movs.cpp b/common/emitter/movs.cpp similarity index 99% rename from common/src/x86emitter/movs.cpp rename to common/emitter/movs.cpp index 5ff4b36214..326fab239d 100644 --- a/common/src/x86emitter/movs.cpp +++ b/common/emitter/movs.cpp @@ -28,9 +28,8 @@ * sudonim(1@gmail.com) */ -#include "PrecompiledHeader.h" -#include "internal.h" -#include "implement/helpers.h" +#include "common/emitter/internal.h" +#include "common/emitter/implement/helpers.h" namespace x86Emitter { diff --git a/common/src/x86emitter/simd.cpp b/common/emitter/simd.cpp similarity index 99% rename from common/src/x86emitter/simd.cpp rename to common/emitter/simd.cpp index e1751370bb..b115945478 100644 --- a/common/src/x86emitter/simd.cpp +++ b/common/emitter/simd.cpp @@ -13,9 +13,8 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "internal.h" -#include "tools.h" +#include "common/emitter/internal.h" +#include "common/emitter/tools.h" // Mask of valid bit fields for the target CPU. Typically this is either 0xFFFF (SSE2 // or better) or 0xFFBF (SSE1 and earlier). Code can ensure a safe/valid MXCSR by diff --git a/common/include/x86emitter/tools.h b/common/emitter/tools.h similarity index 99% rename from common/include/x86emitter/tools.h rename to common/emitter/tools.h index b32432a2e8..9889f76841 100644 --- a/common/include/x86emitter/tools.h +++ b/common/emitter/tools.h @@ -15,7 +15,7 @@ #pragma once -#include "Utilities/Dependencies.h" +#include "common/Dependencies.h" enum x86VendorType { x86Vendor_Intel = 0, diff --git a/common/include/x86emitter/x86_intrin.h b/common/emitter/x86_intrin.h similarity index 100% rename from common/include/x86emitter/x86_intrin.h rename to common/emitter/x86_intrin.h diff --git a/common/src/x86emitter/x86emitter.cpp b/common/emitter/x86emitter.cpp similarity index 99% rename from common/src/x86emitter/x86emitter.cpp rename to common/emitter/x86emitter.cpp index 55a58bb27a..8a79eccd5d 100644 --- a/common/src/x86emitter/x86emitter.cpp +++ b/common/emitter/x86emitter.cpp @@ -28,9 +28,8 @@ * sudonim(1@gmail.com) */ -#include "PrecompiledHeader.h" -#include "internal.h" -#include "tools.h" +#include "common/emitter/internal.h" +#include "common/emitter/tools.h" // ------------------------------------------------------------------------ // Notes on Thread Local Storage: diff --git a/common/include/x86emitter/x86emitter.h b/common/emitter/x86emitter.h similarity index 89% rename from common/include/x86emitter/x86emitter.h rename to common/emitter/x86emitter.h index 46fa776118..ad9a5b174a 100644 --- a/common/include/x86emitter/x86emitter.h +++ b/common/emitter/x86emitter.h @@ -41,11 +41,11 @@ #pragma once -#include "x86types.h" -#include "tools.h" -#include "instructions.h" +#include "common/emitter/x86types.h" +#include "common/emitter/tools.h" +#include "common/emitter/instructions.h" // Including legacy items for now, but these should be removed eventually, // once most code is no longer dependent on them. -#include "legacy_types.h" -#include "legacy_instructions.h" +#include "common/emitter/legacy_types.h" +#include "common/emitter/legacy_instructions.h" diff --git a/common/include/x86emitter/x86types.h b/common/emitter/x86types.h similarity index 99% rename from common/include/x86emitter/x86types.h rename to common/emitter/x86types.h index b68426ef51..eda149ddba 100644 --- a/common/include/x86emitter/x86types.h +++ b/common/emitter/x86types.h @@ -15,6 +15,8 @@ #pragma once +#include "common/Threading.h" + #ifdef __M_X86_64 static const uint iREGCNT_XMM = 16; static const uint iREGCNT_GPR = 16; @@ -38,8 +40,6 @@ enum XMMSSEType { // as a project option. The multithreaded emitter relies on native compiler support for // TLS -- Macs are crap out of luck there (for now). -#include "Utilities/Threading.h" - #ifndef x86EMIT_MULTITHREADED #if PCSX2_THREAD_LOCAL #define x86EMIT_MULTITHREADED 1 diff --git a/common/include/Utilities/RedtapeWindows.h b/common/include/Utilities/RedtapeWindows.h deleted file mode 100644 index 36baed02bb..0000000000 --- a/common/include/Utilities/RedtapeWindows.h +++ /dev/null @@ -1,46 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#ifdef __WXMSW__ -#include -#else - -////////////////////////////////////////////////////////////////////////////////////////// -// Windows Redtape! No windows.h should be included without it! -// -// This header's purpose is to include windows.h with the correct OS version info, and -// to undefine some of windows.h's more evil macros (min/max). It also does a _WIN32 -// check, so that we don't have to do it explicitly in every instance where it might -// be needed from non-Win32-specific files - -#define NOMINMAX // Disables other libs inclusion of their own min/max macros (we use std instead) - -#ifdef _WIN32 - -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 -#endif - -#include - -// TODO: I think NOMINMAX above takes care of this already. So these can probably be removed. -// disable Windows versions of min/max -- we'll use the typesafe STL versions instead. -#undef min -#undef max - -#endif -#endif diff --git a/common/include/wx/folderdesc.txt b/common/include/wx/folderdesc.txt deleted file mode 100644 index e03a2e0cd9..0000000000 --- a/common/include/wx/folderdesc.txt +++ /dev/null @@ -1,15 +0,0 @@ -------------------------------------------------- - include/wx folder -- PCSX2 Common Includes -------------------------------------------------- - -This folder contains various classes borrowed from wxWidgets 2.9.x / 3.0. - -/Common/include is a PCSX2 project default include search path, and with the /wx -folder prefix, these files can be included the same way as other wxWidgets includes: - -#include - -If/when PCSX2 upgrades to wx2.9/3.0 these files will be removed and the wxWidgets -distribution files will automatically be used instead. - -NOTE: Folder is currently empty, by design. Nothing from 2.9/3.0 is useful anymore (for now). \ No newline at end of file diff --git a/common/include/Utilities/mt_queue.h b/common/mt_queue.h similarity index 100% rename from common/include/Utilities/mt_queue.h rename to common/mt_queue.h diff --git a/common/src/Utilities/pxCheckBox.cpp b/common/pxCheckBox.cpp similarity index 97% rename from common/src/Utilities/pxCheckBox.cpp rename to common/pxCheckBox.cpp index 3b15a3268f..f15e8c669c 100644 --- a/common/src/Utilities/pxCheckBox.cpp +++ b/common/pxCheckBox.cpp @@ -13,9 +13,8 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "pxCheckBox.h" -#include "pxStaticText.h" +#include "common/pxCheckBox.h" +#include "common/pxStaticText.h" using namespace pxSizerFlags; diff --git a/common/include/Utilities/pxCheckBox.h b/common/pxCheckBox.h similarity index 99% rename from common/include/Utilities/pxCheckBox.h rename to common/pxCheckBox.h index 64748711d5..60154b5063 100644 --- a/common/include/Utilities/pxCheckBox.h +++ b/common/pxCheckBox.h @@ -16,7 +16,7 @@ #pragma once #include -#include "wxGuiTools.h" +#include "common/wxGuiTools.h" // ------------------------------------------------------------------------------------- // pxCheckBox diff --git a/common/include/Utilities/pxEvents.h b/common/pxEvents.h similarity index 99% rename from common/include/Utilities/pxEvents.h rename to common/pxEvents.h index b272bf2f5f..805769b775 100644 --- a/common/include/Utilities/pxEvents.h +++ b/common/pxEvents.h @@ -16,7 +16,9 @@ #pragma once #include -#include "General.h" +#include "common/General.h" +#include "common/Dependencies.h" +#include "common/Threading.h" wxDECLARE_EVENT(pxEvt_StartIdleEventTimer, wxCommandEvent); wxDECLARE_EVENT(pxEvt_DeleteObject, wxCommandEvent); diff --git a/common/include/Utilities/pxForwardDefs.h b/common/pxForwardDefs.h similarity index 100% rename from common/include/Utilities/pxForwardDefs.h rename to common/pxForwardDefs.h diff --git a/common/src/Utilities/pxRadioPanel.cpp b/common/pxRadioPanel.cpp similarity index 98% rename from common/src/Utilities/pxRadioPanel.cpp rename to common/pxRadioPanel.cpp index 0a880dae3c..e5d60c5f1d 100644 --- a/common/src/Utilities/pxRadioPanel.cpp +++ b/common/pxRadioPanel.cpp @@ -13,11 +13,9 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "pxRadioPanel.h" -#include "pxStaticText.h" - -#include "SafeArray.inl" +#include "common/pxRadioPanel.h" +#include "common/pxStaticText.h" +#include "common/SafeArray.inl" template class SafeArray; diff --git a/common/include/Utilities/pxRadioPanel.h b/common/pxRadioPanel.h similarity index 98% rename from common/include/Utilities/pxRadioPanel.h rename to common/pxRadioPanel.h index 5f11c34c62..bf9772e2b7 100644 --- a/common/include/Utilities/pxRadioPanel.h +++ b/common/pxRadioPanel.h @@ -16,8 +16,8 @@ #pragma once #include -#include "SafeArray.h" -#include "wxGuiTools.h" +#include "common/SafeArray.h" +#include "common/wxGuiTools.h" // -------------------------------------------------------------------------------------- // RadioPanelItem diff --git a/common/src/Utilities/pxStaticText.cpp b/common/pxStaticText.cpp similarity index 99% rename from common/src/Utilities/pxStaticText.cpp rename to common/pxStaticText.cpp index 1034119826..2d2aa58b61 100644 --- a/common/src/Utilities/pxStaticText.cpp +++ b/common/pxStaticText.cpp @@ -13,9 +13,9 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "pxStaticText.h" #include +#include "common/pxStaticText.h" +#include "common/Assertions.h" // -------------------------------------------------------------------------------------- // pxStaticText (implementations) diff --git a/common/include/Utilities/pxStaticText.h b/common/pxStaticText.h similarity index 99% rename from common/include/Utilities/pxStaticText.h rename to common/pxStaticText.h index a12896cede..0b1e88b15e 100644 --- a/common/include/Utilities/pxStaticText.h +++ b/common/pxStaticText.h @@ -15,6 +15,7 @@ #pragma once +#include #include "wxGuiTools.h" // -------------------------------------------------------------------------------------- diff --git a/common/src/Utilities/pxStreams.cpp b/common/pxStreams.cpp similarity index 98% rename from common/src/Utilities/pxStreams.cpp rename to common/pxStreams.cpp index 10f07c37d4..3f930bb903 100644 --- a/common/src/Utilities/pxStreams.cpp +++ b/common/pxStreams.cpp @@ -13,13 +13,12 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "wxBaseTools.h" -#include "pxStreams.h" - +#include #include -#include +#include "common/wxBaseTools.h" +#include "common/pxStreams.h" +#include "common/StringHelpers.h" // -------------------------------------------------------------------------------------- // pxStreamBase (implementations) diff --git a/common/include/Utilities/pxStreams.h b/common/pxStreams.h similarity index 99% rename from common/include/Utilities/pxStreams.h rename to common/pxStreams.h index b43e7ba8e1..f3463ff127 100644 --- a/common/include/Utilities/pxStreams.h +++ b/common/pxStreams.h @@ -16,7 +16,7 @@ #pragma once #include -#include "wx/filefn.h" +#include #include #include "Dependencies.h" diff --git a/common/src/Utilities/pxTranslate.cpp b/common/pxTranslate.cpp similarity index 97% rename from common/src/Utilities/pxTranslate.cpp rename to common/pxTranslate.cpp index a45d608c4b..501c299551 100644 --- a/common/src/Utilities/pxTranslate.cpp +++ b/common/pxTranslate.cpp @@ -13,7 +13,7 @@ * If not, see . */ -#include "PrecompiledHeader.h" +#include bool pxIsEnglish(int id) { diff --git a/common/src/Utilities/pxWindowTextWriter.cpp b/common/pxWindowTextWriter.cpp similarity index 97% rename from common/src/Utilities/pxWindowTextWriter.cpp rename to common/pxWindowTextWriter.cpp index f49adb44fc..1211527c47 100644 --- a/common/src/Utilities/pxWindowTextWriter.cpp +++ b/common/pxWindowTextWriter.cpp @@ -13,8 +13,9 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "wxGuiTools.h" +#include +#include "common/wxGuiTools.h" +#include "common/StringHelpers.h" // -------------------------------------------------------------------------------------- // pxWindowTextWriter Implementations diff --git a/common/svn_readme.txt b/common/svn_readme.txt deleted file mode 100644 index 511ec8d323..0000000000 --- a/common/svn_readme.txt +++ /dev/null @@ -1,17 +0,0 @@ - -Folder: vsprops/ - - Contains Win32-specific build scripts and .vsprops files for use by Win32 projects - of our many (many!) plugins. - -Folder: include/ - - Houses the common include files for various shared portions of Pcsx2 code. The most - significant are the PS2Edefs / PS2Etypes files (plugin APIs). Other code snippets\ - and generic usefuls may be added at a later date. - -Folder: src/ - - Source code for snippets and libs maintained by the Pcsx2 Team. Code is compiled into - libs, which are found in /deps. (automatically included into your plugin linker - search path if you use the common/vsprops/) \ No newline at end of file diff --git a/common/vsprops/BaseProperties.props b/common/vsprops/BaseProperties.props index 09ef6c3fc3..15018e7840 100644 --- a/common/vsprops/BaseProperties.props +++ b/common/vsprops/BaseProperties.props @@ -10,7 +10,7 @@ true - $(SolutionDir)\common\include;$(SolutionDir)\3rdparty\wxWidgets3.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir);$(SolutionDir)\3rdparty\wxWidgets3.0\include;%(AdditionalIncludeDirectories) __WIN32__;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) 16Bytes true @@ -29,7 +29,7 @@ "$(SolutionDir)common\vsprops\preBuild.cmd" - $(SolutionDir)\common\include;$(SolutionDir)\3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir);$(SolutionDir)\3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories) \ No newline at end of file diff --git a/common/vsprops/CommonLibrary.props b/common/vsprops/CommonLibrary.props index 2f3759273b..2f0444678e 100644 --- a/common/vsprops/CommonLibrary.props +++ b/common/vsprops/CommonLibrary.props @@ -11,7 +11,7 @@ - $(SvnRootDir)\common\include\$(ProjectName);$(SvnRootDir)\common\include;$(SvnRootDir)\3rdparty\wxwidgets3.0\include;$(SvnRootDir)\3rdparty;%(AdditionalIncludeDirectories) + $(SolutionDir);$(SolutionDir)\3rdparty\wxwidgets3.0\include;$(SolutionDir)\3rdparty;%(AdditionalIncludeDirectories) __WIN32__;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) _ARCH_64=1;_M_X86_64;__M_X86_64;%(PreprocessorDefinitions) _ARCH_32=1;_M_X86_32;%(PreprocessorDefinitions) diff --git a/common/src/Utilities/wxAppWithHelpers.cpp b/common/wxAppWithHelpers.cpp similarity index 99% rename from common/src/Utilities/wxAppWithHelpers.cpp rename to common/wxAppWithHelpers.cpp index 53b1af9b64..01613f1112 100644 --- a/common/src/Utilities/wxAppWithHelpers.cpp +++ b/common/wxAppWithHelpers.cpp @@ -13,11 +13,9 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "wxAppWithHelpers.h" - -#include "ThreadingInternal.h" -#include "PersistentThread.h" +#include "common/wxAppWithHelpers.h" +#include "common/ThreadingInternal.h" +#include "common/PersistentThread.h" wxDEFINE_EVENT(pxEvt_StartIdleEventTimer, wxCommandEvent); wxDEFINE_EVENT(pxEvt_DeleteObject, wxCommandEvent); diff --git a/common/include/Utilities/wxAppWithHelpers.h b/common/wxAppWithHelpers.h similarity index 97% rename from common/include/Utilities/wxAppWithHelpers.h rename to common/wxAppWithHelpers.h index 0b38bb7490..f9555cdd24 100644 --- a/common/include/Utilities/wxAppWithHelpers.h +++ b/common/wxAppWithHelpers.h @@ -17,10 +17,10 @@ #include -#include "Threading.h" -#include "wxGuiTools.h" -#include "pxEvents.h" -#include "AppTrait.h" +#include "common/Threading.h" +#include "common/wxGuiTools.h" +#include "common/pxEvents.h" +#include "common/AppTrait.h" using namespace Threading; diff --git a/common/include/Utilities/wxBaseTools.h b/common/wxBaseTools.h similarity index 98% rename from common/include/Utilities/wxBaseTools.h rename to common/wxBaseTools.h index 2a38f51fce..748db15946 100644 --- a/common/include/Utilities/wxBaseTools.h +++ b/common/wxBaseTools.h @@ -15,7 +15,7 @@ #pragma once -#include "Dependencies.h" +#include "common/Dependencies.h" // -------------------------------------------------------------------------------------- // wxBaseTools.h diff --git a/common/src/Utilities/wxGuiTools.cpp b/common/wxGuiTools.cpp similarity index 99% rename from common/src/Utilities/wxGuiTools.cpp rename to common/wxGuiTools.cpp index cfe967d00e..74a9d73490 100644 --- a/common/src/Utilities/wxGuiTools.cpp +++ b/common/wxGuiTools.cpp @@ -13,9 +13,9 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "wxGuiTools.h" -#include "pxStaticText.h" +#include "common/PrecompiledHeader.h" +#include "common/wxGuiTools.h" +#include "common/pxStaticText.h" #include #include diff --git a/common/include/Utilities/wxGuiTools.h b/common/wxGuiTools.h similarity index 99% rename from common/include/Utilities/wxGuiTools.h rename to common/wxGuiTools.h index d2d68e6c86..27362138f6 100644 --- a/common/include/Utilities/wxGuiTools.h +++ b/common/wxGuiTools.h @@ -15,6 +15,11 @@ #pragma once +#include +#include +#include +#include "common/Dependencies.h" + // ---------------------------------------------------------------------------- // wxGuiTools.h // @@ -24,15 +29,6 @@ // them. For tools which require only wxBase, see wxBaseTools.h // ---------------------------------------------------------------------------- - -#if wxUSE_GUI - -#include "Dependencies.h" -#include -#include - -#include - class pxStaticText; class pxStaticHeading; class pxCheckBox; @@ -803,5 +799,3 @@ extern void pxSetToolTip(wxWindow &wind, const wxString &src); extern wxFont pxGetFixedFont(int ptsize = 8, wxFontWeight weight = wxFONTWEIGHT_NORMAL, bool underline = false); extern pxDialogCreationFlags pxDialogFlags(); - -#endif diff --git a/common/src/Utilities/wxHelpers.cpp b/common/wxHelpers.cpp similarity index 98% rename from common/src/Utilities/wxHelpers.cpp rename to common/wxHelpers.cpp index 8325a32fc6..caefe1f7af 100644 --- a/common/src/Utilities/wxHelpers.cpp +++ b/common/wxHelpers.cpp @@ -13,15 +13,14 @@ * If not, see . */ -#include "PrecompiledHeader.h" -#include "wxGuiTools.h" -#include "pxStaticText.h" -#include "Threading.h" -#include "IniInterface.h" - #include #include #include +#include "common/General.h" +#include "common/wxGuiTools.h" +#include "common/pxStaticText.h" +#include "common/Threading.h" +#include "common/IniInterface.h" using namespace pxSizerFlags; diff --git a/common/src/Utilities/x86/MemcpyFast.cpp b/common/x86/MemcpyFast.cpp similarity index 97% rename from common/src/Utilities/x86/MemcpyFast.cpp rename to common/x86/MemcpyFast.cpp index 144809328b..9d6be915d3 100644 --- a/common/src/Utilities/x86/MemcpyFast.cpp +++ b/common/x86/MemcpyFast.cpp @@ -1,7 +1,8 @@ // GH: AMD memcpy was removed. The remaining part (memcmp_mmx) is likely from Zerofrog. // Hopefully memcmp_mmx will be dropped in the future. -#include "PrecompiledHeader.h" +#include "common/MemcpyFast.h" +#include "common/Assertions.h" #ifdef _MSC_VER #pragma warning(disable : 4414) diff --git a/pcsx2/CDVD/CompressedFileReaderUtils.h b/pcsx2/CDVD/CompressedFileReaderUtils.h index f99c0db9bf..124da604d2 100644 --- a/pcsx2/CDVD/CompressedFileReaderUtils.h +++ b/pcsx2/CDVD/CompressedFileReaderUtils.h @@ -15,7 +15,7 @@ #pragma once -#include +#include "common/Pcsx2Types.h" /////////// Some complementary utilities for zlib_indexed.c ////////// diff --git a/pcsx2/CDVD/CsoFileReader.cpp b/pcsx2/CDVD/CsoFileReader.cpp index 44dd547ed2..9305d6ee1f 100644 --- a/pcsx2/CDVD/CsoFileReader.cpp +++ b/pcsx2/CDVD/CsoFileReader.cpp @@ -17,7 +17,7 @@ #include "AsyncFileReader.h" #include "CompressedFileReaderUtils.h" #include "CsoFileReader.h" -#include "Pcsx2Types.h" +#include "common/Pcsx2Types.h" #ifdef __POSIX__ #include #else diff --git a/pcsx2/CDVD/ThreadedFileReader.h b/pcsx2/CDVD/ThreadedFileReader.h index 4216f363a4..896729d0c9 100644 --- a/pcsx2/CDVD/ThreadedFileReader.h +++ b/pcsx2/CDVD/ThreadedFileReader.h @@ -16,7 +16,7 @@ #pragma once #include "AsyncFileReader.h" -#include "Utilities/PersistentThread.h" +#include "common/PersistentThread.h" #include #include diff --git a/pcsx2/Common.h b/pcsx2/Common.h index b740afd310..b24f373b9e 100644 --- a/pcsx2/Common.h +++ b/pcsx2/Common.h @@ -15,7 +15,7 @@ #pragma once -#include "Pcsx2Defs.h" +#include "common/Pcsx2Defs.h" static const u32 BIAS = 2; // Bus is half of the actual ps2 speed static const u32 PS2CLK = 294912000; //hz /* 294.912 mhz */ diff --git a/pcsx2/Config.h b/pcsx2/Config.h index cc5cb7fd69..d4208825a7 100644 --- a/pcsx2/Config.h +++ b/pcsx2/Config.h @@ -15,8 +15,8 @@ #pragma once -#include "x86emitter/tools.h" -#include "Utilities/General.h" +#include "common/emitter/tools.h" +#include "common/General.h" #include class IniInterface; diff --git a/pcsx2/DebugTools/BiosDebugData.h b/pcsx2/DebugTools/BiosDebugData.h index 4e3ec34509..f5c547f806 100644 --- a/pcsx2/DebugTools/BiosDebugData.h +++ b/pcsx2/DebugTools/BiosDebugData.h @@ -14,7 +14,7 @@ */ #pragma once -#include "Pcsx2Types.h" +#include "common/Pcsx2Types.h" #include "ps2/BiosTools.h" struct EEInternalThread { // internal struct diff --git a/pcsx2/DebugTools/Breakpoints.h b/pcsx2/DebugTools/Breakpoints.h index bd3b54c75e..bc54fb9ac8 100644 --- a/pcsx2/DebugTools/Breakpoints.h +++ b/pcsx2/DebugTools/Breakpoints.h @@ -20,7 +20,7 @@ #include #include "DebugInterface.h" -#include "Pcsx2Types.h" +#include "common/Pcsx2Types.h" struct BreakPointCond { diff --git a/pcsx2/DebugTools/Debug.h b/pcsx2/DebugTools/Debug.h index 66e4f90465..12d478238a 100644 --- a/pcsx2/DebugTools/Debug.h +++ b/pcsx2/DebugTools/Debug.h @@ -15,7 +15,7 @@ #pragma once -#include "Utilities/TraceLog.h" +#include "common/TraceLog.h" #include "Memory.h" extern FILE *emuLog; diff --git a/pcsx2/DebugTools/DisassemblyManager.h b/pcsx2/DebugTools/DisassemblyManager.h index 198ff9d2c9..6089e0b588 100644 --- a/pcsx2/DebugTools/DisassemblyManager.h +++ b/pcsx2/DebugTools/DisassemblyManager.h @@ -16,8 +16,8 @@ #pragma once #include "SymbolMap.h" -#include "Utilities/Threading.h" -#include "Pcsx2Types.h" +#include "common/Threading.h" +#include "common/Pcsx2Types.h" #include "DebugInterface.h" #include "MIPSAnalyst.h" diff --git a/pcsx2/DebugTools/ExpressionParser.h b/pcsx2/DebugTools/ExpressionParser.h index ce43906701..b0e32b2468 100644 --- a/pcsx2/DebugTools/ExpressionParser.h +++ b/pcsx2/DebugTools/ExpressionParser.h @@ -15,7 +15,7 @@ #pragma once -#include "Pcsx2Types.h" +#include "common/Pcsx2Types.h" #include typedef std::pair ExpressionPair; diff --git a/pcsx2/DebugTools/MipsStackWalk.h b/pcsx2/DebugTools/MipsStackWalk.h index 06c73e727f..df00ce0829 100644 --- a/pcsx2/DebugTools/MipsStackWalk.h +++ b/pcsx2/DebugTools/MipsStackWalk.h @@ -21,7 +21,7 @@ #pragma once #include -#include "Pcsx2Types.h" +#include "common/Pcsx2Types.h" class DebugInterface; diff --git a/pcsx2/DebugTools/SymbolMap.h b/pcsx2/DebugTools/SymbolMap.h index 9d9d64bb8c..5bf3aa5c13 100644 --- a/pcsx2/DebugTools/SymbolMap.h +++ b/pcsx2/DebugTools/SymbolMap.h @@ -21,7 +21,7 @@ #include #include -#include "Pcsx2Types.h" +#include "common/Pcsx2Types.h" enum SymbolType { ST_NONE = 0, diff --git a/pcsx2/GS/GS.cpp b/pcsx2/GS/GS.cpp index 02907e612c..4939fd5a4d 100644 --- a/pcsx2/GS/GS.cpp +++ b/pcsx2/GS/GS.cpp @@ -24,7 +24,7 @@ #include "GSLzma.h" #include "AppCoreThread.h" -#include "Utilities/pxStreams.h" +#include "common/pxStreams.h" #ifdef _WIN32 diff --git a/pcsx2/GS/GS.h b/pcsx2/GS/GS.h index 53d39b46cd..2487549fe7 100644 --- a/pcsx2/GS/GS.h +++ b/pcsx2/GS/GS.h @@ -19,7 +19,7 @@ // clang-format off #include "config.h" -#include "Pcsx2Types.h" +#include "common/Pcsx2Types.h" #include "GS_types.h" #include "Window/GSSetting.h" #include "SaveState.h" diff --git a/pcsx2/GS/GSThread_CXX11.h b/pcsx2/GS/GSThread_CXX11.h index 3de22d5689..904912e5ac 100644 --- a/pcsx2/GS/GSThread_CXX11.h +++ b/pcsx2/GS/GSThread_CXX11.h @@ -16,7 +16,7 @@ #pragma once #include "GS.h" -#include "Utilities/boost_spsc_queue.hpp" +#include "common/boost_spsc_queue.hpp" template class GSJobQueue final diff --git a/pcsx2/GS/GSVector.h b/pcsx2/GS/GSVector.h index aa46c4c2ee..433e2f0e60 100644 --- a/pcsx2/GS/GSVector.h +++ b/pcsx2/GS/GSVector.h @@ -110,7 +110,7 @@ class GSVector8i; #include "GSVector8i.h" #include "GSVector8.h" -#include "Utilities/Dependencies.h" +#include "common/Dependencies.h" // conversion diff --git a/pcsx2/Gif_Unit.h b/pcsx2/Gif_Unit.h index 25653c9582..8f9df90ec7 100644 --- a/pcsx2/Gif_Unit.h +++ b/pcsx2/Gif_Unit.h @@ -21,7 +21,7 @@ #include "GS.h" // FIXME common path ? -#include "Utilities/boost_spsc_queue.hpp" +#include "common/boost_spsc_queue.hpp" struct GS_Packet; extern void Gif_MTGS_Wait(bool isMTVU); diff --git a/pcsx2/IPC.h b/pcsx2/IPC.h index 61f1391040..89d0a2ced6 100644 --- a/pcsx2/IPC.h +++ b/pcsx2/IPC.h @@ -25,7 +25,7 @@ #define IPC_DEFAULT_SLOT 28011 #define IPC_EMULATOR_NAME "pcsx2" -#include "Utilities/PersistentThread.h" +#include "common/PersistentThread.h" #include "System/SysThreads.h" #include #ifdef _WIN32 diff --git a/pcsx2/IPU/IPU.cpp b/pcsx2/IPU/IPU.cpp index bb79ae33b3..8f5177921b 100644 --- a/pcsx2/IPU/IPU.cpp +++ b/pcsx2/IPU/IPU.cpp @@ -24,7 +24,7 @@ #include #include "AppConfig.h" -#include "Utilities/MemsetFast.inl" +#include "common/MemsetFast.inl" // the BP doesn't advance and returns -1 if there is no data to be read __aligned16 tIPU_cmd ipu_cmd; diff --git a/pcsx2/IPU/mpeg2lib/Mpeg.cpp b/pcsx2/IPU/mpeg2lib/Mpeg.cpp index 8af6dbdff1..6499ebd877 100644 --- a/pcsx2/IPU/mpeg2lib/Mpeg.cpp +++ b/pcsx2/IPU/mpeg2lib/Mpeg.cpp @@ -33,7 +33,7 @@ #include "Mpeg.h" #include "Vlc.h" -#include "Utilities/MemsetFast.inl" +#include "common/MemsetFast.inl" const int non_linear_quantizer_scale [] = { diff --git a/pcsx2/IopGte.cpp b/pcsx2/IopGte.cpp index 410409a098..5310c92d18 100644 --- a/pcsx2/IopGte.cpp +++ b/pcsx2/IopGte.cpp @@ -20,7 +20,7 @@ #include "IopGte.h" //#include "R3000A.h" #include "IopCommon.h" -#include "Utilities/MathUtils.h" +#include "common/MathUtils.h" #ifdef GTE_DUMP #define G_OP(name,delay) fprintf(gteLog, "* : %08X : %02d : %s\n", psxRegs.code, delay, name); #define G_SD(reg) fprintf(gteLog, "+D%02d : %08X\n", reg, psxRegs.CP2D.r[reg]); diff --git a/pcsx2/MMI.cpp b/pcsx2/MMI.cpp index bb2de18c05..482cb053a8 100644 --- a/pcsx2/MMI.cpp +++ b/pcsx2/MMI.cpp @@ -16,7 +16,7 @@ #include "PrecompiledHeader.h" #include "Common.h" -#include "Utilities/MathUtils.h" +#include "common/MathUtils.h" namespace R5900 { namespace Interpreter { diff --git a/pcsx2/Memory.cpp b/pcsx2/Memory.cpp index a3f752c3e6..477546f052 100644 --- a/pcsx2/Memory.cpp +++ b/pcsx2/Memory.cpp @@ -47,7 +47,7 @@ BIOS #include "ps2/BiosTools.h" #include "SPU2/spu2.h" -#include "Utilities/PageFaultSource.h" +#include "common/PageFaultSource.h" #ifdef ENABLECACHE #include "Cache.h" diff --git a/pcsx2/Memory.h b/pcsx2/Memory.h index bb1487ff32..f58e10257f 100644 --- a/pcsx2/Memory.h +++ b/pcsx2/Memory.h @@ -21,7 +21,7 @@ #include "vtlb.h" -#include "x86emitter/x86_intrin.h" +#include "common/emitter/x86_intrin.h" // [TODO] This *could* be replaced with an assignment operator on u128 that implicitly // uses _mm_store and _mm_load internally. However, there are alignment concerns -- diff --git a/pcsx2/MemoryTypes.h b/pcsx2/MemoryTypes.h index 9f13853062..6abef5a87e 100644 --- a/pcsx2/MemoryTypes.h +++ b/pcsx2/MemoryTypes.h @@ -14,6 +14,8 @@ */ #pragma once +#include "common/Pcsx2Defs.h" +#include "common/Dependencies.h" namespace Ps2MemSize { diff --git a/pcsx2/PAD/Windows/DirectInput.cpp b/pcsx2/PAD/Windows/DirectInput.cpp index acd0423dfd..a41857487e 100644 --- a/pcsx2/PAD/Windows/DirectInput.cpp +++ b/pcsx2/PAD/Windows/DirectInput.cpp @@ -23,7 +23,7 @@ #include "VKey.h" #include "DirectInput.h" #include "DeviceEnumerator.h" -#include "Pcsx2Defs.h" +#include "common/Pcsx2Defs.h" // All for getting GUIDs of XInput devices.... #include diff --git a/pcsx2/PAD/Windows/PAD.h b/pcsx2/PAD/Windows/PAD.h index e6720f55c8..dbc385b120 100644 --- a/pcsx2/PAD/Windows/PAD.h +++ b/pcsx2/PAD/Windows/PAD.h @@ -20,8 +20,8 @@ #include #include #include -#include "Utilities/pxStreams.h" -#include "Utilities/Console.h" +#include "common/pxStreams.h" +#include "common/Console.h" #include #include diff --git a/pcsx2/Patch.h b/pcsx2/Patch.h index 57b5bae84e..bfd7efcdd1 100644 --- a/pcsx2/Patch.h +++ b/pcsx2/Patch.h @@ -35,7 +35,7 @@ // - The 6 widescreen patches are 6 pnach-style patch lines loaded either from cheats_ws folder or from cheats_ws.zip -#include "Pcsx2Defs.h" +#include "common/Pcsx2Defs.h" #include "SysForwardDefs.h" #include "AppGameDatabase.h" diff --git a/pcsx2/PathDefs.h b/pcsx2/PathDefs.h index 2803e54ad8..82b0bc9d81 100644 --- a/pcsx2/PathDefs.h +++ b/pcsx2/PathDefs.h @@ -15,7 +15,7 @@ #pragma once -#include "Utilities/Path.h" +#include "common/Path.h" enum FoldersEnum_t { diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp index 7389b87df3..cc59529403 100644 --- a/pcsx2/Pcsx2Config.cpp +++ b/pcsx2/Pcsx2Config.cpp @@ -17,7 +17,7 @@ #include -#include "Utilities/IniInterface.h" +#include "common/IniInterface.h" #include "Config.h" #include "GS.h" #include "gui/GSFrame.h" diff --git a/pcsx2/PrecompiledHeader.h b/pcsx2/PrecompiledHeader.h index c5848f71af..e92e68f8cf 100644 --- a/pcsx2/PrecompiledHeader.h +++ b/pcsx2/PrecompiledHeader.h @@ -22,7 +22,7 @@ # pragma warning(disable:4996) //ignore the stricmp deprecated warning #endif -#include "Utilities/Dependencies.h" +#include "common/Dependencies.h" #define NOMINMAX // Disables other libs inclusion of their own min/max macros (we use std instead) @@ -67,15 +67,15 @@ // unchanged for long periods of time, or happen to be used by almost everything, so they // need a full recompile anyway, when modified (etc) -#include "Pcsx2Defs.h" +#include "common/Pcsx2Defs.h" #include "i18n.h" -#include "Utilities/wxBaseTools.h" -#include "Utilities/Path.h" -#include "Utilities/Console.h" -#include "Utilities/MemcpyFast.h" -#include "Utilities/General.h" -#include "x86emitter/tools.h" +#include "common/wxBaseTools.h" +#include "common/Path.h" +#include "common/Console.h" +#include "common/MemcpyFast.h" +#include "common/General.h" +#include "common/emitter/tools.h" #include "Config.h" diff --git a/pcsx2/R5900OpcodeTables.h b/pcsx2/R5900OpcodeTables.h index eb46577853..fd545282ed 100644 --- a/pcsx2/R5900OpcodeTables.h +++ b/pcsx2/R5900OpcodeTables.h @@ -15,7 +15,7 @@ #ifndef _R5900_OPCODETABLES_H #define _R5900_OPCODETABLES_H -#include "Pcsx2Defs.h" +#include "common/Pcsx2Defs.h" enum Syscall : u8 { diff --git a/pcsx2/Recording/Utilities/InputRecordingLogger.h b/pcsx2/Recording/Utilities/InputRecordingLogger.h index d070aa86cc..07fc53d4be 100644 --- a/pcsx2/Recording/Utilities/InputRecordingLogger.h +++ b/pcsx2/Recording/Utilities/InputRecordingLogger.h @@ -18,7 +18,7 @@ #include "App.h" #include "ConsoleLogger.h" #include "DebugTools/Debug.h" -#include "Utilities/Console.h" +#include "common/Console.h" #include diff --git a/pcsx2/Recording/VirtualPad/VirtualPad.cpp b/pcsx2/Recording/VirtualPad/VirtualPad.cpp index 7fbfc2192d..3910c59c0f 100644 --- a/pcsx2/Recording/VirtualPad/VirtualPad.cpp +++ b/pcsx2/Recording/VirtualPad/VirtualPad.cpp @@ -21,7 +21,7 @@ #include "App.h" #include "MSWstuff.h" -#include "Utilities/EmbeddedImage.h" +#include "common/EmbeddedImage.h" #include "wx/dcbuffer.h" #include "wx/display.h" #include "wx/spinctrl.h" diff --git a/pcsx2/Recording/VirtualPad/VirtualPad.h b/pcsx2/Recording/VirtualPad/VirtualPad.h index 94cf7ad4c8..1f57e19107 100644 --- a/pcsx2/Recording/VirtualPad/VirtualPad.h +++ b/pcsx2/Recording/VirtualPad/VirtualPad.h @@ -21,7 +21,7 @@ #include #include "AppConfig.h" -#include "Pcsx2Types.h" +#include "common/Pcsx2Types.h" #include "wx/checkbox.h" #include "wx/dc.h" diff --git a/pcsx2/Recording/VirtualPad/VirtualPadData.h b/pcsx2/Recording/VirtualPad/VirtualPadData.h index 35695024e8..44718e4625 100644 --- a/pcsx2/Recording/VirtualPad/VirtualPadData.h +++ b/pcsx2/Recording/VirtualPad/VirtualPadData.h @@ -17,7 +17,7 @@ #ifndef DISABLE_RECORDING -#include "Pcsx2Types.h" +#include "common/Pcsx2Types.h" #include "Recording/PadData.h" #include "Recording/VirtualPad/VirtualPadResources.h" diff --git a/pcsx2/Recording/VirtualPad/VirtualPadResources.h b/pcsx2/Recording/VirtualPad/VirtualPadResources.h index 7aba06a141..cebe4c7f39 100644 --- a/pcsx2/Recording/VirtualPad/VirtualPadResources.h +++ b/pcsx2/Recording/VirtualPad/VirtualPadResources.h @@ -19,7 +19,7 @@ #include -#include "Pcsx2Types.h" +#include "common/Pcsx2Types.h" #include "wx/bitmap.h" #include "wx/checkbox.h" #include "wx/gdicmn.h" diff --git a/pcsx2/SPU2/Wavedump_wav.cpp b/pcsx2/SPU2/Wavedump_wav.cpp index 9962332cd7..6578d0f537 100644 --- a/pcsx2/SPU2/Wavedump_wav.cpp +++ b/pcsx2/SPU2/Wavedump_wav.cpp @@ -101,7 +101,7 @@ namespace WaveDump } } // namespace WaveDump -#include "Utilities/Threading.h" +#include "common/Threading.h" using namespace Threading; diff --git a/pcsx2/SPU2/Windows/CfgHelpers.cpp b/pcsx2/SPU2/Windows/CfgHelpers.cpp index cea3492f4e..bd1d73da5c 100644 --- a/pcsx2/SPU2/Windows/CfgHelpers.cpp +++ b/pcsx2/SPU2/Windows/CfgHelpers.cpp @@ -18,7 +18,7 @@ #include "SPU2/Global.h" #include "Dialogs.h" -#include "Utilities/StringHelpers.h" +#include "common/StringHelpers.h" extern uptr gsWindowHandle; @@ -49,7 +49,7 @@ void SysMessage(const wchar_t* fmt, ...) ////// -#include "Utilities/Path.h" +#include "common/Path.h" wxString CfgFile(L"SPU2.ini"); bool pathSet = false; diff --git a/pcsx2/SPU2/Windows/ConfigDebug.cpp b/pcsx2/SPU2/Windows/ConfigDebug.cpp index 6c3da3e811..ecab064496 100644 --- a/pcsx2/SPU2/Windows/ConfigDebug.cpp +++ b/pcsx2/SPU2/Windows/ConfigDebug.cpp @@ -16,7 +16,7 @@ #include "PrecompiledHeader.h" #include "SPU2/Global.h" #include "Dialogs.h" -#include "Utilities\Path.h" +#include "common/Path.h" bool DebugEnabled = false; diff --git a/pcsx2/SPU2/Windows/SPU2.rc b/pcsx2/SPU2/Windows/SPU2.rc index 01dc814e09..ec76abd78f 100644 --- a/pcsx2/SPU2/Windows/SPU2.rc +++ b/pcsx2/SPU2/Windows/SPU2.rc @@ -8,7 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "svnrev.h" -#include "afxresmw.h" +#include "common/afxresmw.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/pcsx2/SPU2/spu2.cpp b/pcsx2/SPU2/spu2.cpp index de011b9aa0..d7591b3a4c 100644 --- a/pcsx2/SPU2/spu2.cpp +++ b/pcsx2/SPU2/spu2.cpp @@ -24,7 +24,7 @@ #include "Windows/Dialogs.h" #endif #include "R3000A.h" -#include "Utilities/pxStreams.h" +#include "common/pxStreams.h" #include "AppCoreThread.h" using namespace Threading; diff --git a/pcsx2/SPU2/spu2.h b/pcsx2/SPU2/spu2.h index 0308b3dd33..b1790499c6 100644 --- a/pcsx2/SPU2/spu2.h +++ b/pcsx2/SPU2/spu2.h @@ -15,7 +15,7 @@ #pragma once -#include "Utilities/Threading.h" +#include "common/Threading.h" #include "SaveState.h" extern Threading::MutexRecursive mtx_SPU2Status; diff --git a/pcsx2/SaveState.cpp b/pcsx2/SaveState.cpp index 6bbe2654fb..1465a2f16f 100644 --- a/pcsx2/SaveState.cpp +++ b/pcsx2/SaveState.cpp @@ -28,7 +28,7 @@ #include "Elfheader.h" #include "Counters.h" -#include "Utilities/SafeArray.inl" +#include "common/SafeArray.inl" #include "SPU2/spu2.h" #include "gui/ConsoleLogger.h" diff --git a/pcsx2/SaveState.h b/pcsx2/SaveState.h index 832a6413f9..822662670a 100644 --- a/pcsx2/SaveState.h +++ b/pcsx2/SaveState.h @@ -16,7 +16,7 @@ #pragma once #include "System.h" -#include "Utilities/Exceptions.h" +#include "common/Exceptions.h" enum class FreezeAction { diff --git a/pcsx2/System.cpp b/pcsx2/System.cpp index fe5aacfe78..9791e2fb65 100644 --- a/pcsx2/System.cpp +++ b/pcsx2/System.cpp @@ -24,8 +24,8 @@ #include "System/RecTypes.h" -#include "Utilities/MemsetFast.inl" -#include "Utilities/Perf.h" +#include "common/MemsetFast.inl" +#include "common/Perf.h" // -------------------------------------------------------------------------------------- diff --git a/pcsx2/System.h b/pcsx2/System.h index 21717bcaa0..987c7c167a 100644 --- a/pcsx2/System.h +++ b/pcsx2/System.h @@ -17,8 +17,8 @@ #include "SysForwardDefs.h" -#include "Utilities/SafeArray.h" -#include "Utilities/Threading.h" // to use threading stuff, include the Threading namespace in your file. +#include "common/SafeArray.h" +#include "common/Threading.h" // to use threading stuff, include the Threading namespace in your file. #include "vtlb.h" diff --git a/pcsx2/System/RecTypes.h b/pcsx2/System/RecTypes.h index 385e022e9a..7f36291646 100644 --- a/pcsx2/System/RecTypes.h +++ b/pcsx2/System/RecTypes.h @@ -15,7 +15,7 @@ #pragma once -#include "Utilities/PageFaultSource.h" +#include "common/PageFaultSource.h" // -------------------------------------------------------------------------------------- // RecompiledCodeReserve diff --git a/pcsx2/System/SysCoreThread.cpp b/pcsx2/System/SysCoreThread.cpp index 3de615df25..1b82b74bf9 100644 --- a/pcsx2/System/SysCoreThread.cpp +++ b/pcsx2/System/SysCoreThread.cpp @@ -40,15 +40,15 @@ #include "DebugTools/MIPSAnalyst.h" #include "DebugTools/SymbolMap.h" -#include "Utilities/PageFaultSource.h" -#include "Utilities/Threading.h" +#include "common/PageFaultSource.h" +#include "common/Threading.h" #include "IopBios.h" #ifdef __WXMSW__ #include #endif -#include "x86emitter/x86_intrin.h" +#include "common/emitter/x86_intrin.h" bool g_CDVDReset = false; diff --git a/pcsx2/System/SysThreads.h b/pcsx2/System/SysThreads.h index 0f27e58294..508fe1ef52 100644 --- a/pcsx2/System/SysThreads.h +++ b/pcsx2/System/SysThreads.h @@ -17,8 +17,8 @@ #include "System.h" -#include "Utilities/PersistentThread.h" -#include "x86emitter/tools.h" +#include "common/PersistentThread.h" +#include "common/emitter/tools.h" #include "IPC.h" diff --git a/pcsx2/USB/USB.cpp b/pcsx2/USB/USB.cpp index fd7274994f..32da4ef8d9 100644 --- a/pcsx2/USB/USB.cpp +++ b/pcsx2/USB/USB.cpp @@ -20,7 +20,7 @@ #include #include "PrecompiledHeader.h" -#include "Utilities/pxStreams.h" +#include "common/pxStreams.h" #include "USB.h" #include "qemu-usb/USBinternal.h" #include "qemu-usb/desc.h" diff --git a/pcsx2/ZipTools/ThreadedZipTools.h b/pcsx2/ZipTools/ThreadedZipTools.h index a26a59acbb..50fe333b53 100644 --- a/pcsx2/ZipTools/ThreadedZipTools.h +++ b/pcsx2/ZipTools/ThreadedZipTools.h @@ -15,8 +15,8 @@ #pragma once -#include "Utilities/PersistentThread.h" -#include "Utilities/pxStreams.h" +#include "common/PersistentThread.h" +#include "common/pxStreams.h" #include "wx/zipstrm.h" using namespace Threading; diff --git a/pcsx2/ZipTools/thread_gzip.cpp b/pcsx2/ZipTools/thread_gzip.cpp index 275813a87e..466ff46022 100644 --- a/pcsx2/ZipTools/thread_gzip.cpp +++ b/pcsx2/ZipTools/thread_gzip.cpp @@ -18,7 +18,7 @@ #include "App.h" #include "SaveState.h" #include "ThreadedZipTools.h" -#include "Utilities/SafeArray.inl" +#include "common/SafeArray.inl" #include "wx/wfstream.h" diff --git a/pcsx2/gui/App.h b/pcsx2/gui/App.h index f6bdeb8d49..36780fc7bd 100644 --- a/pcsx2/gui/App.h +++ b/pcsx2/gui/App.h @@ -15,7 +15,7 @@ #pragma once -#include "Utilities/wxAppWithHelpers.h" +#include "common/wxAppWithHelpers.h" #include #include diff --git a/pcsx2/gui/AppAssert.cpp b/pcsx2/gui/AppAssert.cpp index 4ce151f86f..d21c54de07 100644 --- a/pcsx2/gui/AppAssert.cpp +++ b/pcsx2/gui/AppAssert.cpp @@ -15,7 +15,7 @@ #include "PrecompiledHeader.h" #include "App.h" -#include "Utilities/Threading.h" +#include "common/Threading.h" #include diff --git a/pcsx2/gui/AppCommon.h b/pcsx2/gui/AppCommon.h index 082fb56a86..6641c52186 100644 --- a/pcsx2/gui/AppCommon.h +++ b/pcsx2/gui/AppCommon.h @@ -15,15 +15,15 @@ #pragma once -#include "Utilities/SafeArray.h" -#include "Utilities/EventSource.h" -#include "Utilities/PersistentThread.h" +#include "common/SafeArray.h" +#include "common/EventSource.h" +#include "common/PersistentThread.h" -#include "Utilities/wxGuiTools.h" -#include "Utilities/pxRadioPanel.h" -#include "Utilities/pxCheckBox.h" -#include "Utilities/pxStaticText.h" -#include "Utilities/CheckedStaticBox.h" +#include "common/wxGuiTools.h" +#include "common/pxRadioPanel.h" +#include "common/pxCheckBox.h" +#include "common/pxStaticText.h" +#include "common/CheckedStaticBox.h" #include "AppForwardDefs.h" #include "AppConfig.h" diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp index b10c7d5c55..0e2fb87812 100644 --- a/pcsx2/gui/AppConfig.cpp +++ b/pcsx2/gui/AppConfig.cpp @@ -19,7 +19,7 @@ #include "MemoryCardFile.h" -#include "Utilities/IniInterface.h" +#include "common/IniInterface.h" #include #include "DebugTools/Debug.h" diff --git a/pcsx2/gui/AppConfig.h b/pcsx2/gui/AppConfig.h index 4600400340..bcf17b09c2 100644 --- a/pcsx2/gui/AppConfig.h +++ b/pcsx2/gui/AppConfig.h @@ -19,8 +19,8 @@ #include "Config.h" #include "PathDefs.h" #include "CDVD/CDVDaccess.h" -#include "Utilities/General.h" -#include "Utilities/Path.h" +#include "common/General.h" +#include "common/Path.h" #include #include diff --git a/pcsx2/gui/AppCoreThread.cpp b/pcsx2/gui/AppCoreThread.cpp index 1f0ea429d1..2013fa30b9 100644 --- a/pcsx2/gui/AppCoreThread.cpp +++ b/pcsx2/gui/AppCoreThread.cpp @@ -23,7 +23,7 @@ #include "Debugger/DisassemblyDialog.h" -#include "Utilities/Threading.h" +#include "common/Threading.h" #include "ps2/BiosTools.h" #include "GS.h" diff --git a/pcsx2/gui/AppEventListeners.h b/pcsx2/gui/AppEventListeners.h index cf5e0c3bec..3e49d9ec55 100644 --- a/pcsx2/gui/AppEventListeners.h +++ b/pcsx2/gui/AppEventListeners.h @@ -15,8 +15,9 @@ #pragma once -#include "Utilities/EventSource.h" -#include "Utilities/pxEvents.h" +#include "common/EventSource.h" +#include "common/pxEvents.h" +#include "common/IniInterface.h" enum CoreThreadStatus { diff --git a/pcsx2/gui/AppEventSources.cpp b/pcsx2/gui/AppEventSources.cpp index eec79c3b99..1ec397eb77 100644 --- a/pcsx2/gui/AppEventSources.cpp +++ b/pcsx2/gui/AppEventSources.cpp @@ -15,8 +15,8 @@ #include "PrecompiledHeader.h" #include "App.h" -#include "Utilities/IniInterface.h" -#include "Utilities/EventSource.inl" +#include "common/IniInterface.h" +#include "common/EventSource.inl" template class EventSource< IEventListener_CoreThread >; template class EventSource< IEventListener_AppStatus >; diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp index af1e443127..56790b4954 100644 --- a/pcsx2/gui/AppInit.cpp +++ b/pcsx2/gui/AppInit.cpp @@ -20,7 +20,7 @@ #include "MSWstuff.h" #include "MTVU.h" // for thread cancellation on shutdown -#include "Utilities/IniInterface.h" +#include "common/IniInterface.h" #include "DebugTools/Debug.h" #include "Dialogs/ModalPopups.h" diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp index 783f238837..ccc5e937ba 100644 --- a/pcsx2/gui/AppMain.cpp +++ b/pcsx2/gui/AppMain.cpp @@ -40,8 +40,8 @@ # include "Recording/InputRecording.h" #endif -#include "Utilities/IniInterface.h" -#include "Utilities/AppTrait.h" +#include "common/IniInterface.h" +#include "common/AppTrait.h" #include diff --git a/pcsx2/gui/AppRes.cpp b/pcsx2/gui/AppRes.cpp index 41bffd036d..d9b3b1842e 100644 --- a/pcsx2/gui/AppRes.cpp +++ b/pcsx2/gui/AppRes.cpp @@ -24,7 +24,7 @@ #include "MSWstuff.h" -#include "Utilities/EmbeddedImage.h" +#include "common/EmbeddedImage.h" #include "Resources/BackgroundLogo.h" #include "Resources/ButtonIcon_Camera.h" diff --git a/pcsx2/gui/AppUserMode.cpp b/pcsx2/gui/AppUserMode.cpp index 3d827f0bcf..ea3ce8bdf3 100644 --- a/pcsx2/gui/AppUserMode.cpp +++ b/pcsx2/gui/AppUserMode.cpp @@ -15,7 +15,7 @@ #include "PrecompiledHeader.h" #include "MainFrame.h" -#include "Utilities/IniInterface.h" +#include "common/IniInterface.h" #include "Dialogs/ModalPopups.h" #include diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp index ae48eebff7..44e169d037 100644 --- a/pcsx2/gui/ConsoleLogger.cpp +++ b/pcsx2/gui/ConsoleLogger.cpp @@ -19,9 +19,9 @@ #include "ConsoleLogger.h" #include "MSWstuff.h" -#include "Utilities/Console.h" -#include "Utilities/IniInterface.h" -#include "Utilities/SafeArray.inl" +#include "common/Console.h" +#include "common/IniInterface.h" +#include "common/SafeArray.inl" #include "Dialogs/LogOptionsDialog.h" #include "DebugTools/Debug.h" diff --git a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp index cff0b21bf8..e6e3f8f13d 100644 --- a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp +++ b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp @@ -20,7 +20,7 @@ #include "Dialogs/ModalPopups.h" -#include "Utilities/EmbeddedImage.h" +#include "common/EmbeddedImage.h" #include "Resources/Logo.h" #include diff --git a/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp b/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp index c57ac9fc19..bc222a94ce 100644 --- a/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp +++ b/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp @@ -19,7 +19,7 @@ #include "MSWstuff.h" #include "ModalPopups.h" -#include "Utilities/StringHelpers.h" +#include "common/StringHelpers.h" using namespace pxSizerFlags; diff --git a/pcsx2/gui/Dialogs/GSDumpDialog.cpp b/pcsx2/gui/Dialogs/GSDumpDialog.cpp index 91f73a25a1..74c42c67e4 100644 --- a/pcsx2/gui/Dialogs/GSDumpDialog.cpp +++ b/pcsx2/gui/Dialogs/GSDumpDialog.cpp @@ -21,7 +21,7 @@ #include "Dialogs/ModalPopups.h" -#include "Utilities/EmbeddedImage.h" +#include "common/EmbeddedImage.h" #include "Resources/NoIcon.h" #include "GS.h" diff --git a/pcsx2/gui/Dialogs/LogOptionsDialog.h b/pcsx2/gui/Dialogs/LogOptionsDialog.h index 29d20eb2ce..7b82ad482d 100644 --- a/pcsx2/gui/Dialogs/LogOptionsDialog.h +++ b/pcsx2/gui/Dialogs/LogOptionsDialog.h @@ -18,8 +18,8 @@ #include "App.h" #include "ConfigurationDialog.h" -#include "Utilities/wxGuiTools.h" -#include "Utilities/CheckedStaticBox.h" +#include "common/wxGuiTools.h" +#include "common/CheckedStaticBox.h" namespace Dialogs { diff --git a/pcsx2/gui/Dialogs/ModalPopups.h b/pcsx2/gui/Dialogs/ModalPopups.h index 308328ca6d..67859138a0 100644 --- a/pcsx2/gui/Dialogs/ModalPopups.h +++ b/pcsx2/gui/Dialogs/ModalPopups.h @@ -18,7 +18,7 @@ #include "App.h" #include "ConfigurationDialog.h" #include "Panels/ConfigurationPanels.h" -#include "Utilities/pxStreams.h" +#include "common/pxStreams.h" #include #include diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp index 0bc7695914..1773d99aa2 100644 --- a/pcsx2/gui/MainMenuClicks.cpp +++ b/pcsx2/gui/MainMenuClicks.cpp @@ -37,7 +37,7 @@ #include "Dialogs/ConfigurationDialog.h" #include "Debugger/DisassemblyDialog.h" -#include "Utilities/IniInterface.h" +#include "common/IniInterface.h" #include "fmt/core.h" #include "wx/numdlg.h" diff --git a/pcsx2/gui/MemoryCardFile.cpp b/pcsx2/gui/MemoryCardFile.cpp index a435b13630..0d8269f18a 100644 --- a/pcsx2/gui/MemoryCardFile.cpp +++ b/pcsx2/gui/MemoryCardFile.cpp @@ -14,7 +14,7 @@ */ #include "PrecompiledHeader.h" -#include "Utilities/SafeArray.inl" +#include "common/SafeArray.inl" #include #include #include diff --git a/pcsx2/gui/MemoryCardFolder.cpp b/pcsx2/gui/MemoryCardFolder.cpp index e6a0a06525..92735f3e4e 100644 --- a/pcsx2/gui/MemoryCardFolder.cpp +++ b/pcsx2/gui/MemoryCardFolder.cpp @@ -14,7 +14,7 @@ */ #include "PrecompiledHeader.h" -#include "Utilities/SafeArray.inl" +#include "common/SafeArray.inl" #include "MemoryCardFile.h" #include "MemoryCardFolder.h" diff --git a/pcsx2/gui/Panels/LogOptionsPanels.cpp b/pcsx2/gui/Panels/LogOptionsPanels.cpp index 61887bc95f..6724a30b0c 100644 --- a/pcsx2/gui/Panels/LogOptionsPanels.cpp +++ b/pcsx2/gui/Panels/LogOptionsPanels.cpp @@ -16,7 +16,7 @@ #include "PrecompiledHeader.h" #include "LogOptionsPanels.h" -#include "Utilities/IniInterface.h" +#include "common/IniInterface.h" #include "DebugTools/Debug.h" #include diff --git a/pcsx2/gui/Panels/MemoryCardListPanel.cpp b/pcsx2/gui/Panels/MemoryCardListPanel.cpp index 0c99e9dcd6..71dc6c326e 100644 --- a/pcsx2/gui/Panels/MemoryCardListPanel.cpp +++ b/pcsx2/gui/Panels/MemoryCardListPanel.cpp @@ -22,7 +22,7 @@ #include "MemoryCardPanels.h" #include "Dialogs/ConfigurationDialog.h" -#include "Utilities/IniInterface.h" +#include "common/IniInterface.h" #include "Sio.h" #include diff --git a/pcsx2/gui/Panels/MemoryCardListView.cpp b/pcsx2/gui/Panels/MemoryCardListView.cpp index c1eebe3d07..9139c824de 100644 --- a/pcsx2/gui/Panels/MemoryCardListView.cpp +++ b/pcsx2/gui/Panels/MemoryCardListView.cpp @@ -19,7 +19,7 @@ #include "Dialogs/ConfigurationDialog.h" -#include "Utilities/IniInterface.h" +#include "common/IniInterface.h" using namespace pxSizerFlags; using namespace Panels; diff --git a/pcsx2/gui/RecentIsoList.cpp b/pcsx2/gui/RecentIsoList.cpp index 0f901b5026..24670932a4 100644 --- a/pcsx2/gui/RecentIsoList.cpp +++ b/pcsx2/gui/RecentIsoList.cpp @@ -18,7 +18,7 @@ #include "AppCoreThread.h" #include "RecentIsoList.h" #include "IsoDropTarget.h" -#include "Utilities/IniInterface.h" +#include "common/IniInterface.h" extern wxString GetMsg_IsoImageChanged(); diff --git a/pcsx2/gui/SysState.cpp b/pcsx2/gui/SysState.cpp index 0f5016d7b2..a9cc15ca7c 100644 --- a/pcsx2/gui/SysState.cpp +++ b/pcsx2/gui/SysState.cpp @@ -22,7 +22,7 @@ #include "VUmicro.h" #include "ZipTools/ThreadedZipTools.h" -#include "Utilities/pxStreams.h" +#include "common/pxStreams.h" #include "SPU2/spu2.h" #include "USB/USB.h" #ifdef _WIN32 diff --git a/pcsx2/gui/i18n.cpp b/pcsx2/gui/i18n.cpp index edcc5965b0..399efc8fe1 100644 --- a/pcsx2/gui/i18n.cpp +++ b/pcsx2/gui/i18n.cpp @@ -16,7 +16,7 @@ #include "PrecompiledHeader.h" #include "i18n.h" #include "AppConfig.h" -#include "Utilities/SafeArray.h" +#include "common/SafeArray.h" #include // Some of the codes provided by wxWidgets are 'obsolete' -- effectively replaced by more specific diff --git a/pcsx2/gui/pxEventThread.h b/pcsx2/gui/pxEventThread.h index 0f6da600ed..02c25fe98b 100644 --- a/pcsx2/gui/pxEventThread.h +++ b/pcsx2/gui/pxEventThread.h @@ -15,8 +15,8 @@ #pragma once -#include "Utilities/PersistentThread.h" -#include "Utilities/pxEvents.h" +#include "common/PersistentThread.h" +#include "common/pxEvents.h" #include #include diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj index 558c7ba872..c880579082 100644 --- a/pcsx2/pcsx2.vcxproj +++ b/pcsx2/pcsx2.vcxproj @@ -1140,14 +1140,6 @@ {2f6c0388-20cb-4242-9f6c-a6ebb6a83f47} false - - {4639972e-424e-4e13-8b07-ca403c481346} - false - - - {a51123f5-9505-4eae-85e7-d320290a272c} - false - {677b7d11-d5e1-40b3-88b1-9a4df83d2213} false @@ -1155,6 +1147,9 @@ {ed2f21fd-0a36-4a8f-9b90-e7d92a2acb63} + + {4639972e-424e-4e13-8b07-ca403c481346} + diff --git a/pcsx2/pcsx2.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters index 7d16a0bcec..3ff6ca7e42 100644 --- a/pcsx2/pcsx2.vcxproj.filters +++ b/pcsx2/pcsx2.vcxproj.filters @@ -276,9 +276,6 @@ Docs - - System\Ps2\EmotionEngine\Hardware - System\Ps2\EmotionEngine\VU\Dynarec\microVU diff --git a/pcsx2/ps2/BiosTools.cpp b/pcsx2/ps2/BiosTools.cpp index a72d10a5c5..462b06d9bd 100644 --- a/pcsx2/ps2/BiosTools.cpp +++ b/pcsx2/ps2/BiosTools.cpp @@ -17,7 +17,7 @@ #include "Common.h" #include "BiosTools.h" -#include "Utilities/pxStreams.h" +#include "common/pxStreams.h" #include "wx/ffile.h" diff --git a/pcsx2/vtlb.cpp b/pcsx2/vtlb.cpp index b1ce8bc1d8..68670851db 100644 --- a/pcsx2/vtlb.cpp +++ b/pcsx2/vtlb.cpp @@ -36,7 +36,7 @@ #include "Cache.h" #include "R5900Exceptions.h" -#include "Utilities/MemsetFast.inl" +#include "common/MemsetFast.inl" using namespace R5900; using namespace vtlb_private; diff --git a/pcsx2/vtlb.h b/pcsx2/vtlb.h index 7ea7bcecc5..f0560a669b 100644 --- a/pcsx2/vtlb.h +++ b/pcsx2/vtlb.h @@ -17,7 +17,7 @@ #include "MemoryTypes.h" -#include "Utilities/PageFaultSource.h" +#include "common/PageFaultSource.h" static const uptr VTLB_AllocUpperBounds = _1gb * 2; diff --git a/pcsx2/windows/Win32.h b/pcsx2/windows/Win32.h index 67cd77ec3e..05cb87e216 100644 --- a/pcsx2/windows/Win32.h +++ b/pcsx2/windows/Win32.h @@ -15,7 +15,7 @@ #pragma once -#include "Utilities/RedtapeWindows.h" // our "safe" include of windows (sets version and undefs uselessness) +#include "common/RedtapeWindows.h" // our "safe" include of windows (sets version and undefs uselessness) #include "System.h" #include "resource.h" diff --git a/pcsx2/windows/wxResources.rc b/pcsx2/windows/wxResources.rc index 9b4af792b9..95f3240124 100644 --- a/pcsx2/windows/wxResources.rc +++ b/pcsx2/windows/wxResources.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxresmw.h" +#include "common/afxresmw.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/pcsx2/x86/R5900_Profiler.h b/pcsx2/x86/R5900_Profiler.h index fe7dd4ac36..d9755ecbb3 100644 --- a/pcsx2/x86/R5900_Profiler.h +++ b/pcsx2/x86/R5900_Profiler.h @@ -14,7 +14,7 @@ */ #pragma once -#include "Pcsx2Defs.h" +#include "common/Pcsx2Defs.h" // Keep my nice alignment please! #define MOVZ MOVZtemp diff --git a/pcsx2/x86/iCore.h b/pcsx2/x86/iCore.h index ca33735e0e..c5e9c7c2da 100644 --- a/pcsx2/x86/iCore.h +++ b/pcsx2/x86/iCore.h @@ -16,7 +16,7 @@ #ifndef _PCSX2_CORE_RECOMPILER_ #define _PCSX2_CORE_RECOMPILER_ -#include "x86emitter/x86emitter.h" +#include "common/emitter/x86emitter.h" #include "VUmicro.h" // Namespace Note : iCore32 contains all of the Register Allocation logic, in addition to a handful diff --git a/pcsx2/x86/iFPUd.cpp b/pcsx2/x86/iFPUd.cpp index 9c97daa1b9..1410eb5f03 100644 --- a/pcsx2/x86/iFPUd.cpp +++ b/pcsx2/x86/iFPUd.cpp @@ -18,7 +18,7 @@ #include "Common.h" #include "R5900OpcodeTables.h" -#include "x86emitter/x86emitter.h" +#include "common/emitter/x86emitter.h" #include "iR5900.h" #include "iFPU.h" diff --git a/pcsx2/x86/iMMI.cpp b/pcsx2/x86/iMMI.cpp index 4a18e828ab..4e93aafc85 100644 --- a/pcsx2/x86/iMMI.cpp +++ b/pcsx2/x86/iMMI.cpp @@ -25,7 +25,7 @@ #include "R5900OpcodeTables.h" #include "iR5900.h" #include "iMMI.h" -#include "Utilities/MathUtils.h" +#include "common/MathUtils.h" using namespace x86Emitter; diff --git a/pcsx2/x86/iMisc.cpp b/pcsx2/x86/iMisc.cpp index bd48e8f372..ec3e240bdc 100644 --- a/pcsx2/x86/iMisc.cpp +++ b/pcsx2/x86/iMisc.cpp @@ -15,7 +15,7 @@ #include "PrecompiledHeader.h" -#include "x86emitter/x86_intrin.h" +#include "common/emitter/x86_intrin.h" SSE_MXCSR g_sseMXCSR = { DEFAULT_sseMXCSR }; SSE_MXCSR g_sseVUMXCSR = { DEFAULT_sseVUMXCSR }; diff --git a/pcsx2/x86/iR3000A.cpp b/pcsx2/x86/iR3000A.cpp index 74dfe09cbb..e2aa8ceb97 100644 --- a/pcsx2/x86/iR3000A.cpp +++ b/pcsx2/x86/iR3000A.cpp @@ -37,7 +37,7 @@ #include "AppConfig.h" -#include "Utilities/Perf.h" +#include "common/Perf.h" #include "DebugTools/Breakpoints.h" using namespace x86Emitter; diff --git a/pcsx2/x86/iR3000A.h b/pcsx2/x86/iR3000A.h index d85391f4c5..10b915a3a0 100644 --- a/pcsx2/x86/iR3000A.h +++ b/pcsx2/x86/iR3000A.h @@ -15,7 +15,7 @@ #ifndef _R3000A_SUPERREC_ #define _R3000A_SUPERREC_ -#include "x86emitter/x86emitter.h" +#include "common/emitter/x86emitter.h" #include "R3000A.h" #include "iCore.h" diff --git a/pcsx2/x86/iR5900.h b/pcsx2/x86/iR5900.h index 21c69497f3..6ac6f7de8c 100644 --- a/pcsx2/x86/iR5900.h +++ b/pcsx2/x86/iR5900.h @@ -16,7 +16,7 @@ #ifndef __IR5900_H__ #define __IR5900_H__ -#include "x86emitter/x86emitter.h" +#include "common/emitter/x86emitter.h" #include "R5900.h" #include "VU.h" #include "iCore.h" diff --git a/pcsx2/x86/ix86-32/iCore-32.cpp b/pcsx2/x86/ix86-32/iCore-32.cpp index 35032cc831..4b35afe599 100644 --- a/pcsx2/x86/ix86-32/iCore-32.cpp +++ b/pcsx2/x86/ix86-32/iCore-32.cpp @@ -19,7 +19,7 @@ #include "iR5900.h" #include "Vif.h" #include "VU.h" -#include "x86emitter/x86emitter.h" +#include "common/emitter/x86emitter.h" #include "R3000A.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp index 375aa9a71e..3c3161bac8 100644 --- a/pcsx2/x86/ix86-32/iR5900-32.cpp +++ b/pcsx2/x86/ix86-32/iR5900-32.cpp @@ -40,8 +40,8 @@ #endif -#include "Utilities/MemsetFast.inl" -#include "Utilities/Perf.h" +#include "common/MemsetFast.inl" +#include "common/Perf.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/recVTLB.cpp b/pcsx2/x86/ix86-32/recVTLB.cpp index 7f9f0373f5..3f880ee6cf 100644 --- a/pcsx2/x86/ix86-32/recVTLB.cpp +++ b/pcsx2/x86/ix86-32/recVTLB.cpp @@ -21,7 +21,7 @@ #include "iCore.h" #include "iR5900.h" -#include "Utilities/Perf.h" +#include "common/Perf.h" using namespace vtlb_private; using namespace x86Emitter; diff --git a/pcsx2/x86/microVU.cpp b/pcsx2/x86/microVU.cpp index 31fbe5db0d..738a1533a0 100644 --- a/pcsx2/x86/microVU.cpp +++ b/pcsx2/x86/microVU.cpp @@ -18,7 +18,7 @@ #include "PrecompiledHeader.h" #include "microVU.h" -#include "Utilities/Perf.h" +#include "common/Perf.h" //------------------------------------------------------------------ // Micro VU - Main Functions diff --git a/pcsx2/x86/microVU.h b/pcsx2/x86/microVU.h index 373275c2c4..e1c6bc4d0c 100644 --- a/pcsx2/x86/microVU.h +++ b/pcsx2/x86/microVU.h @@ -31,11 +31,11 @@ using namespace x86Emitter; #include "iR5900.h" #include "R5900OpcodeTables.h" #include "System/RecTypes.h" -#include "x86emitter/x86emitter.h" +#include "common/emitter/x86emitter.h" #include "microVU_Misc.h" #include "microVU_IR.h" #include "microVU_Profiler.h" -#include "Utilities/Perf.h" +#include "common/Perf.h" struct microBlockLink { microBlock block; diff --git a/pcsx2/x86/newVif.h b/pcsx2/x86/newVif.h index 5739cd2524..f75c0b01e9 100644 --- a/pcsx2/x86/newVif.h +++ b/pcsx2/x86/newVif.h @@ -18,7 +18,7 @@ #include "Vif.h" #include "VU.h" -#include "x86emitter/x86emitter.h" +#include "common/emitter/x86emitter.h" #include "System/RecTypes.h" using namespace x86Emitter; diff --git a/pcsx2/x86/newVif_Dynarec.cpp b/pcsx2/x86/newVif_Dynarec.cpp index c447b7b110..1d0280b219 100644 --- a/pcsx2/x86/newVif_Dynarec.cpp +++ b/pcsx2/x86/newVif_Dynarec.cpp @@ -20,7 +20,7 @@ #include "PrecompiledHeader.h" #include "newVif_UnpackSSE.h" #include "MTVU.h" -#include "Utilities/Perf.h" +#include "common/Perf.h" static void recReset(int idx) { nVif[idx].vifBlocks.reset(); diff --git a/pcsx2/x86/newVif_UnpackSSE.h b/pcsx2/x86/newVif_UnpackSSE.h index 68bdf00808..43133d27af 100644 --- a/pcsx2/x86/newVif_UnpackSSE.h +++ b/pcsx2/x86/newVif_UnpackSSE.h @@ -19,7 +19,7 @@ #include "Vif_Dma.h" #include "newVif.h" -#include "x86emitter/x86_intrin.h" +#include "common/emitter/x86_intrin.h" using namespace x86Emitter; diff --git a/tools/bin2cpp/bin2cpp.cpp b/tools/bin2cpp/bin2cpp.cpp index c01aacca04..31273e7748 100644 --- a/tools/bin2cpp/bin2cpp.cpp +++ b/tools/bin2cpp/bin2cpp.cpp @@ -180,7 +180,7 @@ int main(int argc, char* argv[]) fprintf( dest, "#pragma once\n\n" - "#include \"Pcsx2Types.h\"\n" + "#include \"common/Pcsx2Types.h\"\n" "#include \n\n" "class %s\n{\n" "public:\n"