Update NRage

This commit is contained in:
Julio C. Rocha 2024-05-10 15:25:27 -07:00
parent 5afc3b7e94
commit 31ed149537
3 changed files with 181 additions and 101 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -1,101 +1,101 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FD617E80-9E40-4138-85DA-B94633972E6A}</ProjectGuid>
<RootNamespace>NRage_Input_V2</RootNamespace>
<ProjectName>PJ64 NRage</ProjectName>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
</ImportGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<PropertyGroup>
<TargetName>PJ64_NRage</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">PJ64_NRage_d</TargetName>
<OutDir>$(SolutionDir)Plugin\Input\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\Input\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(Root)Source\3rdParty\directx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
<AdditionalDependencies>xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(Root)Source\3rdParty\directx\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\nragev20\Version.h.in" "$(SolutionDir)Source\nragev20\Version.h"</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Debug.cpp">
<ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="DirectInput.cpp" />
<ClCompile Include="FileAccess.cpp" />
<ClCompile Include="GBCart.cpp" />
<ClCompile Include="Interface.cpp" />
<ClCompile Include="International.cpp" />
<ClCompile Include="NRagePluginV2.cpp" />
<ClCompile Include="PakIO.cpp" />
<ClCompile Include="XInputController.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Version.h" />
<ClInclude Include="XInputController.h" />
<ClInclude Include="commonIncludes.h" />
<ClInclude Include="ControllerSpecs\Controller #1.1.h" />
<ClInclude Include="Debug.h" />
<ClInclude Include="DirectInput.h" />
<ClInclude Include="FileAccess.h" />
<ClInclude Include="GBCart.h" />
<ClInclude Include="Interface.h" />
<ClInclude Include="International.h" />
<ClInclude Include="NRagePluginV2.h" />
<ClInclude Include="PakIO.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="settings.h" />
</ItemGroup>
<ItemGroup>
<None Include="configs\Controller1.cpf" />
<None Include="configs\Shortcuts.sc" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="NRagePluginV2.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
</ProjectReference>
<ProjectReference Include="..\UpdateVersion\UpdateVersion.vcxproj">
<Project>{1968162c-0793-491d-91a1-81645a24d399}</Project>
</ProjectReference>
</ItemGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FD617E80-9E40-4138-85DA-B94633972E6A}</ProjectGuid>
<RootNamespace>NRage_Input_V2</RootNamespace>
<ProjectName>PJ64 NRage</ProjectName>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
</ImportGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<PropertyGroup>
<TargetName>PJ64_NRage</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">PJ64_NRage_d</TargetName>
<OutDir>$(SolutionDir)Plugin\Input\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\Input\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(Root)Source\3rdParty\directx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
<AdditionalDependencies>xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(Root)Source\3rdParty\directx\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<PreBuildEvent>
<!-- <Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\nragev20\Version.h.in" "$(SolutionDir)Source\nragev20\Version.h"</Command> -->
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Debug.cpp">
<ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="DirectInput.cpp" />
<ClCompile Include="FileAccess.cpp" />
<ClCompile Include="GBCart.cpp" />
<ClCompile Include="Interface.cpp" />
<ClCompile Include="International.cpp" />
<ClCompile Include="NRagePluginV2.cpp" />
<ClCompile Include="PakIO.cpp" />
<ClCompile Include="XInputController.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Version.h" />
<ClInclude Include="XInputController.h" />
<ClInclude Include="commonIncludes.h" />
<ClInclude Include="ControllerSpecs\Controller #1.1.h" />
<ClInclude Include="Debug.h" />
<ClInclude Include="DirectInput.h" />
<ClInclude Include="FileAccess.h" />
<ClInclude Include="GBCart.h" />
<ClInclude Include="Interface.h" />
<ClInclude Include="International.h" />
<ClInclude Include="NRagePluginV2.h" />
<ClInclude Include="PakIO.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="settings.h" />
</ItemGroup>
<ItemGroup>
<None Include="configs\Controller1.cpf" />
<None Include="configs\Shortcuts.sc" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="NRagePluginV2.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
</ProjectReference>
<ProjectReference Include="..\UpdateVersion\UpdateVersion.vcxproj">
<Project>{1968162c-0793-491d-91a1-81645a24d399}</Project>
</ProjectReference>
</ItemGroup>
</Project>

81
Source/nragev20/Version.h Normal file
View File

@ -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