Skip to content

Commit 921fc25

Browse files
committed
Use the x64 resourrces for the AnyCpu build.
1 parent f7d7044 commit 921fc25

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

src/Magick.NET/Magick.NET.csproj

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,38 +81,44 @@
8181
<Compile Include="../Shared/TypeHelper.cs" Link="Helpers/TypeHelper.cs" />
8282
</ItemGroup>
8383

84+
<PropertyGroup>
85+
<ResourceFolder>../Magick.Native/resources/Release$(QuantumType)</ResourceFolder>
86+
<ResourceFolder Condition="'$(Platform)' != 'AnyCPU'">$(ResourceFolder)/$(Platform)</ResourceFolder>
87+
<ResourceFolder Condition="'$(Platform)' == 'AnyCPU'">$(ResourceFolder)/x64</ResourceFolder>
88+
</PropertyGroup>
89+
8490
<ItemGroup>
85-
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/$(Platform)/colors.xml" Link="Resources/colors.xml">
91+
<EmbeddedResource Include="$(ResourceFolder)/colors.xml" Link="Resources/colors.xml">
8692
<LogicalName>ImageMagick.Resources.Xml.colors.xml</LogicalName>
8793
</EmbeddedResource>
88-
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/$(Platform)/configure.xml" Link="Resources/configure.xml">
94+
<EmbeddedResource Include="$(ResourceFolder)/configure.xml" Link="Resources/configure.xml">
8995
<LogicalName>ImageMagick.Resources.Xml.configure.xml</LogicalName>
9096
</EmbeddedResource>
91-
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/$(Platform)/delegates.xml" Link="Resources/delegates.xml">
97+
<EmbeddedResource Include="$(ResourceFolder)/delegates.xml" Link="Resources/delegates.xml">
9298
<LogicalName>ImageMagick.Resources.Xml.delegates.xml</LogicalName>
9399
</EmbeddedResource>
94-
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/$(Platform)/english.xml" Link="Resources/english.xml">
100+
<EmbeddedResource Include="$(ResourceFolder)/english.xml" Link="Resources/english.xml">
95101
<LogicalName>ImageMagick.Resources.Xml.english.xml</LogicalName>
96102
</EmbeddedResource>
97-
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/$(Platform)/locale.xml" Link="Resources/locale.xml">
103+
<EmbeddedResource Include="$(ResourceFolder)/locale.xml" Link="Resources/locale.xml">
98104
<LogicalName>ImageMagick.Resources.Xml.locale.xml</LogicalName>
99105
</EmbeddedResource>
100-
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/$(Platform)/log.xml" Link="Resources/log.xml">
106+
<EmbeddedResource Include="$(ResourceFolder)/log.xml" Link="Resources/log.xml">
101107
<LogicalName>ImageMagick.Resources.Xml.log.xml</LogicalName>
102108
</EmbeddedResource>
103-
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/$(Platform)/mime.xml" Link="Resources/mime.xml">
109+
<EmbeddedResource Include="$(ResourceFolder)/mime.xml" Link="Resources/mime.xml">
104110
<LogicalName>ImageMagick.Resources.Xml.mime.xml</LogicalName>
105111
</EmbeddedResource>
106-
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/$(Platform)/policy.xml" Link="Resources/policy.xml">
112+
<EmbeddedResource Include="$(ResourceFolder)/policy.xml" Link="Resources/policy.xml">
107113
<LogicalName>ImageMagick.Resources.Xml.policy.xml</LogicalName>
108114
</EmbeddedResource>
109-
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/$(Platform)/thresholds.xml" Link="Resources/thresholds.xml">
115+
<EmbeddedResource Include="$(ResourceFolder)/thresholds.xml" Link="Resources/thresholds.xml">
110116
<LogicalName>ImageMagick.Resources.Xml.thresholds.xml</LogicalName>
111117
</EmbeddedResource>
112-
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/$(Platform)/type.xml" Link="Resources/type.xml">
118+
<EmbeddedResource Include="$(ResourceFolder)/type.xml" Link="Resources/type.xml">
113119
<LogicalName>ImageMagick.Resources.Xml.type.xml</LogicalName>
114120
</EmbeddedResource>
115-
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/$(Platform)/type-ghostscript.xml" Link="Resources/type-ghostscript.xml">
121+
<EmbeddedResource Include="$(ResourceFolder)/type-ghostscript.xml" Link="Resources/type-ghostscript.xml">
116122
<LogicalName>ImageMagick.Resources.Xml.type-ghostscript.xml</LogicalName>
117123
</EmbeddedResource>
118124
</ItemGroup>

0 commit comments

Comments
 (0)