Add version resources and tweak name and other strings

This commit is contained in:
Cameron Gutman 2018-11-10 22:37:18 -08:00
parent a6136ee16e
commit aff55adf7f
4 changed files with 32 additions and 3 deletions

20
GSv6Fwd/GSv6Fwd.rc Normal file
View File

@ -0,0 +1,20 @@
#include <windows.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "Moonlight Game Streaming Project"
VALUE "FileDescription", "IPv6 Forwarder for GameStream"
VALUE "ProductName", "IPv6 Forwarder for GameStream"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END

View File

@ -150,6 +150,9 @@
<ClCompile Include="GSv6Fwd.cpp" /> <ClCompile Include="GSv6Fwd.cpp" />
<ClCompile Include="pcp.cpp" /> <ClCompile Include="pcp.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ResourceCompile Include="GSv6Fwd.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

View File

@ -22,4 +22,9 @@
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ResourceCompile Include="GSv6Fwd.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project> </Project>

View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"> xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension">
<Product Id="*" Name="IPv6 Forwarder for GS Protocol" Language="1033" Version="1.0.0.0" Manufacturer="Moonlight Game Streaming Project" UpgradeCode="cae27153-26ed-4da2-8dd5-8cddc7126a05"> <Product Id="*" Name="IPv6 Forwarder for GameStream" Language="1033" Version="!(bind.fileVersion.GSv6FwdExe)"
Manufacturer="Moonlight Game Streaming Project" UpgradeCode="cae27153-26ed-4da2-8dd5-8cddc7126a05">
<Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" /> <Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
@ -15,7 +16,7 @@
<Fragment> <Fragment>
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder"> <Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="GS IPv6 Forwarder" /> <Directory Id="INSTALLFOLDER" Name="IPv6 Forwarder for GameStream" />
</Directory> </Directory>
</Directory> </Directory>
</Fragment> </Fragment>
@ -23,7 +24,7 @@
<Fragment> <Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<Component Id="ProductComponent"> <Component Id="ProductComponent">
<File Source="$(var.GSv6Fwd.TargetPath)" KeyPath="yes"> <File Source="$(var.GSv6Fwd.TargetPath)" KeyPath="yes" Id="GSv6FwdExe">
<fire:FirewallException Id="FwException" <fire:FirewallException Id="FwException"
Scope="any" Scope="any"
Name="IPv6 Forwarder for GS Protocol"/> Name="IPv6 Forwarder for GS Protocol"/>