External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4 from wuganhao/feature/fix-linking-error

Browse Source 
Fix - failed linking library.
This commit is contained in:
Wu, Ganhao 2021-12-24 15:41:31 +08:00 committed by GitHub
commit e8405ef751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bundle/nuget/fmt.nuspec
View File

@ -9,8 +9,8 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.</description> <description>{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.</description>
<repository type="git" url="https://github.com/$repository$/" /> <repository type="git" url="https://github.com/$repository$/" />
<license type="file">docs\license.md</license> <license type="file">docs\license.md</license>
<readme>docs\readme.md</readme> <readme>docs\readme.md</readme>
<dependencies> <dependencies>
<group targetFramework="native0.0" /> <group targetFramework="native0.0" />
</dependencies> </dependencies>
@ -18,13 +18,13 @@
<files> <files>
<file src="include\fmt\**\*" target="include\fmt\" /> <file src="include\fmt\**\*" target="include\fmt\" />
<file src="build\Debug\fmtd.lib" target="lib\native\x64\debug\" /> <file src="build\Debug\fmtd.lib" target="lib\native\x64\debug\" />
<file src="build\bin\Debug\fmtd.dll" target="lib\native\x64\debug\" /> <file src="build\bin\Debug\fmtd.dll" target="lib\native\x64\debug\" />
<file src="build\bin\Debug\fmtd.pdb" target="lib\native\x64\debug\" /> <file src="build\bin\Debug\fmtd.pdb" target="lib\native\x64\debug\" />
<file src="build\Release\fmt.lib" target="lib\native\x64\debug\" /> <file src="build\Release\fmt.lib" target="lib\native\x64\release\" />
<file src="build\bin\Release\fmt.dll" target="lib\native\x64\debug\" /> <file src="build\bin\Release\fmt.dll" target="lib\native\x64\release\" />
<file src="bundle\nuget\fmt.props" target="build\$Id$.props" /> <file src="bundle\nuget\fmt.props" target="build\$Id$.props" />
<file src="bundle\nuget\fmt.targets" target="build\$Id$.targets" /> <file src="bundle\nuget\fmt.targets" target="build\$Id$.targets" />
<file src="license.md" target="docs\" /> <file src="license.md" target="docs\" />
<file src="readme.md" target="docs\" /> <file src="readme.md" target="docs\" />
</files> </files>
</package> </package>

6
bundle/nuget/fmt.props
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<fmtIncludePaths>$(MSBuildThisFileDirectory)..\include\;$(MSBuildThisFileDirectory)..\lib\native\x64\$(Configuration)</fmtIncludePaths> <fmtIncludePaths>$(MSBuildThisFileDirectory)..\include\</fmtIncludePaths>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'"> <PropertyGroup Condition="'$(Configuration)'=='Release'">
<fmtLibs>fmt.lib;</fmtLibs> <fmtLibs>fmt.lib</fmtLibs>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'"> <PropertyGroup Condition="'$(Configuration)'=='Debug'">
<fmtLibs>fmtd.lib;</fmtLibs> <fmtLibs>fmtd.lib</fmtLibs>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

4
bundle/nuget/fmt.targets
View File

@ -7,7 +7,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<Link> <Link>
<AdditionalDependencies>%(fmtLibs);%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>$(fmtLibs);%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
@ -20,7 +20,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<wxWidgetsArtifacts Include="$(MSBuildThisFileDirectory)..\lib\native\x64\$(Configuration)\*.dll" /> <wxWidgetsArtifacts Include="$(MSBuildThisFileDirectory)..\lib\native\x64\$(Configuration)\*.dll" />
<wxWidgetsArtifacts Condition="'$(Configuration)'=='Debug'" Include="$(MSBuildThisFileDirectory)..\lib\native\x64\$(Configuration)\*.pdb" /> <wxWidgetsArtifacts Condition="'$(Configuration)'=='Debug'" Include="$(MSBuildThisFileDirectory)..\lib\native\$(Platform)\$(Configuration)\*.pdb" />
</ItemGroup> </ItemGroup>
<Target Name="DeployfmtArtifacts"> <Target Name="DeployfmtArtifacts">
<Error Text="Package 'wxWidgets' currently only support 64bit build" Condition="'$(Platform)'!='x64'" /> <Error Text="Package 'wxWidgets' currently only support 64bit build" Condition="'$(Platform)'!='x64'" />