Skip to content

Commit

Permalink
OMBUILDDIR absolute path and git HEAD
Browse files Browse the repository at this point in the history
- Set absolute path for OMBUILDDIR otherwise ModelicaExternalC configure
doesn't work
- Get the git SHA instead of svn revision.
- Set Modelica.g EOL to LF.
- Set OMBUILDIR in Parser makefile to properly copy the parser lib.
  • Loading branch information
adeas31 committed May 5, 2015
1 parent a608558 commit 6c148e7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile.common
Expand Up @@ -150,7 +150,7 @@ opencl_rt_clean:

breakprocess:
(cd tools/debugging/ && time g++ BreakProcess.cpp -o BreakProcess -static-libgcc)
(cd tools/debugging/ && cp BreakProcess.exe ../../$(builddir_bin)/)
(cd tools/debugging/ && cp BreakProcess.exe $(builddir_bin))

all-runtimeCPPinstall:
$(MAKE) mkbuilddirs
Expand Down
6 changes: 3 additions & 3 deletions Makefile.omdev.mingw
Expand Up @@ -3,7 +3,7 @@ all : .testvariables settings release

autoconfGeneratedFiles =

OMBUILDDIR=./build
OMBUILDDIR=$(CURDIR)/build
prefix = ./build
exec_prefix = ${prefix}
bindir = ${exec_prefix}/bin
Expand Down Expand Up @@ -57,7 +57,7 @@ FMILIB_SHARED = OFF
# For Windows build static CMinpack lib!
CMINPACKLIB_SHARED = OFF

CONFIG_REVISION = $(shell svn info | grep "Revision: " | cut -d ' ' -f 2)
CONFIG_REVISION = $(shell git rev-parse HEAD)

revision:
@echo Current revision: $(CONFIG_REVISION)
Expand Down Expand Up @@ -179,7 +179,7 @@ copycppheader:
omc: mkbuilddirs interactive fmil omdev_extra_dlls breakprocess opencl_rt CMinpack metis Cdaskr $(IPOPT_TARGET) graphstream
(time $(MAKE) -f $(defaultMakefileTarget) CFLAGS="$(CFLAGS)" omc-bootstrapped)

boehm-gc-lib: build/lib/omc/libomcgc.a
boehm-gc-lib: $(OMBUILDDIR)/lib/omc/libomcgc.a

fmil_msvc:
rm -f build/lib/omc/msvc/fmil*
Expand Down
1 change: 1 addition & 0 deletions Parser/Makefile.omdev.mingw
Expand Up @@ -3,6 +3,7 @@ CXX=g++
CFLAGS=-O3 -Wall
CPPFLAGS=-I$(COMPILERHOME) $(RMLINC) -I. -I$(ANTLR) -I$(ANTLR)/include $(BUILDINC) -I../3rdParty/gc/include

OMBUILDDIR=../build
OMC=../build/bin/omc.exe
LIB_OMC=lib/omc
ANTLR_LIB=libomantlr3.a
Expand Down

0 comments on commit 6c148e7

Please sign in to comment.