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

git-svn-id: https://localhost/svn/Project64/trunk@14 111125ac-702d-7242-af9c-5ba8ae61c1ef

This commit is contained in:
zilmar 2008-12-01 18:19:49 +00:00
parent 05ac90c959
commit 361bdcaa84
14 changed files with 81 additions and 415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Project64.dsw
View File

@ -31,10 +31,6 @@ Project: "Project64"=".\Source\Project64\Project64.dsp" - Package Owner=<4>
Package=<5>
{{{
begin source code control
"$/Project64/Project 64 1.7", RCBAAAAA
.\source
end source code control
}}}
Package=<4>
@ -49,6 +45,36 @@ Package=<4>
###############################################################################
Project: "RSP"=".\Source\RSP\RSP.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name Common
End Project Dependency
Begin Project Dependency
Project_Dep_Name Settings
End Project Dependency
}}}
###############################################################################
Project: "Settings"=".\Source\Settings\Settings.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "WTL"=".\SOURCE\WTL\WTL.dsp" - Package Owner=<4>
Package=<5>

13
Source/Project64/Plugins/Audio Plugin.cpp
View File

@ -45,7 +45,6 @@ CAudioPlugin::CAudioPlugin ( const char * FileName) {
Update = (void (__cdecl *)(BOOL))GetProcAddress( (HMODULE)hDll, "AiUpdate" );
//version 102 functions
SetSettingInfo = (void (__cdecl *)(PLUGIN_SETTINGS *))GetProcAddress( (HMODULE)hDll, "SetSettingInfo" );
PluginOpened = (void (__cdecl *)(void))GetProcAddress( (HMODULE)hDll, "PluginLoaded" );
//Make sure dll had all needed functions
@ -56,11 +55,9 @@ CAudioPlugin::CAudioPlugin ( const char * FileName) {
if (RomClosed == NULL) { UnloadPlugin(); return; }
if (ProcessAList == NULL) { UnloadPlugin(); return; }
if (m_PluginInfo.Version >= 0x0102)
SetSettingInfo = (void (__cdecl *)(PLUGIN_SETTINGS *))GetProcAddress( (HMODULE)hDll, "SetSettingInfo" );
if (SetSettingInfo)
{
if (SetSettingInfo == NULL) { UnloadPlugin(); return; }
if (PluginOpened == NULL) { UnloadPlugin(); return; }
PLUGIN_SETTINGS info;
info.dwSize = sizeof(PLUGIN_SETTINGS);
info.DefaultStartRange = FirstAudioDefaultSet;
@ -78,7 +75,11 @@ CAudioPlugin::CAudioPlugin ( const char * FileName) {
SetSettingInfo(&info);
//_Settings->UnknownSetting_AUDIO = info.UseUnregisteredSetting;
}
if (m_PluginInfo.Version >= 0x0102)
{
if (PluginOpened == NULL) { UnloadPlugin(); return; }
PluginOpened();
}

12
Source/Project64/Plugins/Controller Plugin.cpp
View File

@ -50,18 +50,15 @@ CControl_Plugin::CControl_Plugin ( const char * FileName) {
RumbleCommand = (void (__cdecl *)(int, BOOL))GetProcAddress( (HMODULE)hDll, "RumbleCommand" );
//version 101 functions
SetSettingInfo = (void (__cdecl *)(PLUGIN_SETTINGS *))GetProcAddress( (HMODULE)hDll, "SetSettingInfo" );
PluginOpened = (void (__cdecl *)(void))GetProcAddress( (HMODULE)hDll, "PluginLoaded" );
//Make sure dll had all needed functions
if (InitFunc == NULL) { UnloadPlugin(); return; }
if (CloseDLL == NULL) { UnloadPlugin(); return; }
if (m_PluginInfo.Version >= 0x0102)
SetSettingInfo = (void (__cdecl *)(PLUGIN_SETTINGS *))GetProcAddress( (HMODULE)hDll, "SetSettingInfo" );
if (SetSettingInfo)
{
if (SetSettingInfo == NULL) { UnloadPlugin(); return; }
if (PluginOpened == NULL) { UnloadPlugin(); return; }
PLUGIN_SETTINGS info;
info.dwSize = sizeof(PLUGIN_SETTINGS);
info.DefaultStartRange = FirstCtrlDefaultSet;
@ -79,6 +76,11 @@ CControl_Plugin::CControl_Plugin ( const char * FileName) {
SetSettingInfo(&info);
// _Settings->UnknownSetting_CTRL = info.UseUnregisteredSetting;
}
if (m_PluginInfo.Version >= 0x0102)
{
if (PluginOpened == NULL) { UnloadPlugin(); return; }
PluginOpened();
}

12
Source/Project64/Plugins/GFX plugin.cpp
View File

@ -46,7 +46,6 @@ CGfxPlugin::CGfxPlugin ( const char * FileName) {
SoftReset = (void (__cdecl *)(void)) GetProcAddress( (HMODULE)hDll, "SoftReset" );
//version 104 functions
SetSettingInfo = (void (__cdecl *)(PLUGIN_SETTINGS *))GetProcAddress( (HMODULE)hDll, "SetSettingInfo" );
PluginOpened = (void (__cdecl *)(void))GetProcAddress( (HMODULE)hDll, "PluginLoaded" );
DrawStatus = (void (__cdecl *)(const char *, BOOL ))GetProcAddress((HMODULE)hDll, "DrawFullScreenStatus");
@ -83,11 +82,9 @@ CGfxPlugin::CGfxPlugin ( const char * FileName) {
}
if (m_PluginInfo.Version >= 0x0104)
SetSettingInfo = (void (__cdecl *)(PLUGIN_SETTINGS *))GetProcAddress( (HMODULE)hDll, "SetSettingInfo" );
if (SetSettingInfo)
{
if (SetSettingInfo == NULL) { UnloadPlugin(); return; }
if (PluginOpened == NULL) { UnloadPlugin(); return; }
PLUGIN_SETTINGS info;
info.dwSize = sizeof(PLUGIN_SETTINGS);
info.DefaultStartRange = FirstGfxDefaultSet;
@ -105,6 +102,11 @@ CGfxPlugin::CGfxPlugin ( const char * FileName) {
SetSettingInfo(&info);
// _Settings->UnknownSetting_GFX = info.UseUnregisteredSetting;
}
if (m_PluginInfo.Version >= 0x0104)
{
if (PluginOpened == NULL) { UnloadPlugin(); return; }
PluginOpened();
}

12
Source/Project64/Plugins/RSP Plugin.cpp
View File

@ -44,7 +44,6 @@ CRSP_Plugin::CRSP_Plugin ( const char * FileName) {
if (EnableDebugging == NULL) { EnableDebugging = DummyFunc1; }
//version 102 functions
SetSettingInfo = (void (__cdecl *)(PLUGIN_SETTINGS *))GetProcAddress( (HMODULE)hDll, "SetSettingInfo" );
PluginOpened = (void (__cdecl *)(void))GetProcAddress( (HMODULE)hDll, "PluginLoaded" );
//Make sure dll had all needed functions
@ -53,11 +52,9 @@ CRSP_Plugin::CRSP_Plugin ( const char * FileName) {
if (RomClosed == NULL) { UnloadPlugin(); return; }
if (CloseDLL == NULL) { UnloadPlugin(); return; }
if (m_PluginInfo.Version >= 0x0102)
SetSettingInfo = (void (__cdecl *)(PLUGIN_SETTINGS *))GetProcAddress( (HMODULE)hDll, "SetSettingInfo" );
if (SetSettingInfo)
{
if (SetSettingInfo == NULL) { UnloadPlugin(); return; }
if (PluginOpened == NULL) { UnloadPlugin(); return; }
PLUGIN_SETTINGS info;
info.dwSize = sizeof(PLUGIN_SETTINGS);
info.DefaultStartRange = FirstRSPDefaultSet;
@ -75,6 +72,11 @@ CRSP_Plugin::CRSP_Plugin ( const char * FileName) {
SetSettingInfo(&info);
//_Settings->UnknownSetting_RSP = info.UseUnregisteredSetting;
}
if (m_PluginInfo.Version >= 0x0102)
{
if (PluginOpened == NULL) { UnloadPlugin(); return; }
PluginOpened();
}

381
Source/Project64/Project64.plg
View File

@ -1,381 +0,0 @@
<html>
<body>
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: Common - Win32 External Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "C:\DOCUME~1\NICHOL~1\LOCALS~1\Temp\RSP7.tmp" with contents
[
/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"../../Build/Common/External/Common.pch" /YX /Fo"../../Build/Common/External/" /Fd"../../Build/Common/External/" /FD /c
"D:\My Programs\Emulation\Project64\SOURCE\Common\File Class.cpp"
"D:\My Programs\Emulation\Project64\SOURCE\Common\Log Class.cpp"
"D:\My Programs\Emulation\Project64\SOURCE\Common\md5.cpp"
"D:\My Programs\Emulation\Project64\SOURCE\Common\MemTest.cpp"
"D:\My Programs\Emulation\Project64\SOURCE\Common\osversion.cpp"
"D:\My Programs\Emulation\Project64\SOURCE\Common\path.cpp"
"D:\My Programs\Emulation\Project64\SOURCE\Common\registry.cpp"
"D:\My Programs\Emulation\Project64\SOURCE\Common\std string.cpp"
"D:\My Programs\Emulation\Project64\SOURCE\Common\stdafx.cpp"
"D:\My Programs\Emulation\Project64\SOURCE\Common\Trace.cpp"
"D:\My Programs\Emulation\Project64\SOURCE\Common\Version.cpp"
]
Creating command line "cl.exe @C:\DOCUME~1\NICHOL~1\LOCALS~1\Temp\RSP7.tmp"
Creating temporary file "C:\DOCUME~1\NICHOL~1\LOCALS~1\Temp\RSP8.tmp" with contents
[
/nologo /out:"../../Bin/External\Common.lib"
"\My Programs\Emulation\Project64\Build\Common\External\File Class.obj"
"\My Programs\Emulation\Project64\Build\Common\External\Log Class.obj"
"\My Programs\Emulation\Project64\Build\Common\External\md5.obj"
"\My Programs\Emulation\Project64\Build\Common\External\MemTest.obj"
"\My Programs\Emulation\Project64\Build\Common\External\osversion.obj"
"\My Programs\Emulation\Project64\Build\Common\External\path.obj"
"\My Programs\Emulation\Project64\Build\Common\External\registry.obj"
"\My Programs\Emulation\Project64\Build\Common\External\std string.obj"
"\My Programs\Emulation\Project64\Build\Common\External\stdafx.obj"
"\My Programs\Emulation\Project64\Build\Common\External\Trace.obj"
"\My Programs\Emulation\Project64\Build\Common\External\Version.obj"
]
Creating command line "link.exe -lib @C:\DOCUME~1\NICHOL~1\LOCALS~1\Temp\RSP8.tmp"
<h3>Output Window</h3>
Compiling...
File Class.cpp
Log Class.cpp
md5.cpp
MemTest.cpp
osversion.cpp
path.cpp
registry.cpp
std string.cpp
stdafx.cpp
Trace.cpp
Version.cpp
Creating library...
<h3>
--------------------Configuration: Project64 - Win32 External Release--------------------
</h3>
<h3>Command Lines</h3>
Creating command line "rc.exe /l 0xc09 /fo"../../Build/Project64/External/UI Resources.res" /i "User Interface" /d "NDEBUG" "D:\My Programs\Emulation\Project64\Source\Project64\User Interface\UI Resources.rc""
Creating temporary file "C:\DOCUME~1\NICHOL~1\LOCALS~1\Temp\RSP9.tmp" with contents
[
/nologo /MD /W3 /GX /O2 /I "../" /I "./" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "EXTERNAL_RELEASE" /Fp"../../Build/Project64/External/Project64.pch" /YX /Fo"../../Build/Project64/External/" /Fd"../../Build/Project64/External/" /FD /EHa /c
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-Application.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-ApplicationIndex.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-Cheats.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-GameSetting.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-GameSettingIndex.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-RDBCpuType.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-RDBOnOff.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-RDBRamSize.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-RDBSaveChip.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-RDBYesNo.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-RelativePath.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-RomDatabase.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-RomDatabaseIndex.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-SelectedDirectory.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-TempBool.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-TempNumber.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\SettingType\SettingsType-TempString.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\N64System Settings.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\Notification Settings.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\Recompiler Settings.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\Settings Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Settings\Settings Page - Advanced Options.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Settings\Settings Page - Directories.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Settings\Settings Page - Game - General.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Settings\Settings Page - Game - Plugin.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Settings\Settings Page - Game - Recompiler.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Settings\Settings Page - Game - Status.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Settings\Settings Page - Game Browser.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Settings\Settings Page - Keyboard Shortcuts.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Settings\Settings Page - Options.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Settings\Settings Page - Plugin.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Settings\Settings Page.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\WTL Controls\ModifiedEditBox.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\WTL Controls\PartialGroupBox.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Cheats.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Frame Per Second Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Gui Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Main Menu Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Menu Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\MenuShortCuts.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Notification Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Rom Browser Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\User Interface\Settings Config.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Multilanguage\Language Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Mips\Audio.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Mips\Memory Labels Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Mips\Memory.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Mips\OpCode Analysis Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Mips\OpCode Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Mips\Register Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Mips\System Timing.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Mips\TLB class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\BreakPoints.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\C Core Interface.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\C Memory.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\CPU.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\Dma.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\Eeprom.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\FlashRam.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\Interpreter CPU.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\Mempak.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\Pif.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\Recompiler CPU.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\Recompiler Fpu Ops.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\Recompiler Ops.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\C Core\Registers.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Debugger\Debugger - Memory Dump.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Debugger\Debugger - Memory Search.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Debugger\Debugger - TLB.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Debugger\Debugger - View Memory.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Debugger\Debugger.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Recompiler\Delay Slot Map Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Recompiler\Function Info.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Recompiler\Function Map Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Recompiler\Recompiler Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Recompiler\Section Info.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Cheat Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\N64 Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\N64 Rom Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Profiling Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Rom Information Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\N64 System\Speed Limitor Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Plugins\Audio Plugin.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Plugins\Controller Plugin.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Plugins\GFX plugin.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Plugins\Plugin Class.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Plugins\Plugin List.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Plugins\RSP Plugin.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\Settings\Gui Settings.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\main.cpp"
"D:\My Programs\Emulation\Project64\Source\Project64\ValidateBinary.cpp"
]
Creating command line "cl.exe @C:\DOCUME~1\NICHOL~1\LOCALS~1\Temp\RSP9.tmp"
Creating temporary file "C:\DOCUME~1\NICHOL~1\LOCALS~1\Temp\RSPA.tmp" with contents
[
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:no /pdb:"../../Bin/External/Project64.pdb" /machine:I386 /out:"../../Bin/External/Project64.exe"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-Application.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-ApplicationIndex.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-Cheats.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-GameSetting.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-GameSettingIndex.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-RDBCpuType.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-RDBOnOff.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-RDBRamSize.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-RDBSaveChip.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-RDBYesNo.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-RelativePath.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-RomDatabase.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-RomDatabaseIndex.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-SelectedDirectory.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-TempBool.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-TempNumber.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\SettingsType-TempString.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\N64System Settings.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Notification Settings.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Recompiler Settings.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Setting Config.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Page - Advanced Options.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Page - Directories.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Page - Game - General.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Page - Game - Plugin.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Page - Game - Recompiler.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Page - Game - Status.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Page - Game Browser.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Page - Keyboard Shortcuts.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Page - Options.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Page - Plugin.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Page.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\ModifiedEditBox.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\PartialGroupBox.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Cheats.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Frame Per Second Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Gui Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Main Menu Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Menu Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\MenuShortCuts.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Notification Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Rom Browser Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Settings Config.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Language Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Audio.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Memory Labels Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Memory.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\OpCode Analysis Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\OpCode Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Register Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\System Timing.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\TLB class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\BreakPoints.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\C Core Interface.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\C main.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\C Memory.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\CPU Log.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\CPU.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Dma.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Eeprom.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Exception.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\FlashRam.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Interpreter CPU.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Interpreter Ops.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Logging.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Mempak.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Pif.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\r4300i Commands.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\r4300i Memory.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\r4300i Registers.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Recompiler CPU.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Recompiler Fpu Ops.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Recompiler Ops.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Registers.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Sram.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Sync CPU.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\TLB Display.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Tlb.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Win32Timer.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\x86 fpu.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\X86.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Debugger - Memory Dump.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Debugger - Memory Search.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Debugger - TLB.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Debugger - View Memory.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Debugger.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Delay Slot Map Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Function Info.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Function Map Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Recompiler Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Section Info.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Cheat Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\N64 Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\N64 Rom Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Profiling Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Rom Information Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Speed Limitor Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Audio Plugin.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Controller Plugin.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\GFX plugin.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Plugin Class.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Plugin List.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\RSP Plugin.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\UNZIP.OBJ"
"\My Programs\Emulation\Project64\Build\Project64\External\zip.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\7zip.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Processor Info.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\Gui Settings.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\main.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\ValidateBinary.obj"
"\My Programs\Emulation\Project64\Build\Project64\External\UI Resources.res"
"\My Programs\Emulation\Project64\Bin\External\Common.lib"
"\My Programs\Emulation\Project64\Bin\External\7zip.lib"
]
Creating command line "link.exe @C:\DOCUME~1\NICHOL~1\LOCALS~1\Temp\RSPA.tmp"
<h3>Output Window</h3>
Compiling resources...
Compiling...
SettingsType-Application.cpp
SettingsType-ApplicationIndex.cpp
SettingsType-Cheats.cpp
SettingsType-GameSetting.cpp
SettingsType-GameSettingIndex.cpp
SettingsType-RDBCpuType.cpp
SettingsType-RDBOnOff.cpp
SettingsType-RDBRamSize.cpp
SettingsType-RDBSaveChip.cpp
SettingsType-RDBYesNo.cpp
SettingsType-RelativePath.cpp
SettingsType-RomDatabase.cpp
SettingsType-RomDatabaseIndex.cpp
SettingsType-SelectedDirectory.cpp
SettingsType-TempBool.cpp
SettingsType-TempNumber.cpp
SettingsType-TempString.cpp
N64System Settings.cpp
Notification Settings.cpp
Recompiler Settings.cpp
Settings Class.cpp
Settings Page - Advanced Options.cpp
Settings Page - Directories.cpp
Settings Page - Game - General.cpp
Settings Page - Game - Plugin.cpp
Settings Page - Game - Recompiler.cpp
Settings Page - Game - Status.cpp
Settings Page - Game Browser.cpp
Settings Page - Keyboard Shortcuts.cpp
Settings Page - Options.cpp
C:\Program Files\Microsoft Visual Studio\VC98\ATL\INCLUDE\atlwin.h(2353) : warning C4247: 'StartDialogProc' not accessible because 'CSettingsPageImpl<class CGeneralOptionsPage>' uses 'public' to inherit from 'CDialogImpl<class CGeneralOptionsPage,class ATL::CWindow>'
C:\Program Files\Microsoft Visual Studio\VC98\ATL\INCLUDE\atlwin.h(2231) : see declaration of 'StartDialogProc'
C:\Program Files\Microsoft Visual Studio\VC98\ATL\INCLUDE\atlwin.h(2346) : while compiling class-template member function 'struct HWND__ *__thiscall ATL::CDialogImpl<class CGeneralOptionsPage,class ATL::CWindow>::Create(struct HWND__ *,long)'
Settings Page - Plugin.cpp
Settings Page.cpp
ModifiedEditBox.cpp
PartialGroupBox.cpp
Cheats.cpp
Frame Per Second Class.cpp
Gui Class.cpp
Main Menu Class.cpp
Menu Class.cpp
MenuShortCuts.cpp
Notification Class.cpp
Rom Browser Class.cpp
Settings Config.cpp
Language Class.cpp
Audio.cpp
Memory Labels Class.cpp
Memory.cpp
OpCode Analysis Class.cpp
OpCode Class.cpp
Register Class.cpp
System Timing.cpp
TLB class.cpp
BreakPoints.cpp
C Core Interface.cpp
C Memory.cpp
CPU.cpp
Dma.cpp
Eeprom.cpp
FlashRam.cpp
Interpreter CPU.cpp
Mempak.cpp
Pif.cpp
Recompiler CPU.cpp
Recompiler Fpu Ops.cpp
Recompiler Ops.cpp
Registers.cpp
Debugger - Memory Dump.cpp
Debugger - Memory Search.cpp
Debugger - TLB.cpp
Debugger - View Memory.cpp
Debugger.cpp
Delay Slot Map Class.cpp
Function Info.cpp
Function Map Class.cpp
Recompiler Class.cpp
Section Info.cpp
Cheat Class.cpp
N64 Class.cpp
N64 Rom Class.cpp
Profiling Class.cpp
Rom Information Class.cpp
Speed Limitor Class.cpp
Audio Plugin.cpp
Controller Plugin.cpp
GFX plugin.cpp
Plugin Class.cpp
Plugin List.cpp
RSP Plugin.cpp
Gui Settings.cpp
main.cpp
ValidateBinary.cpp
Linking...
LINK : warning LNK4089: all references to "OLEAUT32.dll" discarded by /OPT:REF
<h3>Results</h3>
Project64.exe - 0 error(s), 2 warning(s)
</pre>
</body>
</html>

1
Source/Project64/Settings.h
View File

@ -25,6 +25,7 @@ enum SettingID {
Setting_ApplicationName,
Setting_UseFromRegistry,
Setting_RdbEditor,
Setting_PluginPageFirst,
Setting_DisableScrSaver,
Setting_AutoSleep,
Setting_AutoStart,

3
Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.cpp
View File

@ -71,8 +71,7 @@ void CSettingTypeRDBRDRamSize::Save ( int Index, bool Value )
void CSettingTypeRDBRDRamSize::Save ( int Index, ULONG Value )
{
Notify().BreakPoint(__FILE__,__LINE__);
m_SettingsIniFile->SaveNumber(m_SectionIdent.c_str(),m_KeyName.c_str(),Value == 0x800000 ? 8 : 4);
}
void CSettingTypeRDBRDRamSize::Save ( int Index, const stdstr & Value )

3
Source/Project64/Settings/Settings Class.cpp
View File

@ -82,7 +82,8 @@ void CSettings::AddHowToHandleSetting ()
//Settings location
AddHandler(Setting_ApplicationName, new CSettingTypeTempString(""));
AddHandler(Setting_UseFromRegistry, new CSettingTypeApplication("Settings","Use Registry",(DWORD)false));
AddHandler(Setting_RdbEditor, new CSettingTypeApplication("","Rdb Editor", false));
AddHandler(Setting_RdbEditor, new CSettingTypeApplication("","Rdb Editor", true));
AddHandler(Setting_PluginPageFirst, new CSettingTypeApplication("","Plugin Page First", false));
AddHandler(Setting_DisableScrSaver, new CSettingTypeApplication("","Disable Screen Saver",(DWORD)true));
AddHandler(Setting_AutoSleep, new CSettingTypeApplication("","Auto Sleep", (DWORD)true));
AddHandler(Setting_AutoStart, new CSettingTypeApplication("","Auto Start", (DWORD)true));

1
Source/Project64/User Interface/Rom Browser Class.cpp
View File

@ -1693,6 +1693,7 @@ bool CRomBrowser::RomDirNeedsRefresh ( void )
MD5 CRomBrowser::RomListHash ( strlist & FileList )
{
stdstr NewFileNames;
FileList.sort();
for (strlist::iterator iter = FileList.begin(); iter != FileList.end(); iter++)
{
NewFileNames += *iter;

16
Source/Project64/User Interface/Settings Config.cpp
View File

@ -44,6 +44,13 @@ LRESULT CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*
} else {
SetWindowText(GS(OPTIONS_TITLE));
if (_Settings->LoadBool(Setting_PluginPageFirst))
{
SettingsSection = new CConfigSettingSection(GS(TAB_PLUGIN));
SettingsSection->AddPage(new COptionPluginPage(this->m_hWnd,rcSettingInfo ));
m_Sections.push_back(SettingsSection);
}
SettingsSection = new CConfigSettingSection(GS(TAB_OPTIONS));
SettingsSection->AddPage(new CGeneralOptionsPage(this->m_hWnd,rcSettingInfo ));
SettingsSection->AddPage(new CAdvancedOptionsPage(this->m_hWnd,rcSettingInfo ));
@ -58,9 +65,12 @@ LRESULT CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*
SettingsSection->AddPage(new COptionsShortCutsPage(this->m_hWnd,rcSettingInfo ));
m_Sections.push_back(SettingsSection);
SettingsSection = new CConfigSettingSection(GS(TAB_PLUGIN));
SettingsSection->AddPage(new COptionPluginPage(this->m_hWnd,rcSettingInfo ));
m_Sections.push_back(SettingsSection);
if (!_Settings->LoadBool(Setting_PluginPageFirst))
{
SettingsSection = new CConfigSettingSection(GS(TAB_PLUGIN));
SettingsSection->AddPage(new COptionPluginPage(this->m_hWnd,rcSettingInfo ));
m_Sections.push_back(SettingsSection);
}
}
//Game Settings

6
Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp
View File

@ -21,14 +21,14 @@ CGameGeneralPage::CGameGeneralPage (HWND hParent, const RECT & rcDispay )
if (ComboBox)
{
ComboBox->SetTextField(GetDlgItem(IDC_MEMORY_SIZE_TEXT));
if (_Settings->LoadBool(Setting_RdbEditor))
/*if (_Settings->LoadBool(Setting_RdbEditor))
{
ComboBox->AddItem(GS(RDRAM_4MB), 4 );
ComboBox->AddItem(GS(RDRAM_8MB), 8 );
} else {
} else {*/
ComboBox->AddItem(GS(RDRAM_4MB), 0x400000 );
ComboBox->AddItem(GS(RDRAM_8MB), 0x800000 );
}
//}
}
ComboBox = AddModComboBox(GetDlgItem(IDC_SAVE_TYPE),Game_SaveChip);

1
Source/RSP/Profiling.cpp
View File

@ -30,6 +30,7 @@ extern "C" {
}
#pragma warning(disable:4786)
#include <common/std string.h>
#include <common/File Class.h>
#include <common/Log Class.h>
#include <map>
#include <vector>

1
Source/RSP/log.cpp
View File

@ -25,6 +25,7 @@
*/
#include <windows.h>
#include <Common/std string.h>
#include <Common/File Class.h>
#include <Common/Log Class.h>
extern "C" {