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

Move class out of file names

This commit is contained in:
zilmar 2021-04-14 15:04:15 +09:30
parent 662637460e
commit c512a592a7
107 changed files with 280 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Android/Bridge/Bridge.vcxproj
View File

@ -34,7 +34,7 @@
<ClCompile Include="JavaRomList.cpp" /> <ClCompile Include="JavaRomList.cpp" />
<ClCompile Include="jniBridge.cpp" /> <ClCompile Include="jniBridge.cpp" />
<ClCompile Include="jniBridgeSettings.cpp" /> <ClCompile Include="jniBridgeSettings.cpp" />
<ClCompile Include="NotificationClass.cpp" /> <ClCompile Include="Notification.cpp" />
<ClCompile Include="SyncBridge.cpp" /> <ClCompile Include="SyncBridge.cpp" />
<ClCompile Include="UISettings.cpp" /> <ClCompile Include="UISettings.cpp" />
</ItemGroup> </ItemGroup>
@ -43,7 +43,7 @@
<ClInclude Include="JavaRomList.h" /> <ClInclude Include="JavaRomList.h" />
<ClInclude Include="jniBridge.h" /> <ClInclude Include="jniBridge.h" />
<ClInclude Include="jniBridgeSettings.h" /> <ClInclude Include="jniBridgeSettings.h" />
<ClInclude Include="NotificationClass.h" /> <ClInclude Include="Notification.h" />
<ClInclude Include="SyncBridge.h" /> <ClInclude Include="SyncBridge.h" />
<ClInclude Include="UISettings.h" /> <ClInclude Include="UISettings.h" />
</ItemGroup> </ItemGroup>

4
Source/Android/Bridge/Bridge.vcxproj.filters
View File

@ -18,7 +18,7 @@
<ClCompile Include="jniBridge.cpp"> <ClCompile Include="jniBridge.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="NotificationClass.cpp"> <ClCompile Include="Notification.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="jniBridgeSettings.cpp"> <ClCompile Include="jniBridgeSettings.cpp">
@ -38,7 +38,7 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="NotificationClass.h"> <ClInclude Include="Notification.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="jniBridgeSettings.h"> <ClInclude Include="jniBridgeSettings.h">

4
Source/Android/Bridge/NotificationClass.cpp → Source/Android/Bridge/Notification.cpp
View File

@ -2,9 +2,9 @@
#include <Common/Trace.h> #include <Common/Trace.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/Settings.h> #include <Project64-core/Settings.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h> #include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h>
#include "NotificationClass.h" #include "Notification.h"
#include "JavaBridge.h" #include "JavaBridge.h"
#if defined(ANDROID) #if defined(ANDROID)
#include <android/log.h> #include <android/log.h>

0
Source/Android/Bridge/NotificationClass.h → Source/Android/Bridge/Notification.h
View File

4
Source/Android/Bridge/jniBridge.cpp
View File

@ -4,13 +4,13 @@
#include <sys/inotify.h> #include <sys/inotify.h>
#include <sys/file.h> #include <sys/file.h>
#endif #endif
#include "NotificationClass.h" #include "Notification.h"
#include <Project64-core/AppInit.h> #include <Project64-core/AppInit.h>
#include <Project64-core/Version.h> #include <Project64-core/Version.h>
#include <Project64-core/TraceModulesProject64.h> #include <Project64-core/TraceModulesProject64.h>
#include <Project64-core/Settings.h> #include <Project64-core/Settings.h>
#include <Project64-core/Settings/SettingType/SettingsType-Application.h> #include <Project64-core/Settings/SettingType/SettingsType-Application.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/Plugin.h> #include <Project64-core/Plugin.h>
#include <Common/Trace.h> #include <Common/Trace.h>

16
Source/Common/Common.vcxproj
View File

@ -38,11 +38,11 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="CriticalSection.cpp" /> <ClCompile Include="CriticalSection.cpp" />
<ClCompile Include="DateTimeClass.cpp" /> <ClCompile Include="DateTime.cpp" />
<ClCompile Include="FileClass.cpp" /> <ClCompile Include="File.cpp" />
<ClCompile Include="HighResTimeStamp.cpp" /> <ClCompile Include="HighResTimeStamp.cpp" />
<ClCompile Include="IniFileClass.cpp" /> <ClCompile Include="IniFile.cpp" />
<ClCompile Include="LogClass.cpp" /> <ClCompile Include="Log.cpp" />
<ClCompile Include="md5.cpp" /> <ClCompile Include="md5.cpp" />
<ClCompile Include="MemoryManagement.cpp" /> <ClCompile Include="MemoryManagement.cpp" />
<ClCompile Include="MemTest.cpp" /> <ClCompile Include="MemTest.cpp" />
@ -57,11 +57,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="CriticalSection.h" /> <ClInclude Include="CriticalSection.h" />
<ClInclude Include="DateTimeClass.h" /> <ClInclude Include="DateTime.h" />
<ClInclude Include="FileClass.h" /> <ClInclude Include="File.h" />
<ClInclude Include="HighResTimeStamp.h" /> <ClInclude Include="HighResTimeStamp.h" />
<ClInclude Include="IniFileClass.h" /> <ClInclude Include="IniFile.h" />
<ClInclude Include="LogClass.h" /> <ClInclude Include="Log.h" />
<ClInclude Include="md5.h" /> <ClInclude Include="md5.h" />
<ClInclude Include="MemoryManagement.h" /> <ClInclude Include="MemoryManagement.h" />
<ClInclude Include="MemTest.h" /> <ClInclude Include="MemTest.h" />

16
Source/Common/Common.vcxproj.filters
View File

@ -14,13 +14,13 @@
<ClCompile Include="CriticalSection.cpp"> <ClCompile Include="CriticalSection.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="FileClass.cpp"> <ClCompile Include="File.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="IniFileClass.cpp"> <ClCompile Include="IniFile.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="LogClass.cpp"> <ClCompile Include="Log.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="md5.cpp"> <ClCompile Include="md5.cpp">
@ -56,7 +56,7 @@
<ClCompile Include="HighResTimeStamp.cpp"> <ClCompile Include="HighResTimeStamp.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="DateTimeClass.cpp"> <ClCompile Include="DateTime.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Random.cpp"> <ClCompile Include="Random.cpp">
@ -67,13 +67,13 @@
<ClInclude Include="CriticalSection.h"> <ClInclude Include="CriticalSection.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="FileClass.h"> <ClInclude Include="File.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="IniFileClass.h"> <ClInclude Include="IniFile.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="LogClass.h"> <ClInclude Include="Log.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="md5.h"> <ClInclude Include="md5.h">
@ -115,7 +115,7 @@
<ClInclude Include="HighResTimeStamp.h"> <ClInclude Include="HighResTimeStamp.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="DateTimeClass.h"> <ClInclude Include="DateTime.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Random.h"> <ClInclude Include="Random.h">

2
Source/Common/DateTimeClass.cpp → Source/Common/DateTime.cpp
View File

@ -1,4 +1,4 @@
#include "DateTimeClass.h" #include "DateTime.h"
#include <time.h> #include <time.h>
CDateTime::CDateTime() CDateTime::CDateTime()

0
Source/Common/DateTimeClass.h → Source/Common/DateTime.h
View File

2
Source/Common/FileClass.cpp → Source/Common/File.cpp
View File

@ -1,4 +1,4 @@
#include "FileClass.h" #include "File.h"
#ifdef _WIN32 #ifdef _WIN32
#include <io.h> #include <io.h>
#define USE_WINDOWS_API #define USE_WINDOWS_API

29
Source/Common/FileClass.h → Source/Common/File.h
View File

@ -6,20 +6,25 @@ class CFileBase
public: public:
enum OpenFlags enum OpenFlags
{ {
modeRead = 0x0000, modeRead = 0x0000,
modeWrite = 0x0001, modeWrite = 0x0001,
modeReadWrite = 0x0002, modeReadWrite = 0x0002,
shareCompat = 0x0000, shareCompat = 0x0000,
shareExclusive = 0x0010, shareExclusive = 0x0010,
shareDenyWrite = 0x0020, shareDenyWrite = 0x0020,
shareDenyRead = 0x0030, shareDenyRead = 0x0030,
shareDenyNone = 0x0040, shareDenyNone = 0x0040,
modeNoInherit = 0x0080, modeNoInherit = 0x0080,
modeCreate = 0x1000, modeCreate = 0x1000,
modeNoTruncate = 0x2000, modeNoTruncate = 0x2000,
}; };
enum SeekPosition { begin = 0x0, current = 0x1, end = 0x2 }; enum SeekPosition
{
begin = 0x0,
current = 0x1,
end = 0x2
};
virtual bool Open(const char * lpszFileName, uint32_t nOpenFlags ) = 0; virtual bool Open(const char * lpszFileName, uint32_t nOpenFlags ) = 0;

2
Source/Common/IniFileClass.cpp → Source/Common/IniFile.cpp
View File

@ -1,4 +1,4 @@
#include "IniFileClass.h" #include "IniFile.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>

2
Source/Common/IniFileClass.h → Source/Common/IniFile.h
View File

@ -4,7 +4,7 @@
#include <strings.h> #include <strings.h>
#endif #endif
#include "FileClass.h" #include "File.h"
#include "CriticalSection.h" #include "CriticalSection.h"
#include <string> #include <string>
#include <map> #include <map>

2
Source/Common/LogClass.cpp → Source/Common/Log.cpp
View File

@ -1,4 +1,4 @@
#include "LogClass.h" #include "Log.h"
#include "path.h" #include "path.h"
#include "Platform.h" #include "Platform.h"
#include <stdio.h> #include <stdio.h>

