mario/TDMtermite
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

virtual destructor for tdmdatatype, makefile: compile on Darwin

Browse Source
This commit is contained in:
Mario Fink 2021-01-22 12:24:55 +01:00
parent 1488aed089
commit 90253f819a
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/tdm_datatype.hpp
View File

@ -41,6 +41,7 @@ public:
tdmdatatype(): sint16_(0), sint32_(0),
uint8_(0), uint16_(0), uint32_(0),
float32_(0.0), float64_(0.0) {};
virtual ~tdmdatatype() = default;
friend std::ostream& operator<<(std::ostream& out, const tdmdatatype& num)
{
return num.print(out);

15
makefile
View File

@ -22,6 +22,9 @@ GHSH := $(shell git rev-parse HEAD | head -c8)
# define install location
INST := /usr/local/bin
# platform
OST := $(shell uname)
# --------------------------------------------------------------------------- #
# CLI tool
@ -37,8 +40,14 @@ uninstall : $(INST)/$(EXE)
# build main.cpp object file and include git version/commit tag
main.o : src/main.cpp lib/$(SRC).hpp lib/tdm_datamodel.hpp
@cp $< $<.cpp
@sed -i 's/TAGSTRING/$(GTAG)/g' $<.cpp
@sed -i 's/HASHSTRING/$(GHSH)/g' $<.cpp
@if [ $(OST) = "Linux" ]; then\
sed -i 's/TAGSTRING/$(GTAG)/g' $<.cpp; \
sed -i 's/HASHSTRING/$(GHSH)/g' $<.cpp; \
fi
@if [ $(OST) = "Darwin" ]; then\
sed -i '' 's/TAGSTRING/$(GTAG)/g' $<.cpp; \
sed -i '' 's/HASHSTRING/$(GHSH)/g' $<.cpp; \
fi
$(CC) -c $(OPT) -I $(LIB) -I lib/ $<.cpp -o $@
@rm $<.cpp
@ -46,7 +55,7 @@ $(SRC).o : lib/$(SRC).cpp lib/$(SRC).hpp lib/tdm_datamodel.hpp
$(CC) -c $(OPT) -I $(LIB) $< -o $@
clean :
rm -f $(EXE) *.o
rm -f $(EXE) *.o src/main.cpp.cpp
# --------------------------------------------------------------------------- #
# check process