From 7612f53eac51d7d920794211aeec0cb1e4f651e9 Mon Sep 17 00:00:00 2001
From: "Julio C. Rocha" <dev@rocha.red>
Date: Fri, 10 May 2024 16:46:25 -0700
Subject: [PATCH] Clean up

---
 .../Project64-audio/Project64-audio.vcxproj   | 173 +++++++--------
 Source/Project64-audio/Version.h.in           |  59 -----
 Source/Project64-core/Project64-core.vcxproj  |   3 -
 Source/Project64-core/Version.h.in            |  39 ----
 .../Project64-input/Project64-input.vcxproj   |   3 -
 Source/Project64-input/Version.h.in           |  39 ----
 .../Project64-rsp-core.vcxproj                | 207 +++++++++---------
 Source/Project64-rsp-core/Version.h.in        |  39 ----
 .../Project64-video/Project64-video.vcxproj   |   3 -
 Source/Project64-video/Version.h.in           |  39 ----
 Source/nragev20/NRage_Input_V2.vcxproj        |   3 -
 Source/nragev20/Version.h.in                  |  61 ------
 12 files changed, 187 insertions(+), 481 deletions(-)
 delete mode 100644 Source/Project64-audio/Version.h.in
 delete mode 100644 Source/Project64-core/Version.h.in
 delete mode 100644 Source/Project64-input/Version.h.in
 delete mode 100644 Source/Project64-rsp-core/Version.h.in
 delete mode 100644 Source/Project64-video/Version.h.in
 delete mode 100644 Source/nragev20/Version.h.in

