Mercurial > jdk8-mips64-public > corba / file comparison
comparison: make/common/shared/Compiler-msvc.gmk
make/common/shared/Compiler-msvc.gmk
- changeset 150
- ee2d8f1bef5b
- parent 114
- 1c130e7b7a2e
- child 158
- 91006f157c46
equal
deleted
inserted
replaced
| 148:930582f667a1 | 150:ee2d8f1bef5b |
|---|---|
| 95 MTL = $(MSDEVTOOLS_PATH)/midl.exe | 95 MTL = $(MSDEVTOOLS_PATH)/midl.exe |
| 96 ifndef COMPILER_PATH | 96 ifndef COMPILER_PATH |
| 97 COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) | 97 COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) |
| 98 endif | 98 endif |
| 99 endif | 99 endif |
| 100 ifeq ($(CC_MAJORVER), 16) | |
| 101 # This should be: CC_VER=16.00.30319.01 LINK_VER=10.00.30319.01 | |
| 102 REQUIRED_CC_VER = 16.00.30319.01 | |
| 103 REQUIRED_LINK_VER = 10.00.30319.01 | |
| 104 COMPILER_NAME=Visual Studio 10 | |
| 105 COMPILER_VERSION=VS2010 | |
| 106 #rebase and midl moved out of Visual Studio into the SDK: | |
| 107 REBASE = $(MSDEVTOOLS_PATH)/rebase | |
| 108 MTL = $(MSDEVTOOLS_PATH)/midl.exe | |
| 109 ifndef COMPILER_PATH | |
| 110 COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) | |
| 111 endif | |
| 112 endif | |
| 100 else | 113 else |
| 101 # else ARCH_DATA_MODEL is 64 | 114 # else ARCH_DATA_MODEL is 64 |
| 102 ifndef LINK_VER | 115 ifndef LINK_VER |
| 103 LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}') | 116 LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}') |
| 104 export LINK_VER | 117 export LINK_VER |
| 142 REQUIRED_CC_VER = 15.00.21022.8 | 155 REQUIRED_CC_VER = 15.00.21022.8 |
| 143 REQUIRED_LINK_VER = 9.00.21022.8 | 156 REQUIRED_LINK_VER = 9.00.21022.8 |
| 144 COMPILER_NAME=Windows SDK 6.1 Visual Studio 9 | 157 COMPILER_NAME=Windows SDK 6.1 Visual Studio 9 |
| 145 COMPILER_VERSION=VS2008 | 158 COMPILER_VERSION=VS2008 |
| 146 RC = $(MSSDK61)/bin/x64/rc | 159 RC = $(MSSDK61)/bin/x64/rc |
| 147 REBASE = $(MSSDK61/bin/x64/rebase | 160 REBASE = $(MSSDK61)/bin/x64/rebase |
| 148 else | 161 else |
| 149 # This will cause problems if ALT_COMPILER_PATH is defined to "" | 162 ifeq ($(CC_MAJORVER), 16) |
| 150 # which is a directive to use the PATH. | 163 # This should be: CC_VER=16.00.30319.01 LINK_VER=9.00.30319.01 |
| 151 REBASE = $(COMPILER_PATH)../REBASE | 164 REQUIRED_CC_VER = 16.00.30319.01 |
| 165 REQUIRED_LINK_VER = 10.00.30319.01 | |
| 166 COMPILER_NAME=Microsoft Visual Studio 10 | |
| 167 COMPILER_VERSION=VS2010 | |
| 168 RC = $(MSSDK7)/bin/x64/rc | |
| 169 REBASE = $(MSSDK7)/bin/x64/rebase | |
| 170 else | |
| 171 # This will cause problems if ALT_COMPILER_PATH is defined to "" | |
| 172 # which is a directive to use the PATH. | |
| 173 REBASE = $(COMPILER_PATH)../REBASE | |
| 174 endif | |
| 152 endif | 175 endif |
| 153 ifndef COMPILER_PATH | 176 ifndef COMPILER_PATH |
| 154 COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) | 177 COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) |
| 155 endif | 178 endif |
| 156 endif | 179 endif |
