Mercurial > hg > truffle
diff make/windows/makefiles/projectcreator.make @ 7216:5a95c784febf
fixed windows make files and VS2012-specific compilation issues
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Tue, 04 Dec 2012 11:14:23 +0100 |
parents | e522a00b91aa |
children | 5fc51c1ecdeb |
line wrap: on
line diff
--- a/make/windows/makefiles/projectcreator.make Tue Dec 04 10:10:02 2012 +0100 +++ b/make/windows/makefiles/projectcreator.make Tue Dec 04 11:14:23 2012 +0100 @@ -144,6 +144,9 @@ -ignorePath_TARGET tiered \ -ignorePath_TARGET c1_ +ProjectCreatorIDEOptionsIgnoreGraal=\ + -ignorePath_TARGET graal + ProjectCreatorIDEOptionsIgnoreCompiler2=\ -ignorePath_TARGET compiler2 \ -ignorePath_TARGET tiered \ @@ -230,15 +233,18 @@ -define_compiler1 COMPILER1 \ -ignorePath_compiler1 core \ -ignorePath_compiler1 src/share/vm/graal \ -$(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1) + $(ProjectCreatorIDEOptionsIgnoreGraal:TARGET=compiler1) \ + $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1) ################################################## # Graal compiler specific options ################################################## ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ - -define_graal COMPILER1 \ -define_graal GRAAL \ -$(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=graal) + -ignorePath_graal core \ + -ignorePath_graal src/share/vm/c1 \ + $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=graal) \ + $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=graal) ################################################## # Server(C2) compiler specific options @@ -260,6 +266,7 @@ -additionalFile_compiler2 ad_$(Platform_arch_model)_pipeline.cpp \ -additionalFile_compiler2 adGlobals_$(Platform_arch_model).hpp \ -additionalFile_compiler2 dfa_$(Platform_arch_model).cpp \ + $(ProjectCreatorIDEOptionsIgnoreGraal:TARGET=compiler2) \ $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=compiler2) # Add in the jvmti (JSR-163) options