From 3657bfb3eeffdefc4d0ee167d671b5dc8632cdca Mon Sep 17 00:00:00 2001 From: Emmet Young Date: Sat, 21 Feb 2015 14:00:59 +1100 Subject: [PATCH 1/2] Make sure NRage properly uses our Version.h --- Source/nragev20/FileAccess.h | 3 +- Source/nragev20/Interface.cpp | 3 +- Source/nragev20/NRagePluginV2.cpp | 8 ++-- Source/nragev20/NRagePluginV2.h | 2 - Source/nragev20/NRagePluginV2.rc | 37 ++++++++----------- Source/nragev20/NRage_Input_V2.vcxproj | 1 + .../nragev20/NRage_Input_V2.vcxproj.filters | 3 ++ Source/nragev20/settings.h | 1 - 8 files changed, 28 insertions(+), 30 deletions(-) diff --git a/Source/nragev20/FileAccess.h b/Source/nragev20/FileAccess.h index 3da65671a..2a4ec74fd 100644 --- a/Source/nragev20/FileAccess.h +++ b/Source/nragev20/FileAccess.h @@ -25,6 +25,7 @@ #define _FILEACCESS_H_ #include "NRagePluginV2.h" +#include "Version.h" #include using std::string; @@ -63,7 +64,7 @@ unsigned long djbHash(const char *str); #define STRING_DEF_GBROMFILE _T("GBxRoms") #define STRING_DEF_GBROMSAVE _T("GBxSaves") -#define STRING_INI_HEADER "# Generated by NRage input plugin V2 version " VERSIONNUMBER "\n" +#define STRING_INI_HEADER "# Generated by NRage input plugin V2 version " VER_FILE_VERSION_STR "\n" // We use these names for loading from INI files and NRage config files #define STRING_INI_GENERAL "General" #define STRING_INI_CONTROLLER "Controller" diff --git a/Source/nragev20/Interface.cpp b/Source/nragev20/Interface.cpp index c0da0f324..2b55a0a24 100644 --- a/Source/nragev20/Interface.cpp +++ b/Source/nragev20/Interface.cpp @@ -32,6 +32,7 @@ #include "PakIO.h" #include "Interface.h" #include "International.h" +#include "Version.h" // Prototypes // BOOL CALLBACK ControllerTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); @@ -102,7 +103,7 @@ BOOL CALLBACK MainDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) TCHAR tszBuffer[DEFAULT_BUFFER], tszMsg[DEFAULT_BUFFER / 2]; LoadString( g_hResourceDLL, IDS_VERSTRING, tszBuffer, DEFAULT_BUFFER / 2); - _stprintf(tszMsg, tszBuffer, VERSIONINFO); + _stprintf(tszMsg, tszBuffer, VER_FILE_VERSION_STR); SetDlgItemText( hDlg, IDC_VERSIONSTRING, tszMsg ); } diff --git a/Source/nragev20/NRagePluginV2.cpp b/Source/nragev20/NRagePluginV2.cpp index 4bfab275d..c0165f268 100644 --- a/Source/nragev20/NRagePluginV2.cpp +++ b/Source/nragev20/NRagePluginV2.cpp @@ -32,7 +32,7 @@ #include "PakIO.h" #include "DirectInput.h" #include "International.h" -#include "version.h" +#include "Version.h" // ProtoTypes // bool prepareHeap(); @@ -77,7 +77,7 @@ BOOL APIENTRY DllMain( HINSTANCE hModule, DWORD ul_reason_for_call, LPVOID lpRe DisableThreadLibraryCalls( hModule ); if( !prepareHeap()) return FALSE; - DebugWriteA("*** DLL Attach (" VERSIONNUMBER "-Debugbuild | built on " __DATE__ " at " __TIME__")\n"); + DebugWriteA("*** DLL Attach (" VER_FILE_VERSION_STR "-Debugbuild | built on " __DATE__ " at " __TIME__")\n"); ZeroMemory( &g_strEmuInfo, sizeof(g_strEmuInfo) ); ZeroMemory( g_devList, sizeof(g_devList) ); ZeroMemory( &g_sysMouse, sizeof(g_sysMouse) ); @@ -172,9 +172,9 @@ EXPORT void CALL DllAbout ( HWND hParent ) LoadString( g_hResourceDLL, IDS_DLG_ABOUT_TITLE, tszTitle, DEFAULT_BUFFER ); - TCHAR szText[DEFAULT_BUFFER * 4] = _T(STRING_PLUGINNAME) _T("\n\n") \ + TCHAR szText[DEFAULT_BUFFER * 4] = _T(VER_FILE_DESCRIPTION_STR) _T("\n\n") \ _T("Visit my site for support: >>http://go.to/nrage<<\n\n") \ - _T("Version ") VERSIONINFO _T(" (") _T(__DATE__) _T(")\n") \ + _T("Version ") VER_FILE_VERSION_STR _T(" (") _T(__DATE__) _T(")\n") \ _T("Done by N-Rage\n") \ _T("\n") \ _T(" - - - - -\n") \ diff --git a/Source/nragev20/NRagePluginV2.h b/Source/nragev20/NRagePluginV2.h index b08fd6698..b1fb2d348 100644 --- a/Source/nragev20/NRagePluginV2.h +++ b/Source/nragev20/NRagePluginV2.h @@ -30,8 +30,6 @@ ///////////////////////////////////////////////////////////////////////////////// //General Plugin -#define STRING_PLUGINNAME "N-Rage For PJ64 " - #define TIMER_MESSAGEWINDOW 123 // maximum number of devices other than SysMouse diff --git a/Source/nragev20/NRagePluginV2.rc b/Source/nragev20/NRagePluginV2.rc index 337f93a16..07d4cafa4 100644 --- a/Source/nragev20/NRagePluginV2.rc +++ b/Source/nragev20/NRagePluginV2.rc @@ -1,6 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" +#include "Version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -523,39 +524,33 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,3,0,2 - PRODUCTVERSION 2,3,0,2 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEVERSION VER_FILE_VERSION + PRODUCTVERSION VER_PRODUCT_VERSION + FILEFLAGSMASK 0x3fL + FILEFLAGS VER_FILEFLAGS + FILEOS VER_FILEOS + FILETYPE VER_FILETYPE + FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "000004b0" BEGIN - VALUE "Comments", "Release Version" - VALUE "FileDescription", "Zilmar Spec Plugin for N64 Emulators" - VALUE "FileVersion", "2.3c" - VALUE "InternalName", "NRage_Input_V2" - VALUE "LegalCopyright", "Copyright © 2001-2015 N-Rage, compiled under GPL licensing" - VALUE "OriginalFilename", "NRage_Input_V2.dll" - VALUE "ProductName", "NRage_Input_V2" - VALUE "ProductVersion", "2.3c" + VALUE "FileDescription", VER_FILE_DESCRIPTION_STR "\0" + VALUE "FileVersion", VER_FILE_VERSION_STR "\0" + VALUE "InternalName", VER_INTERNAL_NAME_STR "\0" + VALUE "LegalCopyright", VER_COPYRIGHT_STR "\0" + VALUE "OriginalFilename", VER_ORIGINAL_FILENAME_STR "\0" + VALUE "ProductName", VER_PRODUCTNAME_STR + VALUE "ProductVersion", VER_PRODUCT_VERSION_STR "\0" END END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x0, 1200 + VALUE "Translation", 0x409, 1200 END END - ///////////////////////////////////////////////////////////////////////////// // // PROFILE diff --git a/Source/nragev20/NRage_Input_V2.vcxproj b/Source/nragev20/NRage_Input_V2.vcxproj index f126936c8..ff06e2fb7 100644 --- a/Source/nragev20/NRage_Input_V2.vcxproj +++ b/Source/nragev20/NRage_Input_V2.vcxproj @@ -62,6 +62,7 @@ + diff --git a/Source/nragev20/NRage_Input_V2.vcxproj.filters b/Source/nragev20/NRage_Input_V2.vcxproj.filters index 2f1dfd4bc..26daf4d76 100644 --- a/Source/nragev20/NRage_Input_V2.vcxproj.filters +++ b/Source/nragev20/NRage_Input_V2.vcxproj.filters @@ -86,6 +86,9 @@ Header Files + + Header Files + diff --git a/Source/nragev20/settings.h b/Source/nragev20/settings.h index ebfa3748b..328ce4d27 100644 --- a/Source/nragev20/settings.h +++ b/Source/nragev20/settings.h @@ -25,7 +25,6 @@ #define _SETTINGS_H_ #define DIRECTINPUT_VERSION 0x0800 -#define VERSIONNUMBER "2.3c" // hacks for GNU C compilers #ifdef __GNUC__ From 78b74bcebf7461cdc39ecfebd8e0f100a054306a Mon Sep 17 00:00:00 2001 From: dsx- Date: Sat, 21 Feb 2015 11:41:20 +0800 Subject: [PATCH 2/2] disable 32bit engine for Mario Story (J) --- Config/Project64.rdb | 1 + 1 file changed, 1 insertion(+) diff --git a/Config/Project64.rdb b/Config/Project64.rdb index cb2bf94d7..92a5be8a8 100644 --- a/Config/Project64.rdb +++ b/Config/Project64.rdb @@ -3756,6 +3756,7 @@ Good Name=Mario Story (J) Internal Name=MARIO STORY Status=Compatible Plugin Note=[video] errors:menus (see GameFAQ) +32bit=No Clear Frame=1 Counter Factor=1 Culling=1