Restructure Windows build project

build-windows/libpEpasn1/libpEpasn1.vcxproj

@@ -60,6 +60,9 @@
     <Link>
       <SubSystem>Windows</SubSystem>
     </Link>
+    <PreBuildEvent>
+      <Command>IF EXIST ".\Debug\libpEpasn1.tlog\unsuccessfulbuild" CD..\.. &amp;&amp; CALL .\build-windows\generate_code.cmd</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -77,6 +80,9 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
+    <PreBuildEvent>
+      <Command>IF EXIST ".\Release\libpEpasn1.tlog\unsuccessfulbuild" CD..\.. &amp;&amp; CALL .\build-windows\generate_code.cmd</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <Text Include="ReadMe.txt" />
@@ -92,8 +98,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-  <Target Name="BeforeRebuild">
-    <Message Text="Generating Code for pEp Sync" />
-    <Exec Command="CD &quot;$(ProjectDir)..\..&quot; &amp;&amp; &quot;$(ProjectDir)..\generate_code.cmd&quot;" />
-  </Target>
 </Project>

build-windows/pEpEngine.vcxproj

@@ -87,8 +87,6 @@
     </Link>
     <PreBuildEvent>
       <Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml" -p sequoia-openpgp-ffi</Command>
-      <Message>
-      </Message>
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>xcopy "$(SolutionDir)sequoia\target\debug\sequoia_openpgp_ffi.dll" "$(TargetDir)" /Y</Command>
@@ -121,8 +119,6 @@
     </Link>
     <PreBuildEvent>
       <Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml" --release -p sequoia-openpgp-ffi</Command>
-      <Message>
-      </Message>
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>xcopy "$(SolutionDir)sequoia\target\release\sequoia_openpgp_ffi.dll" "$(TargetDir)" /Y</Command>