From 31ed149537c29da45d5ae0f619ee6595138b149e Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Fri, 10 May 2024 15:25:27 -0700 Subject: [PATCH] Update NRage --- .gitignore | 1 - Source/nragev20/NRage_Input_V2.vcxproj | 200 ++++++++++++------------- Source/nragev20/Version.h | 81 ++++++++++ 3 files changed, 181 insertions(+), 101 deletions(-) create mode 100644 Source/nragev20/Version.h diff --git a/.gitignore b/.gitignore index e204f3e6f..cf18105f7 100644 --- a/.gitignore +++ b/.gitignore @@ -95,7 +95,6 @@ Thumbs.db /Plugin64/RSP/RSP-HLE_d.dll /Plugin64/RSP/RSP-HLE.dll /Save -/Source/nragev20/Version.h /Source/Project64-core/Version.h /Source/Project64-input/Version.h /Source/Project64-video/Version.h diff --git a/Source/nragev20/NRage_Input_V2.vcxproj b/Source/nragev20/NRage_Input_V2.vcxproj index e415ec323..9ab26defc 100644 --- a/Source/nragev20/NRage_Input_V2.vcxproj +++ b/Source/nragev20/NRage_Input_V2.vcxproj @@ -1,101 +1,101 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {FD617E80-9E40-4138-85DA-B94633972E6A} - NRage_Input_V2 - PJ64 NRage - - - DynamicLibrary - - - - - - - - - PJ64_NRage - PJ64_NRage_d - $(SolutionDir)Plugin\Input\ - $(SolutionDir)Plugin64\Input\ - - - - $(Root)Source\3rdParty\directx\include;%(AdditionalIncludeDirectories) - - Level3 - - - xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies) - $(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories) - $(Root)Source\3rdParty\directx\lib64;%(AdditionalLibraryDirectories) - false - - - "$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\nragev20\Version.h.in" "$(SolutionDir)Source\nragev20\Version.h" - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {b4a4b994-9111-42b1-93c2-6f1ca8bc4421} - - - {1968162c-0793-491d-91a1-81645a24d399} - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FD617E80-9E40-4138-85DA-B94633972E6A} + NRage_Input_V2 + PJ64 NRage + + + DynamicLibrary + + + + + + + + + PJ64_NRage + PJ64_NRage_d + $(SolutionDir)Plugin\Input\ + $(SolutionDir)Plugin64\Input\ + + + + $(Root)Source\3rdParty\directx\include;%(AdditionalIncludeDirectories) + + Level3 + + + xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies) + $(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories) + $(Root)Source\3rdParty\directx\lib64;%(AdditionalLibraryDirectories) + false + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {b4a4b994-9111-42b1-93c2-6f1ca8bc4421} + + + {1968162c-0793-491d-91a1-81645a24d399} + + \ No newline at end of file diff --git a/Source/nragev20/Version.h b/Source/nragev20/Version.h new file mode 100644 index 000000000..e167627f8 --- /dev/null +++ b/Source/nragev20/Version.h @@ -0,0 +1,81 @@ +/* +N-Rage`s Dinput8 Plugin +(C) 2002, 2006 Norbert Wladyka + +Author`s Email: norbert.wladyka@chello.at +Website: http://go.to/nrage + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#define STRINGIZE2(s) #s +#define STRINGIZE(s) STRINGIZE2(s) + +#ifndef VERSION_MAJOR +#define VERSION_MAJOR 4 +#endif +#ifndef VERSION_MINOR +#define VERSION_MINOR 0 +#endif +#ifndef VERSION_REVISION +#define VERSION_REVISION 0 +#endif +#ifndef VERSION_BUILD +#define VERSION_BUILD 9999 +#endif +#ifndef VERSION_PREFIX +#define VERSION_PREFIX "Dev-" +#endif +#ifndef VERSION_BUILD_YEAR +#define VERSION_BUILD_YEAR 2022 +#endif + +#ifndef GIT_REVISION +#define GIT_REVISION "" +#endif +#ifndef GIT_REVISION_SHORT +#define GIT_REVISION_SHORT "" +#endif +#ifndef GIT_DIRTY +#define GIT_DIRTY "" +#endif +#ifndef GIT_VERSION +#define GIT_VERSION Unknown +#endif + +#define VER_FILE_DESCRIPTION_STR "N-Rage for Project64" +#define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD +#define VER_FILE_VERSION_STR VERSION_PREFIX STRINGIZE(VERSION_MAJOR) \ + "." STRINGIZE(VERSION_MINOR) \ + "." STRINGIZE(VERSION_REVISION) \ + "." STRINGIZE(VERSION_BUILD) \ + "-" STRINGIZE(GIT_VERSION) + +#define VER_PRODUCTNAME_STR "N-Rage" +#define VER_PRODUCT_VERSION VER_FILE_VERSION +#define VER_PRODUCT_VERSION_STR VER_FILE_VERSION_STR +#define VER_ORIGINAL_FILENAME_STR VER_PRODUCTNAME_STR ".dll" +#define VER_INTERNAL_NAME_STR VER_PRODUCTNAME_STR +#define VER_COPYRIGHT_STR "Copyright (C) " STRINGIZE(VERSION_BUILD_YEAR) + +#ifdef _DEBUG +#define VER_VER_DEBUG VS_FF_DEBUG +#else +#define VER_VER_DEBUG 0 +#endif + +#define VER_FILEOS VOS_NT_WINDOWS32 +#define VER_FILEFLAGS VER_VER_DEBUG +#define VER_FILETYPE VFT_DLL