equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 1997, 2012, 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. |
52 # improving the quality of crash log stack traces involving jvm.dll. |
52 # improving the quality of crash log stack traces involving jvm.dll. |
53 |
53 |
54 # These are always used in all compiles |
54 # These are always used in all compiles |
55 CXX_FLAGS=/nologo /W3 /WX |
55 CXX_FLAGS=/nologo /W3 /WX |
56 |
56 |
57 # Let's add debug information always too. |
57 # Let's add debug information when Full Debug Symbols is enabled |
|
58 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" |
58 CXX_FLAGS=$(CXX_FLAGS) /Zi |
59 CXX_FLAGS=$(CXX_FLAGS) /Zi |
|
60 !endif |
59 |
61 |
60 # Based on BUILDARCH we add some flags and select the default compiler name |
62 # Based on BUILDARCH we add some flags and select the default compiler name |
61 !if "$(BUILDARCH)" == "ia64" |
63 !if "$(BUILDARCH)" == "ia64" |
62 MACHINE=IA64 |
64 MACHINE=IA64 |
63 DEFAULT_COMPILER_NAME=VS2003 |
65 DEFAULT_COMPILER_NAME=VS2003 |
237 LD=link.exe |
239 LD=link.exe |
238 !endif |
240 !endif |
239 LD_FLAGS= $(LD_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \ |
241 LD_FLAGS= $(LD_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \ |
240 comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \ |
242 comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \ |
241 uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \ |
243 uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \ |
242 /opt:ICF,8 /map /debug |
244 /opt:ICF,8 |
|
245 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" |
|
246 LD_FLAGS= $(LD_FLAGS) /map /debug |
|
247 !endif |
243 |
248 |
244 |
249 |
245 !if $(MSC_VER) >= 1600 |
250 !if $(MSC_VER) >= 1600 |
246 LD_FLAGS= $(LD_FLAGS) psapi.lib |
251 LD_FLAGS= $(LD_FLAGS) psapi.lib |
247 !endif |
252 !endif |