update Make/files

This commit is contained in:
Christoph Goniva, DCS Computing GmbH
2015-01-05 13:56:45 +01:00
parent 88743b79fd
commit fd44270f96
2 changed files with 8 additions and 0 deletions

View File

@ -1,4 +1,5 @@
cfdemCloud = cfdemCloud
cfdTools = cfdTools
forceModels = subModels/forceModel
forceSubModels = subModels/forceModel/forceSubModels
forceModelsMS = subModels/forceModelMS
@ -19,11 +20,15 @@ $(cfdemCloud)/cfdemCloud.C
derived/cfdemCloudIB/cfdemCloudIB.C
derived/cfdemCloudMS/cfdemCloudMS.C
$(cfdTools)/global.C
$(cfdTools)/newGlobal.C
$(forceModels)/forceModel/forceModel.C
$(forceModels)/forceModel/newForceModel.C
$(forceModels)/noDrag/noDrag.C
$(forceModels)/checkCouplingInterval/checkCouplingInterval.C
$(forceModels)/DiFeliceDrag/DiFeliceDrag.C
$(forceModels)/fieldStore/fieldStore.C
$(forceModels)/GidaspowDrag/GidaspowDrag.C
$(forceModels)/SchillerNaumannDrag/SchillerNaumannDrag.C
$(forceModels)/Archimedes/Archimedes.C

View File

@ -1,6 +1,9 @@
sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(RULES)/mplib$(WM_MPLIB)
GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags)
PFLAGS+= -DGITVERSION=\"$(GIT_VERSION)\"
EXE_INC = \
$(PFLAGS) \