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

common: reorganize

This commit is contained in:
kojin 2021-09-01 16:31:46 -04:00 committed by Kojin
parent ce8a30bf8f
commit 8fdaaa2eab
239 changed files with 559 additions and 1145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
PCSX2_suite.sln
View File

@ -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}

5
common/src/Utilities/AlignedMalloc.cpp → common/AlignedMalloc.cpp
View File

@ -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

0
common/include/Utilities/AppTrait.h → common/AppTrait.h
View File

3
common/include/Utilities/Assertions.h → common/Assertions.h
View File

@ -15,6 +15,9 @@
#pragma once
#include <wx/string.h>
#include "common/Pcsx2Defs.h"
#ifndef __pxFUNCTION__
#if defined(__GNUG__)
#define __pxFUNCTION__ __PRETTY_FUNCTION__

0
common/src/Utilities/CMakeLists.txt → common/CMakeLists.txt
View File

3
common/src/Utilities/CheckedStaticBox.cpp → common/CheckedStaticBox.cpp
View File

@ -13,8 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "CheckedStaticBox.h"
#include "common/CheckedStaticBox.h"
CheckedStaticBox::CheckedStaticBox(wxWindow *parent, int orientation, const wxString &title)
: wxPanelWithHelpers(parent, wxVERTICAL)

2
common/include/Utilities/CheckedStaticBox.h → common/CheckedStaticBox.h
View File

@ -15,7 +15,7 @@
#pragma once
#include "wxGuiTools.h"
#include "common/wxGuiTools.h"
class CheckedStaticBox : public wxPanelWithHelpers
{

8
common/src/Utilities/Console.cpp → common/Console.cpp
View File

@ -13,11 +13,9 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#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;

0
common/include/Utilities/Console.h → common/Console.h
View File

0
common/src/Utilities/Darwin/DarwinMisc.cpp → common/Darwin/DarwinMisc.cpp
View File

0
common/src/Utilities/Darwin/DarwinSemaphore.cpp → common/Darwin/DarwinSemaphore.cpp
View File

0
common/src/Utilities/Darwin/DarwinThreads.cpp → common/Darwin/DarwinThreads.cpp
View File

6
common/include/Utilities/Dependencies.h → common/Dependencies.h
View File

@ -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"

0
common/include/Utilities/EmbeddedImage.h → common/EmbeddedImage.h
View File

0
common/src/Utilities/EventSource.cpp → common/EventSource.cpp
View File

2
common/include/Utilities/EventSource.h → common/EventSource.h
View File

@ -16,7 +16,7 @@
#pragma once
#include <list>
#include "Threading.h"
#include "common/Threading.h"
// --------------------------------------------------------------------------------------
// EventSource< template EvtType >

2
common/include/Utilities/EventSource.inl → common/EventSource.inl
View File

@ -15,7 +15,7 @@
#pragma once
#include "Threading.h"
#include "common/Threading.h"
using Threading::ScopedLock;

7
common/src/Utilities/Exceptions.cpp → common/Exceptions.cpp
View File

@ -13,15 +13,14 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include <wx/app.h>
#include "Threading.h"
#if defined(__UNIX__)
#include <signal.h>
#endif
#include "common/Threading.h"
#include "common/General.h"
// for lack of a better place...
Fnptr_OutOfMemory pxDoOutOfMemory = NULL;

6
common/include/Utilities/Exceptions.h → common/Exceptions.h
View File

@ -15,8 +15,10 @@
#pragma once
#include "Assertions.h"
#include <memory>
#include <wx/string.h>
#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);

6
common/src/Utilities/FastFormatString.cpp → common/FastFormatString.cpp
View File

@ -13,9 +13,9 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#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)

4
common/include/Utilities/General.h → common/General.h
View File

@ -15,6 +15,10 @@
#pragma once
#include <atomic>
#include <wx/string.h>
#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)

6
common/src/Utilities/IniInterface.cpp → common/IniInterface.cpp
View File

@ -13,11 +13,11 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "IniInterface.h"
#include <wx/gdicmn.h>
#include "common/IniInterface.h"
#include "common/Console.h"
const wxRect wxDefaultRect(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord);
wxDirName g_fullBaseDirName = wxDirName(L"");

0
common/include/Utilities/IniInterface.h → common/IniInterface.h
View File

9
common/src/Utilities/Linux/LnxHostSys.cpp → common/Linux/LnxHostSys.cpp
View File

@ -13,17 +13,15 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "../PrecompiledHeader.h"
#include "PageFaultSource.h"
#ifndef _WIN32
#include <wx/thread.h>
#include <sys/mman.h>
#include <signal.h>
#include <errno.h>
#include <unistd.h>
#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

4
common/src/Utilities/Linux/LnxMisc.cpp → common/Linux/LnxMisc.cpp
View File

@ -13,8 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "../PrecompiledHeader.h"
#ifndef _WIN32
#include <ctype.h>
#include <time.h>
#include <unistd.h>
@ -59,3 +58,4 @@ void ScreensaverAllow(bool allow)
{
// no-op
}
#endif

7
common/src/Utilities/Linux/LnxThreads.cpp → common/Linux/LnxThreads.cpp
View File

@ -13,9 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "../PrecompiledHeader.h"
#include "PersistentThread.h"
#ifndef _WIN32
#include <unistd.h>
#if defined(__linux__)
#include <sys/prctl.h>
@ -23,6 +21,8 @@
#include <pthread_np.h>
#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

2
common/include/Utilities/MathUtils.h → common/MathUtils.h
View File

@ -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)

