Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit b44f0a7

Browse files
adeas31OpenModelica-Hudson
authored andcommitted
Fix the SEMLA Windows build.
Belonging to [master]: - #2208
1 parent 06a166d commit b44f0a7

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Makefile.common

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ semla: mkbuilddirs
4242
mv $(builddir_lib)/omc/SEMLA/lve$(EXE) $(builddir_lib)/omc/SEMLA/LVE/lve_$(LVE_EXE_SUFFIX)$(EXE)
4343

4444
semla-clean:
45-
#rm -rf ../SEMLA/build
46-
#rm -rf ../SEMLA/install
45+
rm -rf ../SEMLA/build
46+
rm -rf ../SEMLA/install
4747
endif # end of OMENCRYPTION
4848

4949
mkbuilddirs:

Makefile.omdev.mingw

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,10 @@ copycppmsvcheader: getMSVCversion
265265
(cp -puf $(BOOST_PATH_MSVC)/boost/*.hpp $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
266266
(cp -pufr $(BOOST_PATH_MSVC)/boost/* $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
267267

268-
ifeq ($(OMENCRYPTION),ON)
269-
omc: mkbuilddirs interactive fmil omdev_extra_dlls breakprocess opencl_rt CMinpack metis Cdaskr $(IPOPT_TARGET) graphstream
270-
else
268+
ifeq ($(OMENCRYPTION),yes)
271269
omc: mkbuilddirs interactive fmil omdev_extra_dlls breakprocess opencl_rt CMinpack metis Cdaskr $(IPOPT_TARGET) graphstream semla
270+
else
271+
omc: mkbuilddirs interactive fmil omdev_extra_dlls breakprocess opencl_rt CMinpack metis Cdaskr $(IPOPT_TARGET) graphstream
272272
endif
273273
(time $(MAKE) -f $(defaultMakefileTarget) CFLAGS="$(CFLAGS)" omc-bootstrapped OMBUILDDIR=$(OMBUILDDIR))
274274

0 commit comments

Comments
 (0)