Skip to content

Commit

Permalink
-use $MAKE instead of make
Browse files Browse the repository at this point in the history
  • Loading branch information
adrpo authored and OpenModelica-Hudson committed Dec 3, 2016
1 parent 8c41330 commit 6c8d8e3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions SimulationRuntime/cpp/Makefile.omdev.mingw
Expand Up @@ -134,7 +134,7 @@ runtimeCpp:
mkdir -p Build_$(PLATFORM); \
(cd ./Build_$(PLATFORM); echo "change to Build_$(PLATFORM)"; \
cmake -G "MSYS Makefiles" -DPLATFORM=$(PLATFORM) $(CMAKE_FLAGS) $(IS_MINGW32) $(IS_MINGW64) -DCMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" MAKE_CXX_COMPILER=g++ ../; \
make);)
$(MAKE));)

runtimeCPPmsvc: getMSVCversion
test -f """${VSCOMNTOOLS}/../../VC/vcvarsall.bat"""
Expand Down Expand Up @@ -197,7 +197,7 @@ endif

install: runtimeCpp
$(foreach PLATFORM, $(PLATFORMS), \
(cd Build_$(PLATFORM); make install);)
(cd Build_$(PLATFORM); $(MAKE) install);)
cp -p $(OMDEVMSYS)/lib/3rdParty/boost-1_55/lib/*.dll $(builddir_bin)/.
ifeq (MINGW32,$(findstring MINGW32,$(shell uname)))
(cd Build; cp -p $(OMDEVMSYS)/tools/msys/mingw32/bin/libboost*.dll $(builddir_bin)/.)
Expand Down

0 comments on commit 6c8d8e3

Please sign in to comment.