From a2b0f3b0fe24888649ce6029380c81c10b76aed9 Mon Sep 17 00:00:00 2001 From: fyodor Date: Mon, 16 Nov 2009 08:30:04 +0000 Subject: [PATCH] grab VC express install location from registry rather than hard coding it, as even the default differs by platform --- mswin32/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mswin32/Makefile b/mswin32/Makefile index ac642c94a..9c2de0c24 100644 --- a/mswin32/Makefile +++ b/mswin32/Makefile @@ -1,5 +1,5 @@ MAKENSIS="/cygdrive/c/Program Files/NSIS/makensis.exe" -VCEXPRESS="/cygdrive/c/Program Files/Microsoft Visual Studio 9.0/Common7/IDE/VCExpress.exe" +VCEXPRESS := $(shell reg query "HKEY_CLASSES_ROOT\\Applications\\VCExpress.exe\\shell\\edit\\command" | egrep '[A-H]:\\' | cut -d\" -f2 | sed 's%\\%/%g' | tr -d '\n') export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' ../nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q') export NMAP_NUM_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_NUM_VERSION' ../nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q') COMMA_VERSION=$(shell echo $(NMAP_NUM_VERSION) | tr '.' ',') @@ -17,7 +17,7 @@ winbuild: @rm ./nmap.nsi.tmp ./nmap.rc.tmp @./license-format/licformat.sh ../COPYING > LICENSE - $(VCEXPRESS) nmap.sln /build release /log $(LOGLOC) + "$(VCEXPRESS)" nmap.sln /build release /log $(LOGLOC) $(MAKENSIS) winpcap/winpcap-nmap.nsi rm -rf nmap-$(NMAP_VERSION) rm -f nmap-$(NMAP_VERSION)-win32.zip