Mercurial > jdk8-mips64-public > corba / file comparison
comparison: make/common/shared/Defs-windows.gmk
make/common/shared/Defs-windows.gmk
- changeset 150
- ee2d8f1bef5b
- parent 114
- 1c130e7b7a2e
- child 158
- 91006f157c46
equal
deleted
inserted
replaced
| 148:930582f667a1 | 150:ee2d8f1bef5b |
|---|---|
| 220 endif | 220 endif |
| 221 endif | 221 endif |
| 222 ifneq ($(subst MSDev98,OLDOLDOLD,$(SHORTMSVCDIR)),$(SHORTMSVCDIR)) | 222 ifneq ($(subst MSDev98,OLDOLDOLD,$(SHORTMSVCDIR)),$(SHORTMSVCDIR)) |
| 223 SHORTMSVCDIR := | 223 SHORTMSVCDIR := |
| 224 endif | 224 endif |
| 225 # If we still don't have it, look for VS100COMNTOOLS, setup by installer? | |
| 226 ifeq ($(SHORTMSVCDIR),) | |
| 227 ifdef VS100COMNTOOLS # /Common/Tools directory, use ../../Vc | |
| 228 xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))" | |
| 229 _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS)) | |
| 230 endif | |
| 231 ifneq ($(_vs100tools),) | |
| 232 SHORTMSVCDIR :=$(_vs100tools)/../../Vc | |
| 233 endif | |
| 234 endif | |
| 235 export SHORTMSVCDIR | |
| 225 # If we still don't have it, look for VS71COMNTOOLS, setup by installer? | 236 # If we still don't have it, look for VS71COMNTOOLS, setup by installer? |
| 226 ifeq ($(SHORTMSVCDIR),) | 237 ifeq ($(SHORTMSVCDIR),) |
| 227 ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7 | 238 ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7 |
| 228 xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))" | 239 xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))" |
| 229 _vs71tools :=$(call FullPath,$(xVS71COMNTOOLS)) | 240 _vs71tools :=$(call FullPath,$(xVS71COMNTOOLS)) |
| 270 endif | 281 endif |
| 271 | 282 |
| 272 # Compilers for 64bit are from SDK | 283 # Compilers for 64bit are from SDK |
| 273 ifeq ($(ARCH_DATA_MODEL), 64) | 284 ifeq ($(ARCH_DATA_MODEL), 64) |
| 274 ifndef SHORTCOMPILERBIN | 285 ifndef SHORTCOMPILERBIN |
| 275 xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/" | 286 ifdef VS100COMNTOOLS # /Common7/Tools directory, use ../../Vc |
| 276 MSSDK61 :=$(call FullPath,$(xMSSDK61)) | 287 xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))" |
| 277 xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/" | 288 _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS)) |
| 278 _vs2008 :=$(call FullPath,$(xVS2008)) | 289 endif |
| 279 ifneq ($(_vs2008),) | 290 ifneq ($(_vs100tools),) |
| 280 ifeq ($(ARCH), ia64) | 291 SHORTCOMPILERBIN :=$(_vs100tools)/../../Vc/bin/amd64 |
| 281 SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/x86_ia64 | 292 xMSSDK70 :="C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/" |
| 282 endif | 293 MSSDK7 :=$(call FullPath,$(xMSSDK70)) |
| 283 ifeq ($(ARCH), amd64) | 294 export MSSDK7 |
| 284 SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/$(ARCH) | 295 else |
| 285 endif | 296 xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/" |
| 286 else | 297 MSSDK61 :=$(call FullPath,$(xMSSDK61)) |
| 287 ifneq ($(SHORTPSDK),) | 298 xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/" |
| 299 _vs2008 :=$(call FullPath,$(xVS2008)) | |
| 300 ifneq ($(_vs2008),) | |
| 288 ifeq ($(ARCH), ia64) | 301 ifeq ($(ARCH), ia64) |
| 289 SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64 | 302 SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/x86_ia64 |
| 290 endif | 303 endif |
| 291 ifeq ($(ARCH), amd64) | 304 ifeq ($(ARCH), amd64) |
| 292 SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64/x86/$(ARCH) | 305 SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/$(ARCH) |
| 306 endif | |
| 307 else | |
| 308 ifneq ($(SHORTPSDK),) | |
| 309 ifeq ($(ARCH), ia64) | |
| 310 SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64 | |
| 311 endif | |
| 312 ifeq ($(ARCH), amd64) | |
| 313 SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64/x86/$(ARCH) | |
| 314 endif | |
| 293 endif | 315 endif |
| 294 endif | 316 endif |
| 295 endif | 317 endif |
| 296 export SHORTCOMPILERBIN | 318 export SHORTCOMPILERBIN |
| 297 endif | 319 endif |
