--- a/hotspot/make/windows/makefiles/projectcreator.make	Thu Dec 17 12:16:03 2015 -0800
+++ b/hotspot/make/windows/makefiles/projectcreator.make	Thu Dec 17 08:41:48 2015 -0800
@@ -70,6 +70,7 @@
         -ignorePath zero \
         -ignorePath aix \
         -ignorePath aarch64 \
+        -ignorePath jdk.vm.ci \
         -hidePath .hg
 
 
@@ -120,19 +121,23 @@
 # Add in build-specific options
 !if "$(BUILDARCH)" == "i486"
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
-	-platformName Win32 \
+        -platformName Win32 \
+        -ignorePath x86_64 \
+        -ignorePath src\share\vm\jvmci \
+        -ignoreFile jvmciCodeInstaller_x86.cpp \
         -define IA32 \
-        -ignorePath x86_64 \
+        -define INCLUDE_JVMCI=0 \
         -define TARGET_ARCH_MODEL_x86_32
 !else
 !if "$(BUILDARCH)" == "amd64"
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
-	-platformName x64 \
+        -platformName x64 \
+        -ignorePath x86_32 \
         -define AMD64 \
-	-define _LP64 \
-        -ignorePath x86_32 \
+        -define _LP64 \
+        -define INCLUDE_JVMCI=1 \
         -define TARGET_ARCH_MODEL_x86_64 \
-	-define TARGET_OS_ARCH_MODEL_windows_x86_64
+        -define TARGET_OS_ARCH_MODEL_windows_x86_64
 !endif
 !endif
 
@@ -141,10 +146,6 @@
  -ignorePath_TARGET tiered \
  -ignorePath_TARGET c1_
 
-ProjectCreatorIDEOptionsIgnoreJVMCI=\
- -ignorePath_TARGET src/share/vm/jvmci \
- -ignorePath_TARGET vm/jvmci
-
 ProjectCreatorIDEOptionsIgnoreCompiler2=\
  -ignorePath_TARGET compiler2 \
  -ignorePath_TARGET tiered \
@@ -165,8 +166,6 @@
 ##################################################
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
  -define_compiler1 COMPILER1 \
- -define_compiler1 INCLUDE_JVMCI=0 \
-$(ProjectCreatorIDEOptionsIgnoreJVMCI:TARGET=compiler1) \
 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1)
 
 ##################################################