3
common/include/Utilities/MemcpyFast.h → common/MemcpyFast.h
View File

@ -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)

0
common/include/Utilities/MemsetFast.inl → common/MemsetFast.inl
View File

11
common/src/Utilities/Mutex.cpp → common/Mutex.cpp
View File

@ -13,13 +13,10 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#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
{

0
common/include/Utilities/PageFaultSource.h → common/PageFaultSource.h
View File

2
common/include/Utilities/Path.h → common/Path.h
View File

@ -16,7 +16,7 @@
#pragma once
#include <wx/filename.h>
#include "StringHelpers.h"
#include "common/StringHelpers.h"
#define g_MaxPath 255 // 255 is safer with antiquated Win32 ASCII APIs.

3
common/src/Utilities/PathUtils.cpp → common/PathUtils.cpp
View File

@ -13,8 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "Path.h"
#include "common/Path.h"
#include <wx/file.h>
#include <wx/utils.h>

23
common/include/Pcsx2Defs.h → common/Pcsx2Defs.h
View File

@ -13,8 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#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

13
common/include/Pcsx2Types.h → common/Pcsx2Types.h
View File

@ -13,8 +13,9 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __PCSX2TYPES_H__
#define __PCSX2TYPES_H__
#pragma once
#include <stdint.h>
// --------------------------------------------------------------------------------------
// 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 <stdint.h>
// 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

13
common/src/Utilities/Perf.cpp → common/Perf.cpp
View File

@ -13,20 +13,19 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "Perf.h"
#include "common/Perf.h"
#include "common/Pcsx2Types.h"
#ifdef __unix__
#include "unistd.h"
#include <unistd.h>
#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

3
common/include/Utilities/Perf.h → common/Perf.h
View File

@ -15,6 +15,9 @@
#pragma once
#include <vector>
#include "common/Pcsx2Types.h"
namespace Perf
{

6
common/include/Utilities/PersistentThread.h → common/PersistentThread.h
View File

@ -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
{

0
common/src/Utilities/PrecompiledHeader.cpp → common/PrecompiledHeader.cpp
View File

14
common/PrecompiledHeader.h Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
*/

21
common/src/Utilities/PrecompiledHeader.h → common/RedtapeWindows.h
View File

@ -13,18 +13,11 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
// 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 <windows.h>
#include <VersionHelpers.h>
#include <ShTypes.h>
#include <timeapi.h>
#include <wx/msw/wrapwin.h>
#endif

3
common/src/Utilities/RwMutex.cpp → common/RwMutex.cpp
View File

@ -13,8 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "RwMutex.h"
#include "common/RwMutex.h"
// --------------------------------------------------------------------------------------
// RwMutex

2
common/include/Utilities/RwMutex.h → common/RwMutex.h
View File

@ -15,7 +15,7 @@
#pragma once
#include "Threading.h"
#include "common/Threading.h"
namespace Threading
{

2
common/include/Utilities/SafeArray.h → common/SafeArray.h
View File

@ -15,7 +15,7 @@
#pragma once
#include "Utilities/Dependencies.h"
#include "common/Dependencies.h"
// pxUSE_SECURE_MALLOC - enables bounds checking on scoped malloc allocations.

0
common/include/Utilities/SafeArray.inl → common/SafeArray.inl
View File

2
common/include/Utilities/ScopedAlloc.h → common/ScopedAlloc.h
View File

@ -15,7 +15,7 @@
#pragma once
#include "Exceptions.h"
#include "common/Exceptions.h"
// pxUSE_SECURE_MALLOC - enables bounds checking on scoped malloc allocations.

0
common/include/Utilities/ScopedPtrMT.h → common/ScopedPtrMT.h
View File

11
common/src/Utilities/Semaphore.cpp → common/Semaphore.cpp
View File

@ -13,13 +13,10 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#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

3
common/src/Utilities/StringHelpers.cpp → common/StringHelpers.cpp
View File

@ -13,8 +13,9 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include <wx/gdicmn.h> // for wxPoint/wxRect stuff
#include "common/Pcsx2Defs.h"
#include "common/StringHelpers.h"
__fi wxString fromUTF8(const char *src)
{

7
common/include/Utilities/StringHelpers.h → common/StringHelpers.h
View File

@ -15,11 +15,10 @@
#pragma once
#include "Dependencies.h"
#include "SafeArray.h"
#include "ScopedAlloc.h"
#include <wx/tokenzr.h>
#include "common/Dependencies.h"
#include "common/SafeArray.h"
#include "common/ScopedAlloc.h"
#if _WIN32
#define WX_STR(str) (str.wc_str())

12
common/src/Utilities/ThreadTools.cpp → common/ThreadTools.cpp
View File

@ -13,17 +13,15 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#ifdef __linux__
#include <signal.h> // 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;

11
common/include/Utilities/Threading.h → common/Threading.h
View File

@ -15,16 +15,19 @@
#pragma once
#ifdef _WIN32
// thanks I hate it.
#include <wx/filefn.h>
#define HAVE_MODE_T
#endif
#include <semaphore.h>
#include <errno.h> // EBUSY
#include <pthread.h>
#ifdef __APPLE__
#include <mach/semaphore.h>
#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.

5
common/src/Utilities/ThreadingDialogs.cpp → common/ThreadingDialogs.cpp
View File

@ -13,9 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "ThreadingDialogs.h"
#include "pxStaticText.h"
#include "common/ThreadingDialogs.h"
#include "common/pxStaticText.h"
using namespace pxSizerFlags;

0
common/include/Utilities/ThreadingDialogs.h → common/ThreadingDialogs.h
View File

0
common/src/Utilities/ThreadingInternal.h → common/ThreadingInternal.h
View File

0
common/include/Utilities/TraceLog.h → common/TraceLog.h
View File

9
common/src/Utilities/VirtualMemory.cpp → common/VirtualMemory.cpp
View File

@ -13,15 +13,12 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "PageFaultSource.h"
#ifndef __WXMSW__
#include <wx/thread.h>
#endif
#include "EventSource.inl"
#include "MemsetFast.inl"
#include "common/PageFaultSource.h"
#include "common/EventSource.inl"
#include "common/MemsetFast.inl"
template class EventSource<IEventListener_PageFault>;

7
common/src/Utilities/Windows/WinHostSys.cpp → common/Windows/WinHostSys.cpp
View File

@ -13,11 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "Utilities/RedtapeWindows.h"
#include "PageFaultSource.h"
#include <winnt.h>
#include "common/RedtapeWindows.h"
#include "common/PageFaultSource.h"
static long DoSysPageFaultExceptionFilter(EXCEPTION_POINTERS *eps)
{

12
common/src/Utilities/Windows/WinMisc.cpp → common/Windows/WinMisc.cpp
View File

@ -13,14 +13,14 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <wx/string.h>
#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 <VersionHelpers.h>
#include <ShTypes.h>
static __aligned16 LARGE_INTEGER lfreq;
void InitCPUTicks()

7
common/src/Utilities/Windows/WinThreads.cpp → common/Windows/WinThreads.cpp
View File

@ -13,10 +13,9 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#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__

0
common/include/afxresmw.h → common/afxresmw.h
View File

0
common/include/Utilities/boost_spsc_queue.hpp → common/boost_spsc_queue.hpp
View File

131
common/build/Utilities/utilities.vcxproj
View File

@ -1,131 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(SolutionDir)common\vsprops\BaseProjectConfig.props" />
<Import Project="$(SolutionDir)common\vsprops\WinSDK.props" />
<PropertyGroup Label="Globals">
<ProjectGuid>{4639972E-424E-4E13-8B07-CA403C481346}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization Condition="$(Configuration.Contains(Release))">true</WholeProgramOptimization>
<UseDebugLibraries Condition="$(Configuration.Contains(Debug))">true</UseDebugLibraries>
<UseDebugLibraries Condition="!$(Configuration.Contains(Debug))">false</UseDebugLibraries>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Label="PropertySheets">
<Import Project="..\..\vsprops\CommonLibrary.props" />
<Import Project="..\..\vsprops\3rdpartyDeps.props" />
<Import Project="..\..\vsprops\pthreads.props" />
<Import Condition="$(Configuration.Contains(Debug))" Project="..\..\vsprops\CodeGen_Debug.props" />
<Import Condition="$(Configuration.Contains(Devel))" Project="..\..\vsprops\CodeGen_Devel.props" />
<Import Condition="$(Configuration.Contains(Release))" Project="..\..\vsprops\CodeGen_Release.props" />
<Import Condition="!$(Configuration.Contains(Release))" Project="..\..\vsprops\IncrementalLinking.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<ExceptionHandling>Async</ExceptionHandling>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>PrecompiledHeader.h</PrecompiledHeaderFile>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\Utilities\AlignedMalloc.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\CheckedStaticBox.cpp" />
<ClCompile Include="..\..\src\Utilities\Console.cpp" />
<ClCompile Include="..\..\src\Utilities\Exceptions.cpp" />
<ClCompile Include="..\..\src\Utilities\FastFormatString.cpp" />
<ClCompile Include="..\..\src\Utilities\IniInterface.cpp" />
<ClCompile Include="..\..\src\Utilities\pxStreams.cpp" />
<ClCompile Include="..\..\src\Utilities\pxTranslate.cpp" />
<ClCompile Include="..\..\src\Utilities\pxWindowTextWriter.cpp" />
<ClCompile Include="..\..\src\Utilities\ThreadingDialogs.cpp" />
<ClCompile Include="..\..\src\Utilities\VirtualMemory.cpp" />
<ClCompile Include="..\..\src\Utilities\x86\MemcpyFast.cpp">
<ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\PathUtils.cpp" />
<ClCompile Include="..\..\src\Utilities\Perf.cpp" />
<ClCompile Include="..\..\src\Utilities\PrecompiledHeader.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\pxCheckBox.cpp" />
<ClCompile Include="..\..\src\Utilities\pxRadioPanel.cpp" />
<ClCompile Include="..\..\src\Utilities\pxStaticText.cpp" />
<ClCompile Include="..\..\src\Utilities\StringHelpers.cpp" />
<ClCompile Include="..\..\src\Utilities\wxAppWithHelpers.cpp" />
<ClCompile Include="..\..\src\Utilities\wxGuiTools.cpp" />
<ClCompile Include="..\..\src\Utilities\wxHelpers.cpp" />
<ClCompile Include="..\..\src\Utilities\Linux\LnxHostSys.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Linux\LnxMisc.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Linux\LnxThreads.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Windows\WinHostSys.cpp" />
<ClCompile Include="..\..\src\Utilities\Windows\WinMisc.cpp" />
<ClCompile Include="..\..\src\Utilities\Windows\WinThreads.cpp" />
<ClCompile Include="..\..\src\Utilities\Mutex.cpp" />
<ClCompile Include="..\..\src\Utilities\RwMutex.cpp" />
<ClCompile Include="..\..\src\Utilities\Semaphore.cpp" />
<ClCompile Include="..\..\src\Utilities\ThreadTools.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\include\Utilities\EventSource.inl" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\Utilities\EmbeddedImage.h" />
<ClInclude Include="..\..\include\Utilities\boost_spsc_queue.hpp" />
<ClInclude Include="..\..\include\Utilities\ScopedAlloc.h" />
<ClInclude Include="..\..\src\Utilities\ThreadingInternal.h" />
<ClInclude Include="..\..\include\Utilities\Assertions.h" />
<ClInclude Include="..\..\include\Utilities\CheckedStaticBox.h" />
<ClInclude Include="..\..\include\Utilities\Console.h" />
<ClInclude Include="..\..\include\Utilities\Dependencies.h" />
<ClInclude Include="..\..\include\Utilities\EventSource.h" />
<ClInclude Include="..\..\include\Utilities\Exceptions.h" />
<ClInclude Include="..\..\include\Utilities\General.h" />
<ClInclude Include="..\..\include\Utilities\MathUtils.h" />
<ClInclude Include="..\..\include\Utilities\MemcpyFast.h" />
<ClInclude Include="..\..\include\Utilities\Path.h" />
<ClInclude Include="..\..\src\Utilities\PrecompiledHeader.h" />
<ClInclude Include="..\..\include\Utilities\pxCheckBox.h" />
<ClInclude Include="..\..\include\Utilities\pxEvents.h" />
<ClInclude Include="..\..\include\Utilities\pxRadioPanel.h" />
<ClInclude Include="..\..\include\Utilities\pxStaticText.h" />
<ClInclude Include="..\..\include\Utilities\RedtapeWindows.h" />
<ClInclude Include="..\..\include\Utilities\SafeArray.h" />
<ClInclude Include="..\..\include\Utilities\StringHelpers.h" />
<ClInclude Include="..\..\include\Utilities\wxAppWithHelpers.h" />
<ClInclude Include="..\..\include\Utilities\wxBaseTools.h" />
<ClInclude Include="..\..\include\Utilities\wxGuiTools.h" />
<ClInclude Include="..\..\include\Utilities\Threading.h" />
<ClInclude Include="..\..\include\Utilities\PersistentThread.h" />
<ClInclude Include="..\..\include\Utilities\RwMutex.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\3rdparty\pthreads4w\build\pthreads4w.vcxproj">
<Project>{0fae817d-9a32-4830-857e-81da57246e16}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\3rdparty\wxwidgets3.0\build\msw\wx30_base.vcxproj">
<Project>{3fcc50c2-81e9-5db2-b8d8-2129427568b1}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\3rdparty\wxwidgets3.0\build\msw\wx30_core.vcxproj">
<Project>{6744dad8-9c70-574a-bff2-9f8dddb24a75}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>

214
common/build/Utilities/utilities.vcxproj.filters
View File

@ -1,214 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Source Files\Linux">
<UniqueIdentifier>{54fbf775-c53a-4e27-8903-2f68688d7764}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Windows">
<UniqueIdentifier>{903e4e1a-fc21-4f41-83c6-fb70d90cbb58}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Threading">
<UniqueIdentifier>{b7963f4a-9718-4852-bb0a-62dc0931f98e}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Header Files\Threading">
<UniqueIdentifier>{a3d21581-efe9-4749-a801-0ae50cbed855}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\Utilities\CheckedStaticBox.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Console.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Exceptions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\x86\MemcpyFast.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\PathUtils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Perf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\PrecompiledHeader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\pxCheckBox.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\pxRadioPanel.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\pxStaticText.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\StringHelpers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\wxAppWithHelpers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\wxGuiTools.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\wxHelpers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Linux\LnxHostSys.cpp">
<Filter>Source Files\Linux</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Linux\LnxMisc.cpp">
<Filter>Source Files\Linux</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Linux\LnxThreads.cpp">
<Filter>Source Files\Linux</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Windows\WinHostSys.cpp">
<Filter>Source Files\Windows</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Windows\WinMisc.cpp">
<Filter>Source Files\Windows</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Windows\WinThreads.cpp">
<Filter>Source Files\Windows</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Mutex.cpp">
<Filter>Source Files\Threading</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\Semaphore.cpp">
<Filter>Source Files\Threading</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\ThreadTools.cpp">
<Filter>Source Files\Threading</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\RwMutex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\FastFormatString.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\IniInterface.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\pxTranslate.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\pxStreams.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\VirtualMemory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\ThreadingDialogs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\pxWindowTextWriter.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Utilities\AlignedMalloc.cpp">
<Filter>Source Files\Linux</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\include\Utilities\EventSource.inl">
<Filter>Header Files</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\Utilities\ThreadingInternal.h">
<Filter>Source Files\Threading</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\Assertions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\boost_spsc_queue.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\CheckedStaticBox.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\Console.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\Dependencies.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\EventSource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\Exceptions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\General.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\MathUtils.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\MemcpyFast.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\Path.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\PersistentThread.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Utilities\PrecompiledHeader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\pxCheckBox.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\pxRadioPanel.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\pxStaticText.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\RedtapeWindows.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\SafeArray.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\StringHelpers.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\wxAppWithHelpers.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\wxBaseTools.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\wxGuiTools.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\Threading.h">
<Filter>Header Files\Threading</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\pxEvents.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\RwMutex.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\ScopedAlloc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\Utilities\EmbeddedImage.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

92
common/build/x86emitter/x86emitter.vcxproj
View File

@ -1,92 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(SolutionDir)common\vsprops\BaseProjectConfig.props" />
<Import Project="$(SolutionDir)common\vsprops\WinSDK.props" />
<PropertyGroup Label="Globals">
<ProjectGuid>{A51123F5-9505-4EAE-85E7-D320290A272C}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization Condition="$(Configuration.Contains(Release))">true</WholeProgramOptimization>
<UseDebugLibraries Condition="$(Configuration.Contains(Debug))">true</UseDebugLibraries>
<UseDebugLibraries Condition="!$(Configuration.Contains(Debug))">false</UseDebugLibraries>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Label="PropertySheets">
<Import Project="..\..\vsprops\CommonLibrary.props" />
<Import Project="..\..\vsprops\pthreads.props" />
<Import Condition="$(Configuration.Contains(Debug))" Project="..\..\vsprops\CodeGen_Debug.props" />
<Import Condition="$(Configuration.Contains(Devel))" Project="..\..\vsprops\CodeGen_Devel.props" />
<Import Condition="$(Configuration.Contains(Release))" Project="..\..\vsprops\CodeGen_Release.props" />
<Import Condition="!$(Configuration.Contains(Release))" Project="..\..\vsprops\IncrementalLinking.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>PrecompiledHeader.h</PrecompiledHeaderFile>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\x86emitter\bmi.cpp" />
<ClCompile Include="..\..\src\x86emitter\cpudetect.cpp" />
<ClCompile Include="..\..\src\x86emitter\fpu.cpp" />
<ClCompile Include="..\..\src\x86emitter\groups.cpp" />
<ClCompile Include="..\..\src\x86emitter\jmp.cpp" />
<ClCompile Include="..\..\src\x86emitter\legacy.cpp" />
<ClCompile Include="..\..\src\x86emitter\legacy_sse.cpp" />
<ClCompile Include="..\..\src\x86emitter\movs.cpp" />
<ClCompile Include="..\..\src\x86emitter\PrecompiledHeader.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\simd.cpp" />
<ClCompile Include="..\..\src\x86emitter\x86emitter.cpp" />
<ClCompile Include="..\..\src\x86emitter\LnxCpuDetect.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\WinCpuDetect.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\x86emitter\implement\bmi.h" />
<ClInclude Include="..\..\src\x86emitter\cpudetect_internal.h" />
<ClInclude Include="..\..\include\x86emitter\instructions.h" />
<ClInclude Include="..\..\include\x86emitter\internal.h" />
<ClInclude Include="..\..\include\x86emitter\legacy_instructions.h" />
<ClInclude Include="..\..\include\x86emitter\legacy_internal.h" />
<ClInclude Include="..\..\include\x86emitter\legacy_types.h" />
<ClInclude Include="..\..\src\x86emitter\PrecompiledHeader.h" />
<ClInclude Include="..\..\include\x86emitter\tools.h" />
<ClInclude Include="..\..\include\x86emitter\x86emitter.h" />
<ClInclude Include="..\..\include\x86emitter\x86types.h" />
<ClInclude Include="..\..\include\x86emitter\implement\dwshift.h" />
<ClInclude Include="..\..\include\x86emitter\implement\group1.h" />
<ClInclude Include="..\..\include\x86emitter\implement\group2.h" />
<ClInclude Include="..\..\include\x86emitter\implement\group3.h" />
<ClInclude Include="..\..\include\x86emitter\implement\helpers.h" />
<ClInclude Include="..\..\include\x86emitter\implement\incdec.h" />
<ClInclude Include="..\..\include\x86emitter\implement\jmpcall.h" />
<ClInclude Include="..\..\include\x86emitter\implement\movs.h" />
<ClInclude Include="..\..\include\x86emitter\implement\test.h" />
<ClInclude Include="..\..\include\x86emitter\implement\xchg.h" />
<ClInclude Include="..\..\include\x86emitter\implement\simd_arithmetic.h" />
<ClInclude Include="..\..\include\x86emitter\implement\simd_comparisons.h" />
<ClInclude Include="..\..\include\x86emitter\implement\simd_helpers.h" />
<ClInclude Include="..\..\include\x86emitter\implement\simd_moremovs.h" />
<ClInclude Include="..\..\include\x86emitter\implement\simd_shufflepack.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\3rdparty\wxwidgets3.0\build\msw\wx30_config.vcxproj">
<Project>{01f4ce10-2cfb-41a8-b41f-e54337868a1d}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>

150
common/build/x86emitter/x86emitter.vcxproj.filters
View File

@ -1,150 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Source Files\Linux">
<UniqueIdentifier>{349ada14-68b6-4be5-8232-b162efb0a5aa}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Windows">
<UniqueIdentifier>{12d7c7d4-d7f1-43cb-86c3-585dad794bf6}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Header Files\Implement">
<UniqueIdentifier>{66921012-17b3-45f6-aa8c-82e845c489f8}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Implement_Simd">
<UniqueIdentifier>{ae9884f6-cbd3-4fb6-a011-c776dce9b6ee}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\x86emitter\cpudetect.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\fpu.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\groups.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\jmp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\legacy.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\legacy_sse.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\movs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\PrecompiledHeader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\simd.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\x86emitter.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\LnxCpuDetect.cpp">
<Filter>Source Files\Linux</Filter>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\WinCpuDetect.cpp">
<Filter>Source Files\Windows</Filter>
</ClCompile>
<ClCompile Include="..\..\src\x86emitter\bmi.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\x86emitter\cpudetect_internal.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\instructions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\internal.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\legacy_instructions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\legacy_internal.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\legacy_types.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\x86emitter\PrecompiledHeader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\tools.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\x86emitter.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\x86types.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\dwshift.h">
<Filter>Header Files\Implement</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\group1.h">
<Filter>Header Files\Implement</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\group2.h">
<Filter>Header Files\Implement</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\group3.h">
<Filter>Header Files\Implement</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\helpers.h">
<Filter>Header Files\Implement</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\incdec.h">
<Filter>Header Files\Implement</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\jmpcall.h">
<Filter>Header Files\Implement</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\movs.h">
<Filter>Header Files\Implement</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\test.h">
<Filter>Header Files\Implement</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\xchg.h">
<Filter>Header Files\Implement</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\simd_arithmetic.h">
<Filter>Header Files\Implement_Simd</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\simd_comparisons.h">
<Filter>Header Files\Implement_Simd</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\simd_helpers.h">
<Filter>Header Files\Implement_Simd</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\simd_moremovs.h">
<Filter>Header Files\Implement_Simd</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\simd_shufflepack.h">
<Filter>Header Files\Implement_Simd</Filter>
</ClInclude>
<ClInclude Include="..\..\include\x86emitter\implement\bmi.h">
<Filter>Header Files\Implement</Filter>
</ClInclude>
</ItemGroup>
</Project>

162
common/common.vcxproj Normal file
View File

@ -0,0 +1,162 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(SolutionDir)common\vsprops\BaseProjectConfig.props" />
<Import Project="$(SolutionDir)common\vsprops\WinSDK.props" />
<PropertyGroup Label="Globals">
<ProjectGuid>{4639972E-424E-4E13-8B07-CA403C481346}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization Condition="$(Configuration.Contains(Release))">true</WholeProgramOptimization>
<UseDebugLibraries Condition="$(Configuration.Contains(Debug))">true</UseDebugLibraries>
<UseDebugLibraries Condition="!$(Configuration.Contains(Debug))">false</UseDebugLibraries>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Label="PropertySheets">
<Import Project="vsprops\CommonLibrary.props" />
<Import Project="vsprops\3rdpartyDeps.props" />
<Import Project="vsprops\pthreads.props" />
<Import Condition="$(Configuration.Contains(Debug))" Project="vsprops\CodeGen_Debug.props" />
<Import Condition="$(Configuration.Contains(Devel))" Project="vsprops\CodeGen_Devel.props" />
<Import Condition="$(Configuration.Contains(Release))" Project="vsprops\CodeGen_Release.props" />
<Import Condition="!$(Configuration.Contains(Release))" Project="vsprops\IncrementalLinking.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<ExceptionHandling>Async</ExceptionHandling>
<PrecompiledHeader>Use</PrecompiledHeader>
<ForcedIncludeFiles>PrecompiledHeader.h</ForcedIncludeFiles>
<PrecompiledHeaderFile>PrecompiledHeader.h</PrecompiledHeaderFile>
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="AlignedMalloc.cpp" />
<ClCompile Include="CheckedStaticBox.cpp" />
<ClCompile Include="Console.cpp" />
<ClCompile Include="Exceptions.cpp" />
<ClCompile Include="FastFormatString.cpp" />
<ClCompile Include="IniInterface.cpp" />
<ClCompile Include="pxStreams.cpp" />
<ClCompile Include="pxTranslate.cpp" />
<ClCompile Include="pxWindowTextWriter.cpp" />
<ClCompile Include="ThreadingDialogs.cpp" />
<ClCompile Include="VirtualMemory.cpp" />
<ClCompile Include="x86\MemcpyFast.cpp">
<ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="PathUtils.cpp" />
<ClCompile Include="Perf.cpp" />
<ClCompile Include="PrecompiledHeader.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="pxCheckBox.cpp" />
<ClCompile Include="pxRadioPanel.cpp" />
<ClCompile Include="pxStaticText.cpp" />
<ClCompile Include="StringHelpers.cpp" />
<ClCompile Include="wxAppWithHelpers.cpp" />
<ClCompile Include="wxGuiTools.cpp" />
<ClCompile Include="wxHelpers.cpp" />
<ClCompile Include="Linux\LnxHostSys.cpp" />
<ClCompile Include="Linux\LnxMisc.cpp" />
<ClCompile Include="Linux\LnxThreads.cpp" />
<ClCompile Include="Windows\WinHostSys.cpp" />
<ClCompile Include="Windows\WinMisc.cpp" />
<ClCompile Include="Windows\WinThreads.cpp" />
<ClCompile Include="Mutex.cpp" />
<ClCompile Include="RwMutex.cpp" />
<ClCompile Include="Semaphore.cpp" />
<ClCompile Include="ThreadTools.cpp" />
<ClCompile Include="emitter\bmi.cpp" />
<ClCompile Include="emitter\cpudetect.cpp" />
<ClCompile Include="emitter\fpu.cpp" />
<ClCompile Include="emitter\groups.cpp" />
<ClCompile Include="emitter\jmp.cpp" />
<ClCompile Include="emitter\legacy.cpp" />
<ClCompile Include="emitter\legacy_sse.cpp" />
<ClCompile Include="emitter\movs.cpp" />
<ClCompile Include="emitter\simd.cpp" />
<ClCompile Include="emitter\x86emitter.cpp" />
<ClCompile Include="emitter\LnxCpuDetect.cpp" />
<ClCompile Include="emitter\WinCpuDetect.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="EventSource.inl" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="EmbeddedImage.h" />
<ClInclude Include="boost_spsc_queue.hpp" />
<ClInclude Include="ScopedAlloc.h" />
<ClInclude Include="ThreadingInternal.h" />
<ClInclude Include="Assertions.h" />
<ClInclude Include="CheckedStaticBox.h" />
<ClInclude Include="Console.h" />
<ClInclude Include="Dependencies.h" />
<ClInclude Include="EventSource.h" />
<ClInclude Include="Exceptions.h" />
<ClInclude Include="General.h" />
<ClInclude Include="MathUtils.h" />
<ClInclude Include="MemcpyFast.h" />
<ClInclude Include="Path.h" />
<ClInclude Include="PrecompiledHeader.h" />
<ClInclude Include="pxCheckBox.h" />
<ClInclude Include="pxEvents.h" />
<ClInclude Include="pxRadioPanel.h" />
<ClInclude Include="pxStaticText.h" />
<ClInclude Include="RedtapeWindows.h" />
<ClInclude Include="SafeArray.h" />
<ClInclude Include="StringHelpers.h" />
<ClInclude Include="wxAppWithHelpers.h" />
<ClInclude Include="wxBaseTools.h" />
<ClInclude Include="wxGuiTools.h" />
<ClInclude Include="Threading.h" />
<ClInclude Include="PersistentThread.h" />
<ClInclude Include="RwMutex.h" />
<ClInclude Include="emitter\implement\bmi.h" />
<ClInclude Include="emitter\cpudetect_internal.h" />
<ClInclude Include="emitter\instructions.h" />
<ClInclude Include="emitter\internal.h" />
<ClInclude Include="emitter\legacy_instructions.h" />
<ClInclude Include="emitter\legacy_internal.h" />
<ClInclude Include="emitter\legacy_types.h" />
<ClInclude Include="emitter\tools.h" />
<ClInclude Include="emitter\x86emitter.h" />
<ClInclude Include="emitter\x86types.h" />
<ClInclude Include="emitter\implement\dwshift.h" />
<ClInclude Include="emitter\implement\group1.h" />
<ClInclude Include="emitter\implement\group2.h" />
<ClInclude Include="emitter\implement\group3.h" />
<ClInclude Include="emitter\implement\helpers.h" />
<ClInclude Include="emitter\implement\incdec.h" />
<ClInclude Include="emitter\implement\jmpcall.h" />
<ClInclude Include="emitter\implement\movs.h" />
<ClInclude Include="emitter\implement\test.h" />
<ClInclude Include="emitter\implement\xchg.h" />
<ClInclude Include="emitter\implement\simd_arithmetic.h" />
<ClInclude Include="emitter\implement\simd_comparisons.h" />
<ClInclude Include="emitter\implement\simd_helpers.h" />
<ClInclude Include="emitter\implement\simd_moremovs.h" />
<ClInclude Include="emitter\implement\simd_shufflepack.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\3rdparty\pthreads4w\build\pthreads4w.vcxproj">
<Project>{0fae817d-9a32-4830-857e-81da57246e16}</Project>
</ProjectReference>
<ProjectReference Include="..\3rdparty\wxwidgets3.0\build\msw\wx30_base.vcxproj">
<Project>{3fcc50c2-81e9-5db2-b8d8-2129427568b1}</Project>
</ProjectReference>
<ProjectReference Include="..\3rdparty\wxwidgets3.0\build\msw\wx30_core.vcxproj">
<Project>{6744dad8-9c70-574a-bff2-9f8dddb24a75}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>

0
common/src/x86emitter/CMakeLists.txt → common/emitter/CMakeLists.txt
View File

6
common/src/x86emitter/LnxCpuDetect.cpp → common/emitter/LnxCpuDetect.cpp
View File

@ -13,9 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "cpudetect_internal.h"
#ifndef _WIN32
#include "common/emitter/cpudetect_internal.h"
#include <wx/thread.h>
// 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

0
common/src/x86emitter/PrecompiledHeader.cpp → common/emitter/PrecompiledHeader.cpp
View File

10
common/src/x86emitter/PrecompiledHeader.h → common/emitter/PrecompiledHeader.h
View File

@ -20,16 +20,16 @@
#include <wx/string.h>
#include "Pcsx2Defs.h"
#include "common/Pcsx2Defs.h"
#include <stdexcept>
#include <cstring> // string.h under c++
#include <cstdio> // stdio.h under c++
#include <cstdlib>
#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

5
common/src/x86emitter/WinCpuDetect.cpp → common/emitter/WinCpuDetect.cpp
View File

@ -13,9 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "cpudetect_internal.h"
#include "common/Console.h"
#include "common/emitter/cpudetect_internal.h"
void x86capabilities::CountLogicalCores()
{

5
common/src/x86emitter/bmi.cpp → common/emitter/bmi.cpp
View File

@ -13,9 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "internal.h"
#include "tools.h"
#include "common/emitter/internal.h"
#include "common/emitter/tools.h"
namespace x86Emitter
{

9
common/src/x86emitter/cpudetect.cpp → common/emitter/cpudetect.cpp
View File

@ -13,10 +13,11 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#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)

4
common/src/x86emitter/cpudetect_internal.h → common/emitter/cpudetect_internal.h
View File

@ -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

3
common/src/x86emitter/fpu.cpp → common/emitter/fpu.cpp
View File

@ -13,8 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "legacy_internal.h"
#include "common/emitter/legacy_internal.h"
//------------------------------------------------------------------
// FPU instructions

5
common/src/x86emitter/groups.cpp → common/emitter/groups.cpp
View File

@ -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
{

0
common/include/x86emitter/implement/bmi.h → common/emitter/implement/bmi.h
View File

0
common/include/x86emitter/implement/dwshift.h → common/emitter/implement/dwshift.h
View File

0
common/include/x86emitter/implement/group1.h → common/emitter/implement/group1.h
View File

0
common/include/x86emitter/implement/group2.h → common/emitter/implement/group2.h
View File

0
common/include/x86emitter/implement/group3.h → common/emitter/implement/group3.h
View File

0
common/include/x86emitter/implement/helpers.h → common/emitter/implement/helpers.h
View File

0
common/include/x86emitter/implement/incdec.h → common/emitter/implement/incdec.h
View File

0
common/include/x86emitter/implement/jmpcall.h → common/emitter/implement/jmpcall.h
View File

0
common/include/x86emitter/implement/movs.h → common/emitter/implement/movs.h
View File

0
common/include/x86emitter/implement/simd_arithmetic.h → common/emitter/implement/simd_arithmetic.h
View File

0
common/include/x86emitter/implement/simd_comparisons.h → common/emitter/implement/simd_comparisons.h
View File

0
common/include/x86emitter/implement/simd_helpers.h → common/emitter/implement/simd_helpers.h
View File

0
common/include/x86emitter/implement/simd_moremovs.h → common/emitter/implement/simd_moremovs.h
View File

0
common/include/x86emitter/implement/simd_shufflepack.h → common/emitter/implement/simd_shufflepack.h
View File

0
common/include/x86emitter/implement/simd_templated_helpers.h → common/emitter/implement/simd_templated_helpers.h
View File

0
common/include/x86emitter/implement/test.h → common/emitter/implement/test.h
View File

0
common/include/x86emitter/implement/xchg.h → common/emitter/implement/xchg.h
View File

0
common/include/x86emitter/instructions.h → common/emitter/instructions.h
View File

5
common/include/x86emitter/internal.h → common/emitter/internal.h
View File

@ -15,9 +15,8 @@
#pragma once
#include "x86types.h"
#include "instructions.h"
#include "common/emitter/x86types.h"
#include "common/emitter/instructions.h"
namespace x86Emitter
{

3
common/src/x86emitter/jmp.cpp → common/emitter/jmp.cpp
View File

@ -28,8 +28,7 @@
* sudonim(1@gmail.com)
*/
#include "PrecompiledHeader.h"
#include "internal.h"
#include "common/emitter/internal.h"
namespace x86Emitter
{

3
common/src/x86emitter/legacy.cpp → common/emitter/legacy.cpp
View File

@ -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)
{

0
common/include/x86emitter/legacy_instructions.h → common/emitter/legacy_instructions.h
View File

6
common/include/x86emitter/legacy_internal.h → common/emitter/legacy_internal.h
View File

@ -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)

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