72 # to prevent dosname from hanging up the make process when $1 is empty. |
72 # to prevent dosname from hanging up the make process when $1 is empty. |
73 # The cygpath utility does not have this problem. |
73 # The cygpath utility does not have this problem. |
74 # The ALT values should never really have spaces or use \. |
74 # The ALT values should never really have spaces or use \. |
75 # Suspect these environment variables to have spaces and/or \ characters: |
75 # Suspect these environment variables to have spaces and/or \ characters: |
76 # SYSTEMROOT, SystemRoot, WINDIR, windir, PROGRAMFILES, ProgramFiles, |
76 # SYSTEMROOT, SystemRoot, WINDIR, windir, PROGRAMFILES, ProgramFiles, |
77 # DXSDK_DIR, MSTOOLS, Mstools, MSSDK, MSSdk, VC71COMNTOOLS, |
77 # DXSDK_DIR, MSTOOLS, Mstools, MSSDK, MSSdk, VCnnCOMNTOOLS, |
78 # MSVCDIR, MSVCDir. |
78 # MSVCDIR, MSVCDir. |
79 # So use $(subst \,/,) on them first adding quotes and placing them in |
79 # So use $(subst \,/,) on them first adding quotes and placing them in |
80 # their own variable assigned with :=, then use FullPath. |
80 # their own variable assigned with :=, then use FullPath. |
81 # |
81 # |
82 |
82 |
245 xMSVCDIR :="$(_program_files)/Microsoft Visual Studio .NET 2003/Vc7" |
245 xMSVCDIR :="$(_program_files)/Microsoft Visual Studio .NET 2003/Vc7" |
246 _msvc_dir :=$(call FullPath,$(xMSVCDIR)) |
246 _msvc_dir :=$(call FullPath,$(xMSVCDIR)) |
247 endif |
247 endif |
248 endif |
248 endif |
249 endif |
249 endif |
250 ifneq ($(subst MSDev98,OLDOLDOLD,$(_msvc_dir)),$(_msvc_dir)) |
250 # If we still don't have it, look for VSnnCOMNTOOLS (newest first), |
251 _msvc_dir := |
251 # set by installer? |
252 endif |
|
253 # If we still don't have it, look for VS71COMNTOOLS, setup by installer? |
|
254 ifeq ($(_msvc_dir),) |
252 ifeq ($(_msvc_dir),) |
|
253 ifdef VS90COMNTOOLS # /Common/Tools directory, use ../../Vc |
|
254 xVS90COMNTOOLS :="$(subst \,/,$(VS90COMNTOOLS))" |
|
255 _vs90tools :=$(call FullPath,$(xVS90COMNTOOLS)) |
|
256 endif |
|
257 ifneq ($(_vs90tools),) |
|
258 _msvc_dir :=$(_vs90tools)/../../Vc |
|
259 _redist_sdk :=$(_msvc_dir)/../SDK/v3.5/Bin |
|
260 endif |
|
261 ifdef VS80COMNTOOLS # /Common/Tools directory, use ../../Vc |
|
262 xVS80COMNTOOLS :="$(subst \,/,$(VS80COMNTOOLS))" |
|
263 _vs80tools :=$(call FullPath,$(xVS80COMNTOOLS)) |
|
264 endif |
|
265 ifneq ($(_vs80tools),) |
|
266 _msvc_dir :=$(_vs80tools)/../../Vc |
|
267 _redist_sdk :=$(_msvc_dir)/../SDK/v2.0/Bin |
|
268 endif |
255 ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7 |
269 ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7 |
256 xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))" |
270 xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))" |
257 _vs71tools :=$(call FullPath,$(xVS71COMNTOOLS)) |
271 _vs71tools :=$(call FullPath,$(xVS71COMNTOOLS)) |
258 endif |
272 endif |
259 ifneq ($(_vs71tools),) |
273 ifneq ($(_vs71tools),) |
260 _msvc_dir :=$(_vs71tools)/../../Vc7 |
274 _msvc_dir :=$(_vs71tools)/../../Vc7 |
|
275 _redist_sdk :=$(_vs71tools)/../.. |
261 endif |
276 endif |
262 endif |
277 endif |
263 ifneq ($(_msvc_dir),) |
278 ifneq ($(_msvc_dir),) |
264 _compiler_bin :=$(_msvc_dir)/Bin |
279 _compiler_bin :=$(_msvc_dir)/Bin |
265 _redist_sdk :=$(_msvc_dir)/../SDK/v1.1/Bin |
|
266 _ms_sdk :=$(_msvc_dir)/PlatformSDK |
280 _ms_sdk :=$(_msvc_dir)/PlatformSDK |
267 endif |
281 endif |
268 endif |
282 endif |
269 |
283 |
270 # The Microsoft Platform SDK installed by itself |
284 # The Microsoft Platform SDK installed by itself |
433 MSVCRT_DLL_PATH :=$(call FullPath,$(xREDIST_DIR)) |
447 MSVCRT_DLL_PATH :=$(call FullPath,$(xREDIST_DIR)) |
434 endif |
448 endif |
435 MSVCRT_DLL_PATH:=$(call AltCheckSpaces,MSVCRT_DLL_PATH) |
449 MSVCRT_DLL_PATH:=$(call AltCheckSpaces,MSVCRT_DLL_PATH) |
436 MSVCRT_DLL_PATH:=$(call AltCheckValue,MSVCRT_DLL_PATH) |
450 MSVCRT_DLL_PATH:=$(call AltCheckValue,MSVCRT_DLL_PATH) |
437 |
451 |
438 # MSVCR71_DLL_PATH: location of msvcr71.dll that will be re-distributed |
452 # MSVCRNN_DLL_PATH: location of msvcrnn.dll that will be re-distributed |
439 ifdef ALT_MSVCR71_DLL_PATH |
453 ifdef ALT_MSVCRNN_DLL_PATH |
440 xALT_MSVCR71_DLL_PATH :="$(subst \,/,$(ALT_MSVCR71_DLL_PATH))" |
454 xALT_MSVCRNN_DLL_PATH :="$(subst \,/,$(ALT_MSVCRNN_DLL_PATH))" |
441 MSVCR71_DLL_PATH :=$(call FullPath,$(xALT_MSVCR71_DLL_PATH)) |
455 MSVCRNN_DLL_PATH :=$(call FullPath,$(xALT_MSVCRNN_DLL_PATH)) |
442 else |
456 else |
443 ifeq ($(_REDIST71_SDK_EXISTS), true) |
457 ifeq ($(_REDISTNN_SDK_EXISTS), true) |
444 xREDIST71_DIR :=$(_redist_sdk) |
458 xREDISTNN_DIR :=$(_redist_sdk) |
445 else |
459 else |
446 xREDIST71_DIR :=$(_system_root)/system32 |
460 xREDISTNN_DIR :=$(_system_root)/system32 |
447 endif |
461 endif |
448 MSVCR71_DLL_PATH :=$(call FullPath,$(xREDIST71_DIR)) |
462 MSVCRNN_DLL_PATH :=$(call FullPath,$(xREDISTNN_DIR)) |
449 endif |
463 endif |
450 MSVCR71_DLL_PATH :=$(call AltCheckSpaces,MSVCR71_DLL_PATH) |
464 MSVCRNN_DLL_PATH :=$(call AltCheckSpaces,MSVCRNN_DLL_PATH) |
451 MSVCR71_DLL_PATH:=$(call AltCheckValue,MSVCR71_DLL_PATH) |
465 MSVCRNN_DLL_PATH:=$(call AltCheckValue,MSVCRNN_DLL_PATH) |
452 |
466 |
453 else |
467 else |
454 |
468 |
455 # MSVCRT_DLL_PATH: location of msvcrt.dll that will be re-distributed |
469 # MSVCRT_DLL_PATH: location of msvcrt.dll that will be re-distributed |
456 ifdef ALT_MSVCRT_DLL_PATH |
470 ifdef ALT_MSVCRT_DLL_PATH |