diff options
| author | Linus Färnstrand <faern@faern.net> | 2022-10-06 17:30:30 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2022-10-10 11:55:56 +0200 |
| commit | ec7ea9fb689c6c3087ccbc4d37cbb786fff44895 (patch) | |
| tree | 51d75bf5b47aeed30dfa2078fe42fe580243903b /windows | |
| parent | 447793c6f8c1dd69486ef395475bede7e06adfee (diff) | |
| download | mullvadvpn-ec7ea9fb689c6c3087ccbc4d37cbb786fff44895.tar.xz mullvadvpn-ec7ea9fb689c6c3087ccbc4d37cbb786fff44895.zip | |
Make Visual Studio/C++ projects fetch version.h from mullvad-version
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/winfw/src/winfw/winfw.rc | 2 | ||||
| -rw-r--r-- | windows/winfw/src/winfw/winfw.vcxproj | 12 | ||||
| -rw-r--r-- | windows/winnet/src/winnet/winnet.rc | 2 | ||||
| -rw-r--r-- | windows/winnet/src/winnet/winnet.vcxproj | 18 |
4 files changed, 32 insertions, 2 deletions
diff --git a/windows/winfw/src/winfw/winfw.rc b/windows/winfw/src/winfw/winfw.rc index 1e70710b75..a101cebb61 100644 --- a/windows/winfw/src/winfw/winfw.rc +++ b/windows/winfw/src/winfw/winfw.rc @@ -1,4 +1,4 @@ -#include "../../../../dist-assets/windows/version.h" +#include "../../../version.h" 1 VERSIONINFO FILEVERSION MAJOR_VERSION,MINOR_VERSION,PATCH_VERSION,0 diff --git a/windows/winfw/src/winfw/winfw.vcxproj b/windows/winfw/src/winfw/winfw.vcxproj index afdb8daec1..f13b019889 100644 --- a/windows/winfw/src/winfw/winfw.vcxproj +++ b/windows/winfw/src/winfw/winfw.vcxproj @@ -181,6 +181,9 @@ <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories> <ModuleDefinitionFile>winfw.def</ModuleDefinitionFile> </Link> + <PreBuildEvent> + <Command>cargo run -q --bin mullvad-version version.h > $(ProjectDir)..\..\..\version.h</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> @@ -201,6 +204,9 @@ <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories> <ModuleDefinitionFile>winfw.def</ModuleDefinitionFile> </Link> + <PreBuildEvent> + <Command>cargo run -q --bin mullvad-version version.h > $(ProjectDir)..\..\..\version.h</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> @@ -225,6 +231,9 @@ <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories> <ModuleDefinitionFile>winfw.def</ModuleDefinitionFile> </Link> + <PreBuildEvent> + <Command>cargo run -q --bin mullvad-version version.h > $(ProjectDir)..\..\..\version.h</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> @@ -249,6 +258,9 @@ <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories> <ModuleDefinitionFile>winfw.def</ModuleDefinitionFile> </Link> + <PreBuildEvent> + <Command>cargo run -q --bin mullvad-version version.h > $(ProjectDir)..\..\..\version.h</Command> + </PreBuildEvent> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/windows/winnet/src/winnet/winnet.rc b/windows/winnet/src/winnet/winnet.rc index 253d011bc1..0509b4a59e 100644 --- a/windows/winnet/src/winnet/winnet.rc +++ b/windows/winnet/src/winnet/winnet.rc @@ -1,4 +1,4 @@ -#include "../../../../dist-assets/windows/version.h" +#include "../../../version.h" 1 VERSIONINFO FILEVERSION MAJOR_VERSION,MINOR_VERSION,PATCH_VERSION,0 diff --git a/windows/winnet/src/winnet/winnet.vcxproj b/windows/winnet/src/winnet/winnet.vcxproj index c32fa0972a..e38fd0e4b1 100644 --- a/windows/winnet/src/winnet/winnet.vcxproj +++ b/windows/winnet/src/winnet/winnet.vcxproj @@ -173,6 +173,9 @@ <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories> <AdditionalDependencies>libshared.lib;libcommon.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> + <PreBuildEvent> + <Command>cargo run -q --bin mullvad-version version.h > $(ProjectDir)..\..\..\version.h</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'"> <ClCompile> @@ -197,6 +200,9 @@ <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-Debug</AdditionalLibraryDirectories> <AdditionalDependencies>libshared.lib;libcommon.lib;Iphlpapi.lib</AdditionalDependencies> </Lib> + <PreBuildEvent> + <Command>cargo run -q --bin mullvad-version version.h > $(ProjectDir)..\..\..\version.h</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> @@ -217,6 +223,9 @@ <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories> <ModuleDefinitionFile>winnet.def</ModuleDefinitionFile> </Link> + <PreBuildEvent> + <Command>cargo run -q --bin mullvad-version version.h > $(ProjectDir)..\..\..\version.h</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'"> <ClCompile> @@ -241,6 +250,9 @@ <AdditionalDependencies>libshared.lib;libcommon.lib;Iphlpapi.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-Debug</AdditionalLibraryDirectories> </Lib> + <PreBuildEvent> + <Command>cargo run -q --bin mullvad-version version.h > $(ProjectDir)..\..\..\version.h</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> @@ -265,6 +277,9 @@ <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories> <AdditionalDependencies>libshared.lib;libcommon.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> + <PreBuildEvent> + <Command>cargo run -q --bin mullvad-version version.h > $(ProjectDir)..\..\..\version.h</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> @@ -289,6 +304,9 @@ <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration)</AdditionalLibraryDirectories> <AdditionalDependencies>libshared.lib;libcommon.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> + <PreBuildEvent> + <Command>cargo run -q --bin mullvad-version version.h > $(ProjectDir)..\..\..\version.h</Command> + </PreBuildEvent> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> |