Skip to content

Commit 7a27184

Browse files
committed
Set the MAGICKCORE_LIBRARY_NAME through a Directory.Build.targets file instead.
1 parent fb27340 commit 7a27184

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ src/ImageMagick/Configure
55
src/ImageMagick/Dependencies
66
src/ImageMagick/Imagemagick
77
src/ImageMagick/ProjectFiles
8+
src/ImageMagick/Directory.Build.targets
89
src/ImageMagick/*.sln
910
src/Magick.Native/lib
1011
src/Magick.Native/bin

build/windows/build.cmd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ set quantumName=%quantum%
3232
if not "%hdri%"=="noHdri" set quantumName=%quantumName%-HDRI
3333
if not "%openMP%"=="noOpenMP" set quantumName=%quantumName%-OpenMP
3434

35-
set library_name=Magick.Native-%quantumName%-%architecture%
35+
set library_name=Magick.Native-%quantumName%-%architecture%.dll
36+
echo ^<Project^>^<ItemDefinitionGroup Condition="'$(MSBuildProjectName)' == 'CORE_MagickCore'"^>^<ClCompile^>^<PreprocessorDefinitions^>%%(PreprocessorDefinitions);MAGICKCORE_LIBRARY_NAME="%library_name%"^</PreprocessorDefinitions^>^</ClCompile^>^</ItemDefinitionGroup^>^</Project^> > Directory.Build.targets
3637

37-
msbuild IM7.Static.%architecture%.sln /m /t:Rebuild /p:Configuration=%config%,Platform=%architecture%,PreprocessorDefinitions="%(PreprocessorDefinitions);MAGICKCORE_LIBRARY_NAME=\"%library_name%\""
38+
msbuild IM7.Static.%architecture%.sln /m /t:Rebuild /p:Configuration=%config%,Platform=%architecture%
3839

3940
if %ERRORLEVEL% neq 0 (
4041
cd %SCRIPT_DIR%

0 commit comments

Comments
 (0)