Mercurial > hg > truffle

comparison make/windows/makefiles/vm.make @ 12039:3cce976666d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge hs25-b46
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 10 Oct 2013 14:20:04 +0200
parents 6b0fd0964b87 31f3b1e1c5e5
children cefad50507d8
comparison
equal deleted inserted replaced
11958:a0f5be106e67 12039:3cce976666d9
32 32
33 !ifdef RELEASE 33 !ifdef RELEASE
34 CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT" 34 CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT"
35 !else 35 !else
36 CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT" 36 CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT"
37 !endif
38
39 !if "$(Variant)" == "core"
40 # No need to define anything, CORE is defined as !COMPILER1 && !COMPILER2
41 !endif 37 !endif
42 38
43 !if "$(Variant)" == "compiler1" 39 !if "$(Variant)" == "compiler1"
44 CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1" 40 CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1"
45 !endif 41 !endif