[64bit] Get nrage and rsp compiling as 64bit

This commit is contained in:
zilmar 2015-05-16 10:55:23 +10:00
parent 8bf7405e3c
commit 13e62d7354
23 changed files with 150 additions and 69 deletions

15
.gitignore vendored
View File

@ -32,5 +32,20 @@ Thumbs.db
/Plugin/RSP/pdb /Plugin/RSP/pdb
/Plugin/RSP/RSP 1.7.dll /Plugin/RSP/RSP 1.7.dll
/Plugin/RSP/RSP_d 1.7.dll /Plugin/RSP/RSP_d 1.7.dll
/Plugin64/GFX/lib
/Plugin64/GFX/map
/Plugin64/GFX/pdb
/Plugin64/GFX/PJ64Glide64.dll
/Plugin64/GFX/PJ64Glide64_d.dll
/Plugin64/Input/lib
/Plugin64/Input/map
/Plugin64/Input/pdb
/Plugin64/Input/PJ64_NRage.dll
/Plugin64/Input/PJ64_NRage_d.dll
/Plugin64/RSP/lib
/Plugin64/RSP/map
/Plugin64/RSP/pdb
/Plugin64/RSP/RSP 1.7.dll
/Plugin64/RSP/RSP_d 1.7.dll
/Source/3rd Party/wx/lib/vc_lib/mswu/wx/msw/rcdefs.h /Source/3rd Party/wx/lib/vc_lib/mswu/wx/msw/rcdefs.h
/Source/3rd Party/wx/lib/vc_lib/mswud/wx/msw/rcdefs.h /Source/3rd Party/wx/lib/vc_lib/mswud/wx/msw/rcdefs.h

View File

@ -0,0 +1,2 @@
[default]
ConfigFile=..\..\Config\Project64.cfg

View File

@ -0,0 +1,2 @@
[default]
ConfigFile=..\..\Config\Project64.cfg

View File

@ -18,6 +18,7 @@ Instant Save=..\..\Save\
Instant Save - Use Selected=1 Instant Save - Use Selected=1
Lang=..\..\Lang Lang=..\..\Lang
Plugin=..\..\Plugin\ Plugin=..\..\Plugin\
Plugin64=..\..\Plugin64\
Plugin - Use Selected=1 Plugin - Use Selected=1
Save=..\..\Save\ Save=..\..\Save\
Save - Use Selected=1 Save - Use Selected=1

View File

