Skip to content

Commit

Permalink
Fix the SEMLA Windows build.
Browse files Browse the repository at this point in the history
Belonging to [master]:
  - OpenModelica/OMCompiler#2208
  • Loading branch information
adeas31 authored and OpenModelica-Hudson committed Feb 15, 2018
1 parent 06a166d commit b44f0a7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile.common
Expand Up @@ -42,8 +42,8 @@ semla: mkbuilddirs
mv $(builddir_lib)/omc/SEMLA/lve$(EXE) $(builddir_lib)/omc/SEMLA/LVE/lve_$(LVE_EXE_SUFFIX)$(EXE)

semla-clean:
#rm -rf ../SEMLA/build
#rm -rf ../SEMLA/install
rm -rf ../SEMLA/build
rm -rf ../SEMLA/install
endif # end of OMENCRYPTION

mkbuilddirs:
Expand Down
6 changes: 3 additions & 3 deletions Makefile.omdev.mingw
Expand Up @@ -265,10 +265,10 @@ copycppmsvcheader: getMSVCversion
(cp -puf $(BOOST_PATH_MSVC)/boost/*.hpp $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/* $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)

ifeq ($(OMENCRYPTION),ON)
omc: mkbuilddirs interactive fmil omdev_extra_dlls breakprocess opencl_rt CMinpack metis Cdaskr $(IPOPT_TARGET) graphstream
else
ifeq ($(OMENCRYPTION),yes)
omc: mkbuilddirs interactive fmil omdev_extra_dlls breakprocess opencl_rt CMinpack metis Cdaskr $(IPOPT_TARGET) graphstream semla
else
omc: mkbuilddirs interactive fmil omdev_extra_dlls breakprocess opencl_rt CMinpack metis Cdaskr $(IPOPT_TARGET) graphstream
endif
(time $(MAKE) -f $(defaultMakefileTarget) CFLAGS="$(CFLAGS)" omc-bootstrapped OMBUILDDIR=$(OMBUILDDIR))

Expand Down

0 comments on commit b44f0a7

Please sign in to comment.