Mercurial > hg > truffle

comparison make/windows/makefiles/vm.make @ 11173:6b0fd0964b87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 31 Jul 2013 11:00:54 +0200
parents 836a62f43af9 33c52908bcdb
children 3cce976666d9
comparison
equal deleted inserted replaced
10912:4ea54634f03e 11173:6b0fd0964b87
134 134
135 CXX_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER 135 CXX_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
136 136
137 !if "$(USE_PRECOMPILED_HEADER)" != "0" 137 !if "$(USE_PRECOMPILED_HEADER)" != "0"
138 CXX_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" 138 CXX_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
139 !if "$(COMPILER_NAME)" == "VS2012"
140 # VS2012 requires this object file to be listed:
141 LD_FLAGS=$(LD_FLAGS) _build_pch_file.obj
142 !endif
139 !else 143 !else
140 CXX_USE_PCH=$(CXX_DONT_USE_PCH) 144 CXX_USE_PCH=$(CXX_DONT_USE_PCH)
141 !endif 145 !endif
142 146
143 # Where to find the source code for the virtual machine (is this used?) 147 # Where to find the source code for the virtual machine (is this used?)