virtual destructor for tdmdatatype, makefile: compile on Darwin
This commit is contained in:
parent
1488aed089
commit
90253f819a
@ -41,6 +41,7 @@ public:
|
|||||||
tdmdatatype(): sint16_(0), sint32_(0),
|
tdmdatatype(): sint16_(0), sint32_(0),
|
||||||
uint8_(0), uint16_(0), uint32_(0),
|
uint8_(0), uint16_(0), uint32_(0),
|
||||||
float32_(0.0), float64_(0.0) {};
|
float32_(0.0), float64_(0.0) {};
|
||||||
|
virtual ~tdmdatatype() = default;
|
||||||
friend std::ostream& operator<<(std::ostream& out, const tdmdatatype& num)
|
friend std::ostream& operator<<(std::ostream& out, const tdmdatatype& num)
|
||||||
{
|
{
|
||||||
return num.print(out);
|
return num.print(out);
|
||||||
|
15
makefile
15
makefile
@ -22,6 +22,9 @@ GHSH := $(shell git rev-parse HEAD | head -c8)
|
|||||||
# define install location
|
# define install location
|
||||||
INST := /usr/local/bin
|
INST := /usr/local/bin
|
||||||
|
|
||||||
|
# platform
|
||||||
|
OST := $(shell uname)
|
||||||
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# CLI tool
|
# CLI tool
|
||||||
|
|
||||||
@ -37,8 +40,14 @@ uninstall : $(INST)/$(EXE)
|
|||||||
# build main.cpp object file and include git version/commit tag
|
# build main.cpp object file and include git version/commit tag
|
||||||
main.o : src/main.cpp lib/$(SRC).hpp lib/tdm_datamodel.hpp
|
main.o : src/main.cpp lib/$(SRC).hpp lib/tdm_datamodel.hpp
|
||||||
@cp $< $<.cpp
|
@cp $< $<.cpp
|
||||||
@sed -i 's/TAGSTRING/$(GTAG)/g' $<.cpp
|
@if [ $(OST) = "Linux" ]; then\
|
||||||
@sed -i 's/HASHSTRING/$(GHSH)/g' $<.cpp
|
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 $@
|
$(CC) -c $(OPT) -I $(LIB) -I lib/ $<.cpp -o $@
|
||||||
@rm $<.cpp
|
@rm $<.cpp
|
||||||
|
|
||||||
@ -46,7 +55,7 @@ $(SRC).o : lib/$(SRC).cpp lib/$(SRC).hpp lib/tdm_datamodel.hpp
|
|||||||
$(CC) -c $(OPT) -I $(LIB) $< -o $@
|
$(CC) -c $(OPT) -I $(LIB) $< -o $@
|
||||||
|
|
||||||
clean :
|
clean :
|
||||||
rm -f $(EXE) *.o
|
rm -f $(EXE) *.o src/main.cpp.cpp
|
||||||
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# check process
|
# check process
|
||||||
|
Loading…
x
Reference in New Issue
Block a user