summaryrefslogtreecommitdiffhomepage
path: root/windows/winfw
diff options
context:
space:
mode:
authorLinus Färnstrand <faern@faern.net>2022-10-06 17:30:30 +0200
committerLinus Färnstrand <linus@mullvad.net>2022-10-10 11:55:56 +0200
commitec7ea9fb689c6c3087ccbc4d37cbb786fff44895 (patch)
tree51d75bf5b47aeed30dfa2078fe42fe580243903b /windows/winfw
parent447793c6f8c1dd69486ef395475bede7e06adfee (diff)
downloadmullvadvpn-ec7ea9fb689c6c3087ccbc4d37cbb786fff44895.tar.xz
mullvadvpn-ec7ea9fb689c6c3087ccbc4d37cbb786fff44895.zip
Make Visual Studio/C++ projects fetch version.h from mullvad-version
Diffstat (limited to 'windows/winfw')
-rw-r--r--windows/winfw/src/winfw/winfw.rc2
-rw-r--r--windows/winfw/src/winfw/winfw.vcxproj12
2 files changed, 13 insertions, 1 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 &gt; $(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 &gt; $(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 &gt; $(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 &gt; $(ProjectDir)..\..\..\version.h</Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">