comparison make/windows/makefiles/projectcreator.make @ 9704:f9a65a0e626b

Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Mon, 13 May 2013 17:11:31 +0200
parents 62838eadbf56
children 836a62f43af9
comparison
equal deleted inserted replaced
9703:57113d21ce36 9704:f9a65a0e626b
53 -relativeInclude src\share\vm\prims\wbtestmethods \ 53 -relativeInclude src\share\vm\prims\wbtestmethods \
54 -relativeInclude src\share\vm\prims \ 54 -relativeInclude src\share\vm\prims \
55 -relativeInclude src\os\windows\vm \ 55 -relativeInclude src\os\windows\vm \
56 -relativeInclude src\os_cpu\windows_$(Platform_arch)\vm \ 56 -relativeInclude src\os_cpu\windows_$(Platform_arch)\vm \
57 -relativeInclude src\cpu\$(Platform_arch)\vm \ 57 -relativeInclude src\cpu\$(Platform_arch)\vm \
58 -relativeInclude src\gpu \
58 -absoluteInclude $(HOTSPOTBUILDSPACE)/%f/generated \ 59 -absoluteInclude $(HOTSPOTBUILDSPACE)/%f/generated \
59 -relativeSrcInclude src \ 60 -relativeSrcInclude src \
60 -absoluteSrcInclude $(HOTSPOTBUILDSPACE) \ 61 -absoluteSrcInclude $(HOTSPOTBUILDSPACE) \
61 -ignorePath $(HOTSPOTBUILDSPACE) \ 62 -ignorePath $(HOTSPOTBUILDSPACE) \
62 -ignorePath launcher \ 63 -ignorePath launcher \