From 7a02d0c27da4fffb797470845f726c87ab886517 Mon Sep 17 00:00:00 2001
From: Mike Wey
Date: Tue, 20 Jun 2017 20:37:19 +0200
Subject: Update dub.json, See #19

---
 dub.json | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'dub.json')

diff --git a/dub.json b/dub.json
index 68f6288..35955fa 100644
--- a/dub.json
+++ b/dub.json
@@ -6,26 +6,27 @@
 	"targetType": "library",
 	"sourcePaths": ["dmagick"],
 	"importPaths": ["dmagick"],
-	"libs": ["MagickCore"],
 	"configurations": [
 		{
 			"name": "windows",
 			"platforms": ["windows"],
 			"sourceFiles-x86": ["MagickCore.lib"],
 			"preGenerateCommands": [
-				"powershell -Command \"get-content $PACKAGE_DIR/dmagick/c/magickVersion.d.in | %{$$_ -replace '@MagickLibVersion@','700'} | %{$$_ -replace '@MagickLibVersionText@','7.0.0'} | %{$$_ -replace '@QuantumDepth@','16'} | %{$$_ -replace '@HDRI@','false'} | Set-Content $PACKAGE_DIR/dmagick/c/magickVersion.d.in\""
+				"powershell -Command \"get-content $PACKAGE_DIR/dmagick/c/magickVersion.d.in | %{$$_ -replace '@MagickLibVersion@','700'} | %{$$_ -replace '@MagickLibVersionText@','7.0.0'} | %{$$_ -replace '@QuantumDepth@','16'} | %{$$_ -replace '@HDRI@','false'} | Set-Content $PACKAGE_DIR/dmagick/c/magickVersion.d\""
 			],
 			"preGenerateCommands-x86": [
-				"@echo @for %%i in (%1) do @if NOT \"%%~$PATH:i\"==\"\" @copy \"%%~$PATH:i\" $PACKAGE_DIR/ > copydll.bat",
+				"@echo @for %%i in (%1) do @if NOT \"%%~$$PATH:i\"==\"\" @copy /Y \"%%~$$PATH:i\" \"$PACKAGE_DIR\" > copydll.bat",
 				"copydll CORE_RL_magick_.dll",
-				"implib /s $PACKAGE_DIR/MagickCore.lib $PACKAGE_DIR/CORE_RL_magick_.dll",
+				"cd $PACKAGE_DIR",
+				"implib /s MagickCore.lib CORE_RL_magick_.dll",
 				"@del copydll.bat",
-				"del $PACKAGE_DIR/CORE_RL_magick_.dll"
+				"del $PACKAGE_DIR\\CORE_RL_magick_.dll"
 			]
 
 		},
 		{
 			"name": "other",
+			"libs": ["MagickCore"],
 			"preGenerateCommands": [
 				"PACKAGE_DIR=$PACKAGE_DIR $PACKAGE_DIR/build-aux/magickVersion.sh"
 			]
-- 
cgit v1.2.3