Mercurial > hg > truffle
comparison make/windows/makefiles/vm.make @ 11144:33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
Reviewed-by: anthony, dholmes, dcubed
Contributed-by: Tim Bell <timothy.bell@oracle.com>
author | dholmes |
---|---|
date | Mon, 15 Jul 2013 23:23:15 -0400 |
parents | f2110083203d |
children | 6b0fd0964b87 31f3b1e1c5e5 |
comparison
equal
deleted
inserted
replaced
11143:ee9e76adced3 | 11144:33c52908bcdb |
---|---|
130 | 130 |
131 CXX_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER | 131 CXX_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER |
132 | 132 |
133 !if "$(USE_PRECOMPILED_HEADER)" != "0" | 133 !if "$(USE_PRECOMPILED_HEADER)" != "0" |
134 CXX_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" | 134 CXX_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" |
135 !if "$(COMPILER_NAME)" == "VS2012" | |
136 # VS2012 requires this object file to be listed: | |
137 LD_FLAGS=$(LD_FLAGS) _build_pch_file.obj | |
138 !endif | |
135 !else | 139 !else |
136 CXX_USE_PCH=$(CXX_DONT_USE_PCH) | 140 CXX_USE_PCH=$(CXX_DONT_USE_PCH) |
137 !endif | 141 !endif |
138 | 142 |
139 # Where to find the source code for the virtual machine (is this used?) | 143 # Where to find the source code for the virtual machine (is this used?) |