1.1 --- a/make/common/shared/Defs-windows.gmk Fri Aug 13 11:38:10 2010 -0700
1.2 +++ b/make/common/shared/Defs-windows.gmk Mon Aug 30 14:39:42 2010 -0700
1.3 @@ -31,7 +31,6 @@
1.4 # Level: Default is 3, 0 means none, 4 is the most but may be unreliable
1.5 # Some makefiles may have set this to 0 to turn off warnings completely,
1.6 # which also effectively creates a COMPILER_WARNINGS_FATAL=false situation.
1.7 -# Program.gmk may turn this down to 2 (building .exe's).
1.8 # Windows 64bit platforms are less likely to be warning free.
1.9 # Historically, Windows 32bit builds should be mostly warning free.
1.10 ifndef COMPILER_WARNING_LEVEL
1.11 @@ -74,7 +73,7 @@
1.12 # The ALT values should never really have spaces or use \.
1.13 # Suspect these environment variables to have spaces and/or \ characters:
1.14 # SYSTEMROOT, SystemRoot, WINDIR, windir, PROGRAMFILES, ProgramFiles,
1.15 -# MSTOOLS, Mstools, MSSDK, MSSdk, VC71COMNTOOLS,
1.16 +# VC71COMNTOOLS,
1.17 # MSVCDIR, MSVCDir.
1.18 # So use $(subst \,/,) on them first adding quotes and placing them in
1.19 # their own variable assigned with :=, then use FullPath.
1.20 @@ -201,124 +200,6 @@
1.21 export SHORTPROGRAMFILES
1.22 endif
1.23
1.24 -# Compilers, SDK, and Visual Studio (MSDEV) [32bit is different from 64bit]
1.25 -ifeq ($(ARCH_DATA_MODEL), 32)
1.26 - ifndef SHORTMSVCDIR
1.27 - # Try looking in MSVCDIR or MSVCDir area first (set by vcvars32.bat)
1.28 - ifdef MSVCDIR
1.29 - xMSVCDIR :="$(subst \,/,$(MSVCDIR))"
1.30 - SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR))
1.31 - else
1.32 - ifdef MSVCDir
1.33 - xMSVCDIR :="$(subst \,/,$(MSVCDir))"
1.34 - SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR))
1.35 - else
1.36 - ifneq ($(SHORTPROGRAMFILES),)
1.37 - xMSVCDIR :="$(SHORTPROGRAMFILES)/Microsoft Visual Studio .NET 2003/Vc7"
1.38 - SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR))
1.39 - endif
1.40 - endif
1.41 - endif
1.42 - ifneq ($(subst MSDev98,OLDOLDOLD,$(SHORTMSVCDIR)),$(SHORTMSVCDIR))
1.43 - SHORTMSVCDIR :=
1.44 - endif
1.45 - # If we still don't have it, look for VS100COMNTOOLS, setup by installer?
1.46 - ifeq ($(SHORTMSVCDIR),)
1.47 - ifdef VS100COMNTOOLS # /Common/Tools directory, use ../../Vc
1.48 - xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
1.49 - _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS))
1.50 - endif
1.51 - ifneq ($(_vs100tools),)
1.52 - SHORTMSVCDIR :=$(_vs100tools)/../../Vc
1.53 - endif
1.54 - endif
1.55 - export SHORTMSVCDIR
1.56 - # If we still don't have it, look for VS71COMNTOOLS, setup by installer?
1.57 - ifeq ($(SHORTMSVCDIR),)
1.58 - ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7
1.59 - xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))"
1.60 - _vs71tools :=$(call FullPath,$(xVS71COMNTOOLS))
1.61 - endif
1.62 - ifneq ($(_vs71tools),)
1.63 - SHORTMSVCDIR :=$(_vs71tools)/../../Vc7
1.64 - endif
1.65 - endif
1.66 - export SHORTMSVCDIR
1.67 - endif
1.68 - ifneq ($(SHORTMSVCDIR),)
1.69 - SHORTCOMPILERBIN :=$(SHORTMSVCDIR)/Bin
1.70 - SHORTPSDK :=$(SHORTMSVCDIR)/PlatformSDK
1.71 - export SHORTCOMPILERBIN
1.72 - export SHORTPSDK
1.73 - endif
1.74 -endif
1.75 -
1.76 -# The Microsoft Platform SDK installed by itself
1.77 -ifneq ($(SHORTPROGRAMFILES),)
1.78 - ifndef SHORTPSDK
1.79 - xPSDK :="$(SHORTPROGRAMFILES)/Microsoft Platform SDK"
1.80 - SHORTPSDK :=$(call FullPath,$(xPSDK))
1.81 - ifeq ($(SHORTPSDK),)
1.82 - xPSDK :="$(SHORTPROGRAMFILES)/Microsoft SDK"
1.83 - SHORTPSDK :=$(call FullPath,$(xMSSDK))
1.84 - endif
1.85 - export SHORTPSDK
1.86 - endif
1.87 -endif
1.88 -
1.89 -# If no SDK found yet, look in other places
1.90 -ifndef SHORTPSDK
1.91 - ifdef MSSDK
1.92 - xMSSDK :="$(subst \,/,$(MSSDK))"
1.93 - SHORTPSDK :=$(call FullPath,$(xMSSDK))
1.94 - else
1.95 - ifdef MSSdk
1.96 - xMSSDK :="$(subst \,/,$(MSSdk))"
1.97 - SHORTPSDK :=$(call FullPath,$(xMSSDK))
1.98 - endif
1.99 - endif
1.100 - export SHORTPSDK
1.101 -endif
1.102 -
1.103 -# Compilers for 64bit are from SDK
1.104 -ifeq ($(ARCH_DATA_MODEL), 64)
1.105 - ifndef SHORTCOMPILERBIN
1.106 - ifdef VS100COMNTOOLS # /Common7/Tools directory, use ../../Vc
1.107 - xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
1.108 - _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS))
1.109 - endif
1.110 - ifneq ($(_vs100tools),)
1.111 - SHORTCOMPILERBIN :=$(_vs100tools)/../../Vc/bin/amd64
1.112 - xMSSDK70 :="C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/"
1.113 - MSSDK7 :=$(call FullPath,$(xMSSDK70))
1.114 - export MSSDK7
1.115 - else
1.116 - xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/"
1.117 - MSSDK61 :=$(call FullPath,$(xMSSDK61))
1.118 - xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/"
1.119 - _vs2008 :=$(call FullPath,$(xVS2008))
1.120 - ifneq ($(_vs2008),)
1.121 - ifeq ($(ARCH), ia64)
1.122 - SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/x86_ia64
1.123 - endif
1.124 - ifeq ($(ARCH), amd64)
1.125 - SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/$(ARCH)
1.126 - endif
1.127 - else
1.128 - ifneq ($(SHORTPSDK),)
1.129 - ifeq ($(ARCH), ia64)
1.130 - SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64
1.131 - endif
1.132 - ifeq ($(ARCH), amd64)
1.133 - SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64/x86/$(ARCH)
1.134 - endif
1.135 - endif
1.136 - endif
1.137 - endif
1.138 - export SHORTCOMPILERBIN
1.139 - endif
1.140 -endif
1.141 -
1.142 # Location on system where jdk installs might be
1.143 ifneq ($(SHORTPROGRAMFILES),)
1.144 USRJDKINSTANCES_PATH =$(SHORTPROGRAMFILES)/Java
1.145 @@ -356,55 +237,6 @@
1.146 export JDK_DEVTOOLS_DIR
1.147 endif
1.148
1.149 -# COMPILER_PATH: path to where the compiler and tools are installed.
1.150 -# NOTE: Must end with / so that it could be empty, allowing PATH usage.
1.151 -ifndef COMPILER_PATH
1.152 - ifdef ALT_COMPILER_PATH
1.153 - xALT_COMPILER_PATH :="$(subst \,/,$(ALT_COMPILER_PATH))"
1.154 - fxALT_COMPILER_PATH :=$(call FullPath,$(xALT_COMPILER_PATH))
1.155 - COMPILER_PATH :=$(call PrefixPath,$(fxALT_COMPILER_PATH))
1.156 - else
1.157 - COMPILER_PATH :=$(call PrefixPath,$(SHORTCOMPILERBIN))
1.158 - endif
1.159 - COMPILER_PATH :=$(call AltCheckSpaces,COMPILER_PATH)
1.160 - export COMPILER_PATH
1.161 -endif
1.162 -
1.163 -# MSDEVTOOLS_PATH: path to where the additional MS Compiler tools are.
1.164 -# NOTE: Must end with / so that it could be empty, allowing PATH usage.
1.165 -ifndef MSDEVTOOLS_PATH
1.166 - ifdef ALT_MSDEVTOOLS_PATH
1.167 - xALT_MSDEVTOOLS_PATH :="$(subst \,/,$(ALT_MSDEVTOOLS_PATH))"
1.168 - fxALT_MSDEVTOOLS_PATH :=$(call FullPath,$(xALT_MSDEVTOOLS_PATH))
1.169 - MSDEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_MSDEVTOOLS_PATH))
1.170 - else
1.171 - ifeq ($(ARCH_DATA_MODEL), 64)
1.172 - ifdef MSTOOLS
1.173 - xMSTOOLS :="$(subst \,/,$(MSTOOLS))"
1.174 - _ms_tools :=$(call FullPath,$(xMSTOOLS))
1.175 - else
1.176 - ifdef Mstools
1.177 - xMSTOOLS :="$(subst \,/,$(Mstools))"
1.178 - _ms_tools :=$(call FullPath,$(xMSTOOLS))
1.179 - else
1.180 - _ms_tools :=
1.181 - endif
1.182 - endif
1.183 - ifneq ($(_ms_tools),)
1.184 - _ms_tools_bin :=$(_ms_tools)/Bin
1.185 - else
1.186 - # Assumes compiler bin is .../Bin/win64/x86/AMD64, rc.exe is 3 levels up
1.187 - _ms_tools_bin :=$(SHORTCOMPILERBIN)/../../..
1.188 - endif
1.189 - else
1.190 - _ms_tools_bin :=$(SHORTCOMPILERBIN)
1.191 - endif
1.192 - MSDEVTOOLS_PATH :=$(call PrefixPath,$(_ms_tools_bin))
1.193 - endif
1.194 - MSDEVTOOLS_PATH:=$(call AltCheckSpaces,MSDEVTOOLS_PATH)
1.195 - export MSDEVTOOLS_PATH
1.196 -endif
1.197 -
1.198 # DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
1.199 # NOTE: Must end with / so that it could be empty, allowing PATH usage.
1.200 ifndef DEVTOOLS_PATH
