equal
deleted
inserted
replaced
42 COMPILE_RMIC=rmic |
42 COMPILE_RMIC=rmic |
43 BOOT_JAVA_HOME= |
43 BOOT_JAVA_HOME= |
44 !endif |
44 !endif |
45 |
45 |
46 # Settings for javac |
46 # Settings for javac |
47 BOOT_SOURCE_LANGUAGE_VERSION=6 |
|
48 BOOT_TARGET_CLASS_VERSION=6 |
|
49 JAVAC_FLAGS=-g -encoding ascii |
47 JAVAC_FLAGS=-g -encoding ascii |
50 BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) |
48 |
|
49 # Prefer BOOT_JDK_SOURCETARGET if it's set (typically by the top build system) |
|
50 # Fall back to the values here if it's not set (hotspot only builds) |
|
51 !ifndef BOOT_JDK_SOURCETARGET |
|
52 BOOTSTRAP_SOURCETARGET=-source 8 -target 8 |
|
53 !else |
|
54 BOOTSTRAP_SOURCETARGET=$(BOOT_JDK_SOURCETARGET) |
|
55 !endif |
|
56 |
|
57 BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) $(BOOTSTRAP_SOURCETARGET) |
51 |
58 |
52 # VS2012 and VS2013 loads VS10 projects just fine (and will |
59 # VS2012 and VS2013 loads VS10 projects just fine (and will |
53 # upgrade them automatically to VS2012 format). |
60 # upgrade them automatically to VS2012 format). |
54 VcVersion=VC10 |
61 VcVersion=VC10 |
55 ProjectFile=jvm.vcxproj |
62 ProjectFile=jvm.vcxproj |