fix windows build

Author: adrpo

Compiler/Makefile.omdev.mingw

@@ -65,14 +65,14 @@ reallyclean:
 report:
 	@(cd report ; $(MAKE))
 
-ifeq ($(wildcard ../build/bin/omc.exe),)
+ifeq ($(wildcard $(OMBUILDDIR)/bin/omc.exe),)
 simcode:
 	@echo OpenModelica has not been compiled yet. Using previously generated SimCode files.
 else
 simcode: OpenModelicaBootstrappingHeader.h
 	$(MAKE) -C Template/ -f Makefile.omdev.mingw
 OpenModelicaBootstrappingHeader.h: FrontEnd/Absyn.mo Script/GlobalScript.mo FrontEnd/Values.mo Util/Error.mo Util/Util.mo Util/FMI.mo GenerateOMCHeader.mos
-	../build/bin/omc +g=MetaModelica GenerateOMCHeader.mos > $@.log || (cat $@.log && false)
+	$(OMBUILDDIR)/bin/omc +g=MetaModelica GenerateOMCHeader.mos > $@.log || (cat $@.log && false)
 	@mv $@.new $@
 endif
 $(SUSANMO): simcode

Compiler/boot/Makefile.common

@@ -76,7 +76,7 @@ bootstrap-from-tarball: $(PATCHES)
 runtime-depends:
 	@# NOTE: OpenModelicaBootstrappingHeader.h has to be regenerated without any other process writing to so/etc or you get bus errors
 	$(MAKE) -f $(defaultMakefileTarget) -C .. OpenModelicaBootstrappingHeader.h OMBUILDDIR=$(OMBUILDDIR)
-	$(MAKE) parser compilerruntime
+	$(MAKE) -f $(defaultMakefileTarget) parser compilerruntime
 parser:
 	$(MAKE) -f $(defaultMakefileTarget) -C ../../Parser install OMBUILDDIR=$(OMBUILDDIR)
 compilerruntime:

Compiler/boot/Makefile.omdev.mingw

@@ -3,7 +3,7 @@ CXX=g++
 CFLAGS=-g -falign-functions
 TOP_DIR=../../
 OMHOME=$(OMBUILDDIR)
-LDFLAGS=-L./ -lomparse -lomcruntime -L"$(OMHOME)/lib/omc" \
+LDFLAGS=-L./ $(LOMPARSE) $(LCOMPILERRUNTIME) -L"$(OMHOME)/lib/omc" \
 -lOpenModelicaRuntimeC \
 -lModelicaExternalC -lm \
 -lomantlr3 -lmico2313 -lregex -lwsock32 -llpsolve55 -luuid -lole32 $(GSLIB) -lws2_32 \

Compiler/runtime/Makefile.omdev.mingw

@@ -24,6 +24,7 @@ GRAPHINCLUDE=../../3rdParty/metis-5.1.0/include
 GRAPHSTREAMINCLUDE = ../../3rdParty/graphstream/gs-netstream/c++/src/
 CJSONINCLUDE = ../../3rdParty/cJSON/
 OMBUILDDIR = ../../build
+OMC=$(OMBUILDDIR)/bin/omc
 
 OMPCC = gcc -fopenmp