Mercurial > jdk8-mips64-public > corba / file comparison
comparison: make/common/shared/Defs-windows.gmk
make/common/shared/Defs-windows.gmk
- changeset 57
- 9c0cc0d0eca2
- parent 1
- 55540e827aef
- child 98
- a12ea7c7b497
equal
deleted
inserted
replaced
| 56:53d5b45f73ab | 57:9c0cc0d0eca2 |
|---|---|
| 280 endif | 280 endif |
| 281 endif | 281 endif |
| 282 | 282 |
| 283 # Compilers for 64bit are from SDK | 283 # Compilers for 64bit are from SDK |
| 284 ifeq ($(ARCH_DATA_MODEL), 64) | 284 ifeq ($(ARCH_DATA_MODEL), 64) |
| 285 ifneq ($(_ms_sdk),) | 285 xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/" |
| 286 MSSDK61 :=$(call FullPath,$(xMSSDK61)) | |
| 287 xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/" | |
| 288 _vs2008 :=$(call FullPath,$(xVS2008)) | |
| 289 ifneq ($(_vs2008),) | |
| 286 ifeq ($(ARCH), ia64) | 290 ifeq ($(ARCH), ia64) |
| 287 _compiler_bin :=$(_ms_sdk)/Bin/Win64 | 291 _compiler_bin :=$(_vs2008)/VC/Bin/x86_ia64 |
| 288 endif | 292 endif |
| 289 ifeq ($(ARCH), amd64) | 293 ifeq ($(ARCH), amd64) |
| 290 _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH) | 294 _compiler_bin :=$(_vs2008)/VC/Bin/$(ARCH) |
| 291 _redist_sdk :=$(_ms_sdk)/redist/win64/AMD64 | 295 _redist_sdk :=$(MSSDK61)/VC/redist |
| 296 endif | |
| 297 else | |
| 298 ifneq ($(_ms_sdk),) | |
| 299 ifeq ($(ARCH), ia64) | |
| 300 _compiler_bin :=$(_ms_sdk)/Bin/Win64 | |
| 301 endif | |
| 302 ifeq ($(ARCH), amd64) | |
| 303 _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH) | |
| 304 _redist_sdk :=$(_ms_sdk)/redist/win64/AMD64 | |
| 305 endif | |
| 292 endif | 306 endif |
| 293 endif | 307 endif |
| 294 endif | 308 endif |
| 295 | 309 |
| 296 # Location on system where jdk installs might be | 310 # Location on system where jdk installs might be |
