Update -input

This commit is contained in:
Julio C. Rocha 2024-05-10 16:13:09 -07:00
parent 7f63b88ee5
commit 358caf653f
3 changed files with 160 additions and 102 deletions

1
.gitignore vendored
View File

@ -95,5 +95,4 @@ Thumbs.db
/Plugin64/RSP/RSP-HLE_d.dll /Plugin64/RSP/RSP-HLE_d.dll
/Plugin64/RSP/RSP-HLE.dll /Plugin64/RSP/RSP-HLE.dll
/Save /Save
/Source/Project64-input/Version.h
/Source/Project64-video/Version.h /Source/Project64-video/Version.h

View File

@ -1,102 +1,102 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </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"> <ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{D3F979CE-8FA7-48C9-A2B3-A33594B48536}</ProjectGuid> <ProjectGuid>{D3F979CE-8FA7-48C9-A2B3-A33594B48536}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>Project64input</RootNamespace> <RootNamespace>Project64input</RootNamespace>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Configuration"> <PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" /> <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
</ImportGroup> </ImportGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<PropertyGroup> <PropertyGroup>
<TargetName>Project64-Input</TargetName> <TargetName>Project64-Input</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">Project64-Input_d</TargetName> <TargetName Condition="'$(Configuration)'=='Debug'">Project64-Input_d</TargetName>
<OutDir>$(SolutionDir)Plugin\Input\</OutDir> <OutDir>$(SolutionDir)Plugin\Input\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\Input\</OutDir> <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\Input\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile> </ClCompile>
<PreBuildEvent> <PreBuildEvent>
<Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\Project64-input\Version.h.in" "$(SolutionDir)Source\Project64-input\Version.h"</Command> <!-- <Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\Project64-input\Version.h.in" "$(SolutionDir)Source\Project64-input\Version.h"</Command> -->
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies>dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">$(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">$(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(Root)Source\3rdParty\directx\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(Root)Source\3rdParty\directx\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="DeviceNotification.cpp" /> <ClCompile Include="DeviceNotification.cpp" />
<ClCompile Include="DirectInput.cpp" /> <ClCompile Include="DirectInput.cpp" />
<ClCompile Include="InputConfigUI.cpp" /> <ClCompile Include="InputConfigUI.cpp" />
<ClCompile Include="InputMain.cpp" /> <ClCompile Include="InputMain.cpp" />
<ClCompile Include="CProject64Input.cpp" /> <ClCompile Include="CProject64Input.cpp" />
<ClCompile Include="InputSettings.cpp" /> <ClCompile Include="InputSettings.cpp" />
<ClCompile Include="OptionsUI.cpp" /> <ClCompile Include="OptionsUI.cpp" />
<ClCompile Include="ShortcutsUI.cpp" /> <ClCompile Include="ShortcutsUI.cpp" />
<ClCompile Include="wtl-BitmapPicture.cpp" /> <ClCompile Include="wtl-BitmapPicture.cpp" />
<ClCompile Include="wtl-ScanButton.cpp" /> <ClCompile Include="wtl-ScanButton.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Button.h" /> <ClInclude Include="Button.h" />
<ClInclude Include="DeviceNotification.h" /> <ClInclude Include="DeviceNotification.h" />
<ClInclude Include="InputSettings.h" /> <ClInclude Include="InputSettings.h" />
<ClInclude Include="InputSettingsID.h" /> <ClInclude Include="InputSettingsID.h" />
<ClInclude Include="N64Controller.h" /> <ClInclude Include="N64Controller.h" />
<ClInclude Include="DirectInput.h" /> <ClInclude Include="DirectInput.h" />
<ClInclude Include="InputConfigUI.h" /> <ClInclude Include="InputConfigUI.h" />
<ClInclude Include="CProject64Input.h" /> <ClInclude Include="CProject64Input.h" />
<ClInclude Include="OptionsUI.h" /> <ClInclude Include="OptionsUI.h" />
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
<ClInclude Include="Shortcuts.h" /> <ClInclude Include="Shortcuts.h" />
<ClInclude Include="ShortcutsUI.h" /> <ClInclude Include="ShortcutsUI.h" />
<ClInclude Include="wtl-BitmapPicture.h" /> <ClInclude Include="wtl-BitmapPicture.h" />
<ClInclude Include="wtl-ScanButton.h" /> <ClInclude Include="wtl-ScanButton.h" />
<ClInclude Include="wtl.h" /> <ClInclude Include="wtl.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="Project64-input.rc" /> <ResourceCompile Include="Project64-input.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="Controller.bmp" /> <Image Include="Controller.bmp" />
<Image Include="Mouse.bmp" /> <Image Include="Mouse.bmp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Common\Common.vcxproj"> <ProjectReference Include="..\Common\Common.vcxproj">
<Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project> <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Settings\Settings.vcxproj"> <ProjectReference Include="..\Settings\Settings.vcxproj">
<Project>{8b9961b1-88d9-4ea3-a752-507a00dd9f3d}</Project> <Project>{8b9961b1-88d9-4ea3-a752-507a00dd9f3d}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\UpdateVersion\UpdateVersion.vcxproj"> <ProjectReference Include="..\UpdateVersion\UpdateVersion.vcxproj">
<Project>{1968162c-0793-491d-91a1-81645a24d399}</Project> <Project>{1968162c-0793-491d-91a1-81645a24d399}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -0,0 +1,59 @@
#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-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) \
"-" STRINGIZE(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