From a6167742811a69d98a716de8f0defa5e50af17d9 Mon Sep 17 00:00:00 2001 From: Scott Blomquist Date: Thu, 3 Jan 2013 23:36:04 +0100 Subject: windows: improve Visual Studio Express build support * Moved generated files to a clearer directory. * Improved detection logic for ctrpp.exe tool. Closes #4482 --- configure | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 3445153c09..a8687f26f5 100755 --- a/configure +++ b/configure @@ -604,15 +604,14 @@ def configure_winsdk(o): if not sys.platform.startswith('win32'): return - try: - p = subprocess.Popen(['ctrpp.exe'], - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - except OSError: + winsdk_dir = os.environ.get("WindowsSdkDir") + + if winsdk_dir and os.path.isfile(winsdk_dir + '\\bin\\ctrpp.exe'): + print "Found ctrpp in WinSDK--will build generated files into tools/msvs/genfiles." + o['variables']['node_has_winsdk'] = 'true' return - o['variables']['node_has_winsdk'] = 'true' + print "ctrpp not found in WinSDK path--using pre-gen files from tools/msvs/genfiles." output = { -- cgit v1.2.3