Skip to content

Commit

Permalink
propagate buildtype on Windows for bug #3426
Browse files Browse the repository at this point in the history
  • Loading branch information
adrpo committed Aug 27, 2015
1 parent 3845a69 commit 9834d3a
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions Makefile.omdev.mingw
Expand Up @@ -9,6 +9,9 @@ DBUS_PATH = $(OMDEV)/lib/dbus-1.6.0-win32/
BOOST_PATH = $(OMDEV)/lib/3rdParty/boost-1_55/
PKG_CONFIG_PATH = $(OMDEV)/lib/gtk+-2.24.10/bin/
OSG_PATH = $(OMDEV)/lib/openscenegraph-2.8.3-mingw/
ifeq ($(BUILDTYPE),)
BUILDTYPE=Debug
endif

.PHONY: omc omc-diff omlibrary-core omplot omedit omnotebook omshell omoptim modelica3d

Expand Down Expand Up @@ -52,10 +55,10 @@ simulationruntimecmsvc:
$(MAKE) -C OMCompiler -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR) simulationruntimecmsvc

runtimeCPPmsvcinstall:
$(MAKE) -C OMCompiler -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR) runtimeCPPmsvcinstall
$(MAKE) -C OMCompiler -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR) BUILDTYPE=$(BUILDTYPE) runtimeCPPmsvcinstall

runtimeCPPinstall:
$(MAKE) -C OMCompiler -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR) runtimeCPPinstall
$(MAKE) -C OMCompiler -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR) BUILDTYPE=$(BUILDTYPE) runtimeCPPinstall

testlogwindows:
$(MAKE) -C testsuite -f Makefile ReferenceFiles
Expand Down Expand Up @@ -132,3 +135,10 @@ clean-python:
clean:
$(MAKE) -f $(defaultMakefileTarget) -C OMCompiler clean OMBUILDDIR=$(OMBUILDDIR)
test ! -d $(OMBUILDDIR) || rm -rf $(OMBUILDDIR)

LIBGITDIRS = `ls libraries/git`

gitclean:
git submodule foreach --recursive 'git clean -fdx -e /git -e /svn'
git clean -fdx -e OpenModelicaSetup -e .project -e .externalToolBuilders/OMDev-MINGW-OpenModelicaBuilder.launch
for d in $(LIBGITDIRS); do git clean -fdx libraries/git/$$d; done

0 comments on commit 9834d3a

Please sign in to comment.