make/windows/projectfiles/common/Makefile

rev 2073 : imported patch vcproj-64

*** 52,63 ****
  
  # Pick up rules for building JVMTI (JSR-163)
  JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles
  !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make
  
- Platform=$(HOTSPOTWORKSPACE)/make/windows/platform_$(BUILDARCH)
- 
  !if "$(Variant)" == "compiler2"
  # Pick up rules for building adlc
  !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
  !endif
  
--- 52,61 ----
*** 103,123 ****
  HOTSPOT_VM_DISTRO="OpenJDK"
  !endif
  !endif
  
  ProjectCreatorIDEOptions =       $(ProjectCreatorIDEOptions) \
-       -platform            $(Platform) \
        -define              HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \
        -define              JRE_RELEASE_VERSION=\\\"$(JRE_RELEASE_VERSION)\\\" \
        -define              HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\"
  
! $(HOTSPOTBUILDROOT)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
          @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)
  
  clean:
          @rm -rf $(HOTSPOTBUILDSPACE)/classes
!         @rm -r ../$(ProjectFile)
  
  $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class: $(ProjectCreatorSources)
          @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes
          @mkdir $(HOTSPOTBUILDSPACE)\classes
          @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\ProjectCreator -d $(HOTSPOTBUILDSPACE)/classes $(ProjectCreatorSources)
--- 101,120 ----
  HOTSPOT_VM_DISTRO="OpenJDK"
  !endif
  !endif
  
  ProjectCreatorIDEOptions =       $(ProjectCreatorIDEOptions) \
        -define              HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \
        -define              JRE_RELEASE_VERSION=\\\"$(JRE_RELEASE_VERSION)\\\" \
        -define              HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\"
  
! $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
          @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)
  
  clean:
          @rm -rf $(HOTSPOTBUILDSPACE)/classes
!         @rm -r $(HOTSPOTBUILDSPACE)/$(ProjectFile)
  
  $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class: $(ProjectCreatorSources)
          @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes
          @mkdir $(HOTSPOTBUILDSPACE)\classes
          @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\ProjectCreator -d $(HOTSPOTBUILDSPACE)/classes $(ProjectCreatorSources)