Windows: Run the upnp string gen script regardless of architecture, and in UWP.

This commit is contained in:
Henrik Rydgård 2020-07-22 00:26:43 +02:00
parent 47f0031f57
commit 5f2156fa27
3 changed files with 100 additions and 1 deletions

View file

@ -212,6 +212,11 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<PreBuildEvent>
<Command>cd ..\..\ext\miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd ..\..\..\..\UWP\miniupnpc_UWP</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -227,6 +232,11 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<PreBuildEvent>
<Command>cd ..\..\ext\miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd ..\..\..\..\UWP\miniupnpc_UWP</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UWP Gold|Win32'">
<ClCompile>
@ -242,6 +252,11 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<PreBuildEvent>
<Command>cd ..\..\ext\miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd ..\..\..\..\UWP\miniupnpc_UWP</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
<ClCompile>
@ -257,6 +272,11 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<PreBuildEvent>
<Command>cd ..\..\ext\miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd ..\..\..\..\UWP\miniupnpc_UWP</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
@ -272,6 +292,11 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<PreBuildEvent>
<Command>cd ..\..\ext\miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd ..\..\..\..\UWP\miniupnpc_UWP</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
<ClCompile>
@ -287,6 +312,11 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<PreBuildEvent>
<Command>cd ..\..\ext\miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd ..\..\..\..\UWP\miniupnpc_UWP</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
@ -302,6 +332,11 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<PreBuildEvent>
<Command>cd ..\..\ext\miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd ..\..\..\..\UWP\miniupnpc_UWP</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UWP Gold|arm'">
<ClCompile>
@ -317,6 +352,11 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<PreBuildEvent>
<Command>cd ..\..\ext\miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd ..\..\..\..\UWP\miniupnpc_UWP</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UWP Gold|ARM64'">
<ClCompile>
@ -332,6 +372,11 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<PreBuildEvent>
<Command>cd ..\..\ext\miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd ..\..\..\..\UWP\miniupnpc_UWP</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@ -347,6 +392,11 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<PreBuildEvent>
<Command>cd ..\..\ext\miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd ..\..\..\..\UWP\miniupnpc_UWP</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@ -362,6 +412,11 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<PreBuildEvent>
<Command>cd ..\..\ext\miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd ..\..\..\..\UWP\miniupnpc_UWP</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UWP Gold|x64'">
<ClCompile>
@ -377,6 +432,11 @@
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
<PreBuildEvent>
<Command>cd ..\..\ext\miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd ..\..\..\..\UWP\miniupnpc_UWP</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\connecthostport.h" />
@ -421,6 +481,9 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UWP Gold|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\ext\miniupnp\miniupnpc\msvc\genminiupnpcstrings.vbs" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

View file

@ -90,5 +90,13 @@
<Filter Include="src">
<UniqueIdentifier>{3e20a98f-6a6c-4ba1-8b5a-d44430460dd1}</UniqueIdentifier>
</Filter>
<Filter Include="scripts">
<UniqueIdentifier>{f940ecfb-a971-43b3-9f9d-afe3545e9798}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\..\ext\miniupnp\miniupnpc\msvc\genminiupnpcstrings.vbs">
<Filter>scripts</Filter>
</None>
</ItemGroup>
</Project>

View file

@ -77,7 +77,7 @@
<RootNamespace>miniupnpc</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Windows\fix_2017.props" />
</ImportGroup>
@ -290,6 +290,34 @@ cd..\..\..</Command>
<PreBuildEvent>
<Command>cd miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd..\..\..</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<PreBuildEvent>
<Command>cd miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd..\..\..</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<PreBuildEvent>
<Command>cd miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd..\..\..</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<PreBuildEvent>
<Command>cd miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd..\..\..</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<PreBuildEvent>
<Command>cd miniupnp\miniupnpc\msvc
genminiupnpcstrings.vbs
cd..\..\..</Command>
</PreBuildEvent>
</ItemDefinitionGroup>