From 85036cffa18a7b2594eebea30acbe0b4dfc9f818 Mon Sep 17 00:00:00 2001 From: "N. Brouard" Date: Wed, 30 Sep 2015 18:35:53 +0000 Subject: [PATCH] Summary: Version read from version.h, itself read with cmake --- src/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index dd37460..4a176a0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,8 @@ #Version has to be set in ../CMakeLists.txt too. -VERSION=0.98r0 +#VERSION=0.98r2 +#VERSION=$(shell echo `grep IMACH_VERSION__ version.h | echo 'titi'`) +VERSION=$(shell echo `grep IMACH_VERSION__ version.h | awk 'BEGIN { FS = "[ \t\n\"]+" } { print $$3 }'`) +OSTYPE = $(shell echo $$OSTYPE) # DRIVEG is for VirtualBox Windows 64bit DRIVEG=f: #DIRG is the corresponding build directory for Virtual Windows @@ -475,6 +478,7 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat pwd ;\ cmake ../..;\ cmake --build . ; \ + echo $(OSTYPE);\ rm -rf imach$(VERSION).app;\ mkdir -p imach$(VERSION).app;\ mkdir -p imach$(VERSION).app/Contents;\ -- 2.43.0