diff --git a/Source/Project64-audio/Project64-audio.vcxproj b/Source/Project64-audio/Project64-audio.vcxproj
index 62404afb9..f663181de 100644
--- a/Source/Project64-audio/Project64-audio.vcxproj
+++ b/Source/Project64-audio/Project64-audio.vcxproj
@@ -1,89 +1,86 @@
-<?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>{D233025A-231F-4A43-92B6-E87193C60ACC}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>Project64-audio</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <NeedsVersioning>true</NeedsVersioning>
-  </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>Project64-Audio</TargetName>
-    <TargetName Condition="'$(Configuration)'=='Debug'">Project64-Audio_d</TargetName>
-    <OutDir>$(SolutionDir)Plugin\Audio\</OutDir>
-    <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\Audio\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>$(Root)Source\3rdParty\directx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PreBuildEvent>
-      <!-- <Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\Project64-audio\Version.h.in" "$(SolutionDir)Source\Project64-audio\Version.h"</Command> -->
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="AudioMain.cpp" />
-    <ClCompile Include="AudioSettings.cpp" />
-    <ClCompile Include="ConfigUI.cpp" />
-    <ClCompile Include="Driver\DirectSound.cpp" />
-    <ClCompile Include="Driver\OpenSLES.cpp" />
-    <ClCompile Include="Driver\SoundBase.cpp" />
-    <ClCompile Include="trace.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="AudioMain.h" />
-    <ClInclude Include="AudioSettings.h" />
-    <ClInclude Include="ConfigUI.h" />
-    <ClInclude Include="Driver\DirectSound.h" />
-    <ClInclude Include="Driver\OpenSLES.h" />
-    <ClInclude Include="Driver\SoundBase.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="SettingsID.h" />
-    <ClInclude Include="trace.h" />
-    <ClInclude Include="Version.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.vcxproj">
-      <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Settings\Settings.vcxproj">
-      <Project>{8b9961b1-88d9-4ea3-a752-507a00dd9f3d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\UpdateVersion\UpdateVersion.vcxproj">
-      <Project>{1968162c-0793-491d-91a1-81645a24d399}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Project64-audio.rc" />
-  </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>{D233025A-231F-4A43-92B6-E87193C60ACC}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Project64-audio</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <NeedsVersioning>true</NeedsVersioning>
+  </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>Project64-Audio</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">Project64-Audio_d</TargetName>
+    <OutDir>$(SolutionDir)Plugin\Audio\</OutDir>
+    <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\Audio\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>$(Root)Source\3rdParty\directx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="AudioMain.cpp" />
+    <ClCompile Include="AudioSettings.cpp" />
+    <ClCompile Include="ConfigUI.cpp" />
+    <ClCompile Include="Driver\DirectSound.cpp" />
+    <ClCompile Include="Driver\OpenSLES.cpp" />
+    <ClCompile Include="Driver\SoundBase.cpp" />
+    <ClCompile Include="trace.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="AudioMain.h" />
+    <ClInclude Include="AudioSettings.h" />
+    <ClInclude Include="ConfigUI.h" />
+    <ClInclude Include="Driver\DirectSound.h" />
+    <ClInclude Include="Driver\OpenSLES.h" />
+    <ClInclude Include="Driver\SoundBase.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="SettingsID.h" />
+    <ClInclude Include="trace.h" />
+    <ClInclude Include="Version.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.vcxproj">
+      <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Settings\Settings.vcxproj">
+      <Project>{8b9961b1-88d9-4ea3-a752-507a00dd9f3d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\UpdateVersion\UpdateVersion.vcxproj">
+      <Project>{1968162c-0793-491d-91a1-81645a24d399}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Project64-audio.rc" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Project64-audio/Version.h.in b/Source/Project64-audio/Version.h.in
deleted file mode 100644
index a7152da1d..000000000
--- a/Source/Project64-audio/Version.h.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#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    "Project64-audio"
-#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)    \
-                                    "-" GIT_VERSION
-
-#define VER_PRODUCTNAME_STR         "Project64-audio"
-#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
diff --git a/Source/Project64-core/Project64-core.vcxproj b/Source/Project64-core/Project64-core.vcxproj
index dcd434a38..104c51ac3 100644
--- a/Source/Project64-core/Project64-core.vcxproj
+++ b/Source/Project64-core/Project64-core.vcxproj
@@ -32,9 +32,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <!-- <Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\Project64-core\Version.h.in" "$(SolutionDir)Source\Project64-core\Version.h"</Command> -->
-    </PreBuildEvent>
     <Lib>
       <AdditionalOptions>/ignore:4221%(AdditionalOptions)</AdditionalOptions>
     </Lib>
diff --git a/Source/Project64-core/Version.h.in b/Source/Project64-core/Version.h.in
deleted file mode 100644
index 1dcc47a6b..000000000
--- a/Source/Project64-core/Version.h.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#define STRINGIZE2(s) #s
-#define STRINGIZE(s) STRINGIZE2(s)
-
-#define VERSION_MAJOR               4
-#define VERSION_MINOR               0
-#define VERSION_REVISION            0
-#define VERSION_BUILD               9999
-#define VERSION_PREFIX              "Dev-"
-#define VERSION_BUILD_YEAR          2022
-
-#define GIT_REVISION                ""
-#define GIT_REVISION_SHORT          ""
-#define GIT_DIRTY                   ""
-#define GIT_VERSION                 "Unknown"
-
-#define VER_FILE_DESCRIPTION_STR    "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)    \
-                                    "-" GIT_VERSION
-
-#define VER_PRODUCTNAME_STR         "Project64"
-#define VER_PRODUCT_VERSION         VER_FILE_VERSION
-#define VER_PRODUCT_VERSION_STR     VER_FILE_VERSION_STR
-#define VER_ORIGINAL_FILENAME_STR   VER_PRODUCTNAME_STR ".exe"
-#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_APP
diff --git a/Source/Project64-input/Project64-input.vcxproj b/Source/Project64-input/Project64-input.vcxproj
index 95d26f026..f7792a9a3 100644
--- a/Source/Project64-input/Project64-input.vcxproj
+++ b/Source/Project64-input/Project64-input.vcxproj
@@ -42,9 +42,6 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <PreBuildEvent>
-      <!-- <Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\Project64-input\Version.h.in" "$(SolutionDir)Source\Project64-input\Version.h"</Command> -->
-    </PreBuildEvent>
     <Link>
       <AdditionalDependencies>dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">$(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/Source/Project64-input/Version.h.in b/Source/Project64-input/Version.h.in
deleted file mode 100644
index 69af5789d..000000000
--- a/Source/Project64-input/Version.h.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#define STRINGIZE2(s) #s
-#define STRINGIZE(s) STRINGIZE2(s)
-
-#define VERSION_MAJOR               4
-#define VERSION_MINOR               0
-#define VERSION_REVISION            0
-#define VERSION_BUILD               9999
-#define VERSION_PREFIX              "Dev-"
-#define VERSION_BUILD_YEAR          2022
-
-#define GIT_REVISION                ""
-#define GIT_REVISION_SHORT          ""
-#define GIT_DIRTY                   ""
-#define GIT_VERSION                 "Unknown"
-
-#define VER_FILE_DESCRIPTION_STR    "Project64-input"
-#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)    \
-                                    "-" GIT_VERSION
-
-#define VER_PRODUCTNAME_STR         "Project64-input"
-#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
diff --git a/Source/Project64-rsp-core/Project64-rsp-core.vcxproj b/Source/Project64-rsp-core/Project64-rsp-core.vcxproj
index ee3c42315..6c31a2d3d 100644
--- a/Source/Project64-rsp-core/Project64-rsp-core.vcxproj
+++ b/Source/Project64-rsp-core/Project64-rsp-core.vcxproj
@@ -1,106 +1,103 @@
-<?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>{7598F6B8-9DA6-4897-B26F-F6865F824BF4}</ProjectGuid>
-    <RootNamespace>Project64rspcore</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <NeedsVersioning>true</NeedsVersioning>
-  </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" />
-  <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <!-- <Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\Project64-rsp-core\Version.h.in" "$(SolutionDir)Source\Project64-rsp-core\Version.h"</Command> -->
-    </PreBuildEvent>
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="cpu\RspClamp.cpp" />
-    <ClCompile Include="cpu\RSPCpu.cpp" />
-    <ClCompile Include="cpu\RSPiInstruction.cpp" />
-    <ClCompile Include="cpu\RSPInterpreterCPU.cpp" />
-    <ClCompile Include="cpu\RSPInterpreterOps.cpp" />
-    <ClCompile Include="cpu\RspLog.cpp" />
-    <ClCompile Include="cpu\RspMemory.cpp" />
-    <ClCompile Include="cpu\RSPRegister.cpp" />
-    <ClCompile Include="cpu\RSPRegisterHandler.cpp" />
-    <ClCompile Include="cpu\RSPRegisterHandlerPlugin.cpp" />
-    <ClCompile Include="cpu\RspTypes.cpp" />
-    <ClCompile Include="Hle\alist.cpp" />
-    <ClCompile Include="Hle\alist_audio.cpp" />
-    <ClCompile Include="Hle\alist_naudio.cpp" />
-    <ClCompile Include="Hle\alist_nead.cpp" />
-    <ClCompile Include="Hle\audio.cpp" />
-    <ClCompile Include="Hle\cicx105.cpp" />
-    <ClCompile Include="Hle\hle.cpp" />
-    <ClCompile Include="Hle\jpeg.cpp" />
-    <ClCompile Include="Hle\mem.cpp" />
-    <ClCompile Include="Hle\mp3.cpp" />
-    <ClCompile Include="Hle\musyx.cpp" />
-    <ClCompile Include="Recompiler\Mmx.cpp" />
-    <ClCompile Include="Recompiler\RspProfiling.cpp" />
-    <ClCompile Include="Recompiler\RspRecompilerAnalysis.cpp" />
-    <ClCompile Include="Recompiler\RspRecompilerCPU.cpp" />
-    <ClCompile Include="Recompiler\RspRecompilerOps.cpp" />
-    <ClCompile Include="Recompiler\RspRecompilerSections.cpp" />
-    <ClCompile Include="Recompiler\Sse.cpp" />
-    <ClCompile Include="Recompiler\X86.cpp" />
-    <ClCompile Include="RSPDebugger.cpp" />
-    <ClCompile Include="RSPInfo.cpp" />
-    <ClCompile Include="Settings\RspSettings.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="cpu\RspClamp.h" />
-    <ClInclude Include="cpu\RSPCpu.h" />
-    <ClInclude Include="cpu\RSPInstruction.h" />
-    <ClInclude Include="cpu\RSPInterpreterCPU.h" />
-    <ClInclude Include="cpu\RSPInterpreterOps.h" />
-    <ClInclude Include="cpu\RspLog.h" />
-    <ClInclude Include="cpu\RspMemory.h" />
-    <ClInclude Include="cpu\RSPOpcode.h" />
-    <ClInclude Include="cpu\RSPRegisterHandler.h" />
-    <ClInclude Include="cpu\RSPRegisterHandlerPlugin.h" />
-    <ClInclude Include="cpu\RSPRegisters.h" />
-    <ClInclude Include="cpu\RspTypes.h" />
-    <ClInclude Include="Hle\alist.h" />
-    <ClInclude Include="Hle\arithmetics.h" />
-    <ClInclude Include="Hle\audio.h" />
-    <ClInclude Include="Hle\hle.h" />
-    <ClInclude Include="Hle\mem.h" />
-    <ClInclude Include="Hle\ucodes.h" />
-    <ClInclude Include="Recompiler\RspProfiling.h" />
-    <ClInclude Include="Recompiler\RspRecompilerCPU.h" />
-    <ClInclude Include="Recompiler\RspRecompilerOps.h" />
-    <ClInclude Include="Recompiler\X86.h" />
-    <ClInclude Include="RSPDebugger.h" />
-    <ClInclude Include="RSPInfo.h" />
-    <ClInclude Include="Settings\RspSettings.h" />
-    <ClInclude Include="Settings\RspSettingsID.h" />
-  </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>{7598F6B8-9DA6-4897-B26F-F6865F824BF4}</ProjectGuid>
+    <RootNamespace>Project64rspcore</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <NeedsVersioning>true</NeedsVersioning>
+  </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" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="cpu\RspClamp.cpp" />
+    <ClCompile Include="cpu\RSPCpu.cpp" />
+    <ClCompile Include="cpu\RSPiInstruction.cpp" />
+    <ClCompile Include="cpu\RSPInterpreterCPU.cpp" />
+    <ClCompile Include="cpu\RSPInterpreterOps.cpp" />
+    <ClCompile Include="cpu\RspLog.cpp" />
+    <ClCompile Include="cpu\RspMemory.cpp" />
+    <ClCompile Include="cpu\RSPRegister.cpp" />
+    <ClCompile Include="cpu\RSPRegisterHandler.cpp" />
+    <ClCompile Include="cpu\RSPRegisterHandlerPlugin.cpp" />
+    <ClCompile Include="cpu\RspTypes.cpp" />
+    <ClCompile Include="Hle\alist.cpp" />
+    <ClCompile Include="Hle\alist_audio.cpp" />
+    <ClCompile Include="Hle\alist_naudio.cpp" />
+    <ClCompile Include="Hle\alist_nead.cpp" />
+    <ClCompile Include="Hle\audio.cpp" />
+    <ClCompile Include="Hle\cicx105.cpp" />
+    <ClCompile Include="Hle\hle.cpp" />
+    <ClCompile Include="Hle\jpeg.cpp" />
+    <ClCompile Include="Hle\mem.cpp" />
+    <ClCompile Include="Hle\mp3.cpp" />
+    <ClCompile Include="Hle\musyx.cpp" />
+    <ClCompile Include="Recompiler\Mmx.cpp" />
+    <ClCompile Include="Recompiler\RspProfiling.cpp" />
+    <ClCompile Include="Recompiler\RspRecompilerAnalysis.cpp" />
+    <ClCompile Include="Recompiler\RspRecompilerCPU.cpp" />
+    <ClCompile Include="Recompiler\RspRecompilerOps.cpp" />
+    <ClCompile Include="Recompiler\RspRecompilerSections.cpp" />
+    <ClCompile Include="Recompiler\Sse.cpp" />
+    <ClCompile Include="Recompiler\X86.cpp" />
+    <ClCompile Include="RSPDebugger.cpp" />
+    <ClCompile Include="RSPInfo.cpp" />
+    <ClCompile Include="Settings\RspSettings.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="cpu\RspClamp.h" />
+    <ClInclude Include="cpu\RSPCpu.h" />
+    <ClInclude Include="cpu\RSPInstruction.h" />
+    <ClInclude Include="cpu\RSPInterpreterCPU.h" />
+    <ClInclude Include="cpu\RSPInterpreterOps.h" />
+    <ClInclude Include="cpu\RspLog.h" />
+    <ClInclude Include="cpu\RspMemory.h" />
+    <ClInclude Include="cpu\RSPOpcode.h" />
+    <ClInclude Include="cpu\RSPRegisterHandler.h" />
+    <ClInclude Include="cpu\RSPRegisterHandlerPlugin.h" />
+    <ClInclude Include="cpu\RSPRegisters.h" />
+    <ClInclude Include="cpu\RspTypes.h" />
+    <ClInclude Include="Hle\alist.h" />
+    <ClInclude Include="Hle\arithmetics.h" />
+    <ClInclude Include="Hle\audio.h" />
+    <ClInclude Include="Hle\hle.h" />
+    <ClInclude Include="Hle\mem.h" />
+    <ClInclude Include="Hle\ucodes.h" />
+    <ClInclude Include="Recompiler\RspProfiling.h" />
+    <ClInclude Include="Recompiler\RspRecompilerCPU.h" />
+    <ClInclude Include="Recompiler\RspRecompilerOps.h" />
+    <ClInclude Include="Recompiler\X86.h" />
+    <ClInclude Include="RSPDebugger.h" />
+    <ClInclude Include="RSPInfo.h" />
+    <ClInclude Include="Settings\RspSettings.h" />
+    <ClInclude Include="Settings\RspSettingsID.h" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Project64-rsp-core/Version.h.in b/Source/Project64-rsp-core/Version.h.in
deleted file mode 100644
index 59ac43c85..000000000
--- a/Source/Project64-rsp-core/Version.h.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#define STRINGIZE2(s) #s
-#define STRINGIZE(s) STRINGIZE2(s)
-
-#define VERSION_MAJOR               4
-#define VERSION_MINOR               0
-#define VERSION_REVISION            0
-#define VERSION_BUILD               9999
-#define VERSION_PREFIX              "Dev-"
-#define VERSION_BUILD_YEAR          2022
-
-#define GIT_REVISION                ""
-#define GIT_REVISION_SHORT          ""
-#define GIT_DIRTY                   ""
-#define GIT_VERSION                 "Unknown"
-
-#define VER_FILE_DESCRIPTION_STR    "Project64-RSP"
-#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)    \
-                                    "-" GIT_VERSION
-
-#define VER_PRODUCTNAME_STR         "Project64-RSP"
-#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
diff --git a/Source/Project64-video/Project64-video.vcxproj b/Source/Project64-video/Project64-video.vcxproj
index 2e40b9542..7568caf70 100644
--- a/Source/Project64-video/Project64-video.vcxproj
+++ b/Source/Project64-video/Project64-video.vcxproj
@@ -46,9 +46,6 @@
       <PrecompiledHeader />
       <DisableSpecificWarnings>4611</DisableSpecificWarnings>
     </ClCompile>
-    <PreBuildEvent>
-      <!-- <Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\Project64-video\Version.h.in" "$(SolutionDir)Source\Project64-video\Version.h"</Command> -->
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="F3DTEXA.h" />
diff --git a/Source/Project64-video/Version.h.in b/Source/Project64-video/Version.h.in
deleted file mode 100644
index c572bc576..000000000
--- a/Source/Project64-video/Version.h.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#define STRINGIZE2(s) #s
-#define STRINGIZE(s) STRINGIZE2(s)
-
-#define VERSION_MAJOR               4
-#define VERSION_MINOR               0
-#define VERSION_REVISION            0
-#define VERSION_BUILD               9999
-#define VERSION_PREFIX              "Dev-"
-#define VERSION_BUILD_YEAR          2022
-
-#define GIT_REVISION                ""
-#define GIT_REVISION_SHORT          ""
-#define GIT_DIRTY                   ""
-#define GIT_VERSION                 "Unknown"
-
-#define VER_FILE_DESCRIPTION_STR    "Project64-video"
-#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)    \
-                                    "-" GIT_VERSION
-
-#define VER_PRODUCTNAME_STR         "Project64-video"
-#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
diff --git a/Source/nragev20/NRage_Input_V2.vcxproj b/Source/nragev20/NRage_Input_V2.vcxproj
index 9ab26defc..7d4202d72 100644
--- a/Source/nragev20/NRage_Input_V2.vcxproj
+++ b/Source/nragev20/NRage_Input_V2.vcxproj
@@ -50,9 +50,6 @@
       <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">
diff --git a/Source/nragev20/Version.h.in b/Source/nragev20/Version.h.in
deleted file mode 100644
index c009652cb..000000000
--- a/Source/nragev20/Version.h.in
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	
-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)
-
-#define VERSION_MAJOR               4
-#define VERSION_MINOR               0
-#define VERSION_REVISION            0
-#define VERSION_BUILD               9999
-#define VERSION_PREFIX              "Dev-"
-#define VERSION_BUILD_YEAR          2022
-
-#define GIT_REVISION                ""
-#define GIT_REVISION_SHORT          ""
-#define GIT_DIRTY                   ""
-#define GIT_VERSION                 "Unknown"
-
-#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)    \
-                                    "-" 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