2
Source/Common/LogClass.h → Source/Common/Log.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <stdarg.h> #include <stdarg.h>
#include <string> #include <string>
#include "FileClass.h" #include "File.h"
class CLog class CLog
{ {

2
Source/Common/Trace.h
View File

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "LogClass.h" #include "Log.h"
enum TraceSeverity enum TraceSeverity
{ {

2
Source/JoinSettings/main.cpp
View File

@ -1,5 +1,5 @@
#include <Common/path.h> #include <Common/path.h>
#include <Common/IniFileClass.h> #include <Common/IniFile.h>
#include <Common/StdString.h> #include <Common/StdString.h>
#include <Project64-core/N64System/Enhancement/EnhancementFile.h> #include <Project64-core/N64System/Enhancement/EnhancementFile.h>
#include <algorithm> #include <algorithm>

2
Source/Project64-audio/trace.cpp
View File

@ -1,7 +1,7 @@
#include "trace.h" #include "trace.h"
#include <Settings/Settings.h> #include <Settings/Settings.h>
#include <Common/path.h> #include <Common/path.h>
#include <Common/LogClass.h> #include <Common/Log.h>
#include "AudioSettings.h" #include "AudioSettings.h"
#ifdef ANDROID #ifdef ANDROID

6
Source/Project64-core/AppInit.cpp
View File

@ -6,9 +6,9 @@
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/Plugins/PluginClass.h> #include <Project64-core/Plugins/Plugin.h>
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64Rom.h>
#include <Project64-core/N64System/N64DiskClass.h> #include <Project64-core/N64System/N64Disk.h>
#include <Project64-core/N64System/Enhancement/Enhancements.h> #include <Project64-core/N64System/Enhancement/Enhancements.h>
#include "Settings/SettingType/SettingsType-Application.h" #include "Settings/SettingType/SettingsType-Application.h"

2
Source/Project64-core/Logging.cpp
View File

@ -7,7 +7,7 @@
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Mips/TranslateVaddr.h> #include <Project64-core/N64System/Mips/TranslateVaddr.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64Rom.h>
CFile * CLogging::m_hLogFile = nullptr; CFile * CLogging::m_hLogFile = nullptr;

2
Source/Project64-core/Logging.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <Project64-core/Settings/LoggingSettings.h> #include <Project64-core/Settings/LoggingSettings.h>
#include <Common/FileClass.h> #include <Common/File.h>
class CLogging : class CLogging :
public CLogSettings public CLogSettings

4
Source/Project64-core/MemoryExceptionFilter.cpp
View File

@ -1,9 +1,9 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Recompiler/RecompilerClass.h> #include <Project64-core/N64System/Recompiler/Recompiler.h>
#include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h> #include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#ifndef _WIN32 #ifndef _WIN32
#include <stdlib.h> #include <stdlib.h>
#endif #endif

2
Source/Project64-core/Multilanguage.h
View File

@ -630,4 +630,4 @@ enum LanguageStringID
ANDROID_VIDEO_NATIVE_RES = 3200, ANDROID_VIDEO_NATIVE_RES = 3200,
}; };
#include "Multilanguage/LanguageClass.h" #include "Multilanguage/Language.h"

0
Source/Project64-core/Multilanguage/LanguageClass.cpp → Source/Project64-core/Multilanguage/Language.cpp
View File

0
Source/Project64-core/Multilanguage/LanguageClass.h → Source/Project64-core/Multilanguage/Language.h
View File

2
Source/Project64-core/N64System/EmulationThread.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/Notification.h> #include <Project64-core/Notification.h>
#include <Common/Util.h> #include <Common/Util.h>

2
Source/Project64-core/N64System/Enhancement/Enhancement.cpp
View File

@ -2,7 +2,7 @@
#include <Project64-core/N64System/Enhancement/Enhancement.h> #include <Project64-core/N64System/Enhancement/Enhancement.h>
#include <Project64-core/Settings/SettingType/SettingsType-GameSetting.h> #include <Project64-core/Settings/SettingType/SettingsType-GameSetting.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
const char * CEnhancement::CheatIdent = "Cheat"; const char * CEnhancement::CheatIdent = "Cheat";
const char * CEnhancement::EnhancementIdent = "Enhancement"; const char * CEnhancement::EnhancementIdent = "Enhancement";

2
Source/Project64-core/N64System/Enhancement/EnhancementFile.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <Project64-core/N64System/Enhancement/Enhancement.h> #include <Project64-core/N64System/Enhancement/Enhancement.h>
#include <Project64-core/N64System/Enhancement/EnhancementList.h> #include <Project64-core/N64System/Enhancement/EnhancementList.h>
#include <Common/FileClass.h> #include <Common/File.h>
#include <Common/CriticalSection.h> #include <Common/CriticalSection.h>
#include <set> #include <set>
#include <string> #include <string>

4
Source/Project64-core/N64System/Enhancement/Enhancements.cpp
View File

@ -2,9 +2,9 @@
#include <Project64-core/N64System/Enhancement/Enhancements.h> #include <Project64-core/N64System/Enhancement/Enhancements.h>
#include <Project64-core/N64System/Enhancement/EnhancementFile.h> #include <Project64-core/N64System/Enhancement/EnhancementFile.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Recompiler/RecompilerClass.h> #include <Project64-core/N64System/Recompiler/Recompiler.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/Plugins/PluginClass.h> #include <Project64-core/Plugins/Plugin.h>
#include <Project64-core/Plugins/GFXPlugin.h> #include <Project64-core/Plugins/GFXPlugin.h>
#include <Project64-core/Plugins/AudioPlugin.h> #include <Project64-core/Plugins/AudioPlugin.h>
#include <Project64-core/Plugins/RSPPlugin.h> #include <Project64-core/Plugins/RSPPlugin.h>

2
Source/Project64-core/N64System/FramePerSecondClass.cpp → Source/Project64-core/N64System/FramePerSecond.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "FramePerSecondClass.h" #include "FramePerSecond.h"
#include <Project64-core/N64System/N64Types.h> #include <Project64-core/N64System/N64Types.h>
CFramePerSecond::CFramePerSecond() : CFramePerSecond::CFramePerSecond() :

0
Source/Project64-core/N64System/FramePerSecondClass.h → Source/Project64-core/N64System/FramePerSecond.h
View File

4
Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp
View File

@ -2,11 +2,11 @@
#include "InterpreterCPU.h" #include "InterpreterCPU.h"
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Mips/OpcodeName.h> #include <Project64-core/N64System/Mips/OpcodeName.h>
#include <Project64-core/N64System/Interpreter/InterpreterOps32.h> #include <Project64-core/N64System/Interpreter/InterpreterOps32.h>
#include <Project64-core/Plugins/PluginClass.h> #include <Project64-core/Plugins/Plugin.h>
#include <Project64-core/Plugins/GFXPlugin.h> #include <Project64-core/Plugins/GFXPlugin.h>
#include <Project64-core/ExceptionHandler.h> #include <Project64-core/ExceptionHandler.h>
#include <Project64-core/Debugger.h> #include <Project64-core/Debugger.h>

4
Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp
View File

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/Interpreter/InterpreterOps.h> #include <Project64-core/N64System/Interpreter/InterpreterOps.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Mips/SystemTiming.h> #include <Project64-core/N64System/Mips/SystemTiming.h>
#include <Project64-core/N64System/Mips/TLBClass.h> #include <Project64-core/N64System/Mips/TLB.h>
#include <Project64-core/N64System/Mips/OpcodeName.h> #include <Project64-core/N64System/Mips/OpcodeName.h>
#include <Project64-core/N64System/Interpreter/InterpreterCPU.h> #include <Project64-core/N64System/Interpreter/InterpreterCPU.h>
#include <Project64-core/Logging.h> #include <Project64-core/Logging.h>

2
Source/Project64-core/N64System/Interpreter/InterpreterOps.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <Project64-core/Settings/DebugSettings.h> #include <Project64-core/Settings/DebugSettings.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/N64System/Mips/OpCode.h> #include <Project64-core/N64System/Mips/OpCode.h>
class R4300iOp : class R4300iOp :

2
Source/Project64-core/N64System/Mips/Audio.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/Mips/Audio.h> #include <Project64-core/N64System/Mips/Audio.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
CAudio::CAudio() CAudio::CAudio()
{ {

6
Source/Project64-core/N64System/Mips/Disk.cpp
View File

@ -1,10 +1,10 @@
// Based from MAME's N64DD driver code by Happy_ // Based from MAME's N64DD driver code by Happy_
#include "stdafx.h" #include "stdafx.h"
#include "Disk.h" #include "Disk.h"
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/N64DiskClass.h> #include <Project64-core/N64System/N64Disk.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/N64System/Mips/SystemTiming.h> #include <Project64-core/N64System/Mips/SystemTiming.h>
#ifdef _WIN32 #ifdef _WIN32

8
Source/Project64-core/N64System/Mips/Dma.cpp
View File

@ -3,12 +3,12 @@
#include <Project64-core/N64System/Mips/Dma.h> #include <Project64-core/N64System/Mips/Dma.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64Rom.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/N64System/Mips/Disk.h> #include <Project64-core/N64System/Mips/Disk.h>
#include <Project64-core/N64System/N64DiskClass.h> #include <Project64-core/N64System/N64Disk.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
CDMA::CDMA(CFlashram & FlashRam, CSram & Sram) : CDMA::CDMA(CFlashram & FlashRam, CSram & Sram) :
m_FlashRam(FlashRam), m_FlashRam(FlashRam),

2
Source/Project64-core/N64System/Mips/Eeprom.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/Mips/Eeprom.h> #include <Project64-core/N64System/Mips/Eeprom.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <time.h> #include <time.h>
CEeprom::CEeprom(bool ReadOnly) : CEeprom::CEeprom(bool ReadOnly) :

4
Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
View File

@ -2,8 +2,8 @@
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64Rom.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h> #include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h>
#include <Project64-core/N64System/Mips/OpcodeName.h> #include <Project64-core/N64System/Mips/OpcodeName.h>
#include <Project64-core/N64System/Mips/Disk.h> #include <Project64-core/N64System/Mips/Disk.h>

2
Source/Project64-core/N64System/Mips/OpcodeName.cpp
View File

@ -2,7 +2,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "OpCode.h" #include "OpCode.h"
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#define FPR_Type(Reg) (Reg) == R4300i_COP1_S ? "S" : (Reg) == R4300i_COP1_D ? "D" :\ #define FPR_Type(Reg) (Reg) == R4300i_COP1_S ? "S" : (Reg) == R4300i_COP1_D ? "D" :\
(Reg) == R4300i_COP1_W ? "W" : "L" (Reg) == R4300i_COP1_W ? "W" : "L"

4
Source/Project64-core/N64System/Mips/PifRam.cpp
View File

@ -4,9 +4,9 @@
#include <Project64-core/N64System/Mips/PifRam.h> #include <Project64-core/N64System/Mips/PifRam.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/Plugins/ControllerPlugin.h> #include <Project64-core/Plugins/ControllerPlugin.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/Mips/Transferpak.h> #include <Project64-core/N64System/Mips/Transferpak.h>
#include <Project64-core/N64System/Mips/Rumblepak.h> #include <Project64-core/N64System/Mips/Rumblepak.h>
#include <Project64-core/N64System/Mips/Mempak.h> #include <Project64-core/N64System/Mips/Mempak.h>

4
Source/Project64-core/N64System/Mips/RegisterClass.cpp → Source/Project64-core/N64System/Mips/Register.cpp
View File

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/Logging.h> #include <Project64-core/Logging.h>

0
Source/Project64-core/N64System/Mips/RegisterClass.h → Source/Project64-core/N64System/Mips/Register.h
View File

2
Source/Project64-core/N64System/Mips/Rumblepak.cpp
View File

@ -2,7 +2,7 @@
#include "Rumblepak.h" #include "Rumblepak.h"
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/Plugins/PluginClass.h> #include <Project64-core/Plugins/Plugin.h>
#include <Project64-core/Plugins/ControllerPlugin.h> #include <Project64-core/Plugins/ControllerPlugin.h>
void Rumblepak::ReadFrom(uint32_t address, uint8_t * data) void Rumblepak::ReadFrom(uint32_t address, uint8_t * data)

2
Source/Project64-core/N64System/Mips/SystemEvents.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/Mips/SystemEvents.h> #include <Project64-core/N64System/Mips/SystemEvents.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
const char * SystemEventName(SystemEvent event) const char * SystemEventName(SystemEvent event)
{ {

4
Source/Project64-core/N64System/Mips/SystemTiming.cpp
View File

@ -1,9 +1,9 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/Mips/SystemTiming.h> #include <Project64-core/N64System/Mips/SystemTiming.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/N64System/Mips/Disk.h> #include <Project64-core/N64System/Mips/Disk.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/3rdParty/zip.h> #include <Project64-core/3rdParty/zip.h>
CSystemTimer::CSystemTimer(CRegisters &Reg, int32_t & NextTimer) : CSystemTimer::CSystemTimer(CRegisters &Reg, int32_t & NextTimer) :

27
Source/Project64-core/N64System/Mips/SystemTiming.h
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include <Common/LogClass.h> #include <Common/Log.h>
#include <Project64-core/N64System/N64Types.h> #include <Project64-core/N64System/N64Types.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/3rdParty/zip.h> #include <Project64-core/3rdParty/zip.h>
class CSystemTimer class CSystemTimer
@ -37,21 +37,20 @@ public:
int64_t CyclesToTimer; int64_t CyclesToTimer;
}; };
public:
CSystemTimer(CRegisters &Reg, int32_t & NextTimer); CSystemTimer(CRegisters &Reg, int32_t & NextTimer);
void SetTimer(TimerType Type, uint32_t Cycles, bool bRelative); void SetTimer(TimerType Type, uint32_t Cycles, bool bRelative);
uint32_t GetTimer(TimerType Type); uint32_t GetTimer(TimerType Type);
void StopTimer(TimerType Type); void StopTimer(TimerType Type);
void UpdateTimers(); void UpdateTimers();
void TimerDone(); void TimerDone();
void Reset(); void Reset();
void UpdateCompareTimer(); void UpdateCompareTimer();
bool SaveAllowed(); bool SaveAllowed();
void SaveData(zipFile & file) const; void SaveData(zipFile & file) const;
void SaveData(CFile & file) const; void SaveData(CFile & file) const;
void LoadData(zipFile & file); void LoadData(zipFile & file);
void LoadData(CFile & file); void LoadData(CFile & file);
void RecordDifference(CLog &LogFile, const CSystemTimer& rSystemTimer); void RecordDifference(CLog &LogFile, const CSystemTimer& rSystemTimer);

4
Source/Project64-core/N64System/Mips/TLBclass.cpp → Source/Project64-core/N64System/Mips/TLB.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "TLBClass.h" #include "TLB.h"
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
CTLB::CTLB(CTLB_CB * CallBack) : CTLB::CTLB(CTLB_CB * CallBack) :
m_CB(CallBack) m_CB(CallBack)

4
Source/Project64-core/N64System/Mips/TLBClass.h → Source/Project64-core/N64System/Mips/TLB.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <Common/LogClass.h> #include <Common/Log.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
class CDebugTlb; class CDebugTlb;

4
Source/Project64-core/N64System/N64DiskClass.cpp → Source/Project64-core/N64System/N64Disk.cpp
View File

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "N64DiskClass.h" #include "N64Disk.h"
#include "SystemGlobals.h" #include "SystemGlobals.h"
#include <Common/md5.h> #include <Common/md5.h>
#include <Common/Platform.h> #include <Common/Platform.h>
#include <Common/MemoryManagement.h> #include <Common/MemoryManagement.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <memory> #include <memory>
CN64Disk::CN64Disk() : CN64Disk::CN64Disk() :

0
Source/Project64-core/N64System/N64DiskClass.h → Source/Project64-core/N64System/N64Disk.h
View File

4
Source/Project64-core/N64System/N64RomClass.cpp → Source/Project64-core/N64System/N64Rom.cpp
View File

@ -1,11 +1,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "N64RomClass.h" #include "N64Rom.h"
#include "SystemGlobals.h" #include "SystemGlobals.h"
#include <Project64-core/3rdParty/zip.h> #include <Project64-core/3rdParty/zip.h>
#include <Common/md5.h> #include <Common/md5.h>
#include <Common/Platform.h> #include <Common/Platform.h>
#include <Common/MemoryManagement.h> #include <Common/MemoryManagement.h>
#include <Common/IniFileClass.h> #include <Common/IniFile.h>
#include <memory> #include <memory>
#ifdef _WIN32 #ifdef _WIN32

0
Source/Project64-core/N64System/N64RomClass.h → Source/Project64-core/N64System/N64Rom.h
View File

6
Source/Project64-core/N64System/N64Class.cpp → Source/Project64-core/N64System/N64System.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "N64Class.h" #include "N64SYstem.h"
#include <Project64-core/3rdParty/zip.h> #include <Project64-core/3rdParty/zip.h>
#include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h> #include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
@ -8,9 +8,9 @@
#include <Project64-core/N64System/Interpreter/InterpreterCPU.h> #include <Project64-core/N64System/Interpreter/InterpreterCPU.h>
#include <Project64-core/N64System/Mips/OpcodeName.h> #include <Project64-core/N64System/Mips/OpcodeName.h>
#include <Project64-core/N64System/Mips/Disk.h> #include <Project64-core/N64System/Mips/Disk.h>
#include <Project64-core/N64System/N64DiskClass.h> #include <Project64-core/N64System/N64Disk.h>
#include <Project64-core/N64System/Enhancement/Enhancements.h> #include <Project64-core/N64System/Enhancement/Enhancements.h>
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64Rom.h>
#include <Project64-core/ExceptionHandler.h> #include <Project64-core/ExceptionHandler.h>
#include <Project64-core/Logging.h> #include <Project64-core/Logging.h>
#include <Project64-core/Debugger.h> #include <Project64-core/Debugger.h>

10
Source/Project64-core/N64System/N64Class.h → Source/Project64-core/N64System/N64System.h
View File

@ -4,8 +4,8 @@
#include <Common/SyncEvent.h> #include <Common/SyncEvent.h>
#include <Common/Thread.h> #include <Common/Thread.h>
#include <Project64-core/Settings/N64SystemSettings.h> #include <Project64-core/Settings/N64SystemSettings.h>
#include <Project64-core/N64System/ProfilingClass.h> #include <Project64-core/N64System/Profiling.h>
#include <Project64-core/N64System/Recompiler/RecompilerClass.h> #include <Project64-core/N64System/Recompiler/Recompiler.h>
#include <Project64-core/N64System/Mips/Audio.h> #include <Project64-core/N64System/Mips/Audio.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Mips/SystemEvents.h> #include <Project64-core/N64System/Mips/SystemEvents.h>
@ -15,9 +15,9 @@
#include <Project64-core/Plugin.h> #include <Project64-core/Plugin.h>
#include <Project64-core/Logging.h> #include <Project64-core/Logging.h>
#include "Mips/TLBClass.h" #include "Mips/TLB.h"
#include "FramePerSecondClass.h" #include "FramePerSecond.h"
#include "SpeedLimiterClass.h" #include "SpeedLimiter.h"
typedef std::list<SystemEvent> EVENT_LIST; typedef std::list<SystemEvent> EVENT_LIST;

4
Source/Project64-core/N64System/ProfilingClass.cpp → Source/Project64-core/N64System/Profiling.cpp
View File

@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include <stdio.h> #include <stdio.h>
#include <Project64-core/N64System/ProfilingClass.h> #include <Project64-core/N64System/Profiling.h>
#include <Common/LogClass.h> #include <Common/Log.h>
enum { MAX_FRAMES = 13 }; enum { MAX_FRAMES = 13 };

0
Source/Project64-core/N64System/ProfilingClass.h → Source/Project64-core/N64System/Profiling.h
View File

2
Source/Project64-core/N64System/Recompiler/CodeBlock.cpp
View File

@ -6,7 +6,7 @@
#include <Project64-core/N64System/Recompiler/Arm/ArmRecompilerOps.h> #include <Project64-core/N64System/Recompiler/Arm/ArmRecompilerOps.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Mips/TranslateVaddr.h> #include <Project64-core/N64System/Mips/TranslateVaddr.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/Mips/OpcodeName.h> #include <Project64-core/N64System/Mips/OpcodeName.h>
bool DelaySlotEffectsCompare(uint32_t PC, uint32_t Reg1, uint32_t Reg2); bool DelaySlotEffectsCompare(uint32_t PC, uint32_t Reg1, uint32_t Reg2);

2
Source/Project64-core/N64System/Recompiler/CodeSection.cpp
View File

@ -5,7 +5,7 @@
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h> #include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h>
#include <Project64-core/N64System/Recompiler/CodeBlock.h> #include <Project64-core/N64System/Recompiler/CodeBlock.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/Interpreter/InterpreterCPU.h> #include <Project64-core/N64System/Interpreter/InterpreterCPU.h>
#include <Project64-core/N64System/Recompiler/LoopAnalysis.h> #include <Project64-core/N64System/Recompiler/LoopAnalysis.h>
#include <Project64-core/N64System/Recompiler/SectionInfo.h> #include <Project64-core/N64System/Recompiler/SectionInfo.h>

8
Source/Project64-core/N64System/Recompiler/FunctionMapClass.cpp → Source/Project64-core/N64System/Recompiler/FunctionMap.cpp
View File

@ -1,11 +1,11 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/Recompiler/FunctionMapClass.h> #include <Project64-core/N64System/Recompiler/FunctionMap.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
CFunctionMap::CFunctionMap() : CFunctionMap::CFunctionMap() :
m_JumpTable(nullptr), m_JumpTable(nullptr),
m_FunctionTable(nullptr) m_FunctionTable(nullptr)
{ {
} }

0
Source/Project64-core/N64System/Recompiler/FunctionMapClass.h → Source/Project64-core/N64System/Recompiler/FunctionMap.h
View File

4
Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp → Source/Project64-core/N64System/Recompiler/Recompiler.cpp
View File

@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/Recompiler/RecompilerClass.h> #include <Project64-core/N64System/Recompiler/Recompiler.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h> #include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/Interpreter/InterpreterCPU.h> #include <Project64-core/N64System/Interpreter/InterpreterCPU.h>
#include <Project64-core/ExceptionHandler.h> #include <Project64-core/ExceptionHandler.h>

6
Source/Project64-core/N64System/Recompiler/RecompilerClass.h → Source/Project64-core/N64System/Recompiler/Recompiler.h
View File

@ -1,10 +1,10 @@
#pragma once #pragma once
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Recompiler/FunctionMapClass.h> #include <Project64-core/N64System/Recompiler/FunctionMap.h>
#include <Project64-core/N64System/Recompiler/RecompilerMemory.h> #include <Project64-core/N64System/Recompiler/RecompilerMemory.h>
#include <Project64-core/N64System/ProfilingClass.h> #include <Project64-core/N64System/Profiling.h>
#include <Project64-core/Settings/RecompilerSettings.h> #include <Project64-core/Settings/RecompilerSettings.h>
#include <Project64-core/Settings/DebugSettings.h> #include <Project64-core/Settings/DebugSettings.h>

2
Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/Recompiler/RecompilerMemory.h> #include <Project64-core/N64System/Recompiler/RecompilerMemory.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Recompiler/RecompilerClass.h> #include <Project64-core/N64System/Recompiler/Recompiler.h>
#include <Common/MemoryManagement.h> #include <Common/MemoryManagement.h>
CRecompMemory::CRecompMemory() : CRecompMemory::CRecompMemory() :

6
Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp
View File

@ -8,14 +8,14 @@
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Interpreter/InterpreterOps.h> #include <Project64-core/N64System/Interpreter/InterpreterOps.h>
#include <Project64-core/N64System/Interpreter/InterpreterCPU.h> #include <Project64-core/N64System/Interpreter/InterpreterCPU.h>
#include <Project64-core/N64System/Recompiler/RecompilerClass.h> #include <Project64-core/N64System/Recompiler/Recompiler.h>
#include <Project64-core/N64System/Recompiler/CodeSection.h> #include <Project64-core/N64System/Recompiler/CodeSection.h>
#include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h> #include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h>
#include <Project64-core/N64System/Recompiler/SectionInfo.h> #include <Project64-core/N64System/Recompiler/SectionInfo.h>
#include <Project64-core/N64System/Recompiler/LoopAnalysis.h> #include <Project64-core/N64System/Recompiler/LoopAnalysis.h>
#include <Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h> #include <Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64Rom.h>
#include <Project64-core/ExceptionHandler.h> #include <Project64-core/ExceptionHandler.h>
#include <Project64-core/Debugger.h> #include <Project64-core/Debugger.h>
#include <stdio.h> #include <stdio.h>

2
Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#if defined(__i386__) || defined(_M_IX86) #if defined(__i386__) || defined(_M_IX86)
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/N64System/Mips/OpCode.h> #include <Project64-core/N64System/Mips/OpCode.h>
#include <Project64-core/N64System/Recompiler/ExitInfo.h> #include <Project64-core/N64System/Recompiler/ExitInfo.h>
#include <Project64-core/N64System/Recompiler/RegInfo.h> #include <Project64-core/N64System/Recompiler/RegInfo.h>

6
Source/Project64-core/N64System/Recompiler/x86/x86RegInfo.cpp
View File

@ -2,8 +2,8 @@
#if defined(__i386__) || defined(_M_IX86) #if defined(__i386__) || defined(_M_IX86)
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/Recompiler/RecompilerClass.h> #include <Project64-core/N64System/Recompiler/Recompiler.h>
#include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h> #include <Project64-core/N64System/Recompiler/RecompilerCodeLog.h>
#include <Project64-core/N64System/Recompiler/x86/x86RegInfo.h> #include <Project64-core/N64System/Recompiler/x86/x86RegInfo.h>
@ -16,7 +16,7 @@ uint32_t CX86RegInfo::m_fpuControl = 0;
const char *Format_Name[] = { "Unknown", "dword", "qword", "float", "double" }; const char *Format_Name[] = { "Unknown", "dword", "qword", "float", "double" };
CX86RegInfo::CX86RegInfo() : CX86RegInfo::CX86RegInfo() :
m_Stack_TopPos(0) m_Stack_TopPos(0)
{ {
for (int32_t i = 0; i < 32; i++) for (int32_t i = 0; i < 32; i++)
{ {

2
Source/Project64-core/N64System/Recompiler/x86/x86RegInfo.h
View File

@ -3,7 +3,7 @@
#if defined(__i386__) || defined(_M_IX86) #if defined(__i386__) || defined(_M_IX86)
#include <Project64-core/N64System/Recompiler/RegBase.h> #include <Project64-core/N64System/Recompiler/RegBase.h>
#include <Project64-core/N64System/Recompiler/x86/x86ops.h> #include <Project64-core/N64System/Recompiler/x86/x86ops.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/Settings/DebugSettings.h> #include <Project64-core/Settings/DebugSettings.h>
class CX86RegInfo : class CX86RegInfo :

2
Source/Project64-core/N64System/SpeedLimiterClass.cpp → Source/Project64-core/N64System/SpeedLimiter.cpp
View File

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "Project64-core/N64System/SpeedLimiterClass.h" #include "Project64-core/N64System/SpeedLimiter.h"
#include <Common/Util.h> #include <Common/Util.h>

0
Source/Project64-core/N64System/SpeedLimiterClass.h → Source/Project64-core/N64System/SpeedLimiter.h
View File

12
Source/Project64-core/Plugin.h
View File

@ -1,12 +1,8 @@
#pragma once #pragma once
//Plugin controller #include <Project64-core/Plugins/Plugin.h>
#include <Project64-core/Plugins/PluginClass.h>
//Base Plugin class, all plugin derive from this, handles core functions
#include <Project64-core/Plugins/PluginBase.h> #include <Project64-core/Plugins/PluginBase.h>
#include <Project64-core/Plugins/GFXPlugin.h>
#include "Plugins/GFXPlugin.h"
#include <Project64-core/Plugins/AudioPlugin.h> #include <Project64-core/Plugins/AudioPlugin.h>
#include "Plugins/ControllerPlugin.h" #include <Project64-core/Plugins/ControllerPlugin.h>
#include "Plugins/RSPPlugin.h" #include <Project64-core/Plugins/RSPPlugin.h>

8
Source/Project64-core/Plugins/AudioPlugin.cpp
View File

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64Rom.h>
#include <Project64-core/N64System/N64DiskClass.h> #include <Project64-core/N64System/N64Disk.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/Plugins/AudioPlugin.h> #include <Project64-core/Plugins/AudioPlugin.h>
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <Windows.h>

4
Source/Project64-core/Plugins/ControllerPlugin.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64Rom.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include "ControllerPlugin.h" #include "ControllerPlugin.h"
CControl_Plugin::CControl_Plugin(void) : CControl_Plugin::CControl_Plugin(void) :

8
Source/Project64-core/Plugins/GFXPlugin.cpp
View File

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64Rom.h>
#include <Project64-core/N64System/N64DiskClass.h> #include <Project64-core/N64System/N64Disk.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include "GFXPlugin.h" #include "GFXPlugin.h"
CGfxPlugin::CGfxPlugin() : CGfxPlugin::CGfxPlugin() :

24
Source/Project64-core/Plugins/PluginClass.cpp → Source/Project64-core/Plugins/Plugin.cpp
View File

@ -1,20 +1,20 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/Plugins/PluginClass.h> #include <Project64-core/Plugins/Plugin.h>
#include <Common/path.h> #include <Common/path.h>
CPlugins::CPlugins(SettingID PluginDirSetting, bool SyncPlugins) : CPlugins::CPlugins(SettingID PluginDirSetting, bool SyncPlugins) :
m_MainWindow(nullptr), m_MainWindow(nullptr),
m_SyncWindow(nullptr), m_SyncWindow(nullptr),
m_PluginDirSetting(PluginDirSetting), m_PluginDirSetting(PluginDirSetting),
m_PluginDir(g_Settings->LoadStringVal(PluginDirSetting)), m_PluginDir(g_Settings->LoadStringVal(PluginDirSetting)),
m_Gfx(nullptr), m_Gfx(nullptr),
m_Audio(nullptr), m_Audio(nullptr),
m_RSP(nullptr), m_RSP(nullptr),
m_Control(nullptr), m_Control(nullptr),
m_initilized(false), m_initilized(false),
m_SyncPlugins(SyncPlugins) m_SyncPlugins(SyncPlugins)
{ {
CreatePlugins(); CreatePlugins();
g_Settings->RegisterChangeCB(Plugin_RSP_Current, this, (CSettings::SettingChangedFunc)PluginChanged); g_Settings->RegisterChangeCB(Plugin_RSP_Current, this, (CSettings::SettingChangedFunc)PluginChanged);

0
Source/Project64-core/Plugins/PluginClass.h → Source/Project64-core/Plugins/Plugin.h
View File

2
Source/Project64-core/Plugins/PluginBase.h
View File

@ -2,7 +2,7 @@
#include <Project64-core/Settings/DebugSettings.h> #include <Project64-core/Settings/DebugSettings.h>
#include <Project64-core/TraceModulesProject64.h> #include <Project64-core/TraceModulesProject64.h>
#include <Project64-core/Plugins/PluginClass.h> #include <Project64-core/Plugins/Plugin.h>
#include <Common/Util.h> #include <Common/Util.h>
#if defined(_WIN32) #if defined(_WIN32)

8
Source/Project64-core/Plugins/RSPPlugin.cpp
View File

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/N64DiskClass.h> #include <Project64-core/N64System/N64Disk.h>
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64Rom.h>
#include "RSPPlugin.h" #include "RSPPlugin.h"
#include "GFXPlugin.h" #include "GFXPlugin.h"
#include <Project64-core/Plugins/AudioPlugin.h> #include <Project64-core/Plugins/AudioPlugin.h>

50
Source/Project64-core/Project64-core.vcxproj
View File

@ -43,13 +43,13 @@
<ClCompile Include="AppInit.cpp" /> <ClCompile Include="AppInit.cpp" />
<ClCompile Include="Logging.cpp" /> <ClCompile Include="Logging.cpp" />
<ClCompile Include="MemoryExceptionFilter.cpp" /> <ClCompile Include="MemoryExceptionFilter.cpp" />
<ClCompile Include="Multilanguage\LanguageClass.cpp" /> <ClCompile Include="Multilanguage\Language.cpp" />
<ClCompile Include="N64System\EmulationThread.cpp" /> <ClCompile Include="N64System\EmulationThread.cpp" />
<ClCompile Include="N64System\Enhancement\Enhancement.cpp" /> <ClCompile Include="N64System\Enhancement\Enhancement.cpp" />
<ClCompile Include="N64System\Enhancement\EnhancementFile.cpp" /> <ClCompile Include="N64System\Enhancement\EnhancementFile.cpp" />
<ClCompile Include="N64System\Enhancement\EnhancementList.cpp" /> <ClCompile Include="N64System\Enhancement\EnhancementList.cpp" />
<ClCompile Include="N64System\Enhancement\Enhancements.cpp" /> <ClCompile Include="N64System\Enhancement\Enhancements.cpp" />
<ClCompile Include="N64System\FramePerSecondClass.cpp" /> <ClCompile Include="N64System\FramePerSecond.cpp" />
<ClCompile Include="N64System\Interpreter\InterpreterCPU.cpp" /> <ClCompile Include="N64System\Interpreter\InterpreterCPU.cpp" />
<ClCompile Include="N64System\Interpreter\InterpreterOps.cpp" /> <ClCompile Include="N64System\Interpreter\InterpreterOps.cpp" />
<ClCompile Include="N64System\Interpreter\InterpreterOps32.cpp" /> <ClCompile Include="N64System\Interpreter\InterpreterOps32.cpp" />
@ -63,26 +63,26 @@
<ClCompile Include="N64System\Mips\Mempak.cpp" /> <ClCompile Include="N64System\Mips\Mempak.cpp" />
<ClCompile Include="N64System\Mips\OpcodeName.cpp" /> <ClCompile Include="N64System\Mips\OpcodeName.cpp" />
<ClCompile Include="N64System\Mips\PifRam.cpp" /> <ClCompile Include="N64System\Mips\PifRam.cpp" />
<ClCompile Include="N64System\Mips\RegisterClass.cpp" /> <ClCompile Include="N64System\Mips\Register.cpp" />
<ClCompile Include="N64System\Mips\Rumblepak.cpp" /> <ClCompile Include="N64System\Mips\Rumblepak.cpp" />
<ClCompile Include="N64System\Mips\Sram.cpp" /> <ClCompile Include="N64System\Mips\Sram.cpp" />
<ClCompile Include="N64System\Mips\SystemEvents.cpp" /> <ClCompile Include="N64System\Mips\SystemEvents.cpp" />
<ClCompile Include="N64System\Mips\SystemTiming.cpp" /> <ClCompile Include="N64System\Mips\SystemTiming.cpp" />
<ClCompile Include="N64System\Mips\TLBclass.cpp" /> <ClCompile Include="N64System\Mips\TLB.cpp" />
<ClCompile Include="N64System\Mips\Transferpak.cpp" /> <ClCompile Include="N64System\Mips\Transferpak.cpp" />
<ClCompile Include="N64System\N64Class.cpp" /> <ClCompile Include="N64System\N64Disk.cpp" />
<ClCompile Include="N64System\N64DiskClass.cpp" /> <ClCompile Include="N64System\N64Rom.cpp" />
<ClCompile Include="N64System\N64RomClass.cpp" /> <ClCompile Include="N64System\N64System.cpp" />
<ClCompile Include="N64System\ProfilingClass.cpp" /> <ClCompile Include="N64System\Profiling.cpp" />
<ClCompile Include="N64System\Recompiler\Arm\ArmOps.cpp" /> <ClCompile Include="N64System\Recompiler\Arm\ArmOps.cpp" />
<ClCompile Include="N64System\Recompiler\Arm\ArmRecompilerOps.cpp" /> <ClCompile Include="N64System\Recompiler\Arm\ArmRecompilerOps.cpp" />
<ClCompile Include="N64System\Recompiler\Arm\ArmRegInfo.cpp" /> <ClCompile Include="N64System\Recompiler\Arm\ArmRegInfo.cpp" />
<ClCompile Include="N64System\Recompiler\CodeBlock.cpp" /> <ClCompile Include="N64System\Recompiler\CodeBlock.cpp" />
<ClCompile Include="N64System\Recompiler\CodeSection.cpp" /> <ClCompile Include="N64System\Recompiler\CodeSection.cpp" />
<ClCompile Include="N64System\Recompiler\FunctionInfo.cpp" /> <ClCompile Include="N64System\Recompiler\FunctionInfo.cpp" />
<ClCompile Include="N64System\Recompiler\FunctionMapClass.cpp" /> <ClCompile Include="N64System\Recompiler\FunctionMap.cpp" />
<ClCompile Include="N64System\Recompiler\LoopAnalysis.cpp" /> <ClCompile Include="N64System\Recompiler\LoopAnalysis.cpp" />
<ClCompile Include="N64System\Recompiler\RecompilerClass.cpp" /> <ClCompile Include="N64System\Recompiler\Recompiler.cpp" />
<ClCompile Include="N64System\Recompiler\RecompilerCodeLog.cpp" /> <ClCompile Include="N64System\Recompiler\RecompilerCodeLog.cpp" />
<ClCompile Include="N64System\Recompiler\RecompilerMemory.cpp" /> <ClCompile Include="N64System\Recompiler\RecompilerMemory.cpp" />
<ClCompile Include="N64System\Recompiler\RegBase.cpp" /> <ClCompile Include="N64System\Recompiler\RegBase.cpp" />
@ -90,13 +90,13 @@
<ClCompile Include="N64System\Recompiler\x86\x86ops.cpp" /> <ClCompile Include="N64System\Recompiler\x86\x86ops.cpp" />
<ClCompile Include="N64System\Recompiler\x86\x86RecompilerOps.cpp" /> <ClCompile Include="N64System\Recompiler\x86\x86RecompilerOps.cpp" />
<ClCompile Include="N64System\Recompiler\x86\x86RegInfo.cpp" /> <ClCompile Include="N64System\Recompiler\x86\x86RegInfo.cpp" />
<ClCompile Include="N64System\SpeedLimiterClass.cpp" /> <ClCompile Include="N64System\SpeedLimiter.cpp" />
<ClCompile Include="N64System\SystemGlobals.cpp" /> <ClCompile Include="N64System\SystemGlobals.cpp" />
<ClCompile Include="Plugins\AudioPlugin.cpp" /> <ClCompile Include="Plugins\AudioPlugin.cpp" />
<ClCompile Include="Plugins\ControllerPlugin.cpp" /> <ClCompile Include="Plugins\ControllerPlugin.cpp" />
<ClCompile Include="Plugins\GFXPlugin.cpp" /> <ClCompile Include="Plugins\GFXPlugin.cpp" />
<ClCompile Include="Plugins\Plugin.cpp" />
<ClCompile Include="Plugins\PluginBase.cpp" /> <ClCompile Include="Plugins\PluginBase.cpp" />
<ClCompile Include="Plugins\PluginClass.cpp" />
<ClCompile Include="Plugins\RSPPlugin.cpp" /> <ClCompile Include="Plugins\RSPPlugin.cpp" />
<ClCompile Include="RomList\RomList.cpp" /> <ClCompile Include="RomList\RomList.cpp" />
<ClCompile Include="Settings.cpp" /> <ClCompile Include="Settings.cpp" />
@ -139,12 +139,12 @@
<ClInclude Include="ExceptionHandler.h" /> <ClInclude Include="ExceptionHandler.h" />
<ClInclude Include="Logging.h" /> <ClInclude Include="Logging.h" />
<ClInclude Include="Multilanguage.h" /> <ClInclude Include="Multilanguage.h" />
<ClInclude Include="Multilanguage\LanguageClass.h" /> <ClInclude Include="Multilanguage\Language.h" />
<ClInclude Include="N64System\Enhancement\Enhancement.h" /> <ClInclude Include="N64System\Enhancement\Enhancement.h" />
<ClInclude Include="N64System\Enhancement\EnhancementFile.h" /> <ClInclude Include="N64System\Enhancement\EnhancementFile.h" />
<ClInclude Include="N64System\Enhancement\EnhancementList.h" /> <ClInclude Include="N64System\Enhancement\EnhancementList.h" />
<ClInclude Include="N64System\Enhancement\Enhancements.h" /> <ClInclude Include="N64System\Enhancement\Enhancements.h" />
<ClInclude Include="N64System\FramePerSecondClass.h" /> <ClInclude Include="N64System\FramePerSecond.h" />
<ClInclude Include="N64System\Interpreter\InterpreterCPU.h" /> <ClInclude Include="N64System\Interpreter\InterpreterCPU.h" />
<ClInclude Include="N64System\Interpreter\InterpreterOps32.h" /> <ClInclude Include="N64System\Interpreter\InterpreterOps32.h" />
<ClInclude Include="N64System\Interpreter\InterpreterOps.h" /> <ClInclude Include="N64System\Interpreter\InterpreterOps.h" />
@ -159,19 +159,19 @@
<ClInclude Include="N64System\Mips\OpCode.h" /> <ClInclude Include="N64System\Mips\OpCode.h" />
<ClInclude Include="N64System\Mips\OpcodeName.h" /> <ClInclude Include="N64System\Mips\OpcodeName.h" />
<ClInclude Include="N64System\Mips\PifRam.h" /> <ClInclude Include="N64System\Mips\PifRam.h" />
<ClInclude Include="N64System\Mips\RegisterClass.h" /> <ClInclude Include="N64System\Mips\Register.h" />
<ClInclude Include="N64System\Mips\Rumblepak.h" /> <ClInclude Include="N64System\Mips\Rumblepak.h" />
<ClInclude Include="N64System\Mips\Sram.h" /> <ClInclude Include="N64System\Mips\Sram.h" />
<ClInclude Include="N64System\Mips\SystemEvents.h" /> <ClInclude Include="N64System\Mips\SystemEvents.h" />
<ClInclude Include="N64System\Mips\SystemTiming.h" /> <ClInclude Include="N64System\Mips\SystemTiming.h" />
<ClInclude Include="N64System\Mips\TLBClass.h" /> <ClInclude Include="N64System\Mips\TLB.h" />
<ClInclude Include="N64System\Mips\Transferpak.h" /> <ClInclude Include="N64System\Mips\Transferpak.h" />
<ClInclude Include="N64System\Mips\TranslateVaddr.h" /> <ClInclude Include="N64System\Mips\TranslateVaddr.h" />
<ClInclude Include="N64System\N64Class.h" /> <ClInclude Include="N64System\N64Disk.h" />
<ClInclude Include="N64System\N64DiskClass.h" /> <ClInclude Include="N64System\N64Rom.h" />
<ClInclude Include="N64System\N64RomClass.h" /> <ClInclude Include="N64System\N64System.h" />
<ClInclude Include="N64System\N64Types.h" /> <ClInclude Include="N64System\N64Types.h" />
<ClInclude Include="N64System\ProfilingClass.h" /> <ClInclude Include="N64System\Profiling.h" />
<ClInclude Include="N64System\Recompiler\Arm\ArmOpCode.h" /> <ClInclude Include="N64System\Recompiler\Arm\ArmOpCode.h" />
<ClInclude Include="N64System\Recompiler\Arm\ArmOps.h" /> <ClInclude Include="N64System\Recompiler\Arm\ArmOps.h" />
<ClInclude Include="N64System\Recompiler\Arm\ArmRecompilerOps.h" /> <ClInclude Include="N64System\Recompiler\Arm\ArmRecompilerOps.h" />
@ -180,7 +180,7 @@
<ClInclude Include="N64System\Recompiler\CodeSection.h" /> <ClInclude Include="N64System\Recompiler\CodeSection.h" />
<ClInclude Include="N64System\Recompiler\ExitInfo.h" /> <ClInclude Include="N64System\Recompiler\ExitInfo.h" />
<ClInclude Include="N64System\Recompiler\FunctionInfo.h" /> <ClInclude Include="N64System\Recompiler\FunctionInfo.h" />
<ClInclude Include="N64System\Recompiler\FunctionMapClass.h" /> <ClInclude Include="N64System\Recompiler\FunctionMap.h" />
<ClInclude Include="N64System\Recompiler\JumpInfo.h" /> <ClInclude Include="N64System\Recompiler\JumpInfo.h" />
<ClInclude Include="N64System\Recompiler\LoopAnalysis.h" /> <ClInclude Include="N64System\Recompiler\LoopAnalysis.h" />
<ClInclude Include="N64System\Recompiler\RecompilerClass.h" /> <ClInclude Include="N64System\Recompiler\RecompilerClass.h" />
@ -194,15 +194,15 @@
<ClInclude Include="N64System\Recompiler\x86\x86ops.h" /> <ClInclude Include="N64System\Recompiler\x86\x86ops.h" />
<ClInclude Include="N64System\Recompiler\x86\x86RecompilerOps.h" /> <ClInclude Include="N64System\Recompiler\x86\x86RecompilerOps.h" />
<ClInclude Include="N64System\Recompiler\x86\x86RegInfo.h" /> <ClInclude Include="N64System\Recompiler\x86\x86RegInfo.h" />
<ClInclude Include="N64System\SpeedLimiterClass.h" /> <ClInclude Include="N64System\SpeedLimiter.h" />
<ClInclude Include="N64System\SystemGlobals.h" /> <ClInclude Include="N64System\SystemGlobals.h" />
<ClInclude Include="Notification.h" /> <ClInclude Include="Notification.h" />
<ClInclude Include="Plugin.h" /> <ClInclude Include="Plugin.h" />
<ClInclude Include="Plugins\AudioPlugin.h" /> <ClInclude Include="Plugins\AudioPlugin.h" />
<ClInclude Include="Plugins\ControllerPlugin.h" /> <ClInclude Include="Plugins\ControllerPlugin.h" />
<ClInclude Include="Plugins\GFXPlugin.h" /> <ClInclude Include="Plugins\GFXPlugin.h" />
<ClInclude Include="Plugins\Plugin.h" />
<ClInclude Include="Plugins\PluginBase.h" /> <ClInclude Include="Plugins\PluginBase.h" />
<ClInclude Include="Plugins\PluginClass.h" />
<ClInclude Include="Plugins\RSPPlugin.h" /> <ClInclude Include="Plugins\RSPPlugin.h" />
<ClInclude Include="RomList\RomList.h" /> <ClInclude Include="RomList\RomList.h" />
<ClInclude Include="Settings.h" /> <ClInclude Include="Settings.h" />
@ -247,8 +247,4 @@
<Project>{1968162c-0793-491d-91a1-81645a24d399}</Project> <Project>{1968162c-0793-491d-91a1-81645a24d399}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="ClassDiagram.cd" />
<None Include="ClassDiagram1.cd" />
</ItemGroup>
</Project> </Project>

53
Source/Project64-core/Project64-core.vcxproj.filters
View File

@ -189,7 +189,7 @@
<ClCompile Include="Plugins\PluginBase.cpp"> <ClCompile Include="Plugins\PluginBase.cpp">
<Filter>Source Files\Plugins</Filter> <Filter>Source Files\Plugins</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Plugins\PluginClass.cpp"> <ClCompile Include="Plugins\Plugin.cpp">
<Filter>Source Files\Plugins</Filter> <Filter>Source Files\Plugins</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Plugins\RSPPlugin.cpp"> <ClCompile Include="Plugins\RSPPlugin.cpp">
@ -198,19 +198,16 @@
<ClCompile Include="N64System\EmulationThread.cpp"> <ClCompile Include="N64System\EmulationThread.cpp">
<Filter>Source Files\N64 System</Filter> <Filter>Source Files\N64 System</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\FramePerSecondClass.cpp"> <ClCompile Include="N64System\FramePerSecond.cpp">
<Filter>Source Files\N64 System</Filter> <Filter>Source Files\N64 System</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\N64Class.cpp"> <ClCompile Include="N64System\N64System.cpp">
<Filter>Source Files\N64 System</Filter> <Filter>Source Files\N64 System</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\N64RomClass.cpp"> <ClCompile Include="N64System\Profiling.cpp">
<Filter>Source Files\N64 System</Filter> <Filter>Source Files\N64 System</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\ProfilingClass.cpp"> <ClCompile Include="N64System\SpeedLimiter.cpp">
<Filter>Source Files\N64 System</Filter>
</ClCompile>
<ClCompile Include="N64System\SpeedLimiterClass.cpp">
<Filter>Source Files\N64 System</Filter> <Filter>Source Files\N64 System</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\SystemGlobals.cpp"> <ClCompile Include="N64System\SystemGlobals.cpp">
@ -225,13 +222,13 @@
<ClCompile Include="N64System\Recompiler\FunctionInfo.cpp"> <ClCompile Include="N64System\Recompiler\FunctionInfo.cpp">
<Filter>Source Files\N64 System\Recompiler</Filter> <Filter>Source Files\N64 System\Recompiler</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\Recompiler\FunctionMapClass.cpp"> <ClCompile Include="N64System\Recompiler\FunctionMap.cpp">
<Filter>Source Files\N64 System\Recompiler</Filter> <Filter>Source Files\N64 System\Recompiler</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\Recompiler\LoopAnalysis.cpp"> <ClCompile Include="N64System\Recompiler\LoopAnalysis.cpp">
<Filter>Source Files\N64 System\Recompiler</Filter> <Filter>Source Files\N64 System\Recompiler</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\Recompiler\RecompilerClass.cpp"> <ClCompile Include="N64System\Recompiler\Recompiler.cpp">
<Filter>Source Files\N64 System\Recompiler</Filter> <Filter>Source Files\N64 System\Recompiler</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\Recompiler\RecompilerMemory.cpp"> <ClCompile Include="N64System\Recompiler\RecompilerMemory.cpp">
@ -264,7 +261,7 @@
<ClCompile Include="N64System\Mips\PifRam.cpp"> <ClCompile Include="N64System\Mips\PifRam.cpp">
<Filter>Source Files\N64 System\Mips</Filter> <Filter>Source Files\N64 System\Mips</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\Mips\RegisterClass.cpp"> <ClCompile Include="N64System\Mips\Register.cpp">
<Filter>Source Files\N64 System\Mips</Filter> <Filter>Source Files\N64 System\Mips</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\Mips\Rumblepak.cpp"> <ClCompile Include="N64System\Mips\Rumblepak.cpp">
@ -279,7 +276,7 @@
<ClCompile Include="N64System\Mips\SystemTiming.cpp"> <ClCompile Include="N64System\Mips\SystemTiming.cpp">
<Filter>Source Files\N64 System\Mips</Filter> <Filter>Source Files\N64 System\Mips</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\Mips\TLBclass.cpp"> <ClCompile Include="N64System\Mips\TLB.cpp">
<Filter>Source Files\N64 System\Mips</Filter> <Filter>Source Files\N64 System\Mips</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\Interpreter\InterpreterCPU.cpp"> <ClCompile Include="N64System\Interpreter\InterpreterCPU.cpp">
@ -291,13 +288,13 @@
<ClCompile Include="N64System\Interpreter\InterpreterOps32.cpp"> <ClCompile Include="N64System\Interpreter\InterpreterOps32.cpp">
<Filter>Source Files\N64 System\Interpreter</Filter> <Filter>Source Files\N64 System\Interpreter</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Multilanguage\LanguageClass.cpp"> <ClCompile Include="Multilanguage\Language.cpp">
<Filter>Source Files\Multilanguage</Filter> <Filter>Source Files\Multilanguage</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\Mips\Disk.cpp"> <ClCompile Include="N64System\Mips\Disk.cpp">
<Filter>Source Files\N64 System\Mips</Filter> <Filter>Source Files\N64 System\Mips</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\N64DiskClass.cpp"> <ClCompile Include="N64System\N64Disk.cpp">
<Filter>Source Files\N64 System</Filter> <Filter>Source Files\N64 System</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="N64System\Mips\GBCart.cpp"> <ClCompile Include="N64System\Mips\GBCart.cpp">
@ -359,7 +356,7 @@
<ClInclude Include="AppInit.h"> <ClInclude Include="AppInit.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Multilanguage\LanguageClass.h"> <ClInclude Include="Multilanguage\Language.h">
<Filter>Header Files\Multilanguage</Filter> <Filter>Header Files\Multilanguage</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Settings\SettingType\SettingsType-Application.h"> <ClInclude Include="Settings\SettingType\SettingsType-Application.h">
@ -425,7 +422,7 @@
<ClInclude Include="Notification.h"> <ClInclude Include="Notification.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Plugins\PluginClass.h"> <ClInclude Include="Plugins\Plugin.h">
<Filter>Header Files\Plugins</Filter> <Filter>Header Files\Plugins</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Plugins\AudioPlugin.h"> <ClInclude Include="Plugins\AudioPlugin.h">
@ -485,19 +482,19 @@
<ClInclude Include="Settings\LoggingSettings.h"> <ClInclude Include="Settings\LoggingSettings.h">
<Filter>Header Files\Settings</Filter> <Filter>Header Files\Settings</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\FramePerSecondClass.h"> <ClInclude Include="N64System\FramePerSecond.h">
<Filter>Header Files\N64 System</Filter> <Filter>Header Files\N64 System</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\N64Class.h"> <ClInclude Include="N64System\N64System.h">
<Filter>Header Files\N64 System</Filter> <Filter>Header Files\N64 System</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\N64RomClass.h"> <ClInclude Include="N64System\N64Rom.h">
<Filter>Header Files\N64 System</Filter> <Filter>Header Files\N64 System</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\N64Types.h"> <ClInclude Include="N64System\N64Types.h">
<Filter>Header Files\N64 System</Filter> <Filter>Header Files\N64 System</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\ProfilingClass.h"> <ClInclude Include="N64System\Profiling.h">
<Filter>Header Files\N64 System</Filter> <Filter>Header Files\N64 System</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\SystemGlobals.h"> <ClInclude Include="N64System\SystemGlobals.h">
@ -515,7 +512,7 @@
<ClInclude Include="N64System\Recompiler\FunctionInfo.h"> <ClInclude Include="N64System\Recompiler\FunctionInfo.h">
<Filter>Header Files\N64 System\Recompiler</Filter> <Filter>Header Files\N64 System\Recompiler</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\Recompiler\FunctionMapClass.h"> <ClInclude Include="N64System\Recompiler\FunctionMap.h">
<Filter>Header Files\N64 System\Recompiler</Filter> <Filter>Header Files\N64 System\Recompiler</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\Recompiler\JumpInfo.h"> <ClInclude Include="N64System\Recompiler\JumpInfo.h">
@ -566,7 +563,7 @@
<ClInclude Include="N64System\Mips\PifRam.h"> <ClInclude Include="N64System\Mips\PifRam.h">
<Filter>Header Files\N64 System\Mips</Filter> <Filter>Header Files\N64 System\Mips</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\Mips\RegisterClass.h"> <ClInclude Include="N64System\Mips\Register.h">
<Filter>Header Files\N64 System\Mips</Filter> <Filter>Header Files\N64 System\Mips</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\Mips\Rumblepak.h"> <ClInclude Include="N64System\Mips\Rumblepak.h">
@ -581,7 +578,7 @@
<ClInclude Include="N64System\Mips\SystemTiming.h"> <ClInclude Include="N64System\Mips\SystemTiming.h">
<Filter>Header Files\N64 System\Mips</Filter> <Filter>Header Files\N64 System\Mips</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\Mips\TLBClass.h"> <ClInclude Include="N64System\Mips\TLB.h">
<Filter>Header Files\N64 System\Mips</Filter> <Filter>Header Files\N64 System\Mips</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\Mips\TranslateVaddr.h"> <ClInclude Include="N64System\Mips\TranslateVaddr.h">
@ -596,8 +593,8 @@
<ClInclude Include="N64System\Interpreter\InterpreterOps.h"> <ClInclude Include="N64System\Interpreter\InterpreterOps.h">
<Filter>Header Files\N64 System\Interpreter</Filter> <Filter>Header Files\N64 System\Interpreter</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\SpeedLimiterClass.h"> <ClInclude Include="N64System\SpeedLimiter.h">
<Filter>Header Files</Filter> <Filter>Header Files\N64 System</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="TraceModulesProject64.h"> <ClInclude Include="TraceModulesProject64.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
@ -608,7 +605,7 @@
<ClInclude Include="N64System\Mips\Disk.h"> <ClInclude Include="N64System\Mips\Disk.h">
<Filter>Header Files\N64 System\Mips</Filter> <Filter>Header Files\N64 System\Mips</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\N64DiskClass.h"> <ClInclude Include="N64System\N64Disk.h">
<Filter>Header Files\N64 System</Filter> <Filter>Header Files\N64 System</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="N64System\Mips\Transferpak.h"> <ClInclude Include="N64System\Mips\Transferpak.h">
@ -672,8 +669,4 @@
<Filter>Header Files\N64 System\Enhancement</Filter> <Filter>Header Files\N64 System\Enhancement</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="ClassDiagram.cd" />
<None Include="ClassDiagram1.cd" />
</ItemGroup>
</Project> </Project>

4
Source/Project64-core/RomList/RomList.cpp
View File

@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "RomList.h" #include "RomList.h"
#include <Project64-core/3rdParty/zip.h> #include <Project64-core/3rdParty/zip.h>
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64Rom.h>
#include <Project64-core/N64System/N64DiskClass.h> #include <Project64-core/N64System/N64Disk.h>
#ifdef _WIN32 #ifdef _WIN32
#include <Project64-core/3rdParty/7zip.h> #include <Project64-core/3rdParty/7zip.h>

2
Source/Project64-core/RomList/RomList.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <Common/path.h> #include <Common/path.h>
#include <Common/IniFileClass.h> #include <Common/IniFile.h>
#include <Common/StdString.h> #include <Common/StdString.h>
#include <Common/md5.h> #include <Common/md5.h>
#include <Common/Thread.h> #include <Common/Thread.h>

2
Source/Project64-core/Settings/GameSettings.cpp
View File

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/Settings/GameSettings.h> #include <Project64-core/Settings/GameSettings.h>
bool CGameSettings::m_UseHleGfx = true; bool CGameSettings::m_UseHleGfx = true;

2
Source/Project64-core/Settings/SettingType/SettingsType-Application.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <Common/IniFileClass.h> #include <Common/IniFile.h>
#include <Project64-core/Settings/SettingType/SettingsType-Base.h> #include <Project64-core/Settings/SettingType/SettingsType-Base.h>
class CSettingTypeApplication : class CSettingTypeApplication :

2
Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <Common/IniFileClass.h> #include <Common/IniFile.h>
#include <Project64-core/Settings/SettingType/SettingsType-Base.h> #include <Project64-core/Settings/SettingType/SettingsType-Base.h>
class CSettingTypeRomDatabase : class CSettingTypeRomDatabase :

2
Source/Project64-video/Main.cpp
View File

@ -15,7 +15,7 @@
#include "Gfx_1.3.h" #include "Gfx_1.3.h"
#include "Version.h" #include "Version.h"
#include <Common/CriticalSection.h> #include <Common/CriticalSection.h>
#include <Common/DateTimeClass.h> #include <Common/DateTime.h>
#include <Common/path.h> #include <Common/path.h>
#include <png/png.h> #include <png/png.h>
#include <memory> #include <memory>

2
Source/Project64-video/trace.cpp
View File

@ -5,7 +5,7 @@
#include <string.h> #include <string.h>
#include <Common/Trace.h> #include <Common/Trace.h>
#include <Common/path.h> #include <Common/path.h>
#include <Common/LogClass.h> #include <Common/Log.h>
#ifdef ANDROID #ifdef ANDROID
#include <android/log.h> #include <android/log.h>

8
Source/Project64/N64System.h
View File

@ -8,13 +8,13 @@
#include "UserInterface.h" #include "UserInterface.h"
#include <Project64-core/N64System/N64Types.h> #include <Project64-core/N64System/N64Types.h>
#include <Project64-core/N64System/ProfilingClass.h> #include <Project64-core/N64System/Profiling.h>
// General MIPS information // General MIPS information
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64Rom.h>
#include <Project64-core/N64System/SpeedLimiterClass.h> #include <Project64-core/N64System/SpeedLimiter.h>
#include <Project64-core/N64System/Mips/OpCode.h> #include <Project64-core/N64System/Mips/OpCode.h>
#include <Project64-core/N64System/Recompiler/x86/x86ops.h> #include <Project64-core/N64System/Recompiler/x86/x86ops.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>

14
Source/Project64/Project64.vcxproj
View File

@ -59,7 +59,7 @@
<ClCompile Include="stdafx.cpp"> <ClCompile Include="stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader> <PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile> </ClCompile>
<ClCompile Include="UserInterface\CheatClassUI.cpp" /> <ClCompile Include="UserInterface\CheatUI.cpp" />
<ClCompile Include="UserInterface\Debugger\Assembler.cpp" /> <ClCompile Include="UserInterface\Debugger\Assembler.cpp" />
<ClCompile Include="UserInterface\Debugger\Breakpoints.cpp" /> <ClCompile Include="UserInterface\Debugger\Breakpoints.cpp" />
<ClCompile Include="UserInterface\Debugger\Debugger-AddBreakpoint.cpp" /> <ClCompile Include="UserInterface\Debugger\Debugger-AddBreakpoint.cpp" />
@ -89,12 +89,12 @@
<ClCompile Include="UserInterface\MainWindow.cpp" /> <ClCompile Include="UserInterface\MainWindow.cpp" />
<ClCompile Include="UserInterface\LoggingUI.cpp" /> <ClCompile Include="UserInterface\LoggingUI.cpp" />
<ClCompile Include="UserInterface\MainMenu.cpp" /> <ClCompile Include="UserInterface\MainMenu.cpp" />
<ClCompile Include="UserInterface\MenuClass.cpp" /> <ClCompile Include="UserInterface\MenuItem.cpp" />
<ClCompile Include="UserInterface\MenuShortCuts.cpp" /> <ClCompile Include="UserInterface\MenuShortCuts.cpp" />
<ClCompile Include="UserInterface\Notification.cpp" /> <ClCompile Include="UserInterface\Notification.cpp" />
<ClCompile Include="UserInterface\ProjectSupport.cpp" /> <ClCompile Include="UserInterface\ProjectSupport.cpp" />
<ClCompile Include="UserInterface\RomBrowserClass.cpp" /> <ClCompile Include="UserInterface\RomBrowser.cpp" />
<ClCompile Include="UserInterface\RomInformationClass.cpp" /> <ClCompile Include="UserInterface\RomInformation.cpp" />
<ClCompile Include="UserInterface\SettingsConfig.cpp" /> <ClCompile Include="UserInterface\SettingsConfig.cpp" />
<ClCompile Include="UserInterface\Settings\SettingsPage-AdvancedOptions.cpp" /> <ClCompile Include="UserInterface\Settings\SettingsPage-AdvancedOptions.cpp" />
<ClCompile Include="UserInterface\Settings\SettingsPage-Defaults.cpp" /> <ClCompile Include="UserInterface\Settings\SettingsPage-Defaults.cpp" />
@ -131,7 +131,7 @@
<ClInclude Include="stdafx.h" /> <ClInclude Include="stdafx.h" />
<ClInclude Include="Support.h" /> <ClInclude Include="Support.h" />
<ClInclude Include="UserInterface.h" /> <ClInclude Include="UserInterface.h" />
<ClInclude Include="UserInterface\CheatClassUI.h" /> <ClInclude Include="UserInterface\CheatUI.h" />
<ClInclude Include="UserInterface\Debugger\Assembler.h" /> <ClInclude Include="UserInterface\Debugger\Assembler.h" />
<ClInclude Include="UserInterface\Debugger\Breakpoints.h" /> <ClInclude Include="UserInterface\Debugger\Breakpoints.h" />
<ClInclude Include="UserInterface\Debugger\DebugDialog.h" /> <ClInclude Include="UserInterface\Debugger\DebugDialog.h" />
@ -164,13 +164,13 @@
<ClInclude Include="UserInterface\MainWindow.h" /> <ClInclude Include="UserInterface\MainWindow.h" />
<ClInclude Include="UserInterface\LoggingUI.h" /> <ClInclude Include="UserInterface\LoggingUI.h" />
<ClInclude Include="UserInterface\MainMenu.h" /> <ClInclude Include="UserInterface\MainMenu.h" />
<ClInclude Include="UserInterface\MenuClass.h" /> <ClInclude Include="UserInterface\MenuItem.h" />
<ClInclude Include="UserInterface\MenuShortCuts.h" /> <ClInclude Include="UserInterface\MenuShortCuts.h" />
<ClInclude Include="UserInterface\Notification.h" /> <ClInclude Include="UserInterface\Notification.h" />
<ClInclude Include="UserInterface\ProjectSupport.h" /> <ClInclude Include="UserInterface\ProjectSupport.h" />
<ClInclude Include="UserInterface\resource.h" /> <ClInclude Include="UserInterface\resource.h" />
<ClInclude Include="UserInterface\RomBrowser.h" /> <ClInclude Include="UserInterface\RomBrowser.h" />
<ClInclude Include="UserInterface\RomInformationClass.h" /> <ClInclude Include="UserInterface\RomInformation.h" />
<ClInclude Include="UserInterface\SettingsConfig.h" /> <ClInclude Include="UserInterface\SettingsConfig.h" />
<ClInclude Include="UserInterface\Settings\SettingsPage-AdvancedOptions.h" /> <ClInclude Include="UserInterface\Settings\SettingsPage-AdvancedOptions.h" />
<ClInclude Include="UserInterface\Settings\SettingsPage-Defaults.h" /> <ClInclude Include="UserInterface\Settings\SettingsPage-Defaults.h" />

42
Source/Project64/Project64.vcxproj.filters
View File

@ -96,9 +96,6 @@
<ClCompile Include="main.cpp"> <ClCompile Include="main.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="UserInterface\CheatClassUI.cpp">
<Filter>Source Files\User Interface Source</Filter>
</ClCompile>
<ClCompile Include="UserInterface\MainWindow.cpp"> <ClCompile Include="UserInterface\MainWindow.cpp">
<Filter>Source Files\User Interface Source</Filter> <Filter>Source Files\User Interface Source</Filter>
</ClCompile> </ClCompile>
@ -108,15 +105,9 @@
<ClCompile Include="UserInterface\MainMenu.cpp"> <ClCompile Include="UserInterface\MainMenu.cpp">
<Filter>Source Files\User Interface Source</Filter> <Filter>Source Files\User Interface Source</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="UserInterface\MenuClass.cpp">
<Filter>Source Files\User Interface Source</Filter>
</ClCompile>
<ClCompile Include="UserInterface\MenuShortCuts.cpp"> <ClCompile Include="UserInterface\MenuShortCuts.cpp">
<Filter>Source Files\User Interface Source</Filter> <Filter>Source Files\User Interface Source</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="UserInterface\RomBrowserClass.cpp">
<Filter>Source Files\User Interface Source</Filter>
</ClCompile>
<ClCompile Include="UserInterface\SettingsConfig.cpp"> <ClCompile Include="UserInterface\SettingsConfig.cpp">
<Filter>Source Files\User Interface Source</Filter> <Filter>Source Files\User Interface Source</Filter>
</ClCompile> </ClCompile>
@ -126,9 +117,6 @@
<ClCompile Include="Settings\NotificationSettings.cpp"> <ClCompile Include="Settings\NotificationSettings.cpp">
<Filter>Source Files\Settings Files</Filter> <Filter>Source Files\Settings Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="UserInterface\RomInformationClass.cpp">
<Filter>Source Files\User Interface Source</Filter>
</ClCompile>
<ClCompile Include="Settings\UISettings.cpp"> <ClCompile Include="Settings\UISettings.cpp">
<Filter>Source Files\Settings Files</Filter> <Filter>Source Files\Settings Files</Filter>
</ClCompile> </ClCompile>
@ -255,14 +243,23 @@
<ClCompile Include="UserInterface\Settings\SettingsPage-Game-DiskDrive.cpp"> <ClCompile Include="UserInterface\Settings\SettingsPage-Game-DiskDrive.cpp">
<Filter>Source Files\User Interface Source\Settings Source</Filter> <Filter>Source Files\User Interface Source\Settings Source</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="UserInterface\RomInformation.cpp">
<Filter>Source Files\User Interface Source</Filter>
</ClCompile>
<ClCompile Include="UserInterface\MenuItem.cpp">
<Filter>Source Files\User Interface Source</Filter>
</ClCompile>
<ClCompile Include="UserInterface\CheatUI.cpp">
<Filter>Source Files\User Interface Source</Filter>
</ClCompile>
<ClCompile Include="UserInterface\RomBrowser.cpp">
<Filter>Source Files\User Interface Source</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="UserInterface\resource.h"> <ClInclude Include="UserInterface\resource.h">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="UserInterface\CheatClassUI.h">
<Filter>Header Files\User Interface Headers</Filter>
</ClInclude>
<ClInclude Include="UserInterface\MainWindow.h"> <ClInclude Include="UserInterface\MainWindow.h">
<Filter>Header Files\User Interface Headers</Filter> <Filter>Header Files\User Interface Headers</Filter>
</ClInclude> </ClInclude>
@ -272,9 +269,6 @@
<ClInclude Include="UserInterface\MainMenu.h"> <ClInclude Include="UserInterface\MainMenu.h">
<Filter>Header Files\User Interface Headers</Filter> <Filter>Header Files\User Interface Headers</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="UserInterface\MenuClass.h">
<Filter>Header Files\User Interface Headers</Filter>
</ClInclude>
<ClInclude Include="UserInterface\MenuShortCuts.h"> <ClInclude Include="UserInterface\MenuShortCuts.h">
<Filter>Header Files\User Interface Headers</Filter> <Filter>Header Files\User Interface Headers</Filter>
</ClInclude> </ClInclude>
@ -344,9 +338,6 @@
<ClInclude Include="WTLApp.h"> <ClInclude Include="WTLApp.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="UserInterface\RomInformationClass.h">
<Filter>Header Files\User Interface Headers</Filter>
</ClInclude>
<ClInclude Include="Settings\GuiSettings.h"> <ClInclude Include="Settings\GuiSettings.h">
<Filter>Header Files\Settings</Filter> <Filter>Header Files\Settings</Filter>
</ClInclude> </ClInclude>
@ -494,6 +485,15 @@
<ClInclude Include="UserInterface\Settings\SettingsPage-Game-DiskDrive.h"> <ClInclude Include="UserInterface\Settings\SettingsPage-Game-DiskDrive.h">
<Filter>Header Files\User Interface Headers\Settings Header</Filter> <Filter>Header Files\User Interface Headers\Settings Header</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="UserInterface\RomInformation.h">
<Filter>Header Files\User Interface Headers</Filter>
</ClInclude>
<ClInclude Include="UserInterface\MenuItem.h">
<Filter>Header Files\User Interface Headers</Filter>
</ClInclude>
<ClInclude Include="UserInterface\CheatUI.h">
<Filter>Header Files\User Interface Headers</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="res\divider.cur"> <None Include="res\divider.cur">

6
Source/Project64/Support.h
View File

@ -5,9 +5,9 @@
#include <Common/MemTest.h> #include <Common/MemTest.h>
#include <Common/CriticalSection.h> #include <Common/CriticalSection.h>
#include <Common/StdString.h> #include <Common/StdString.h>
#include <Common/FileClass.h> #include <Common/File.h>
#include <Common/LogClass.h> #include <Common/Log.h>
#include <Common/Trace.h> #include <Common/Trace.h>
#include <Common/path.h> #include <Common/path.h>
#include <Common/IniFileClass.h> #include <Common/IniFile.h>
#include <Common/md5.h> #include <Common/md5.h>

6
Source/Project64/UserInterface.h
View File

@ -10,11 +10,11 @@
#include "UserInterface/MenuShortCuts.h" #include "UserInterface/MenuShortCuts.h"
#include "UserInterface/RomBrowser.h" #include "UserInterface/RomBrowser.h"
#include "UserInterface/MainWindow.h" #include "UserInterface/MainWindow.h"
#include "UserInterface/MenuClass.h" #include "UserInterface/MenuItem.h"
#include "UserInterface/MainMenu.h" #include "UserInterface/MainMenu.h"
#include "UserInterface/Notification.h" #include "UserInterface/Notification.h"
#include <Project64-core/N64System/FramePerSecondClass.h> #include <Project64-core/N64System/FramePerSecond.h>
#include "UserInterface/resource.h" #include "UserInterface/resource.h"
#include "UserInterface/SettingsConfig.h" #include "UserInterface/SettingsConfig.h"
#include "UserInterface/CheatClassUI.h" #include "UserInterface/CheatUI.h"
#include "UserInterface/SupportWindow.h" #include "UserInterface/SupportWindow.h"

0
Source/Project64/UserInterface/CheatClassUI.cpp → Source/Project64/UserInterface/CheatUI.cpp
View File

0
Source/Project64/UserInterface/CheatClassUI.h → Source/Project64/UserInterface/CheatUI.h
View File

4
Source/Project64/UserInterface/Debugger/Breakpoints.cpp
View File

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "Breakpoints.h" #include "Breakpoints.h"
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/Register.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Mips/OpcodeName.h> #include <Project64-core/N64System/Mips/OpcodeName.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64System.h>
CBreakpoints::CBreakpoints() : CBreakpoints::CBreakpoints() :
m_bHaveRegBP(false), m_bHaveRegBP(false),

2
Source/Project64/UserInterface/Debugger/DebugMMU.cpp
View File

@ -2,7 +2,7 @@
#include "DebugMMU.h" #include "DebugMMU.h"
#include <Common/MemoryManagement.h> #include <Common/MemoryManagement.h>
#include <Project64-core/N64System/N64DiskClass.h> #include <Project64-core/N64System/N64Disk.h>
#define PJMEM_CARTROM 1 #define PJMEM_CARTROM 1

4
Source/Project64/UserInterface/MainMenu.cpp
View File

@ -1,9 +1,9 @@
#include "stdafx.h" #include "stdafx.h"
#include "RomInformationClass.h" #include "RomInformation.h"
#include "Debugger/Breakpoints.h" #include "Debugger/Breakpoints.h"
#include "Debugger/ScriptSystem.h" #include "Debugger/ScriptSystem.h"
#include "DiscordRPC.h" #include "DiscordRPC.h"
#include <Project64-core/N64System/N64DiskClass.h> #include <Project64-core/N64System/N64Disk.h>
#include <Project64\UserInterface\About.h> #include <Project64\UserInterface\About.h>
#include <windows.h> #include <windows.h>
#include <commdlg.h> #include <commdlg.h>

5
Source/Project64/UserInterface/MainWindow.cpp
View File

@ -1,11 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "RomInformationClass.h" #include "RomInformation.h"
#include <Project64\UserInterface\About.h> #include <Project64\UserInterface\About.h>
#include <commctrl.h> #include <commctrl.h>
#include <Project64-core/Settings/SettingType/SettingsType-Application.h> #include <Project64-core/Settings/SettingType/SettingsType-Application.h>
#include <Project64-core/N64System/Enhancement/Enhancements.h> #include <Project64-core/N64System/Enhancement/Enhancements.h>
#include <Project64-core/N64System/N64DiskClass.h> #include <Project64-core/N64System/N64Disk.h>
#include "DiscordRPC.h" #include "DiscordRPC.h"
void EnterLogOptions(HWND hwndOwner); void EnterLogOptions(HWND hwndOwner);

4
Source/Project64/UserInterface/MainWindow.h
View File

@ -2,8 +2,8 @@
#include "../Settings/GuiSettings.h" #include "../Settings/GuiSettings.h"
#include <Project64/UserInterface/Debugger/debugger.h> #include <Project64/UserInterface/Debugger/debugger.h>
#include <Project64-core/Plugins/PluginClass.h> #include <Project64-core/Plugins/Plugin.h>
#include <Project64\UserInterface\CheatClassUI.h> #include <Project64\UserInterface\CheatUI.h>
#include <Project64\UserInterface\EnhancementUI.h> #include <Project64\UserInterface\EnhancementUI.h>
#include <Project64\UserInterface\ProjectSupport.h> #include <Project64\UserInterface\ProjectSupport.h>

0
Source/Project64/UserInterface/MenuClass.cpp → Source/Project64/UserInterface/MenuItem.cpp
View File

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