@ -60,7 +60,8 @@ Global
{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|x64.Build.0 = Debug|x64 {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|x64.Build.0 = Debug|x64
{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.ActiveCfg = Release|Win32 {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.ActiveCfg = Release|Win32
{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.Build.0 = Release|Win32 {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.Build.0 = Release|Win32
{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|x64.ActiveCfg = Release|Win32 {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|x64.ActiveCfg = Release|x64
{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|x64.Build.0 = Release|x64
{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|Win32.ActiveCfg = Debug|Win32 {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|Win32.ActiveCfg = Debug|Win32
{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|Win32.Build.0 = Debug|Win32 {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|Win32.Build.0 = Debug|Win32
{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|x64.ActiveCfg = Debug|x64 {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|x64.ActiveCfg = Debug|x64
@ -71,13 +72,15 @@ Global
{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Release|x64.Build.0 = Release|x64 {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Release|x64.Build.0 = Release|x64
{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.ActiveCfg = Debug|Win32 {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.ActiveCfg = Debug|Win32
{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.Build.0 = Debug|Win32 {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.Build.0 = Debug|Win32
{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|x64.ActiveCfg = Debug|Win32 {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|x64.ActiveCfg = Debug|x64
{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|x64.Build.0 = Debug|x64
{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.ActiveCfg = Release|Win32 {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.ActiveCfg = Release|Win32
{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.Build.0 = Release|Win32 {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.Build.0 = Release|Win32
{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|x64.ActiveCfg = Release|Win32 {A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|x64.ActiveCfg = Release|Win32
{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|Win32.ActiveCfg = Debug|Win32 {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|Win32.ActiveCfg = Debug|Win32
{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|Win32.Build.0 = Debug|Win32 {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|Win32.Build.0 = Debug|Win32
{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|x64.ActiveCfg = Debug|Win32 {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|x64.ActiveCfg = Debug|x64
{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|x64.Build.0 = Debug|x64
{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|Win32.ActiveCfg = Release|Win32 {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|Win32.ActiveCfg = Release|Win32
{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|Win32.Build.0 = Release|Win32 {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|Win32.Build.0 = Release|Win32
{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|x64.ActiveCfg = Release|Win32 {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|x64.ActiveCfg = Release|Win32
@ -87,7 +90,8 @@ Global
{3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|x64.Build.0 = Debug|x64 {3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|x64.Build.0 = Debug|x64
{3326E128-33AF-422C-BB7C-67CC6B915610}.Release|Win32.ActiveCfg = Release|Win32 {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|Win32.ActiveCfg = Release|Win32
{3326E128-33AF-422C-BB7C-67CC6B915610}.Release|Win32.Build.0 = Release|Win32 {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|Win32.Build.0 = Release|Win32
{3326E128-33AF-422C-BB7C-67CC6B915610}.Release|x64.ActiveCfg = Release|Win32 {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|x64.ActiveCfg = Release|x64
{3326E128-33AF-422C-BB7C-67CC6B915610}.Release|x64.Build.0 = Release|x64
{4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|Win32.ActiveCfg = Debug|Win32 {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|Win32.ActiveCfg = Debug|Win32
{4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|Win32.Build.0 = Debug|Win32 {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|Win32.Build.0 = Debug|Win32
{4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|x64.ActiveCfg = Debug|Win32 {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|x64.ActiveCfg = Debug|Win32
@ -100,7 +104,8 @@ Global
{731BD205-2826-4631-B7AF-117658E88DBC}.Debug|x64.Build.0 = Debug|x64 {731BD205-2826-4631-B7AF-117658E88DBC}.Debug|x64.Build.0 = Debug|x64
{731BD205-2826-4631-B7AF-117658E88DBC}.Release|Win32.ActiveCfg = Release|Win32 {731BD205-2826-4631-B7AF-117658E88DBC}.Release|Win32.ActiveCfg = Release|Win32
{731BD205-2826-4631-B7AF-117658E88DBC}.Release|Win32.Build.0 = Release|Win32 {731BD205-2826-4631-B7AF-117658E88DBC}.Release|Win32.Build.0 = Release|Win32
{731BD205-2826-4631-B7AF-117658E88DBC}.Release|x64.ActiveCfg = Release|Win32 {731BD205-2826-4631-B7AF-117658E88DBC}.Release|x64.ActiveCfg = Release|x64
{731BD205-2826-4631-B7AF-117658E88DBC}.Release|x64.Build.0 = Release|x64
{360A34F3-3172-4B09-8BC9-B3FBEE677863}.Debug|Win32.ActiveCfg = Debug|Win32 {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Debug|Win32.ActiveCfg = Debug|Win32
{360A34F3-3172-4B09-8BC9-B3FBEE677863}.Debug|x64.ActiveCfg = Debug|Win32 {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Debug|x64.ActiveCfg = Debug|Win32
{360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|Win32.ActiveCfg = Release|Win32 {360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|Win32.ActiveCfg = Release|Win32
@ -156,7 +161,8 @@ Global
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.ActiveCfg = Release|Win32 {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.ActiveCfg = Release|Win32
{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.ActiveCfg = Debug|Win32 {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.ActiveCfg = Debug|Win32
{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.Build.0 = Debug|Win32 {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.Build.0 = Debug|Win32
{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|x64.ActiveCfg = Debug|Win32 {FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|x64.ActiveCfg = Debug|x64
{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|x64.Build.0 = Debug|x64
{FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.ActiveCfg = Release|Win32 {FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.ActiveCfg = Release|Win32
{FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.Build.0 = Release|Win32 {FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.Build.0 = Release|Win32
{FD617E80-9E40-4138-85DA-B94633972E6A}.Release|x64.ActiveCfg = Release|Win32 {FD617E80-9E40-4138-85DA-B94633972E6A}.Release|x64.ActiveCfg = Release|Win32

Binary file not shown.

Binary file not shown.

View File

@ -796,11 +796,7 @@ LRESULT CALLBACK LangSelectProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
{ {
lResult = HTCAPTION; lResult = HTCAPTION;
} }
#ifdef _M_IX86 SetWindowLong(hDlg, DWLP_MSGRESULT, lResult);
SetWindowLong(hDlg, DWL_MSGRESULT, lResult);
#else
g_Notify->BreakPoint(__FILEW__,__LINE__);
#endif
return TRUE; return TRUE;
} }
break; break;

View File

@ -69,13 +69,15 @@ void CPluginList::AddPluginFromDir ( CPath Dir)
hLib = NULL; hLib = NULL;
} }
UINT LastErrorMode = SetErrorMode( SEM_FAILCRITICALERRORS ); //UINT LastErrorMode = SetErrorMode( SEM_FAILCRITICALERRORS );
WriteTraceF(TraceDebug,__FUNCTION__ ": loading %s",(LPCSTR)Dir); WriteTraceF(TraceDebug,__FUNCTION__ ": loading %s",(LPCSTR)Dir);
hLib = LoadLibrary(Dir); hLib = LoadLibrary(Dir);
SetErrorMode(LastErrorMode); //SetErrorMode(LastErrorMode);
if (hLib == NULL) if (hLib == NULL)
{ {
DWORD LoadError = GetLastError();
WriteTraceF(TraceDebug, __FUNCTION__ ": failed to loadi %s (error: %d)", (LPCSTR)Dir, LoadError);
continue; continue;
} }

View File

@ -312,10 +312,6 @@
<Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project> <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Glide64\Glide64.vcxproj">
<Project>{a4d13408-a794-4199-8fc7-4a9a32505005}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

View File

@ -248,10 +248,17 @@ void CSettings::AddHowToHandleSetting ()
AddHandler(Directory_GameUseSelected, new CSettingTypeApplication("Directory","Game - Use Selected",false)); AddHandler(Directory_GameUseSelected, new CSettingTypeApplication("Directory","Game - Use Selected",false));
AddHandler(Directory_Plugin, new CSettingTypeSelectedDirectory("Dir:Plugin",Directory_PluginInitial,Directory_PluginSelected,Directory_PluginUseSelected)); AddHandler(Directory_Plugin, new CSettingTypeSelectedDirectory("Dir:Plugin",Directory_PluginInitial,Directory_PluginSelected,Directory_PluginUseSelected));
AddHandler(Directory_PluginInitial, new CSettingTypeRelativePath("Plugin","")); #ifdef _M_IX86
AddHandler(Directory_PluginInitial, new CSettingTypeRelativePath("Plugin", ""));
AddHandler(Directory_PluginSelected, new CSettingTypeApplicationPath("Directory","Plugin",Directory_PluginInitial)); AddHandler(Directory_PluginSelected, new CSettingTypeApplicationPath("Directory","Plugin",Directory_PluginInitial));
AddHandler(Directory_PluginUseSelected, new CSettingTypeApplication("Directory","Plugin - Use Selected",false)); AddHandler(Directory_PluginUseSelected, new CSettingTypeApplication("Directory","Plugin - Use Selected",false));
AddHandler(Directory_PluginSync, new CSettingTypeRelativePath("SyncPlugin","")); AddHandler(Directory_PluginSync, new CSettingTypeRelativePath("SyncPlugin",""));
#else
AddHandler(Directory_PluginInitial, new CSettingTypeRelativePath("Plugin64", ""));
AddHandler(Directory_PluginSelected, new CSettingTypeApplicationPath("Directory", "Plugin64", Directory_PluginInitial));
AddHandler(Directory_PluginUseSelected, new CSettingTypeApplication("Directory", "Plugin - Use Selected", false));
AddHandler(Directory_PluginSync, new CSettingTypeRelativePath("SyncPlugin64", ""));
#endif
AddHandler(Directory_SnapShot, new CSettingTypeSelectedDirectory("Dir:Snapshot",Directory_SnapShotInitial,Directory_SnapShotSelected,Directory_SnapShotUseSelected)); AddHandler(Directory_SnapShot, new CSettingTypeSelectedDirectory("Dir:Snapshot",Directory_SnapShotInitial,Directory_SnapShotSelected,Directory_SnapShotUseSelected));
AddHandler(Directory_SnapShotInitial, new CSettingTypeRelativePath("Screenshots","")); AddHandler(Directory_SnapShotInitial, new CSettingTypeRelativePath("Screenshots",""));

View File

@ -1139,14 +1139,8 @@ DWORD CALLBACK AboutBoxProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam)
{ {
lResult = HTCAPTION; lResult = HTCAPTION;
} }
#ifdef _M_IX86 SetWindowLong(hWnd, DWLP_MSGRESULT, lResult);
SetWindowLong(hWnd, DWL_MSGRESULT, lResult);
#else
g_Notify->BreakPoint(__FILEW__,__LINE__);
#endif
return TRUE; return TRUE;
} }
break; break;
case WM_CTLCOLORSTATIC: case WM_CTLCOLORSTATIC:

View File

@ -98,12 +98,12 @@ const char * AboutMsg ( void )
/************ Functions ***********/ /************ Functions ***********/
DWORD AsciiToHex (char * HexValue) DWORD AsciiToHex (char * HexValue)
{ {
DWORD Count, Finish, Value = 0; DWORD Value = 0;
Finish = strlen(HexValue); size_t Finish = strlen(HexValue);
if (Finish > 8 ) { Finish = 8; } if (Finish > 8 ) { Finish = 8; }
for (Count = 0; Count < Finish; Count++) for (size_t Count = 0; Count < Finish; Count++)
{ {
Value = (Value << 4); Value = (Value << 4);
switch( HexValue[Count] ) switch( HexValue[Count] )
@ -273,6 +273,7 @@ void DetectCpuSpecs(void)
DWORD AMD_Features = 0; DWORD AMD_Features = 0;
__try { __try {
#ifdef _M_IX86
_asm { _asm {
/* Intel features */ /* Intel features */
mov eax, 1 mov eax, 1
@ -284,7 +285,15 @@ void DetectCpuSpecs(void)
cpuid cpuid
or [AMD_Features], edx or [AMD_Features], edx
} }
} __except ( EXCEPTION_EXECUTE_HANDLER) { #else
int cpuInfo[4];
__cpuid(cpuInfo, 1);
Intel_Features = cpuInfo[3];
__cpuid(cpuInfo, 0x80000001);
AMD_Features = cpuInfo[3];
#endif
}
__except (EXCEPTION_EXECUTE_HANDLER) {
AMD_Features = Intel_Features = 0; AMD_Features = Intel_Features = 0;
} }
@ -411,7 +420,7 @@ void ProcessMenuItem(int ID)
} }
break; break;
case ID_COMPILER: case ID_COMPILER:
DialogBox(hinstDLL, "RSPCOMPILER", HWND_DESKTOP, CompilerDlgProc); DialogBox(hinstDLL, "RSPCOMPILER", HWND_DESKTOP, (DLGPROC)CompilerDlgProc);
break; break;
case ID_BREAKONSTARTOFTASK: case ID_BREAKONSTARTOFTASK:
{ {
@ -768,5 +777,5 @@ __declspec(dllexport) void PluginLoaded (void)
void UseUnregisteredSetting (int /*SettingID*/) void UseUnregisteredSetting (int /*SettingID*/)
{ {
_asm int 3 DebugBreak();
} }

View File

@ -59,6 +59,7 @@ public:
DWORD OldTimerAddr = StopTimer(); DWORD OldTimerAddr = StopTimer();
m_CurrentTimerAddr = Address; m_CurrentTimerAddr = Address;
#ifdef _M_IX86
DWORD HiValue, LoValue; DWORD HiValue, LoValue;
_asm { _asm {
pushad pushad
@ -69,14 +70,17 @@ public:
} }
m_StartTimeHi = HiValue; m_StartTimeHi = HiValue;
m_StartTimeLo = LoValue; m_StartTimeLo = LoValue;
#else
DebugBreak();
#endif
return OldTimerAddr; return OldTimerAddr;
} }
DWORD StopTimer ( void ) DWORD StopTimer ( void )
{ {
DWORD HiValue, LoValue;
if (m_CurrentTimerAddr == Timer_None) { return m_CurrentTimerAddr; } if (m_CurrentTimerAddr == Timer_None) { return m_CurrentTimerAddr; }
#ifdef _M_IX86
DWORD HiValue, LoValue;
_asm { _asm {
pushad pushad
rdtsc rdtsc
@ -85,7 +89,7 @@ public:
popad popad
} }
__int64 StopTime = ((unsigned __int64)HiValue << 32) + (unsigned __int64)LoValue; __int64 StopTime = ((unsigned __int64)HiValue << 32) + (unsigned __int64)LoValue;
__int64 StartTime = ((unsigned __int64)m_StartTimeHi << 32) + (unsigned __int64)m_StartTimeLo; __int64 StartTime = ((unsigned __int64)m_StartTimeHi << 32) + (unsigned __int64)m_StartTimeLo;
__int64 TimeTaken = StopTime - StartTime; __int64 TimeTaken = StopTime - StartTime;
@ -96,8 +100,11 @@ public:
} }
else else
{ {
m_Entries.insert(PROFILE_ENRTIES::value_type(m_CurrentTimerAddr,TimeTaken)); m_Entries.insert(PROFILE_ENRTIES::value_type(m_CurrentTimerAddr, TimeTaken));
} }
#else
DebugBreak();
#endif
DWORD OldTimerAddr = m_CurrentTimerAddr; DWORD OldTimerAddr = m_CurrentTimerAddr;
m_CurrentTimerAddr = Timer_None; m_CurrentTimerAddr = Timer_None;

View File

@ -661,7 +661,7 @@ void RSP_Commands_Setup ( HWND hDlg )
SendMessage(hList,LB_SETITEMHEIGHT, (WPARAM)0,(LPARAM)MAKELPARAM(14, 0)); SendMessage(hList,LB_SETITEMHEIGHT, (WPARAM)0,(LPARAM)MAKELPARAM(14, 0));
} }
sprintf(Location,"%03X",*PrgCount); sprintf(Location, "%03X", PrgCount ? *PrgCount : 0);
hAddress = CreateWindowEx(0,"EDIT",Location, WS_CHILD | ES_UPPERCASE | WS_VISIBLE | hAddress = CreateWindowEx(0,"EDIT",Location, WS_CHILD | ES_UPPERCASE | WS_VISIBLE |
WS_BORDER | WS_TABSTOP,375,17,36,18, hDlg,(HMENU)IDC_ADDRESS,hinstDLL, NULL ); WS_BORDER | WS_TABSTOP,375,17,36,18, hDlg,(HMENU)IDC_ADDRESS,hinstDLL, NULL );
if (hAddress) if (hAddress)

View File

@ -401,7 +401,7 @@ LRESULT CALLBACK RSP_Registers_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
HideRSP_RegisterPanel (CurrentPanel); HideRSP_RegisterPanel (CurrentPanel);
item.mask = TCIF_PARAM; item.mask = TCIF_PARAM;
TabCtrl_GetItem( hTab, TabCtrl_GetCurSel( hTab ), &item ); TabCtrl_GetItem( hTab, TabCtrl_GetCurSel( hTab ), &item );
CurrentPanel = item.lParam; CurrentPanel = (int)item.lParam;
InvalidateRect( hStatic, NULL, FALSE ); InvalidateRect( hStatic, NULL, FALSE );
UpdateRSPRegistersScreen(); UpdateRSPRegistersScreen();
ShowRSP_RegisterPanel ( CurrentPanel ); ShowRSP_RegisterPanel ( CurrentPanel );
@ -513,7 +513,11 @@ void SetupRSP_RegistersMain (HWND hDlg) {
SetupRSP_Vect2Panel ( hDlg ); SetupRSP_Vect2Panel ( hDlg );
hStatic = CreateWindowEx(0,"STATIC","", WS_CHILD|WS_VISIBLE, 5,6,616,290,hDlg,0,hinstDLL,NULL ); hStatic = CreateWindowEx(0,"STATIC","", WS_CHILD|WS_VISIBLE, 5,6,616,290,hDlg,0,hinstDLL,NULL );
RefreshProc = (FARPROC)SetWindowLong( hStatic,GWL_WNDPROC,(long)RefreshRSP_RegProc); #ifdef _M_IX86
RefreshProc = (FARPROC)SetWindowLong(hStatic, GWL_WNDPROC, (long)RefreshRSP_RegProc);
#else
DebugBreak();
#endif
UpdateRSPRegistersScreen (); UpdateRSPRegistersScreen ();
ShowRSP_RegisterPanel ( GeneralPurpose ); ShowRSP_RegisterPanel ( GeneralPurpose );

View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}</ProjectGuid> <ProjectGuid>{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}</ProjectGuid>
@ -25,7 +33,9 @@
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
<Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" /> <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
<Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
@ -33,7 +43,8 @@
<PropertyGroup> <PropertyGroup>
<TargetName>RSP 1.7</TargetName> <TargetName>RSP 1.7</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RSP_d 1.7</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RSP_d 1.7</TargetName>
<OutDir>$(SolutionDir)Plugin\RSP\</OutDir> <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">RSP_d 1.7</TargetName>
<OutDir>$(SolutionDir)Plugin64\RSP\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>

View File

@ -933,11 +933,15 @@ DWORD RunRecompilerCPU ( DWORD Cycles ) {
StartTimer(*PrgCount); StartTimer(*PrgCount);
} }
#ifdef _M_IX86
_asm { _asm {
pushad pushad
call Block call Block
popad popad
} }
#else
DebugBreak();
#endif
if (Profiling && IndvidualBlock) { if (Profiling && IndvidualBlock) {
StopTimer(); StopTimer();
} }
@ -948,7 +952,11 @@ DWORD RunRecompilerCPU ( DWORD Cycles ) {
} }
if (IsMmxEnabled == TRUE) { if (IsMmxEnabled == TRUE) {
#ifdef _M_IX86
_asm emms _asm emms
#else
DebugBreak();
#endif
} }
return Cycles; return Cycles;
} }

View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}</ProjectGuid> <ProjectGuid>{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}</ProjectGuid>
@ -25,7 +33,9 @@
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" /> <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
<Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" /> <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
<Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

View File

@ -22,6 +22,7 @@
*/ */
#include <InitGuid.h>
#include "commonIncludes.h" #include "commonIncludes.h"
#include <dinput.h> #include <dinput.h>
#include "NRagePluginV2.h" #include "NRagePluginV2.h"
@ -29,6 +30,7 @@
#include "DirectInput.h" #include "DirectInput.h"
#include "XInputController.h" #include "XInputController.h"
#include <math.h> #include <math.h>
#include <CGuid.h>
// ProtoTypes // // ProtoTypes //
HRESULT AcquireDevice( LPDIRECTINPUTDEVICE8 lpDirectInputDevice ); HRESULT AcquireDevice( LPDIRECTINPUTDEVICE8 lpDirectInputDevice );

View File

@ -183,10 +183,10 @@ BOOL CALLBACK MainDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
case TAB_CONTROLLER2: case TAB_CONTROLLER2:
case TAB_CONTROLLER3: case TAB_CONTROLLER3:
case TAB_CONTROLLER4: case TAB_CONTROLLER4:
hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_CONTROLLER ), hDlg, ControllerTabProc ); hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_CONTROLLER), hDlg, (DLGPROC)ControllerTabProc);
break; break;
case TAB_SHORTCUTS: case TAB_SHORTCUTS:
hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_SHORTCUT ), hDlg, ShortcutsTabProc ); hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_SHORTCUT), hDlg, (DLGPROC)ShortcutsTabProc);
break; break;
default: default:
hTabControl = NULL; hTabControl = NULL;
@ -420,18 +420,18 @@ BOOL CALLBACK ControllerTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
{ {
case TAB_CONTROLS: case TAB_CONTROLS:
if( pcController->fXInput) // added to show the xinput controller config tab --tecnicors if( pcController->fXInput) // added to show the xinput controller config tab --tecnicors
hTabControl = CreateDialog ( g_hResourceDLL, MAKEINTRESOURCE( IDD_XCONTROLS ), hDlg, XControlsTabProc ); hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_XCONTROLS), hDlg, (DLGPROC)XControlsTabProc);
else else
hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_CONTROLS ), hDlg, ControlsTabProc ); hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_CONTROLS), hDlg, (DLGPROC)ControlsTabProc);
break; break;
case TAB_DEVICES: case TAB_DEVICES:
hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_DEVICES ), hDlg, DevicesTabProc ); hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_DEVICES), hDlg, (DLGPROC)DevicesTabProc);
break; break;
case TAB_MODIFIERS: case TAB_MODIFIERS:
hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_MODIFIER ), hDlg, ModifierTabProc ); hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_MODIFIER), hDlg, (DLGPROC)ModifierTabProc);
break; break;
case TAB_PAK: case TAB_PAK:
hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_CONTROLLERPAK ), hDlg, ControllerPakTabProc ); hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_CONTROLLERPAK), hDlg, (DLGPROC)ControllerPakTabProc);
break; break;
default: default:
hTabControl = NULL; hTabControl = NULL;
@ -528,9 +528,9 @@ BOOL CALLBACK ControllerTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
if( hTabControl ) if( hTabControl )
DestroyWindow( hTabControl ); DestroyWindow( hTabControl );
if( pcController->fXInput ) if( pcController->fXInput )
hTabControl = CreateDialog ( g_hResourceDLL, MAKEINTRESOURCE( IDD_XCONTROLS ), hDlg, XControlsTabProc ); hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_XCONTROLS), hDlg, (DLGPROC)XControlsTabProc);
else else
hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_CONTROLS ), hDlg, ControlsTabProc ); hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_CONTROLS), hDlg, (DLGPROC)ControlsTabProc);
{ {
hDlgItem = GetDlgItem( hDlg, IDC_CONTROLLERTAB ); hDlgItem = GetDlgItem( hDlg, IDC_CONTROLLERTAB );
@ -566,9 +566,9 @@ BOOL CALLBACK ControllerTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
DestroyWindow( hTabControl ); DestroyWindow( hTabControl );
if( pcController->fXInput ) if( pcController->fXInput )
hTabControl = CreateDialog ( g_hResourceDLL, MAKEINTRESOURCE( IDD_XCONTROLS ), hDlg, XControlsTabProc ); hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_XCONTROLS), hDlg, (DLGPROC)XControlsTabProc);
else else
hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_CONTROLS ), hDlg, ControlsTabProc ); hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_CONTROLS), hDlg, (DLGPROC)ControlsTabProc);
{ {
hDlgItem = GetDlgItem( hDlg, IDC_CONTROLLERTAB ); hDlgItem = GetDlgItem( hDlg, IDC_CONTROLLERTAB );
@ -1775,13 +1775,13 @@ BOOL CALLBACK ModifierTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
switch( bByte ) switch( bByte )
{ {
case MDT_MOVE: case MDT_MOVE:
hModProperties = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_MOD_MOVE ), hDlg, MoveModifierDialog ); hModProperties = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_MOD_MOVE), hDlg, (DLGPROC)MoveModifierDialog);
break; break;
case MDT_MACRO: case MDT_MACRO:
hModProperties = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_MOD_MACRO ), hDlg, MacroModifierDialog ); hModProperties = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_MOD_MACRO), hDlg, (DLGPROC)MacroModifierDialog);
break; break;
case MDT_CONFIG: case MDT_CONFIG:
hModProperties = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_MOD_CONFIG ), hDlg, ConfigModifierDialog ); hModProperties = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_MOD_CONFIG), hDlg, (DLGPROC)ConfigModifierDialog);
break; break;
case MDT_NONE: case MDT_NONE:
default: default:
@ -1953,23 +1953,23 @@ BOOL CALLBACK ControllerPakTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
switch( bByte ) switch( bByte )
{ {
case PAK_MEM: case PAK_MEM:
hPakWindow = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_PAK_MEMPAK ), hDlg, MemPakProc ); hPakWindow = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_PAK_MEMPAK), hDlg, (DLGPROC)MemPakProc);
break; break;
case PAK_RUMBLE: case PAK_RUMBLE:
hPakWindow = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_PAK_RUMBLE ), hDlg, RumblePakProc ); hPakWindow = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_PAK_RUMBLE), hDlg, (DLGPROC)RumblePakProc);
break; break;
case PAK_TRANSFER: case PAK_TRANSFER:
hPakWindow = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_PAK_TRANSFER ), hDlg, TransferPakProc ); hPakWindow = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_PAK_TRANSFER), hDlg, (DLGPROC)TransferPakProc);
break; break;
case PAK_ADAPTOID: case PAK_ADAPTOID:
hPakWindow = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_PAK_ADAPTOID ), hDlg, PakProc ); hPakWindow = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_PAK_ADAPTOID), hDlg, (DLGPROC)PakProc);
break; break;
case PAK_VOICE: case PAK_VOICE:
case PAK_NONRAW: case PAK_NONRAW:
case PAK_NONE: case PAK_NONE:
default: default:
hPakWindow = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_PAK_TEXT ), hDlg, PakProc ); hPakWindow = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_PAK_TEXT), hDlg, (DLGPROC)PakProc);
} }
if( hPakWindow ) if( hPakWindow )
@ -2123,7 +2123,7 @@ BOOL CALLBACK MemPakProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
} }
return TRUE; return TRUE;
case IDC_CHGDIR: case IDC_CHGDIR:
if( DialogBox( g_hResourceDLL, MAKEINTRESOURCE( IDD_FOLDERS ), hDlg, FoldersDialogProc ) == TRUE ) if (DialogBox(g_hResourceDLL, MAKEINTRESOURCE(IDD_FOLDERS), hDlg, (DLGPROC)FoldersDialogProc) == TRUE)
MemPakProc( hDlg, WM_USER_UPDATE, 0, 0 ); MemPakProc( hDlg, WM_USER_UPDATE, 0, 0 );
return TRUE; return TRUE;
@ -2751,7 +2751,7 @@ BOOL CALLBACK TransferPakProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
return TRUE; return TRUE;
case IDC_CHGDIR: case IDC_CHGDIR:
if( DialogBox( g_hResourceDLL, MAKEINTRESOURCE( IDD_FOLDERS ), hDlg, FoldersDialogProc ) == TRUE ) if (DialogBox(g_hResourceDLL, MAKEINTRESOURCE(IDD_FOLDERS), hDlg, (DLGPROC)FoldersDialogProc) == TRUE)
TransferPakProc( hDlg, WM_USER_UPDATE, 0, 0 ); TransferPakProc( hDlg, WM_USER_UPDATE, 0, 0 );
return TRUE; return TRUE;

