make/windows/makefiles/compile.make

changeset 2540
15d6977f04b0
parent 2397
dbf8dcf069d1
child 2590
99bd05619fa4
equal deleted inserted replaced
2521:b83527d0482d 2540:15d6977f04b0
1 # 1 #
2 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1997, 2011, 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.
139 !if "$(MSC_VER)" == "1600" 139 !if "$(MSC_VER)" == "1600"
140 COMPILER_NAME=VS2010 140 COMPILER_NAME=VS2010
141 !endif 141 !endif
142 !endif 142 !endif
143 143
144 # Add what version of the compiler we think this is to the compile line
145 CPP_FLAGS=$(CPP_FLAGS) /D "MSC_VER=$(MSC_VER)"
146
147 # By default, we do not want to use the debug version of the msvcrt.dll file 144 # By default, we do not want to use the debug version of the msvcrt.dll file
148 # but if MFC_DEBUG is defined in the environment it will be used. 145 # but if MFC_DEBUG is defined in the environment it will be used.
149 MS_RUNTIME_OPTION = /MD 146 MS_RUNTIME_OPTION = /MD
150 !if "$(MFC_DEBUG)" == "true" 147 !if "$(MFC_DEBUG)" == "true"
151 MS_RUNTIME_OPTION = /MTd /D "_DEBUG" 148 MS_RUNTIME_OPTION = /MTd /D "_DEBUG"

mercurial