Mercurial > HandyFTP

changeset 111:1be3af76b0ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Try to get the target CPU from the Visual Studio environment, so you don't need to set TARGET_CPU. Also don't fail "installer" target if package subdirectory does not exist.
author Brian Smith <brian@dbsoft.org>
date Tue, 30 May 2017 17:45:07 -0500
parents e105a4f6bf92
children edcbacb6c8dd
files src/makefile.vc
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/makefile.vc	Tue Oct 06 01:49:33 2015 -0500
+++ b/src/makefile.vc	Tue May 30 17:45:07 2017 -0500
@@ -12,7 +12,11 @@
 #	Default to x86 if not specified
 #
 !if "$(TARGET_CPU)" == ""
+!if "$(VSCMD_ARG_TGT_ARCH)" == ""
 TARGET_CPU=x86
+!else
+TARGET_CPU=$(VSCMD_ARG_TGT_ARCH)
+!endif
 !endif
 
 !if "$(TARGET_CPU)" == "x86"
@@ -74,7 +78,7 @@
 # Create a zip file for use with Nullsoft's Install system
 # Requires NSIS and makensis to be in the PATH     
 installer:
-    rd /s /q ..\install\package
+    -rd /s /q ..\install\package
     md ..\install\package
     copy handyftp.exe ..\install\package
     copy $(DWINCDIR)\dw.dll ..\install\package