comparison make/windows/makefiles/product.make @ 1983:c760f78e0a53

7003125: precompiled.hpp is included when precompiled headers are not used Summary: Added an ifndef DONT_USE_PRECOMPILED_HEADER to precompiled.hpp. Set up DONT_USE_PRECOMPILED_HEADER when compiling with Sun Studio or when the user specifies USE_PRECOMPILED_HEADER=0. Fixed broken include dependencies. Reviewed-by: coleenp, kvn
author stefank
date Wed, 01 Dec 2010 15:04:06 +0100
parents f95d63e2154a
children cb2d0a362639
comparison
equal deleted inserted replaced
1982:6a2d73358ff7 1983:c760f78e0a53
25 HS_INTERNAL_NAME=jvm 25 HS_INTERNAL_NAME=jvm
26 HS_FNAME=$(HS_INTERNAL_NAME).dll 26 HS_FNAME=$(HS_INTERNAL_NAME).dll
27 AOUT=$(HS_FNAME) 27 AOUT=$(HS_FNAME)
28 GENERATED=../generated 28 GENERATED=../generated
29 29
30 default:: _build_pch_file.obj $(AOUT) checkAndBuildSA 30 # Allow the user to turn off precompiled headers from the command line.
31 !if "$(USE_PRECOMPILED_HEADER)" != "0"
32 BUILD_PCH_FILE=_build_pch_file.obj
33 !endif
34
35 default:: $(BUILD_PCH_FILE) $(AOUT) checkAndBuildSA
31 36
32 !include ../local.make 37 !include ../local.make
33 !include compile.make 38 !include compile.make
34 39
35 CPP_FLAGS=$(CPP_FLAGS) $(PRODUCT_OPT_OPTION) 40 CPP_FLAGS=$(CPP_FLAGS) $(PRODUCT_OPT_OPTION)