equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 1999, 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. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
72 MSVCPNN_DLL = msvcp100.dll |
72 MSVCPNN_DLL = msvcp100.dll |
73 MS_RUNTIME_LIBRARIES = $(MSVCRNN_DLL) |
73 MS_RUNTIME_LIBRARIES = $(MSVCRNN_DLL) |
74 endif |
74 endif |
75 |
75 |
76 EXTRA_LFLAGS += /LIBPATH:$(DXSDK_LIB_PATH) |
76 EXTRA_LFLAGS += /LIBPATH:$(DXSDK_LIB_PATH) |
|
77 |
|
78 # Full Debug Symbols has been enabled on Windows since JDK1.4.1. |
|
79 # Default is enabled with debug info files ZIP'ed to save space. |
|
80 |
|
81 ENABLE_FULL_DEBUG_SYMBOLS ?= 1 |
|
82 |
|
83 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
|
84 ZIP_DEBUGINFO_FILES ?= 1 |
|
85 else |
|
86 ZIP_DEBUGINFO_FILES=0 |
|
87 endif |
77 |
88 |
78 # C Compiler flag definitions |
89 # C Compiler flag definitions |
79 |
90 |
80 # |
91 # |
81 # Default optimization |
92 # Default optimization |
199 # -YX -Fp/.../foobar.pch Use precompiled headers (try someday?) |
210 # -YX -Fp/.../foobar.pch Use precompiled headers (try someday?) |
200 # -nologo Don't print out startup message |
211 # -nologo Don't print out startup message |
201 # /D _STATIC_CPPLIB |
212 # /D _STATIC_CPPLIB |
202 # Use static link for the C++ runtime (so msvcpnn.dll not needed) |
213 # Use static link for the C++ runtime (so msvcpnn.dll not needed) |
203 # |
214 # |
204 CFLAGS_COMMON += -Zi -nologo |
215 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
|
216 CFLAGS_COMMON += -Zi |
|
217 endif |
|
218 CFLAGS_COMMON += -nologo |
205 CFLAGS_OPT = $(CC_OPT) |
219 CFLAGS_OPT = $(CC_OPT) |
206 CFLAGS_DBG = -Od $(MS_RUNTIME_DEBUG_OPTION) |
220 CFLAGS_DBG = -Od $(MS_RUNTIME_DEBUG_OPTION) |
207 |
221 |
208 CFLAGS_VS2010 += -Zc:wchar_t- |
222 CFLAGS_VS2010 += -Zc:wchar_t- |
209 |
223 |
303 # Settings for the JDI - Serviceability Agent binding. |
317 # Settings for the JDI - Serviceability Agent binding. |
304 HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/bin |
318 HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/bin |
305 SALIB_NAME = $(LIB_PREFIX)sawindbg.$(LIBRARY_SUFFIX) |
319 SALIB_NAME = $(LIB_PREFIX)sawindbg.$(LIBRARY_SUFFIX) |
306 SAMAP_NAME = $(LIB_PREFIX)sawindbg.map |
320 SAMAP_NAME = $(LIB_PREFIX)sawindbg.map |
307 SAPDB_NAME = $(LIB_PREFIX)sawindbg.pdb |
321 SAPDB_NAME = $(LIB_PREFIX)sawindbg.pdb |
|
322 SA_DIZ_NAME = $(LIB_PREFIX)sawindbg.diz |
308 |
323 |
309 ifeq ($(ARCH), ia64) |
324 ifeq ($(ARCH), ia64) |
310 # SA will never be supported here. |
325 # SA will never be supported here. |
311 INCLUDE_SA = false |
326 INCLUDE_SA = false |
312 else |
327 else |