fix windows build

OpenModelica · Sep 29, 2015 · 9e3866d · 9e3866d
1 parent ed9ce6f
commit 9e3866d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/SimulationRuntime/java_interface/Makefile.omdev.mingw b/SimulationRuntime/java_interface/Makefile.omdev.mingw
@@ -1,13 +1,14 @@
-top_builddir = ../../../../
+OMBUILDDIR = ../../../
+top_builddir = ../../
 
 include Makefile.common
 
 modelica_java.jar: $(java_sources)
 	@echo "* Compiling modelica_java.jar"
 	@rm -rf bin-jar; mkdir bin-jar
 	@"$(JAVAC)" -source 5 -cp "$(antlr)" -d bin-jar $(java_sources)
-	@"$(JAR)" cf $@ $(java_sources:src/%=-C src %) $(resources:src/%=-C src %) -C bin-jar . || (rm $@ && false)
+	@$(JAR) cf modelica_java.jar $(java_sources:src/%=-C src %) $(resources:src/%=-C src %) -C bin-jar . || (rm $@ && false)
 test: $(java_sources)
 	rm -rf bin-test; mkdir bin-test
-	@"$(JAVAC)" -source 5 -cp "$(antlr);$(junit)" -d bin-test $(java_sources) $(java_tests)
-	"$(JAVA)" -cp "bin-test;src;$(antlr);$(junit)" org.junit.runner.JUnitCore $(junit_tests)
+	"$(JAVAC)" -source 5 -cp "$(antlr):$(junit)" -d bin-test $(java_sources) $(java_tests)
+	OPENMODELICAHOME="@OMBUILDDIR@" $(JAVA) -cp "bin-test:src:$(antlr):$(junit)" org.junit.runner.JUnitCore $(junit_tests)