equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2003, 2010, 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. |
46 BOOT_SOURCE_LANGUAGE_VERSION=6 |
46 BOOT_SOURCE_LANGUAGE_VERSION=6 |
47 BOOT_TARGET_CLASS_VERSION=6 |
47 BOOT_TARGET_CLASS_VERSION=6 |
48 JAVAC_FLAGS=-g -encoding ascii |
48 JAVAC_FLAGS=-g -encoding ascii |
49 BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) |
49 BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) |
50 |
50 |
51 ProjectFile=vm.vcproj |
51 ProjectFile=jvm.vcproj |
52 |
52 |
53 !if "$(MSC_VER)" == "1200" |
53 !if "$(MSC_VER)" == "1200" |
54 |
54 |
55 VcVersion=VC6 |
55 VcVersion=VC6 |
56 ProjectFile=vm.dsp |
56 ProjectFile=vm.dsp |
61 |
61 |
62 !elseif "$(MSC_VER)" == "1500" |
62 !elseif "$(MSC_VER)" == "1500" |
63 |
63 |
64 VcVersion=VC9 |
64 VcVersion=VC9 |
65 |
65 |
|
66 !elseif "$(MSC_VER)" == "1600" |
|
67 |
|
68 # for compatibility - we don't yet have a ProjectCreator for VC10 |
|
69 VcVersion=VC9 |
|
70 |
66 !else |
71 !else |
67 |
72 |
68 VcVersion=VC7 |
73 VcVersion=VC7 |
69 |
74 |
70 !endif |
75 !endif |