View File

@ -243,7 +243,7 @@ EXPORT void CALL DllConfig ( HWND hParent )
} }
LeaveCriticalSection( &g_critical ); LeaveCriticalSection( &g_critical );
int iOK = DialogBox( g_hResourceDLL, MAKEINTRESOURCE( IDD_MAINCFGDIALOG ), hParent, MainDlgProc ); int iOK = DialogBox(g_hResourceDLL, MAKEINTRESOURCE(IDD_MAINCFGDIALOG), hParent, (DLGPROC)MainDlgProc);
// If we go into the dialog box, and the user navigates to the Rumble window, our FF device can get unacquired. // If we go into the dialog box, and the user navigates to the Rumble window, our FF device can get unacquired.
// So let's reinit them now if we're running, just to be safe --rabid // So let's reinit them now if we're running, just to be safe --rabid

View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{FD617E80-9E40-4138-85DA-B94633972E6A}</ProjectGuid> <ProjectGuid>{FD617E80-9E40-4138-85DA-B94633972E6A}</ProjectGuid>
@ -25,15 +33,15 @@
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" /> <Import Project="$(SolutionDir)PropertySheets\Win32.$(Configuration).props" />
</ImportGroup> </ImportGroup>
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<TargetName>PJ64_NRage</TargetName> <TargetName>PJ64_NRage</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PJ64_NRage_d</TargetName> <TargetName Condition="'$(Configuration)'=='Debug'">PJ64_NRage_d</TargetName>
<OutDir>$(SolutionDir)Plugin\Input\</OutDir> <OutDir>$(SolutionDir)Plugin64\Input\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
@ -44,12 +52,13 @@
<Link> <Link>
<AdditionalDependencies>xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(Root)Source\3rd Party\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(Root)Source\3rd Party\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(Root)Source\3rd Party\directx\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Debug.cpp"> <ClCompile Include="Debug.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="DirectInput.cpp" /> <ClCompile Include="DirectInput.cpp" />
<ClCompile Include="FileAccess.cpp" /> <ClCompile Include="FileAccess.cpp" />