Mercurial > hg > truffle
comparison make/windows/makefiles/vm.make @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | 5a95c784febf 8b46b0196eb0 |
children | b9a918201d47 |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
1 # | 1 # |
2 # Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | 4 # |
5 # This code is free software; you can redistribute it and/or modify it | 5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as | 6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. | 7 # published by the Free Software Foundation. |
40 CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT" | 40 CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT" |
41 !endif | 41 !endif |
42 | 42 |
43 !if "$(Variant)" == "core" | 43 !if "$(Variant)" == "core" |
44 # No need to define anything, CORE is defined as !COMPILER1 && !COMPILER2 | 44 # No need to define anything, CORE is defined as !COMPILER1 && !COMPILER2 |
45 !endif | |
46 | |
47 !if "$(Variant)" == "kernel" | |
48 CXX_FLAGS=$(CXX_FLAGS) /D "KERNEL" | |
49 !endif | 45 !endif |
50 | 46 |
51 !if "$(Variant)" == "compiler1" | 47 !if "$(Variant)" == "compiler1" |
52 CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1" | 48 CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1" |
53 !endif | 49 !endif |