make/Main.gmk

@@ -250,11 +250,12 @@
 endef
 
 $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
 
 hotspot-ide-project:
-        +($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
+        +($(CD) $(TOPDIR)/make/ide/visualstudio/hotspot && $(MAKE) $(MAKE_ARGS) \
+            -I $(TOPDIR)/make/hotspot -f CreateVSProject.gmk)
 
 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
     $(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-ide-project
 
 ################################################################################

@@ -283,23 +284,23 @@
 ALL_TARGETS += compile-commands compile-commands-hotspot
 
 ################################################################################
 # VS Code projects
 vscode-project:
-        +($(CD) $(TOPDIR)/make/vscode && $(MAKE) $(MAKE_ARGS) -f CreateVSCodeProject.gmk \
+        +($(CD) $(TOPDIR)/make/ide/vscode/hotspot && $(MAKE) $(MAKE_ARGS) -f CreateVSCodeProject.gmk \
       VSCODE_INDEXER=cpptools)
 
 vscode-project-clangd:
-        +($(CD) $(TOPDIR)/make/vscode && $(MAKE) $(MAKE_ARGS) -f CreateVSCodeProject.gmk \
+        +($(CD) $(TOPDIR)/make/ide/vscode/hotspot && $(MAKE) $(MAKE_ARGS) -f CreateVSCodeProject.gmk \
       VSCODE_INDEXER=clangd)
 
 vscode-project-rtags:
-        +($(CD) $(TOPDIR)/make/vscode && $(MAKE) $(MAKE_ARGS) -f CreateVSCodeProject.gmk \
+        +($(CD) $(TOPDIR)/make/ide/vscode/hotspot && $(MAKE) $(MAKE_ARGS) -f CreateVSCodeProject.gmk \
       VSCODE_INDEXER=rtags)
 
 vscode-project-ccls:
-        +($(CD) $(TOPDIR)/make/vscode && $(MAKE) $(MAKE_ARGS) -f CreateVSCodeProject.gmk \
+        +($(CD) $(TOPDIR)/make/ide/vscode/hotspot && $(MAKE) $(MAKE_ARGS) -f CreateVSCodeProject.gmk \
       VSCODE_INDEXER=ccls)
 
 ALL_TARGETS += vscode-project vscode-project-clangd vscode-project-rtags \
   vscode-project-ccls