comparison make/windows/makefiles/adlc.make @ 12044:6aef5b6bbdd8

Merge.
author Doug Simon <doug.simon@oracle.com>
date Thu, 10 Oct 2013 18:26:09 +0200
parents ce8969c36762
children de6a9e811145
comparison
equal deleted inserted replaced
12043:e6fd83e09082 12044:6aef5b6bbdd8
53 /I "$(WorkSpace)\src\os\windows\vm" \ 53 /I "$(WorkSpace)\src\os\windows\vm" \
54 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm" 54 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm"
55 55
56 !if "$(Platform_arch_model)" == "$(Platform_arch)" 56 !if "$(Platform_arch_model)" == "$(Platform_arch)"
57 SOURCES_AD=\ 57 SOURCES_AD=\
58 $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad \ 58 $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad
59 $(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm/windows_$(Platform_arch_model).ad
60 !else 59 !else
61 SOURCES_AD=\ 60 SOURCES_AD=\
62 $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad \ 61 $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad \
63 $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch).ad \ 62 $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch).ad
64 $(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm/windows_$(Platform_arch_model).ad
65 !endif 63 !endif
66 64
67 # NOTE! If you add any files here, you must also update GENERATED_NAMES_IN_DIR 65 # NOTE! If you add any files here, you must also update GENERATED_NAMES_IN_DIR
68 # and ProjectCreatorIDEOptions in projectcreator.make. 66 # and ProjectCreatorIDEOptions in projectcreator.make.
69 GENERATED_NAMES=\ 67 GENERATED_NAMES=\