Merge pull request #27 from ThundeRatz/feature/use_bundled_jre

Use bundled JRE to generate cube files
ThundeRatz · Nov 13, 2021 · 57a4eb5 · 57a4eb5
2 parents 8819289 + 1323942
commit 57a4eb5
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -243,9 +243,11 @@ $(BUILD_DIR):
 
 ifeq ($(OS),Windows_NT)
 CUBE_JAR  := "$(CUBE_PATH)\STM32CubeMX.exe"
+JAVA_EXE  := "$(CUBE_PATH)\jre\bin\java.exe"
 JLINK_EXE := JLink.exe
 else
 CUBE_JAR  := "$(CUBE_PATH)/STM32CubeMX"
+JAVA_EXE  := "$(CUBE_PATH)/jre/bin/java"
 JLINK_EXE := JLinkExe
 endif
 
@@ -266,6 +268,9 @@ endif
 
 # Generate Cube Files
 cube: .cube
+	$(AT)$(JAVA_EXE) -jar $(CUBE_JAR) -q $<
+
+cube_old: .cube
 	$(AT)java -jar $(CUBE_JAR) -q $<
 
 # Prepare workspace