Mercurial > hg > graal-jvmci-8
comparison make/windows/makefiles/compile.make @ 1485:fb57d4cf76c2
6931180: Migration to recent versions of MS Platform SDK
6951582: Build problems on win64
Summary: Changes to enable building JDK7 with Microsoft Visual Studio 2010
Reviewed-by: ohair, art, ccheung, dcubed
author | prr |
---|---|
date | Tue, 11 May 2010 14:35:43 -0700 |
parents | bd02caa94611 |
children | c18cbe5936b8 |
comparison
equal
deleted
inserted
replaced
1403:3221d1887d30 | 1485:fb57d4cf76c2 |
---|---|
90 # 1200 is for VC6 | 90 # 1200 is for VC6 |
91 # 1300 and 1310 is VS2003 or VC7 | 91 # 1300 and 1310 is VS2003 or VC7 |
92 # 1399 is our fake number for the VS2005 compiler that really isn't 1400 | 92 # 1399 is our fake number for the VS2005 compiler that really isn't 1400 |
93 # 1400 is for VS2005 | 93 # 1400 is for VS2005 |
94 # 1500 is for VS2008 | 94 # 1500 is for VS2008 |
95 # 1600 is for VS2010 | |
95 # Do not confuse this MSC_VER with the predefined macro _MSC_VER that the | 96 # Do not confuse this MSC_VER with the predefined macro _MSC_VER that the |
96 # compiler provides, when MSC_VER==1399, _MSC_VER will be 1400. | 97 # compiler provides, when MSC_VER==1399, _MSC_VER will be 1400. |
97 # Normally they are the same, but a pre-release of the VS2005 compilers | 98 # Normally they are the same, but a pre-release of the VS2005 compilers |
98 # in the Windows 64bit Platform SDK said it was 1400 when it was really | 99 # in the Windows 64bit Platform SDK said it was 1400 when it was really |
99 # closer to VS2003 in terms of option spellings, so we use 1399 for that | 100 # closer to VS2003 in terms of option spellings, so we use 1399 for that |
119 COMPILER_NAME=VS2005 | 120 COMPILER_NAME=VS2005 |
120 !endif | 121 !endif |
121 !if "$(MSC_VER)" == "1500" | 122 !if "$(MSC_VER)" == "1500" |
122 COMPILER_NAME=VS2008 | 123 COMPILER_NAME=VS2008 |
123 !endif | 124 !endif |
125 !if "$(MSC_VER)" == "1600" | |
126 COMPILER_NAME=VS2010 | |
127 !endif | |
124 !endif | 128 !endif |
125 | 129 |
126 # Add what version of the compiler we think this is to the compile line | 130 # Add what version of the compiler we think this is to the compile line |
127 CPP_FLAGS=$(CPP_FLAGS) /D "MSC_VER=$(MSC_VER)" | 131 CPP_FLAGS=$(CPP_FLAGS) /D "MSC_VER=$(MSC_VER)" |
128 | 132 |
171 # as resources inside build artifacts. | 175 # as resources inside build artifacts. |
172 MT=mt.exe | 176 MT=mt.exe |
173 !endif | 177 !endif |
174 | 178 |
175 !if "$(COMPILER_NAME)" == "VS2008" | 179 !if "$(COMPILER_NAME)" == "VS2008" |
180 PRODUCT_OPT_OPTION = /O2 /Oy- | |
181 FASTDEBUG_OPT_OPTION = /O2 /Oy- | |
182 DEBUG_OPT_OPTION = /Od | |
183 GX_OPTION = /EHsc | |
184 LINK_FLAGS = /manifest $(LINK_FLAGS) | |
185 # Manifest Tool - used in VS2005 and later to adjust manifests stored | |
186 # as resources inside build artifacts. | |
187 MT=mt.exe | |
188 !endif | |
189 | |
190 !if "$(COMPILER_NAME)" == "VS2010" | |
176 PRODUCT_OPT_OPTION = /O2 /Oy- | 191 PRODUCT_OPT_OPTION = /O2 /Oy- |
177 FASTDEBUG_OPT_OPTION = /O2 /Oy- | 192 FASTDEBUG_OPT_OPTION = /O2 /Oy- |
178 DEBUG_OPT_OPTION = /Od | 193 DEBUG_OPT_OPTION = /Od |
179 GX_OPTION = /EHsc | 194 GX_OPTION = /EHsc |
180 LINK_FLAGS = /manifest $(LINK_FLAGS) | 195 LINK_FLAGS = /manifest $(LINK_FLAGS) |