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

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

View File

@ -9,8 +9,8 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<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$/" />
<license type="file">docs\license.md</license>
<readme>docs\readme.md</readme>
<license type="file">docs\license.md</license>
<readme>docs\readme.md</readme>
<dependencies>
<group targetFramework="native0.0" />
</dependencies>
@ -18,13 +18,13 @@
<files>
<file src="include\fmt\**\*" target="include\fmt\" />
<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.pdb" target="lib\native\x64\debug\" />
<file src="build\Release\fmt.lib" target="lib\native\x64\debug\" />
<file src="build\bin\Release\fmt.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\Release\fmt.lib" target="lib\native\x64\release\" />
<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.targets" target="build\$Id$.targets" />
<file src="license.md" target="docs\" />
<file src="readme.md" target="docs\" />
<file src="license.md" target="docs\" />
<file src="readme.md" target="docs\" />
</files>
</package>

View File

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

View File

@ -7,7 +7,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>%(fmtLibs);%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(fmtLibs);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
@ -20,7 +20,7 @@
</PropertyGroup>
<ItemGroup>
<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>
<Target Name="DeployfmtArtifacts">
<Error Text="Package 'wxWidgets' currently only support 64bit build" Condition="'$(Platform)'!='x64'" />